Make country iso code optional, don't import Kobo data if counytry iso code is not set

Author: sergey-misuk-personal

src/country_workspace/config/fragments/app.py

@@ -5,7 +5,6 @@
 
 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/kobo/forms.py

@@ -13,7 +13,11 @@ class ImportKoboForm(forms.Form):
         help_text="Which field contains individual records",
     )
 
-    def __init__(self, *args: Any, country_iso_code: str, **kwargs: Any) -> None:
+    def __init__(self, *args: Any, country_iso_code: str | None, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
-        client = make_client(country_iso_code)
-        self.fields["project_id"].choices = [(asset.uid, asset.name) for asset in client.assets]
+        if country_iso_code:
+            client = make_client(country_iso_code)
+            self.fields["project_id"].choices = [(asset.uid, asset.name) for asset in client.assets]
+        else:
+            self.cleaned_data = {}  # type: ignore
+            self.add_error(None, "Please set country iso code for office to use Kobo import")

src/country_workspace/management/commands/demo.py

@@ -42,7 +42,6 @@ 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,7 +170,6 @@ 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

@@ -1,14 +1,5 @@
 # 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):
@@ -22,10 +13,4 @@ class Migration(migrations.Migration):
             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/models/office.py

@@ -12,7 +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)
+    country_iso_code = models.CharField(max_length=3, blank=True, null=True)
 
     extra_fields = models.JSONField(default=dict, blank=True, null=False)