Consolidate migrations #569

Signed-off-by: Thomas Druez <[email protected]>
aboutcode-org · May 8, 2023 · de7f6a1 · de7f6a1
1 parent a79cd7e
commit de7f6a1
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 83 deletions.
diff --git a/scanpipe/migrations/0030_scancode_toolkit_v32_model_updates.py b/scanpipe/migrations/0030_scancode_toolkit_v32_model_updates.py
@@ -111,4 +111,38 @@ class Migration(migrations.Migration):
                 name="scanpipe_di_other_l_1f1616_idx",
             ),
         ),
+
+        # CodebaseResource
+        migrations.RenameField(
+            model_name="codebaseresource",
+            old_name="license_expressions",
+            new_name="detected_license_expression",
+        ),
+        migrations.AlterField(
+            model_name="codebaseresource",
+            name="detected_license_expression",
+            field=models.TextField(blank=True, help_text="TODO"),
+        ),
+        migrations.RenameField(
+            model_name="codebaseresource",
+            old_name="licenses",
+            new_name="license_detections",
+        ),
+        migrations.AddField(
+            model_name="codebaseresource",
+            name="detected_license_expression_spdx",
+            field=models.TextField(blank=True, help_text="TODO"),
+        ),
+        migrations.AddField(
+            model_name="codebaseresource",
+            name="license_clues",
+            field=models.JSONField(
+                blank=True, default=list, help_text="List of license clues."
+            ),
+        ),
+        migrations.AddField(
+            model_name="codebaseresource",
+            name="percentage_of_license_text",
+            field=models.FloatField(blank=True, help_text="TODO", null=True),
+        ),
     ]
diff --git a/scanpipe/migrations/0031_scancode_toolkit_v32_data_updates.py b/scanpipe/migrations/0031_scancode_toolkit_v32_data_updates.py
@@ -4,9 +4,9 @@
 from django.db.models import Q
 
 
-def compute_declared_license_expression_spdx(apps, schema_editor):
+def compute_package_declared_license_expression_spdx(apps, schema_editor):
     """
-    Compute `declared_license_expression_spdx`, when missing,
+    Compute DiscoveredPackage `declared_license_expression_spdx`, when missing,
     from `declared_license_expression`, when available.
     """
     from licensedcode.cache import build_spdx_license_expression
@@ -28,5 +28,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(compute_declared_license_expression_spdx),
+        migrations.RunPython(
+            compute_package_declared_license_expression_spdx,
+            reverse_code=migrations.RunPython.noop,
+        ),
     ]
diff --git a/scanpipe/migrations/0032_remove_codebaseresource_license_expressions_and_more.py b/scanpipe/migrations/0032_remove_codebaseresource_license_expressions_and_more.py
diff --git a/scanpipe/migrations/0033_alter_codebaseresource_detected_license_expression_and_more.py b/scanpipe/migrations/0033_alter_codebaseresource_detected_license_expression_and_more.py
diff --git a/scanpipe/models.py b/scanpipe/models.py
@@ -1438,17 +1438,16 @@ def has_value(self, field_name):
         return self.filter(~Q((f"{field_name}__in", EMPTY_VALUES)))
 
 
-# TODO: Add in UI, API, ...
 class ScanFieldsModelMixin(models.Model):
     """Fields returned by the ScanCode-toolkit scans."""
 
     detected_license_expression = models.TextField(
         blank=True,
-        help_text=_(""),
+        help_text=_("TODO"),
     )
     detected_license_expression_spdx = models.TextField(
         blank=True,
-        help_text=_(""),
+        help_text=_("TODO"),
     )
     license_detections = models.JSONField(
         blank=True,
@@ -1463,7 +1462,7 @@ class ScanFieldsModelMixin(models.Model):
     percentage_of_license_text = models.FloatField(
         blank=True,
         null=True,
-        help_text=_(""),
+        help_text=_("TODO"),
     )
     copyrights = models.JSONField(
         blank=True,