From 7ade660a0f7927f96161723711dfbdba8caa828a Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Thu, 7 Mar 2024 11:00:40 -0500 Subject: [PATCH 1/4] enable auto migrations for both jwql databases --- jwql/pull_jwql_branch.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jwql/pull_jwql_branch.sh b/jwql/pull_jwql_branch.sh index 95a1c94b4..5544124d7 100644 --- a/jwql/pull_jwql_branch.sh +++ b/jwql/pull_jwql_branch.sh @@ -76,8 +76,9 @@ fi # 3. Install jwql pip install -e .. -# 4. Merge Any Migrations -python ./website/manage.py migrate +# 4. Merge Any Migrations that exist in either database (router.py will sort where they go) +python ./website/manage.py migrate jwql +python ./website/manage.py migrate jwql --database=monitors # 5. Bring the service back up if [ "$reset" = true ]; then From 693d5c4d7cb8fcf7d8c5ba9b2fc6387f4f7cff5f Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Thu, 7 Mar 2024 11:05:23 -0500 Subject: [PATCH 2/4] test model update to remove --- jwql/website/apps/jwql/models.py | 1 + jwql/website/apps/jwql/monitor_models/claw.py | 1 + 2 files changed, 2 insertions(+) diff --git a/jwql/website/apps/jwql/models.py b/jwql/website/apps/jwql/models.py index 715b1bb5b..0fb2fbbe3 100644 --- a/jwql/website/apps/jwql/models.py +++ b/jwql/website/apps/jwql/models.py @@ -168,6 +168,7 @@ class Anomalies(models.Model): subsequently_masked_short = models.BooleanField(default=False) monitored_short = models.BooleanField(default=False) bright_object_not_a_short = models.BooleanField(default=False) + brad_delete_me = models.BooleanField(default=False) def get_marked_anomalies(self): """Return all boolean field names (anomalies) currently set""" diff --git a/jwql/website/apps/jwql/monitor_models/claw.py b/jwql/website/apps/jwql/monitor_models/claw.py index a1c6c93e3..8ad6699fe 100644 --- a/jwql/website/apps/jwql/monitor_models/claw.py +++ b/jwql/website/apps/jwql/monitor_models/claw.py @@ -63,6 +63,7 @@ class NIRCamClawStats(models.Model): skyflat_filename = models.CharField(blank=True, null=True) doy = models.FloatField(blank=True, null=True) total_bkg = models.FloatField(blank=True, null=True) + brad_delete_monitor = models.BooleanField(default=False) class Meta: managed = True From 53858a80e8853b54dec086a233cd527acde475e5 Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Thu, 7 Mar 2024 11:06:44 -0500 Subject: [PATCH 3/4] temp migration to test will be removed --- .../0019_anomalies_brad_delete_me_and_more.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py diff --git a/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py b/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py new file mode 100644 index 000000000..394d5edaf --- /dev/null +++ b/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.7 on 2024-03-07 16:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('jwql', '0018_nircamclawstats_doy_nircamclawstats_total_bkg'), + ] + + operations = [ + migrations.AddField( + model_name='anomalies', + name='brad_delete_me', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='nircamclawstats', + name='brad_delete_monitor', + field=models.BooleanField(default=False), + ), + ] From 88d2938915fcf82b269a9a4e00a5cacae9564492 Mon Sep 17 00:00:00 2001 From: Bradley Sappington Date: Thu, 7 Mar 2024 11:23:47 -0500 Subject: [PATCH 4/4] Revert "test model update to remove" This reverts commit 693d5c4d7cb8fcf7d8c5ba9b2fc6387f4f7cff5f. --- .../0019_anomalies_brad_delete_me_and_more.py | 23 ------------------- jwql/website/apps/jwql/models.py | 1 - jwql/website/apps/jwql/monitor_models/claw.py | 1 - 3 files changed, 25 deletions(-) delete mode 100644 jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py diff --git a/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py b/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py deleted file mode 100644 index 394d5edaf..000000000 --- a/jwql/website/apps/jwql/migrations/0019_anomalies_brad_delete_me_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.1.7 on 2024-03-07 16:06 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('jwql', '0018_nircamclawstats_doy_nircamclawstats_total_bkg'), - ] - - operations = [ - migrations.AddField( - model_name='anomalies', - name='brad_delete_me', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='nircamclawstats', - name='brad_delete_monitor', - field=models.BooleanField(default=False), - ), - ] diff --git a/jwql/website/apps/jwql/models.py b/jwql/website/apps/jwql/models.py index 0fb2fbbe3..715b1bb5b 100644 --- a/jwql/website/apps/jwql/models.py +++ b/jwql/website/apps/jwql/models.py @@ -168,7 +168,6 @@ class Anomalies(models.Model): subsequently_masked_short = models.BooleanField(default=False) monitored_short = models.BooleanField(default=False) bright_object_not_a_short = models.BooleanField(default=False) - brad_delete_me = models.BooleanField(default=False) def get_marked_anomalies(self): """Return all boolean field names (anomalies) currently set""" diff --git a/jwql/website/apps/jwql/monitor_models/claw.py b/jwql/website/apps/jwql/monitor_models/claw.py index 8ad6699fe..a1c6c93e3 100644 --- a/jwql/website/apps/jwql/monitor_models/claw.py +++ b/jwql/website/apps/jwql/monitor_models/claw.py @@ -63,7 +63,6 @@ class NIRCamClawStats(models.Model): skyflat_filename = models.CharField(blank=True, null=True) doy = models.FloatField(blank=True, null=True) total_bkg = models.FloatField(blank=True, null=True) - brad_delete_monitor = models.BooleanField(default=False) class Meta: managed = True