Add country iso code to office

Author: sergey-misuk-personal

src/country_workspace/admin/office.py

@@ -10,7 +10,7 @@
 
 @admin.register(Office)
 class OfficeAdmin(BaseModelAdmin):
-    list_display = ("name", "long_name", "slug", "code", "active")
+    list_display = ("name", "long_name", "slug", "code", "active", "country_iso_code")
     search_fields = ("name", "slug", "code")
     list_filter = ("active",)
     readonly_fields = ("hope_id", "slug")

src/country_workspace/config/fragments/app.py

@@ -5,6 +5,7 @@
 
 TENANT_TENANT_MODEL = "country_workspace.Office"
 TENANT_HQ = "= HQ ="
+TENANT_HQ_COUNTRY = "AFG"
 
 AURORA_API_TOKEN = env("AURORA_API_TOKEN")
 AURORA_API_URL = env("AURORA_API_URL")

src/country_workspace/contrib/hope/sync/office.py

@@ -25,6 +25,7 @@ def sync_offices(stdout: TextIOBase | None = None) -> dict[str, int]:
                         "code": record["code"],
                         "active": record["active"],
                         "long_name": record["long_name"],
+                        # TODO: sync country iso code
                     },
                 )
                 totals["add" if created else "upd"] += 1

src/country_workspace/contrib/kobo/forms.py

@@ -3,12 +3,6 @@
 
 class ImportKoboForm(forms.Form):
     batch_name = forms.CharField(required=False, help_text="Label for this batch")
-    country_code = forms.CharField(
-        required=False,
-        help_text="Country ISO code",
-        min_length=3,
-        max_length=3,
-    )
     individual_records_field = forms.CharField(
         required=False,
         initial="individual_questions",

src/country_workspace/management/commands/demo.py

@@ -42,6 +42,7 @@ def handle(self, *args: Any, **options: Any) -> None:
                 settings.TENANT_HQ,
             ),
             name=settings.TENANT_HQ,
+            country_iso_code=settings.TENANT_HQ_COUNTRY,
         )
 
         analysts, __ = Group.objects.get_or_create(name=settings.ANALYST_GROUP_NAME)

src/country_workspace/management/commands/upgrade.py

@@ -170,6 +170,7 @@ def handle(self, *args: Any, **options: Any) -> None:  # noqa
                     settings.TENANT_HQ,
                 ),
                 name=settings.TENANT_HQ,
+                country_iso_code=settings.TENANT_HQ_COUNTRY,
             )
             call_command("upgradescripts", ["apply"])
             echo("Upgrade completed", style_func=self.style.SUCCESS)

src/country_workspace/migrations/0006_office_country_iso_code.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.7 on 2025-03-18 12:26
+from django.apps.registry import Apps
+from django.db import migrations, models
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+
+
+def migrate_data(apps: Apps, _: BaseDatabaseSchemaEditor) -> None:
+    office_model = apps.get_model("country_workspace", "Office")
+    for obj in office_model.objects.filter(country_iso_code=None):
+        obj.country_iso_code = "AFG"
+        obj.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("country_workspace", "0005_alter_asyncjob_file"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="office",
+            name="country_iso_code",
+            field=models.CharField(max_length=3, null=True),
+        ),
+        migrations.RunPython(migrate_data, reverse_code=migrations.RunPython.noop),
+        migrations.AlterField(
+            model_name="office",
+            name="country_iso_code",
+            field=models.CharField(max_length=3),
+        ),
+    ]

src/country_workspace/migrations/0007_alter_program_individual_columns.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.7 on 2025-03-18 12:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("country_workspace", "0006_office_country_iso_code"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="program",
+            name="individual_columns",
+            field=models.TextField(default="name\nid", help_text="Columns to display i the Admin table"),
+        ),
+    ]

src/country_workspace/models/office.py

@@ -12,6 +12,7 @@ class Office(BaseModel):
     code = models.CharField(max_length=100, blank=True, null=True, db_index=True, unique=True)
     slug = models.SlugField(max_length=100, blank=True, null=True, db_index=True, unique=True)
     active = models.BooleanField(default=False)
+    country_iso_code = models.CharField(max_length=3, blank=False, null=False)
 
     extra_fields = models.JSONField(default=dict, blank=True, null=False)
 

src/country_workspace/workspaces/admin/program.py

@@ -317,7 +317,7 @@ def import_kobo(self, request: HttpRequest, program: "CountryProgram") -> Import
                 owner=request.user,
                 config={
                     "batch_name": form.cleaned_data["batch_name"] or BATCH_NAME_DEFAULT,
-                    "country_code": form.cleaned_data["country_code"],
+                    "country_code": program.country_office.country_iso_code,
                     "individual_records_field": form.cleaned_data["individual_records_field"],
                 },
             )