NS initiatives – 4 lang categories

Author: szabozoltan69

api/management/commands/ingest_ns_initiatives.py

@@ -5,7 +5,13 @@
 from sentry_sdk.crons import monitor
 
 from api.logger import logger
-from api.models import Country, CronJob, CronJobStatus, NSDInitiatives
+from api.models import (
+    Country,
+    CronJob,
+    CronJobStatus,
+    NSDInitiatives,
+    NSDInitiativesCategory,
+)
 from main.sentry import SentryMonitor
 
 DEFAULT_COUNTRY_ID = 289  # IFRC
@@ -32,7 +38,6 @@ def get_defaults(element, country, funding_period, lang):
         "fund_type": (
             f"{element.get('Fund')} – {element.get('FundingType')}" if element.get("FundingType") else element.get("Fund")
         ),
-        "categories": element.get("Categories"),
         "allocation": element.get("AllocationInCHF"),
         "funding_period": funding_period,
         "translation_module_original_language": lang,
@@ -133,6 +138,26 @@ def handle(self, *args, **kwargs):
                         created_ns_initiatives_pk.append(ni.pk)
                         logger.warning(f"Created non-EN entry: {remote_id} / {lang}")
 
+                # Handle categories (language-aware)
+                raw_categories = element.get("Categories") or []
+                if isinstance(raw_categories, (list, tuple)):
+                    cat_objs = []
+                    for c in raw_categories:
+                        if not c:
+                            continue
+                        name = str(c).strip()
+                        if not name:
+                            continue
+                        # Create / fetch category for this specific language
+                        obj, _ = NSDInitiativesCategory.objects.get_or_create(
+                            name=name,
+                            lang=lang,
+                        )
+                        cat_objs.append(obj)
+
+                    if cat_objs:
+                        ni.categories.add(*cat_objs)
+
         # Remove old entries not present in the latest fetch
         NSDInitiatives.objects.exclude(id__in=created_ns_initiatives_pk).delete()
 

api/migrations/0226_nsdinitiativescategory_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2.19 on 2025-09-25 12:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0225_nsdinitiatives_nsia_risk_ar_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NSDInitiativesCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True, verbose_name='Name')),
+            ],
+            options={
+                'verbose_name': 'NSD initiative category',
+                'verbose_name_plural': 'NSD initiative categories',
+                'ordering': ('name',),
+            },
+        ),
+        migrations.RemoveField(
+            model_name='nsdinitiatives',
+            name='categories',
+        ),
+        migrations.AddField(
+            model_name='nsdinitiatives',
+            name='categories',
+            field=models.ManyToManyField(blank=True, related_name='initiatives', to='api.nsdinitiativescategory', verbose_name='Funding categories'),
+        ),
+        migrations.AddField(
+            model_name='nsdinitiativescategory',
+            name='lang',
+            field=models.CharField(choices=[('en', 'English'), ('es', 'Spanish'), ('fr', 'French'), ('ar', 'Arabic')], db_index=True, default='en', max_length=5),
+        ),
+        migrations.AlterField(
+            model_name='nsdinitiativescategory',
+            name='name',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterUniqueTogether(
+            name='nsdinitiativescategory',
+            unique_together={('name', 'lang')},
+        ),
+    ]

api/models.py

@@ -419,14 +419,41 @@ class CountryOrganizationalCapacity(models.Model):
     financial_capacity = models.TextField(verbose_name=_("Financial Capacity"), null=True, blank=True)
 
 
+LANG_CHOICES = (
+    ("en", "English"),
+    ("es", "Spanish"),
+    ("fr", "French"),
+    ("ar", "Arabic"),
+)
+
+
+class NSDInitiativesCategory(models.Model):
+    name = models.CharField(max_length=255)
+    lang = models.CharField(max_length=5, choices=LANG_CHOICES, db_index=True, default="en")
+
+    class Meta:
+        ordering = ("name",)
+        unique_together = ("name", "lang")
+        verbose_name = _("NSD initiative category")
+        verbose_name_plural = _("NSD initiative categories")
+
+    def __str__(self):
+        return f"{self.name} ({self.lang})"
+
+
 class NSDInitiatives(models.Model):
     country = models.ForeignKey(Country, verbose_name=_("Country"), on_delete=models.CASCADE)
     title = models.CharField(verbose_name=_("Title"), max_length=255)
     fund_type = models.CharField(verbose_name=_("Fund Type"), max_length=255)
     allocation = models.IntegerField(verbose_name=_("Allocation in CHF"))
     year = models.CharField(verbose_name=_("Year"), max_length=20)
     funding_period = models.IntegerField(verbose_name=_("Funding Period in Month"))
-    categories = ArrayField(models.CharField(max_length=255), verbose_name=_("Funding categories"), default=list, null=True)
+    categories = models.ManyToManyField(
+        NSDInitiativesCategory,
+        blank=True,
+        related_name="initiatives",
+        verbose_name=_("Funding categories"),
+    )
     remote_id = models.IntegerField(db_index=True, unique=True, null=True, blank=True)
     nsia_risk = models.CharField(verbose_name=_("NSIA Risk"), max_length=30, null=True, blank=True)
 

api/serializers.py

@@ -657,11 +657,20 @@ class Meta:
         fields = ("id", "first_name", "last_name", "position")
 
 
-class NSDInitiativesSerialzier(ModelSerializer):
+class NSDInitiativesSerializer(ModelSerializer):
+    categories = serializers.SerializerMethodField()
+
     class Meta:
         model = NSDInitiatives
         fields = "__all__"
 
+    @staticmethod
+    def get_categories(obj):
+        out = {}
+        for lang, name in obj.categories.values_list("lang", "name"):
+            out.setdefault(lang, []).append(name)
+        return out
+
 
 class CountryCapacityStrengtheningSerializer(ModelSerializer):
     assessment_type_display = serializers.CharField(read_only=True, source="get_assessment_type_display")
@@ -691,7 +700,7 @@ class CountryRelationSerializer(ModelSerializer):
     centroid = serializers.SerializerMethodField()
     regions_details = RegionSerializer(source="region", read_only=True)
     directory = CountryDirectorySerializer(source="countrydirectory_set", read_only=True, many=True)
-    initiatives = NSDInitiativesSerialzier(source="nsdinitiatives_set", read_only=True, many=True)
+    initiatives = NSDInitiativesSerializer(source="nsdinitiatives_set", read_only=True, many=True)
     capacity = CountryCapacityStrengtheningSerializer(source="countrycapacitystrengthening_set", read_only=True, many=True)
     organizational_capacity = CountryOrganizationalCapacitySerializer(
         source="countryorganizationalcapacity",
@@ -2521,6 +2530,7 @@ def create(self, validated_data):
         else:
             title = "Export"
         user = self.context["request"].user
+
         if export_type == Export.ExportType.PER:
             validated_data["url"] = f"{settings.GO_WEB_INTERNAL_URL}/countries/{country_id}/{export_type}/{export_id}/export/"
         else: