Merge pull request #2062 from IFRCGo/fix/country-page-bug

Rename env var

Author: thenav56

api/management/commands/ingest_gdacs.py

@@ -60,7 +60,7 @@ def handle(self, *args, **options):
                 "event_type": alert[nspace + "eventtype"],
                 "alert_level": levels[alert_level],
                 "alert_score": alert_score,
-                "severity": alert[nspace + "severity"]["#text"],
+                "severity": alert[nspace + "severity"].get("#text"),
                 "severity_unit": alert[nspace + "severity"]["@unit"],
                 "severity_value": alert[nspace + "severity"]["@value"],
                 "population_unit": alert[nspace + "population"]["@unit"],

api/management/commands/ingest_ns_document.py

@@ -17,7 +17,7 @@ def handle(self, *args, **kwargs):
 
         # Fetch country codes
         country_code_url = "https://go-api.ifrc.org/api/NationalSocietiesContacts/"
-        headers = {'Authorization': f'Basic {settings.NS_DOCUMENT_API_TOKEN}'}
+        headers = {'Authorization': f'Basic {settings.NS_INITIATIVES_API_TOKEN}'}
         country_code_response = requests.get(url=country_code_url, headers=headers)
 
         if country_code_response.status_code != 200:

databank/management/commands/fdrs_annual_income.py

@@ -33,5 +33,4 @@ def handle(self, *args, **kwargs):
                         }
                         fdrs_data_count += 1
                         FDRSAnnualIncome.objects.get_or_create(**data)
-                        print(f'create count {fdrs_data_count}')
         logger.info(f"Successfully created {fdrs_data_count} country data")

databank/management/commands/ingest_acaps.py

@@ -2,6 +2,7 @@
 import datetime as dt
 import xmltodict
 import pandas as pd
+import time
 from dateutil.parser import parse
 
 from django.core.management.base import BaseCommand
@@ -26,6 +27,7 @@ def handle(self, *args, **kwargs):
                     "Authorization": "Token %s" % settings.ACAPS_API_TOKEN
                 }
             )
+            logger.info(f'Importing for country {name}')
             response_data = response.json()
             if 'results' in response_data and len(response_data['results']):
                 df = pd.DataFrame.from_records(response_data["results"])
@@ -41,4 +43,5 @@ def handle(self, *args, **kwargs):
                             'source': df_data[11],
                             'source_date': df_data[12]
                         }
-                        AcapsSeasonalCalender.objects.create(**dict_data)
+                        AcapsSeasonalCalender.objects.create(**dict_data)
+            time.sleep(5)

databank/management/commands/ingest_climate.py

@@ -72,9 +72,7 @@ def handle(self, *args, **options):
                                 precipitation=precipitation_monthly
                             )
                         logger.info('Minimum, maximum and Average temperature of country temperature data added successfully')
-                        print('Minimum, maximum and Average temperature of country temperature data added successfully')
 
                 except Exception as ex:
                     logger.error(f'Error in ingesting climate data: {ex}')
-                    print(f'Error in ingesting climate data: {ex}')
                     continue

databank/management/commands/ingest_worldbank.py

@@ -40,16 +40,20 @@ def handle(self, *args, **kwargs):
             independent=True
         ).exclude(iso3="COK"):
             country_iso3 = country.iso3
+            logger.info(f'Importing country {country_iso3}')
             for indicator in world_bank_indicators:
                 page = 1  # Reset the page for each indicator
                 while True:
-                    response = requests.get(f'https://api.worldbank.org/v2/country/{country_iso3}/indicator/{indicator}?date={daterange}', params={
+                    try:
+                        response = requests.get(f'https://api.worldbank.org/v2/country/{country_iso3}/indicator/{indicator}?date={daterange}', params={
                         'format': 'json',
                         'source': 2,
                         'per_page': 5000 - 1,  # World Bank throws error on 5000
                         'page': page,
-                    })
-                    response.raise_for_status()
+                        })
+                    except requests.exceptions.HTTPError as err:
+                        print(err.response.text)
+                        continue
                     try:
                         data_list = response.json()[1]
                         if data_list is not None and len(data_list) > 0:
@@ -73,7 +77,6 @@ def handle(self, *args, **kwargs):
                                     existing_data = next((data for data in country_dict[geo_id] if data[2] == indicator), None)
                                     if existing_data is None or existing_data[1] < year:
                                         country_dict[geo_id].append((pop, year, indicator))
-                                        print(country_dict)
                                         logger.info(json.dumps(country_dict))
                         if 'pages' in response.json()[0]:
                             if page >= response.json()[0]['pages']:

main/settings.py

@@ -103,7 +103,7 @@
     ACAPS_API_TOKEN=(str, None),
     NS_DOCUMENT_API_KEY=(str, None),
     NS_INITIATIVES_API_KEY=(str, None),
-    NS_DOCUMENT_API_TOKEN=(str, None)
+    NS_INITIATIVES_API_TOKEN=(str, None)
 )
 
 
@@ -525,7 +525,7 @@
 ACAPS_API_TOKEN = env('ACAPS_API_TOKEN')
 NS_DOCUMENT_API_KEY = env('NS_DOCUMENT_API_KEY')
 NS_INITIATIVES_API_KEY = env('NS_INITIATIVES_API_KEY')
-NS_DOCUMENT_API_TOKEN = env('NS_DOCUMENT_API_TOKEN')
+NS_INITIATIVES_API_TOKEN = env('NS_INITIATIVES_API_TOKEN')
 
 DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE = "OBSOLETE_PAYLOAD"