Fix crash when accessing nonexistent timeseries data via api (fixes #75)

openmeteo · Apr 12, 2018 · d94faf1 · d94faf1
1 parent 2d80c74
commit d94faf1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/enhydris/api/tests.py b/enhydris/api/tests.py
@@ -165,6 +165,16 @@ def testGentityList(self):
                                                    default_timezone=None)
             self.assertEqual(res_last_modified, ref_datum.last_modified)
 
+        @RandomEnhydrisTimeseriesDataDir()
+        def test_get_nonexisting_timeseries_data_using_url_query(self):
+            response = self.client.get("/api/tsdata/?pk=9999999999999")
+            self.assertEqual(response.status_code, 404)
+
+        @RandomEnhydrisTimeseriesDataDir()
+        def test_get_nonexisting_timeseries_data_using_url_parameter(self):
+            response = self.client.get('/api/tsdata/9999999', follow=True)
+            self.assertEqual(response.status_code, 404)
+
 
 class WriteTestCase(TestCase):
 

diff --git a/enhydris/api/views.py b/enhydris/api/views.py
@@ -55,11 +55,14 @@ class Tsdata(APIView):
     permission_classes = (CanEditOrReadOnly,)
 
     def get(self, request, pk, format=None):
-        timeseries = models.Timeseries.objects.get(pk=int(pk))
-        self.check_object_permissions(request, timeseries)
-        response = HttpResponse(content_type='text/plain')
-        pd2hts.write(timeseries.get_data(), response)
-        return response
+        try:
+            timeseries = models.Timeseries.objects.get(pk=int(pk))
+            self.check_object_permissions(request, timeseries)
+            response = HttpResponse(content_type='text/plain')
+            pd2hts.write(timeseries.get_data(), response)
+            return response
+        except models.Timeseries.DoesNotExist:
+            raise Http404
 
     def put(self, request, pk, format=None):
         try: