Use same schema when creating cases, as the schema used to dump them

Author: c8y3

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

@@ -107,9 +107,7 @@ def search(self):
     def create(self):
         try:
             request_data = call_deprecated_on_preload_modules_hook('case_create', request.get_json(), None)
-            add_case_schema = CaseSchema()
-            # TODO should use self._schema!
-            case = add_case_schema.load(request_data)
+            case = self._schema.load(request_data)
             case_template_id = request_data.pop('case_template_id', None)
             case = cases_create(case, case_template_id)
             result = self._schema.dump(case)

source/app/schema/marshables.py

@@ -2477,16 +2477,17 @@ def verify_customer(self, data: Dict[str, Any], **kwargs: Any) -> Dict[str, Any]
             ValidationError: If the customer ID is not valid.
 
         """
-        assert_type_mml(input_var=data.get('case_customer'),
-                        field_name='case_customer',
+        customer_identifier = data.get('case_customer_id')
+        assert_type_mml(input_var=customer_identifier,
+                        field_name='case_customer_id',
                         type=int,
                         allow_none=True)
 
-        client = Client.query.filter(Client.client_id == data.get('case_customer')).first()
+        client = Client.query.filter(Client.client_id == customer_identifier).first()
         if client:
             return data
 
-        raise ValidationError("Invalid client id", field_name="case_customer")
+        raise ValidationError('Invalid client id', field_name='case_customer_id')
 
 
 class CaseDetailsSchema(ma.SQLAlchemyAutoSchema):

tests/iris.py

@@ -99,7 +99,7 @@ def create_dummy_case(self):
         body = {
             'case_name': 'case name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }
         response = self._api.post('/api/v2/cases', body).json()

tests/tests_rest_cases.py

@@ -44,7 +44,7 @@ def test_create_case_should_return_201(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         })
         self.assertEqual(201, response.status_code)
@@ -53,15 +53,15 @@ def test_create_case_with_spurious_slash_should_return_404(self):
         response = self._subject.create('/api/v2/cases/', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         })
         self.assertEqual(404, response.status_code)
 
     def test_create_case_with_missing_name_should_return_400(self):
         response = self._subject.create('/api/v2/cases', {
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         })
         self.assertEqual(400, response.status_code)
@@ -70,7 +70,7 @@ def test_create_case_with_classification_id_should_set_classification_id(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': '',
             'classification_id': 2
         }).json()
@@ -88,7 +88,7 @@ def test_get_case_should_return_case_data(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }).json()
         identifier = response['case_id']
@@ -99,7 +99,7 @@ def test_delete_case_should_return_204(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }).json()
         identifier = response['case_id']
@@ -110,7 +110,7 @@ def test_get_case_should_return_404_after_it_is_deleted(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }).json()
         identifier = response['case_id']
@@ -131,7 +131,7 @@ def test_get_cases_should_filter_on_case_name(self):
         response = self._subject.create('/api/v2/cases', {
             'case_name': 'test_get_cases_should_filter_on_case_name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }).json()
         case_identifier = response['case_id']
@@ -178,17 +178,17 @@ def test_create_case_should_return_data_with_case_customer_when_case_customer_is
         body = {
             'case_name': 'case name',
             'case_description': 'description',
-            'case_customer': '',
+            'case_customer_id': '',
             'case_soc_id': ''
         }
         response = self._subject.create('/api/v2/cases', body).json()
-        self.assertIn('case_customer', response['data'])
+        self.assertIn('case_customer_id', response['data'])
 
     def test_create_case_should_return_field_case_customer(self):
         body = {
             'case_name': 'case name',
             'case_description': 'description',
-            'case_customer': 1,
+            'case_customer_id': 1,
             'case_soc_id': ''
         }
         response = self._subject.create('/api/v2/cases', body).json()