From b63a01120b6395cbd24ac334cf0327ccf874ecf5 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Tue, 2 Mar 2021 12:15:56 +0000 Subject: [PATCH] Fix migrations --- RIGS/migrations/0040_auto_20210302_1148.py | 67 +++++++++++++++++++ RIGS/migrations/0040_profile_dark_theme.py | 18 ----- ...208_1603.py => 0041_auto_20210302_1204.py} | 38 ++++++----- RIGS/migrations/0042_auto_20210302_1121.py | 18 ----- RIGS/models.py | 3 - assets/migrations/0020_auto_20210302_1201.py | 23 +++++++ ...208_1603.py => 0021_auto_20210302_1204.py} | 10 +-- 7 files changed, 116 insertions(+), 61 deletions(-) create mode 100644 RIGS/migrations/0040_auto_20210302_1148.py delete mode 100644 RIGS/migrations/0040_profile_dark_theme.py rename RIGS/migrations/{0041_auto_20210208_1603.py => 0041_auto_20210302_1204.py} (94%) delete mode 100644 RIGS/migrations/0042_auto_20210302_1121.py create mode 100644 assets/migrations/0020_auto_20210302_1201.py rename assets/migrations/{0020_auto_20210208_1603.py => 0021_auto_20210302_1204.py} (75%) diff --git a/RIGS/migrations/0040_auto_20210302_1148.py b/RIGS/migrations/0040_auto_20210302_1148.py new file mode 100644 index 00000000..fd923180 --- /dev/null +++ b/RIGS/migrations/0040_auto_20210302_1148.py @@ -0,0 +1,67 @@ +# Generated by Django 3.1.7 on 2021-03-02 11:48 + +from django.db import migrations + + +def postgres_migration_prep(apps, schema_editor): + model = apps.get_model("RIGS", "Event") + for field in ["auth_request_to", "collector", "description", "notes", "purchase_order"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "EventAuthorisation") + for field in ["account_code", "uni_id"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "EventChecklist") + for field in ["extinguishers_location", "hs_location", "w1_description", "w2_description", "w3_description"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "EventItem") + for field in ["description"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "Organisation") + for field in ["address", "email", "notes", "phone"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "Payment") + for field in ["method"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "Person") + for field in ["address", "email", "notes", "phone"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "Profile") + for field in ["phone"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "RiskAssessment") + for field in ["general_notes", "persons_responsible_structures", "power_notes", "rigging_plan", "sound_notes"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + model = apps.get_model("RIGS", "Venue") + for field in ["address", "email", "notes", "phone"]: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0039_auto_20210123_1910'), + ] + + operations = [ + migrations.RunPython(postgres_migration_prep, migrations.RunPython.noop) + ] diff --git a/RIGS/migrations/0040_profile_dark_theme.py b/RIGS/migrations/0040_profile_dark_theme.py deleted file mode 100644 index 0de43954..00000000 --- a/RIGS/migrations/0040_profile_dark_theme.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2021-02-06 10:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('RIGS', '0039_auto_20210123_1910'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='dark_theme', - field=models.BooleanField(default=False), - ), - ] diff --git a/RIGS/migrations/0041_auto_20210208_1603.py b/RIGS/migrations/0041_auto_20210302_1204.py similarity index 94% rename from RIGS/migrations/0041_auto_20210208_1603.py rename to RIGS/migrations/0041_auto_20210302_1204.py index 94795ad2..8dfc0efb 100644 --- a/RIGS/migrations/0041_auto_20210208_1603.py +++ b/RIGS/migrations/0041_auto_20210302_1204.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2021-02-08 16:03 +# Generated by Django 3.1.7 on 2021-03-02 12:04 import RIGS.models from django.db import migrations, models @@ -7,10 +7,27 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('RIGS', '0040_profile_dark_theme'), + ('RIGS', '0040_auto_20210302_1148'), ] operations = [ + migrations.RemoveField( + model_name='event', + name='meet_info', + ), + migrations.RemoveField( + model_name='event', + name='payment_method', + ), + migrations.RemoveField( + model_name='event', + name='payment_received', + ), + migrations.AddField( + model_name='profile', + name='dark_theme', + field=models.BooleanField(default=False), + ), migrations.AlterField( model_name='event', name='auth_request_to', @@ -26,26 +43,11 @@ class Migration(migrations.Migration): name='description', field=models.TextField(blank=True, default=''), ), - migrations.AlterField( - model_name='event', - name='meet_info', - field=models.CharField(blank=True, default='', max_length=255), - ), migrations.AlterField( model_name='event', name='notes', field=models.TextField(blank=True, default=''), ), - migrations.AlterField( - model_name='event', - name='payment_method', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AlterField( - model_name='event', - name='payment_received', - field=models.CharField(blank=True, default='', max_length=255), - ), migrations.AlterField( model_name='event', name='purchase_order', @@ -144,7 +146,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='profile', name='phone', - field=models.CharField(default='', max_length=13, null=True), + field=models.CharField(blank=True, default='', max_length=13), ), migrations.AlterField( model_name='riskassessment', diff --git a/RIGS/migrations/0042_auto_20210302_1121.py b/RIGS/migrations/0042_auto_20210302_1121.py deleted file mode 100644 index 08f8729a..00000000 --- a/RIGS/migrations/0042_auto_20210302_1121.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.7 on 2021-03-02 11:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('RIGS', '0041_auto_20210208_1603'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='phone', - field=models.CharField(blank=True, default='', max_length=13), - ), - ] diff --git a/RIGS/models.py b/RIGS/models.py index b84401a1..83effe0a 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -312,7 +312,6 @@ class Event(models.Model, RevisionMixin): end_time = models.TimeField(blank=True, null=True) access_at = models.DateTimeField(blank=True, null=True) meet_at = models.DateTimeField(blank=True, null=True) - meet_info = models.CharField(max_length=255, blank=True, default='') # Crew management checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True, @@ -321,8 +320,6 @@ class Event(models.Model, RevisionMixin): verbose_name="MIC", on_delete=models.CASCADE) # Monies - payment_method = models.CharField(max_length=255, blank=True, default='') - payment_received = models.CharField(max_length=255, blank=True, default='') purchase_order = models.CharField(max_length=255, blank=True, default='', verbose_name='PO') collector = models.CharField(max_length=255, blank=True, default='', verbose_name='collected by') diff --git a/assets/migrations/0020_auto_20210302_1201.py b/assets/migrations/0020_auto_20210302_1201.py new file mode 100644 index 00000000..8a5a8cc1 --- /dev/null +++ b/assets/migrations/0020_auto_20210302_1201.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.7 on 2021-03-02 12:01 + +from django.db import migrations + + +def postgres_migration_prep(apps, schema_editor): + model = apps.get_model("assets", "Supplier") + fields = ["address", "email", "notes", "phone"] + for field in fields: + filter_param = {"{}__isnull".format(field): True} + update_param = {field: ""} + model.objects.filter(**filter_param).update(**update_param) + + +class Migration(migrations.Migration): + + dependencies = [ + ('assets', '0019_fix_cabletype'), + ] + + operations = [ + migrations.RunPython(postgres_migration_prep, migrations.RunPython.noop) + ] diff --git a/assets/migrations/0020_auto_20210208_1603.py b/assets/migrations/0021_auto_20210302_1204.py similarity index 75% rename from assets/migrations/0020_auto_20210208_1603.py rename to assets/migrations/0021_auto_20210302_1204.py index c040462a..9aa10634 100644 --- a/assets/migrations/0020_auto_20210208_1603.py +++ b/assets/migrations/0021_auto_20210302_1204.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2021-02-08 16:03 +# Generated by Django 3.1.7 on 2021-03-02 12:04 from django.db import migrations, models import django.db.models.deletion @@ -7,7 +7,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('assets', '0019_fix_cabletype'), + ('assets', '0020_auto_20210302_1201'), ] operations = [ @@ -20,12 +20,14 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='cabletype', name='plug', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='plug', to='assets.connector'), + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='plug', to='assets.connector'), + preserve_default=False, ), migrations.AlterField( model_name='cabletype', name='socket', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='socket', to='assets.connector'), + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='socket', to='assets.connector'), + preserve_default=False, ), migrations.AlterField( model_name='supplier',