-
-
Notifications
You must be signed in to change notification settings - Fork 775
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sync email subscriber and profiles keywords field #4474
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
''' | ||
Copyright (C) 2019 Gitcoin Core | ||
|
||
This program is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU Affero General Public License as published | ||
by the Free Software Foundation, either version 3 of the License, or | ||
(at your option) any later version. | ||
|
||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU Affero General Public License for more details. | ||
|
||
You should have received a copy of the GNU Affero General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
''' | ||
import time | ||
|
||
from django.core.management.base import BaseCommand | ||
|
||
# https://github.com/gitcoinco/web/issues/4424 | ||
|
||
class Command(BaseCommand): | ||
|
||
help = 'syncs email subscriber and profiles' | ||
|
||
def handle(self, *args, **options): | ||
from dashboard.models import Profile, SearchHistory | ||
from marketing.models import EmailSubscriber | ||
|
||
counter = 0 | ||
# pull keywords by search history | ||
for profile in Profile.objects.filter(keywords=[]): | ||
|
||
histories = SearchHistory.objects.filter(user__profile=profile) | ||
keywords = [] | ||
for history in histories: | ||
if history.data.get('keywords', None): | ||
keywords = history.data['keywords'][0].split(',') | ||
if keywords: | ||
print("1", counter, profile.handle, keywords) | ||
counter += 1 | ||
profile.keywords = keywords | ||
profile.save() | ||
|
||
# pull keywords by emailsubscriber into profile | ||
for profile in Profile.objects.filter(keywords=[]): | ||
es = EmailSubscriber.objects.filter(email=profile.email).exclude(keywords=[]).first() | ||
if es: | ||
print("2", es.keywords, profile.handle) | ||
profile.keywords = es.keywords | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't we want to append these keywords rather than overwrite them? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
profile.save() | ||
|
||
# pull keywords by profile into ES | ||
for es in EmailSubscriber.objects.filter(keywords=[]): | ||
profile = Profile.objects.filter(email=es.email).exclude(keywords=[]).first() | ||
if profile: | ||
print("3", profile.keywords, profile.handle) | ||
es.keywords = profile.keywords | ||
es.save() | ||
|
||
#TODO: if a profile / emailsubscriber both have keywords we need to merge them |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we are iterating over the profiles that don't have any keywords, but the for loop above assigns keywords to each profile that lacks them if there is a search history object for that user. In this loop, we are combining the email subscriber keywords with the profile keywords, but we are only iterating over profiles that have no keywords.
I think we need to combine the two
for profile in Profile.objects.filter(keywords=[]):
loops so we can get both search history and email subscriber keywords applied. In the current code, adding the search history keywords to a profile essentially skips adding email subscriber keywords to that same profile.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
32a1a05