Skip to content
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 5 commits into from
Jun 1, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions app/dashboard/management/commands/sync_es_profile.py
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=[]):
Copy link
Contributor

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

es = EmailSubscriber.objects.filter(email=profile.email).exclude(keywords=[]).first()
if es:
print("2", es.keywords, profile.handle)
profile.keywords = es.keywords
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want to append these keywords rather than overwrite them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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
1 change: 1 addition & 0 deletions scripts/crontab
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
*/10 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash sync_gas_prices >> /var/log/gitcoin/sync_gas_prices.log 2>&1
1 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash sync_gas_guzzlers >> /var/log/gitcoin/sync_gas_guzzlers.log 2>&1
15 */6 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_profiles >> /var/log/gitcoin/sync_profiles.log 2>&1
15 2 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_es_profiles >> /var/log/gitcoin/sync_es_profiles.log 2>&1
15 2 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_dupe_profiles >> /var/log/gitcoin/cleanup_dupe_profiles.log 2>&1
15 2 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_stray_activities >> /var/log/gitcoin/cleanup_stray_activities.log 2>&1
15 4 * * * cd gitcoin/coin; bash scripts/run_management_command.bash cleanup_db_space >> /var/log/gitcoin/cleanup_db_space.log 2>&1
Expand Down