From a6bfb3ea6b49ed28c66afae2e5d54ab53e6d226a Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 21 Nov 2019 13:47:37 +0300 Subject: [PATCH] partner migrations --- ...121_0929.py => 0003_auto_20191121_1045.py} | 10 +++++++--- .../migrations/0004_auto_20191121_1045.py | 19 +++++++++++++++++++ apps/partner/migrations/0004_partner_name.py | 18 ------------------ apps/partner/transfer_data.py | 16 ++++++++++++++-- 4 files changed, 40 insertions(+), 23 deletions(-) rename apps/partner/migrations/{0003_auto_20191121_0929.py => 0003_auto_20191121_1045.py} (76%) create mode 100644 apps/partner/migrations/0004_auto_20191121_1045.py delete mode 100644 apps/partner/migrations/0004_partner_name.py diff --git a/apps/partner/migrations/0003_auto_20191121_0929.py b/apps/partner/migrations/0003_auto_20191121_1045.py similarity index 76% rename from apps/partner/migrations/0003_auto_20191121_0929.py rename to apps/partner/migrations/0003_auto_20191121_1045.py index 526e14ce..6d548091 100644 --- a/apps/partner/migrations/0003_auto_20191121_0929.py +++ b/apps/partner/migrations/0003_auto_20191121_1045.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.7 on 2019-11-21 09:29 +# Generated by Django 2.2.7 on 2019-11-21 10:45 from django.db import migrations, models import django.db.models.deletion @@ -15,14 +15,18 @@ class Migration(migrations.Migration): migrations.AddField( model_name='partner', name='establishment', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='partners', to='establishment.Establishment', verbose_name='Establishment'), - preserve_default=False, + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='partners', to='establishment.Establishment', verbose_name='Establishment'), ), migrations.AddField( model_name='partner', name='expiry_date', field=models.DateField(blank=True, null=True, verbose_name='expiry date'), ), + migrations.AddField( + model_name='partner', + name='name', + field=models.CharField(blank=True, max_length=255, null=True, verbose_name='name'), + ), migrations.AddField( model_name='partner', name='old_id', diff --git a/apps/partner/migrations/0004_auto_20191121_1045.py b/apps/partner/migrations/0004_auto_20191121_1045.py new file mode 100644 index 00000000..1906a8c0 --- /dev/null +++ b/apps/partner/migrations/0004_auto_20191121_1045.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.7 on 2019-11-21 10:45 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('partner', '0003_auto_20191121_1045'), + ] + + operations = [ + migrations.AlterField( + model_name='partner', + name='establishment', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='partners', to='establishment.Establishment', verbose_name='Establishment'), + ), + ] diff --git a/apps/partner/migrations/0004_partner_name.py b/apps/partner/migrations/0004_partner_name.py deleted file mode 100644 index ef9ac8e8..00000000 --- a/apps/partner/migrations/0004_partner_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-21 10:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('partner', '0003_auto_20191121_0929'), - ] - - operations = [ - migrations.AddField( - model_name='partner', - name='name', - field=models.CharField(blank=True, max_length=255, null=True, verbose_name='name'), - ), - ] diff --git a/apps/partner/transfer_data.py b/apps/partner/transfer_data.py index e3219838..f373427a 100644 --- a/apps/partner/transfer_data.py +++ b/apps/partner/transfer_data.py @@ -1,11 +1,23 @@ -from django.db.models import Value, IntegerField, F from pprint import pprint + +from establishment.models import Establishment from transfer.models import EstablishmentBacklinks from transfer.serializers.partner import PartnerSerializer def transfer_partner(): - queryset = EstablishmentBacklinks.objects.filter(type="Partner") + establishments = Establishment.objects.filter(old_id__isnull=False).values_list('old_id', flat=True) + queryset = EstablishmentBacklinks.objects.filter( + establishment_id__in=list(establishments), + ).values( + 'id', + 'establishment_id', + # 'aasm_state', + # 'created_at', + # 'establishment_id', + # 'mark', + # 'vintage', + ) # queryset = EstablishmentBacklinks.objects.all() # Partner and Sponsor