Merge branch 'main' into FFT-102/fte-attrition

uktrade · Dec 10, 2024 · dc3adae · dc3adae
2 parents 692d321 + 0a0a883
commit dc3adae
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 3 deletions.
diff --git a/.copilot/image_build_run.sh b/.copilot/image_build_run.sh
@@ -3,7 +3,13 @@
 # Exit early if something goes wrong
 set -e
 
+export DJANGO_SETTINGS_MODULE=config.settings.ci
+
+cp .env.ci .env
+
 # Add commands below to run inside the container after all the other buildpacks have been applied
-export $(grep -v '^#' .env.ci | xargs)
 
 python manage.py collectstatic --noinput
+
+# Cleanup
+rm .env
diff --git a/upload_file/migrations/0007_alter_fileupload_document_type_and_more.py b/upload_file/migrations/0007_alter_fileupload_document_type_and_more.py
@@ -0,0 +1,77 @@
+# Generated by Django 5.1.3 on 2024-12-09 17:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("upload_file", "0006_alter_simplehistoryfileupload_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="fileupload",
+            name="document_type",
+            field=models.CharField(
+                choices=[
+                    ("actuals", "Actuals"),
+                    ("budget", "Budget"),
+                    ("previousyear", "Previous Year"),
+                    ("projectpercentage", "Project Percentages"),
+                    ("forecast", "Forecast"),
+                    ("other", "Other"),
+                ],
+                default="actuals",
+                max_length=100,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fileupload",
+            name="file_location",
+            field=models.CharField(
+                choices=[
+                    ("actuals", "Actuals"),
+                    ("budget", "Budget"),
+                    ("previousyear", "Previous Year"),
+                    ("projectpercentage", "Project Percentages"),
+                    ("forecast", "Forecast"),
+                    ("other", "Other"),
+                ],
+                default="S3",
+                max_length=100,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="simplehistoryfileupload",
+            name="document_type",
+            field=models.CharField(
+                choices=[
+                    ("actuals", "Actuals"),
+                    ("budget", "Budget"),
+                    ("previousyear", "Previous Year"),
+                    ("projectpercentage", "Project Percentages"),
+                    ("forecast", "Forecast"),
+                    ("other", "Other"),
+                ],
+                default="actuals",
+                max_length=100,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="simplehistoryfileupload",
+            name="file_location",
+            field=models.CharField(
+                choices=[
+                    ("actuals", "Actuals"),
+                    ("budget", "Budget"),
+                    ("previousyear", "Previous Year"),
+                    ("projectpercentage", "Project Percentages"),
+                    ("forecast", "Forecast"),
+                    ("other", "Other"),
+                ],
+                default="S3",
+                max_length=100,
+            ),
+        ),
+    ]
diff --git a/upload_file/models.py b/upload_file/models.py
@@ -37,8 +37,8 @@ class FileUpload(BaseModel):
         (BUDGET, "Budget"),
         (PREVIOUSYEAR, "Previous Year"),
         (PROJECT_PERCENTAGE, "Project Percentages"),
-        {FORECAST, "Forecast"},
-        {OTHER, "Other"},
+        (FORECAST, "Forecast"),
+        (OTHER, "Other"),
     ]
 
     LOCALFILE = "local"