Update ScannableURI migrations #49 #285

Signed-off-by: Jono Yang <[email protected]>
aboutcode-org · Mar 7, 2024 · 86b0885 · 86b0885
1 parent 5856cde
commit 86b0885
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 72 deletions.
diff --git a/minecode/migrations/0032_remove_scannableuri_minecode_sc_scan_st_d6a459_idx_and_more.py b/minecode/migrations/0032_remove_scannableuri_minecode_sc_scan_st_d6a459_idx_and_more.py
@@ -1,7 +1,7 @@
-# Generated by Django 5.0.1 on 2024-02-15 23:16
+# Generated by Django 5.0.1 on 2024-03-07 00:59
 
-from django.db import migrations, models
 import uuid
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -16,28 +16,32 @@ class Migration(migrations.Migration):
             model_name="scannableuri",
             name="minecode_sc_scan_st_d6a459_idx",
         ),
+        migrations.RenameField(
+            model_name="scannableuri",
+            old_name="rescan_uri",
+            new_name="reindex_uri",
+        ),
         migrations.AlterUniqueTogether(
             name="scannableuri",
             unique_together=set(),
         ),
         migrations.AddField(
             model_name="scannableuri",
-            name="scan_date",
-            field=models.DateTimeField(
+            name="pipelines",
+            field=models.JSONField(
                 blank=True,
-                db_index=True,
-                help_text="Timestamp set to the date when a scan was taken by a worker",
-                null=True,
+                default=list,
+                editable=False,
+                help_text="A list of ScanCode.io pipeline names to be run for this scan",
             ),
         ),
         migrations.AddField(
             model_name="scannableuri",
-            name="scan_project_url",
-            field=models.CharField(
+            name="scan_date",
+            field=models.DateTimeField(
                 blank=True,
                 db_index=True,
-                help_text="URL to scan project for this Package",
-                max_length=2048,
+                help_text="Timestamp set to the date when a scan was taken by a worker",
                 null=True,
             ),
         ),
@@ -49,10 +53,14 @@ class Migration(migrations.Migration):
         migrations.AddIndex(
             model_name="scannableuri",
             index=models.Index(
-                fields=["scan_status", "scan_date", "last_status_poll_date"],
-                name="minecode_sc_scan_st_5e04d7_idx",
+                fields=["scan_status", "scan_date"],
+                name="minecode_sc_scan_st_baab37_idx",
             ),
         ),
+        migrations.RemoveField(
+            model_name="scannableuri",
+            name="last_status_poll_date",
+        ),
         migrations.RemoveField(
             model_name="scannableuri",
             name="scan_request_date",

diff --git a/...ode/migrations/0037_auto_20240304_1933.py → ...s/0035_create_scan_queue_workers_group.py b/...ode/migrations/0037_auto_20240304_1933.py → ...s/0035_create_scan_queue_workers_group.py
@@ -31,7 +31,7 @@ def create_scan_queue_workers_group_and_permissions(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("minecode", "0036_scannableuri_pipelines"),
+        ("minecode", "0034_scannableuri_alter_uuid_field"),
     ]
 
     operations = [

diff --git a/minecode/migrations/0035_rename_rescan_uri_scannableuri_reindex_uri.py b/minecode/migrations/0035_rename_rescan_uri_scannableuri_reindex_uri.py
diff --git a/minecode/migrations/0036_scannableuri_pipelines.py b/minecode/migrations/0036_scannableuri_pipelines.py
diff --git a/minecode/models.py b/minecode/models.py
@@ -662,22 +662,6 @@ class ScannableURI(BaseURI):
         help_text='Timestamp set to the date when a scan was taken by a worker',
     )
 
-    last_status_poll_date = models.DateTimeField(
-        null=True,
-        blank=True,
-        db_index=True,
-        help_text='Timestamp set to the date of the last status poll. '
-                  'Used to track the scan polling.',
-    )
-
-    scan_project_url = models.CharField(
-        max_length=2048,
-        db_index=True,
-        null=True,
-        blank=True,
-        help_text='URL to scan project for this Package',
-    )
-
     pipelines = models.JSONField(
         default=list,
         blank=True,
@@ -751,7 +735,6 @@ class Meta:
                 fields=[
                     'scan_status',
                     'scan_date',
-                    'last_status_poll_date',
                 ]
             ),
             # ordered by for the main queue query e.g. '-priority'