Merge down hotfixes to unstable

contentcuration/contentcuration/migrations/0142_add_task_signature.py → contentcuration/contentcuration/migrations/0141_add_task_signature.py

@@ -11,7 +11,7 @@ def __init__(self, name, app_label):
         super(Migration, self).__init__(name, 'django_celery_results')
 
     dependencies = [
-        ('contentcuration', '0141_soft_delete_user'),
+        ('contentcuration', '0140_delete_task'),
         ('django_celery_results', '0011_taskresult_periodic_task_name'),
     ]
 

contentcuration/contentcuration/migrations/0142_remove_file_file_media_duration_int.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.18 on 2023-04-26 18:55
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0141_add_task_signature'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='file',
+            name='file_media_duration_int',
+        ),
+    ]

contentcuration/contentcuration/migrations/0143_file_file_media_duration_int.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.18 on 2023-05-03 15:28
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0142_remove_file_file_media_duration_int'),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='file',
+            constraint=models.CheckConstraint(check=models.Q(models.Q(('duration__gt', 0), ('preset__in', ['audio', 'audio_dependency', 'high_res_video', 'low_res_video', 'video_dependency'])), ('duration__isnull', True), _connector='OR'), name='file_media_duration_int'),
+        ),
+    ]

contentcuration/contentcuration/migrations/0141_soft_delete_user.py → contentcuration/contentcuration/migrations/0144_soft_delete_user.py

@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contentcuration', '0140_delete_task'),
+        ('contentcuration', '0143_file_file_media_duration_int'),
     ]
 
     operations = [

contentcuration/contentcuration/models.py

@@ -2179,7 +2179,13 @@ class StagedFile(models.Model):
 FILE_DISTINCT_INDEX_NAME = "file_checksum_file_size_idx"
 FILE_MODIFIED_DESC_INDEX_NAME = "file_modified_desc_idx"
 FILE_DURATION_CONSTRAINT = "file_media_duration_int"
-MEDIA_PRESETS = [format_presets.AUDIO, format_presets.VIDEO_HIGH_RES, format_presets.VIDEO_LOW_RES]
+MEDIA_PRESETS = [
+    format_presets.AUDIO,
+    format_presets.AUDIO_DEPENDENCY,
+    format_presets.VIDEO_HIGH_RES,
+    format_presets.VIDEO_LOW_RES,
+    format_presets.VIDEO_DEPENDENCY,
+]
 
 
 class File(models.Model):
@@ -2331,7 +2337,12 @@ class Meta:
             models.Index(fields=["-modified"], name=FILE_MODIFIED_DESC_INDEX_NAME),
         ]
         constraints = [
-            models.CheckConstraint(check=(Q(preset__in=MEDIA_PRESETS, duration__gt=0) | Q(duration__isnull=True)), name=FILE_DURATION_CONSTRAINT)
+            # enforces that duration is null when not a media preset, but the duration may be null for media presets
+            # but if not-null, should be greater than 0
+            models.CheckConstraint(
+                check=(Q(preset__in=MEDIA_PRESETS, duration__gt=0) | Q(duration__isnull=True)),
+                name=FILE_DURATION_CONSTRAINT
+            )
         ]
 
 

contentcuration/kolibri_public/migrations/0001_initial.py

@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("contentcuration", "0142_add_task_signature"),
+        ("contentcuration", "0141_add_task_signature"),
     ]
 
     operations = [