Merge uat hotfix downstream to dev

api/cases/tests/test_case_ecju_queries.py

@@ -526,7 +526,8 @@ def test_close_query_has_optional_response_exporter(self):
         self.assertIsNone(response_ecju_query["response"])
         self.assertIsNotNone(response_ecju_query["responded_at"])
 
-    def test_close_query_has_optional_response_govuser(self):
+    @parameterized.expand(["", None])
+    def test_close_query_has_required_response_govuser(self, response_value):
         case = self.create_standard_application_case(self.organisation)
         ecju_query = self.create_ecju_query(case, question="provide details please", gov_user=self.gov_user)
 
@@ -535,18 +536,11 @@ def test_close_query_has_optional_response_govuser(self):
 
         query_response_url = reverse("cases:case_ecju_query", kwargs={"pk": case.id, "ecju_pk": ecju_query.id})
 
-        data = {"response": ""}
+        data = {"response": response_value}
 
         response = self.client.put(query_response_url, data, **self.gov_headers)
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-
-        response_ecju_query = response.json()["ecju_query"]
-        self.assertIsNone(response_ecju_query["response"])
-        self.assertIsNotNone(response_ecju_query["responded_at"])
-
-        response_get = self.client.get(query_response_url, **self.gov_headers)
-        self.assertEqual(True, response_get.json()["ecju_query"]["is_manually_closed"])
-        self.assertEqual(0, BaseNotification.objects.filter(object_id=ecju_query.id).count())
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        self.assertEqual(response.json()["errors"], "Enter a reason why you are closing the query")
 
     def test_caseworker_manually_closes_query_exporter_responds_raises_error(self):
         case = self.create_standard_application_case(self.organisation)

api/cases/views/views.py

@@ -617,6 +617,15 @@ def put(self, request, pk, ecju_pk):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        is_govuser = hasattr(request.user, "govuser")
+        is_blank_response = not bool(request.data.get("response"))
+
+        # response is required only when a govuser closes a query
+        if is_govuser and is_blank_response:
+            return JsonResponse(
+                data={"errors": "Enter a reason why you are closing the query"}, status=status.HTTP_400_BAD_REQUEST
+            )
+
         data = {"responded_by_user": str(request.user.pk)}
 
         if request.data.get("response"):
@@ -631,7 +640,6 @@ def put(self, request, pk, ecju_pk):
                 ecju_query_type = ContentType.objects.get_for_model(EcjuQuery)
                 BaseNotification.objects.filter(object_id=ecju_pk, content_type=ecju_query_type).delete()
 
-                is_govuser = hasattr(request.user, "govuser")
                 # If the user is a Govuser query is manually being closed by a caseworker
                 query_verb = AuditType.ECJU_QUERY_MANUALLY_CLOSED if is_govuser else AuditType.ECJU_QUERY_RESPONSE
                 audit_trail_service.create(