Merge pull request #574 from praekeltfoundation/MOMZA-2371-track-what…

…sapp-send-failures

Fix deliveryfailure get not found

eventstore/test_views.py

@@ -3019,6 +3019,19 @@ def test_get_deliveryfailure_by_msisdn(self):
             },
         )
 
+    def test_get_deliveryfailure_by_msisdn_not_found(self):
+        """
+        Should return 404 if there is no DeliveryFailure object found
+        """
+        user = get_user_model().objects.create_user("test")
+        user.user_permissions.add(
+            Permission.objects.get(codename="view_deliveryfailure")
+        )
+        self.client.force_authenticate(user)
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
     def test_deliveryfailure_data_validation(self):
         """
         The supplied data must be validated, and any errors returned

eventstore/views.py

@@ -615,8 +615,9 @@ class DeliveryFailureViewSet(GenericViewSet, CreateModelMixin, RetrieveModelMixi
     pagination_class = CursorPaginationFactory("timestamp")
 
     def get_object(self):
-        obj = DeliveryFailure.objects.get(contact_id=self.kwargs["pk"])
-        if not obj.pk:
+        try:
+            obj = DeliveryFailure.objects.get(contact_id=self.kwargs["pk"])
+        except DeliveryFailure.DoesNotExist:
             raise Http404()
         self.check_object_permissions(self.request, obj)
         return obj