Merge branch 'main' into issue-766-fix-docker-compose

Author: geekygirlsarah

web/tests/test_views.py

@@ -242,3 +242,31 @@ def test_robots_txt_post_disallowed(self):
         response = self.client.post("/robots.txt")
 
         self.assertEqual(HTTPStatus.METHOD_NOT_ALLOWED, response.status_code)
+
+    def test_api_not_found(self):
+        """Test if an invalid API call returns a 404 error"""
+        url = "http://localhost:8000/api/shared/config/config.env/"
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+
+    def test_single_concept_view_valid_language_version(self):
+        """
+        Test if the API response contains 'meta' and 'concepts' keys. And doesnt return error.
+        """
+        url = '/api/data_types/javascript/ECMAScript%202009/'
+        
+        # Send GET request to the URL
+        response = self.client.get(url)
+
+        # Check the response status
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+
+        # Parse the response JSON
+        response_data = response.json()
+
+        # Assert that 'meta' and 'concepts' keys exist
+        self.assertIn('meta', response_data)
+        self.assertIn('concepts', response_data)
+
+

web/views.py

@@ -428,11 +428,16 @@ def api_reference(request, structure_key, lang, version):
     store_url_info(request)
 
     lang = Language(lang, "")
-    response = lang.load_filled_concepts(structure_key, version)
+
+    try:
+        response = lang.load_filled_concepts(structure_key, version)
+    except Exception as e:
+        return error_handler_404_not_found(request, e)
 
     if response is False:
         return HttpResponseNotFound()
 
+
     return HttpResponse(response, content_type="application/json")
 
 def api_compare(request, structure_key, lang1, version1, lang2, version2):