From ba6d18d20249cd57726d06f324815090043e2e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 7 Nov 2019 17:01:26 +0300 Subject: [PATCH] Fix account migration --- .../management/commands/add_account.py | 38 ++++++++++++++ .../account/management/commands/add_social.py | 50 +++++++++++++++++++ .../management/commands/add_position.py | 1 - project/settings/local.py | 22 ++++++++ requirements/development.txt | 3 +- 5 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 apps/account/management/commands/add_account.py create mode 100644 apps/account/management/commands/add_social.py diff --git a/apps/account/management/commands/add_account.py b/apps/account/management/commands/add_account.py new file mode 100644 index 00000000..808f661e --- /dev/null +++ b/apps/account/management/commands/add_account.py @@ -0,0 +1,38 @@ +from django.core.management.base import BaseCommand +from django.db import connections +from django.db.models import Q +from establishment.management.commands.add_position import namedtuplefetchall +from account.models import User + + +class Command(BaseCommand): + help = 'Add account from old db to new db' + + def account_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select a.email, a.id as account_id + from accounts as a + where a.email is not null + and a.email not in ('cyril@tomatic.net', + 'cyril2@tomatic.net', + 'd.sadykova@id-east.ru', + 'd.sadykova@octopod.ru', + 'n.yurchenko@id-east.ru' + ) + and a.confirmed_at is not null + ''') + return namedtuplefetchall(cursor) + + def handle(self, *args, **kwargs): + objects = [] + for a in self.account_sql(): + count = User.objects.filter(Q(email=a.email) | Q(old_id=a.account_id)).count() + if count == 0: + objects.append(User(email=a.email, + unconfirmed_email=False, + email_confirmed=True, + old_id=a.account_id + )) + User.objects.bulk_create(objects) + self.stdout.write(self.style.WARNING(f'Created accounts objects.')) \ No newline at end of file diff --git a/apps/account/management/commands/add_social.py b/apps/account/management/commands/add_social.py new file mode 100644 index 00000000..1554e255 --- /dev/null +++ b/apps/account/management/commands/add_social.py @@ -0,0 +1,50 @@ +from django.core.management.base import BaseCommand +from django.db import connections +from django.db.models import Q +from social_django.models import UserSocialAuth +from establishment.management.commands.add_position import namedtuplefetchall +from account.models import User + + +class Command(BaseCommand): + help = 'Add account from old db to new db' + + def social_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select + DISTINCT + i.account_id, i.provider, i.uid + from + ( + select a.email, a.id as account_id + from accounts as a + where a.email is not null + and a.email not in ('cyril@tomatic.net', + 'cyril2@tomatic.net', + 'd.sadykova@id-east.ru', + 'd.sadykova@octopod.ru', + 'n.yurchenko@id-east.ru' + ) + and a.confirmed_at is not null + ) t + join identities i on i.account_id = t.account_id + ''') + return namedtuplefetchall(cursor) + + def handle(self, *args, **kwargs): + objects = [] + for s in self.social_sql(): + user = User.objects.filter(old_id=s.account_id) + if user.count() > 0: + social = UserSocialAuth.objects.filter(user=user.first(), + provider=s.provider, + uid=s.uid) + if social.count() == 0: + objects.append(UserSocialAuth(user=user.first(), provider=s.provider, + uid=s.uid) + ) + print('INSERT') + + UserSocialAuth.objects.bulk_create(objects) + self.stdout.write(self.style.WARNING(f'Created social objects.')) \ No newline at end of file diff --git a/apps/establishment/management/commands/add_position.py b/apps/establishment/management/commands/add_position.py index 0a456a69..18e8f05c 100644 --- a/apps/establishment/management/commands/add_position.py +++ b/apps/establishment/management/commands/add_position.py @@ -24,7 +24,6 @@ class Command(BaseCommand): return namedtuplefetchall(cursor) def handle(self, *args, **kwargs): - objects = [] for p in self.position_sql(): count = Position.objects.filter(name={"en-GB": p.position_name}).count() diff --git a/project/settings/local.py b/project/settings/local.py index e87b99f6..b1775ebd 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -73,6 +73,28 @@ LOGGING = { } + +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': os.environ.get('DB_NAME'), + 'USER': os.environ.get('DB_USERNAME'), + 'PASSWORD': os.environ.get('DB_PASSWORD'), + 'HOST': os.environ.get('DB_HOSTNAME'), + 'PORT': os.environ.get('DB_PORT'), + }, + 'legacy': { + 'ENGINE': 'django.db.backends.mysql', + # 'HOST': '172.17.0.1', + # 'HOST': '172.23.0.1', + 'HOST': 'mysql_db', + 'PORT': 3306, + 'NAME': 'dev', + 'USER': 'dev', + 'PASSWORD': 'octosecret123' + } +} + # ELASTICSEARCH SETTINGS ELASTICSEARCH_DSL = { 'default': { diff --git a/requirements/development.txt b/requirements/development.txt index 21f7ead9..77c3d73c 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,3 +1,4 @@ -r base.txt ipdb -ipython \ No newline at end of file +ipython +mysqlclient==1.4.4 \ No newline at end of file