Merge branch 'development'

Author: nat236919

app/main.py

@@ -24,8 +24,8 @@
 )
 
 # Setup CORS (https://fastapi.tiangolo.com/tutorial/cors/)
-# ** Note: Wild-card setup is used here for demonstration only,
-#         Please change the setting in accordance with your application
+# Note: Wild-card setup is used here for demonstration only,
+#       Please change the setting in accordance with your application
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],

app/models/covid_model_api_v2.py

@@ -86,13 +86,16 @@ def get_country(self, country_name: str) -> Dict[str, Any]:
         """ Get a country data from its name or ISO 2 """
         all_country_data = self.get_current()['data']
 
+        # Check input
+        if not isinstance(country_name, str) or not country_name.isalpha():
+            return {}
+
         # Search for a given country
-        ## In case a country name is not found, assume it's a country code (iso2) 
-        if country_name not in [country_data['location'].lower() for country_data in all_country_data]:
-            country_name = self.lookup_table[country_name.upper()] # translate country code to its name
+        country_name = country_name.lower()
+        country_name_from_code = self.lookup_table.get(country_name.upper(), '').lower()
 
-        data = [country_data for country_data in all_country_data if country_name.lower() == country_data['location'].lower()]
-        data = data[0] if data else data
+        data = [country_data for country_data in all_country_data if country_data['location'].lower() in [country_name, country_name_from_code]]
+        data = data[0] if data else {}
 
         return data