Add GNI Per Capita for WB

api/serializers.py

@@ -6,6 +6,7 @@
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.db import transaction
+from django.db import models
 from django.contrib.auth.models import Permission
 from django.utils.translation import get_language as django_get_language
 
@@ -775,18 +776,19 @@ def get_centroid(country) -> dict:
         return country.centroid and json.loads(country.centroid.geojson)
 
     @extend_schema_field(
-        MiniDelegationOfficeSerializer
+        MiniDelegationOfficeSerializer(many=True)
     )
     def get_country_delegation(self, country):
         return DelegationOffice.objects.filter(
-            dotype__name="Country Delegation",
             country=country,
         ).values(
             'hod_first_name',
             'hod_last_name',
             'hod_mobile_number',
             'hod_email',
-        ).first()
+        ).annotate(
+            dotype_name=models.F('dotype__name')
+        ).distinct()
 
 
 class CountryKeyDocumentSerializer(ModelSerializer):

databank/management/commands/ingest_worldbank.py

@@ -24,7 +24,8 @@ def handle(self, *args, **kwargs):
             ('IQ.CPA.GNDR.XQ', CO.world_bank_gender_inequality_index),
             ('SP.DYN.LE00.IN', CO.world_bank_life_expectancy),
             ('SE.ADT.LITR.ZS', CO.world_bank_literacy_rate),
-            ('SI.POV.NAHC', CO.world_bank_poverty_rate)
+            ('SI.POV.NAHC', CO.world_bank_poverty_rate),
+            ('NY.GNP.PCAP.CD', CO.world_bank_gni_capita)
         )
 
         world_bank_indicators = [indicator for indicator, _ in world_bank_indicator_map]
@@ -95,6 +96,7 @@ def handle(self, *args, **kwargs):
                 overview.world_bank_life_expectancy = indicators[7][0]
                 overview.world_bank_literacy_rate = indicators[8][0]
                 overview.world_bank_poverty_rate = indicators[9][0]
+                overview.world_bank_gni_capita = indicators[10][0]
                 overview.save(
                     update_fields=[
                         'world_bank_population',
@@ -106,6 +108,7 @@ def handle(self, *args, **kwargs):
                         'world_bank_gender_inequality_index',
                         'world_bank_life_expectancy',
                         'world_bank_literacy_rate',
-                        'world_bank_poverty_rate'
+                        'world_bank_poverty_rate',
+                        'world_bank_gni_capita',
                     ]
                 )

databank/migrations/0025_countryoverview_world_bank_gni_capita.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2024-05-08 05:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('databank', '0024_countryoverview_fdrs_data_fetched_year'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='countryoverview',
+            name='world_bank_gni_capita',
+            field=models.IntegerField(blank=True, null=True, verbose_name='world bank GNI Per Capita'),
+        ),
+    ]

databank/models.py

@@ -523,6 +523,10 @@ class CountryOverview(models.Model):
         verbose_name=_('world bank poverty rate'),
         null=True, blank=True
     )
+    world_bank_gni_capita = models.IntegerField(
+        verbose_name=_('world bank GNI Per Capita'),
+        null=True, blank=True
+    )
 
     # fetched from unicef
     unicef_population_under_18 = models.IntegerField(

local_units/serializers.py

@@ -139,11 +139,14 @@ class LocalUnitOptionsSerializer(serializers.Serializer):
 
 
 class MiniDelegationOfficeSerializer(serializers.ModelSerializer):
+    dotype_name = serializers.CharField(source='dotype.name', read_only=True)
+
     class Meta:
         model = DelegationOffice
         fields = (
             'hod_first_name',
             'hod_last_name',
             'hod_mobile_number',
             'hod_email',
+            'dotype_name'
         )