NSIA, ESF, CBF changes

Author: szabozoltan69

api/management/commands/ingest_ns_initiatives.py

@@ -58,8 +58,8 @@ def handle(self, *args, **kwargs):
                 "Categories",
                 "AllocationInCHF",
                 "FundingPeriodInMonths",
-                "FundingType",  # ?
-                "FundingPeriodInYears",  # ?
+                "FundingType",
+                "FundingPeriodInYears",
             ],
         )
         funding_data = funding_data.replace({np.nan: None})
@@ -71,12 +71,12 @@ def handle(self, *args, **kwargs):
                 nsd_initiatives, created = NSDInitiatives.objects.get_or_create(
                     country=country,
                     year=data[1],
-                    fund_type=data[2],
+                    fund_type=f"{data[2]} ({data[7]})" if data[7] else data[2],
                     defaults={
                         "title": data[3],
                         "categories": data[4],
                         "allocation": data[5],
-                        "funding_period": data[6],
+                        "funding_period": data[6] if data[6] else data[8] * 12,
                     },
                 )
                 if not created: