Updated IHM to change in field name when updating case

Author: c8y3

source/app/blueprints/rest/v2/cases.py

@@ -46,7 +46,6 @@
 from app.business.errors import BusinessProcessingError
 from app.datamgmt.manage.manage_cases_db import get_filtered_cases
 from app.schema.marshables import CaseSchemaForAPIV2
-from app.schema.marshables import CaseSchema
 from app.blueprints.access_controls import ac_api_requires
 from app.business.access_controls import ac_fast_check_current_user_has_case_access
 from app.blueprints.access_controls import ac_api_return_access_denied
@@ -136,23 +135,22 @@ def update(self, identifier):
 
             request_data = request.get_json()
 
+            customer_identifier = request_data.get('case_customer_id')
             # If user tries to update the customer, check if the user has access to the new customer
-            if request_data.get('case_customer') and request_data.get('case_customer') != case.client_id:
-                if not user_has_client_access(iris_current_user.id, request_data.get('case_customer')):
+            if customer_identifier and customer_identifier != case.client_id:
+                if not user_has_client_access(iris_current_user.id, customer_identifier):
                     raise BusinessProcessingError('Invalid customer ID. Permission denied.')
 
             if 'case_name' in request_data:
                 short_case_name = request_data.get('case_name').replace(f'#{case.case_id} - ', '')
                 request_data['case_name'] = f'#{case.case_id} - {short_case_name}'
-            request_data['case_customer'] = case.client_id if not request_data.get(
-                'case_customer') else request_data.get(
-                'case_customer')
-            request_data['reviewer_id'] = None if request_data.get('reviewer_id') == '' else request_data.get(
-                'reviewer_id')
-
-            # TODO should use self._schema!
-            add_case_schema = CaseSchema()
-            updated_case = add_case_schema.load(request_data, instance=case, partial=True)
+            if not customer_identifier:
+                request_data['case_customer_id'] = case.client_id
+            reviewer_identifier = request_data.get('reviewer_id')
+            if reviewer_identifier == '':
+                request_data['reviewer_id'] = None
+
+            updated_case = self._schema.load(request_data, instance=case, partial=True)
 
             protagonists = request_data.get('protagonists')
             tags = request_data.get('case_tags')

source/app/schema/marshables.py

@@ -2437,7 +2437,7 @@ class Meta:
         model = Cases
         include_fk = True
         load_instance = True
-        exclude = ['name', 'description', 'soc_id', 'client_id', 'initial_date', 'state_id', 'owner_id']
+        exclude = ['name', 'description', 'soc_id', 'client_id', 'initial_date']
         unknown = EXCLUDE
 
     @pre_load

tests/tests_rest_cases.py

@@ -228,7 +228,7 @@ def test_update_case_should_allow_to_update_status(self):
     def test_update_case_should_allow_to_update_customer(self):
         identifier = self._subject.create_dummy_case()
         customer_identifier = self._subject.create_dummy_customer()
-        response = self._subject.update(f'/api/v2/cases/{identifier}', {'case_customer': customer_identifier}).json()
+        response = self._subject.update(f'/api/v2/cases/{identifier}', {'case_customer_id': customer_identifier}).json()
         self.assertEqual(customer_identifier, response['case_customer_id'])
 
     def test_update_case_should_allow_to_update_reviewer(self):