RAS-1289 Update the way claims is determined in the party service:

_infra/helm/secure-message/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.1.75
+version: 2.1.76
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.1.75
+appVersion: 2.1.76

secure_message/api_mocks/party_service_mock.py

@@ -28,7 +28,7 @@ def get_users_details(self, uuids):
             user_details = []
         return user_details
 
-    def does_user_have_claim(self, user_id, business_id):
+    def does_user_have_claim(self, user_id, business_id, _):
         user_details = self._respondent_ids[user_id]
         associations = user_details["associations"]
         is_enrolled = self._is_user_associated_to_business(associations, business_id)

secure_message/resources/messages.py

@@ -60,7 +60,7 @@ def post(self):
     def _has_valid_claim(user, message: Message) -> bool:
         """Validates that the user has a valid claim to interact with the business and survey in the post data
         internal users have claims to everything, respondents need to check against party"""
-        return user.is_internal or party.does_user_have_claim(user.user_uuid, message.business_id)
+        return user.is_internal or party.does_user_have_claim(user.user_uuid, message.business_id, message.survey_id)
 
     @staticmethod
     def _message_save(message: Message):

secure_message/services/party_service.py

@@ -43,15 +43,15 @@ def get_users_details(self, uuids):
         return self._get_user_details_from_party_service(uuids)
 
     @staticmethod
-    def does_user_have_claim(user_id: str, business_id: str) -> bool:
+    def does_user_have_claim(user_id: str, business_id: str, survey_id: str) -> bool:
         """Returns true of the user id has a claim on the business_id, survey_id combination
         False if not.
 
         Rather than inspect the respondent data it defers to Party Service for the precise logic
         to determine what constitutes a valid claim so as to maintain separation of concerns and
         avoid future maintenance issues.
         """
-        params = {"respondent_id": user_id, "business_id": business_id}
+        params = {"respondent_id": user_id, "business_id": business_id, "survey_id": survey_id}
 
         response = requests.get(
             f"{current_app.config['PARTY_URL']}/party-api/v1/respondents/claim",

secure_message/services/service_toggles.py

@@ -55,8 +55,8 @@ def get_user_details(self, uuid):
     def get_users_details(self, uuids):
         return self._service.get_users_details(uuids)
 
-    def does_user_have_claim(self, user_id, business_id):
-        return self._service.does_user_have_claim(user_id, business_id)
+    def does_user_have_claim(self, user_id, business_id, survey_id):
+        return self._service.does_user_have_claim(user_id, business_id, survey_id)
 
 
 class InternalUser(ServiceMockToggle):

tests/app/test_mock_party.py

@@ -52,22 +52,25 @@ def test_get_business_details_returns_none_if_business_id_not_known(self):
     def test_get_does_user_have_claim_returns_true_if_known(self):
         user_id = "ab123456-ce17-40c2-a8fc-abcdef123456"
         business_id = "b3ba864b-7cbc-4f44-84fe-88dc018a1a4c"
+        survey_id = "ab822606-e9a7-41bc-bbfd-f0cfddcd25b5"
         sut = PartyServiceMock()
-        result = sut.does_user_have_claim(user_id, business_id)
+        result = sut.does_user_have_claim(user_id, business_id, survey_id)
         self.assertTrue(result)
 
     def test_get_does_user_have_claim_returns_false_for_unknown_business_id(self):
         user_id = "ab123456-ce17-40c2-a8fc-abcdef123456"
         business_id = "somethingunknown"
+        survey_id = "ab822606-e9a7-41bc-bbfd-f0cfddcd25b5"
         sut = PartyServiceMock()
-        result = sut.does_user_have_claim(user_id, business_id)
+        result = sut.does_user_have_claim(user_id, business_id, survey_id)
         self.assertFalse(result)
 
     def test_get_does_user_have_claim_returns_false_for_not_active_user(self):
         user_id = "inactive_user"
         business_id = "b3ba864b-7cbc-4f44-84fe-88dc018a1a4c"
+        survey_id = "ab822606-e9a7-41bc-bbfd-f0cfddcd25b5"
         sut = PartyServiceMock()
-        result = sut.does_user_have_claim(user_id, business_id)
+        result = sut.does_user_have_claim(user_id, business_id, survey_id)
         self.assertFalse(result)