make incomming data available to update them in before_post and before_patch and also for relationship resource manager

Author: akira-dev

flask_rest_jsonapi/resource.py

@@ -137,8 +137,6 @@ def get(self, *args, **kwargs):
     def post(self, *args, **kwargs):
         """Create an object
         """
-        self.before_post(args, kwargs)
-
         json_data = request.get_json()
 
         qs = QSManager(request.args, self.schema)
@@ -169,6 +167,8 @@ def post(self, *args, **kwargs):
                 error['title'] = "Validation error"
             return errors, 422
 
+        self.before_post(args, kwargs, data=data)
+
         obj = self._data_layer.create_object(data, kwargs)
 
         result = schema.dump(obj).data
@@ -181,7 +181,7 @@ def before_get(self, args, kwargs):
     def after_get(self, result):
         pass
 
-    def before_post(self, args, kwargs):
+    def before_post(self, args, kwargs, data=None):
         pass
 
     def after_post(self, result):
@@ -214,8 +214,6 @@ def get(self, *args, **kwargs):
     def patch(self, *args, **kwargs):
         """Update an object
         """
-        self.before_patch(args, kwargs)
-
         json_data = request.get_json()
 
         qs = QSManager(request.args, self.schema)
@@ -253,6 +251,8 @@ def patch(self, *args, **kwargs):
         if json_data['data']['id'] != str(kwargs[self.data_layer.get('url_field', 'id')]):
             raise BadRequest('/data/id', 'Value of id does not match the resource identifier in url')
 
+        self.before_patch(args, kwargs, data=data)
+
         obj = self._data_layer.get_object(kwargs)
         self._data_layer.update_object(obj, data, kwargs)
 
@@ -280,7 +280,7 @@ def before_get(self, args, kwargs):
     def after_get(self, result):
         pass
 
-    def before_patch(self, args, kwargs):
+    def before_patch(self, args, kwargs, data=None):
         pass
 
     def after_patch(self, result):
@@ -335,8 +335,6 @@ def get(self, *args, **kwargs):
     def post(self, *args, **kwargs):
         """Add / create relationship(s)
         """
-        self.before_post(args, kwargs)
-
         json_data = request.get_json()
 
         relationship_field, model_relationship_field, related_type_, related_id_field = self._get_relationship_data()
@@ -359,6 +357,8 @@ def post(self, *args, **kwargs):
                 if obj['type'] != related_type_:
                     raise InvalidType('/data/type', 'The type provided does not match the resource type')
 
+        self.before_post(args, kwargs, json_data=json_data)
+
         obj_, updated = self._data_layer.create_relationship(json_data,
                                                              model_relationship_field,
                                                              related_id_field,
@@ -383,8 +383,6 @@ def post(self, *args, **kwargs):
     def patch(self, *args, **kwargs):
         """Update a relationship
         """
-        self.before_patch(args, kwargs)
-
         json_data = request.get_json()
 
         relationship_field, model_relationship_field, related_type_, related_id_field = self._get_relationship_data()
@@ -407,6 +405,8 @@ def patch(self, *args, **kwargs):
                 if obj['type'] != related_type_:
                     raise InvalidType('/data/type', 'The type provided does not match the resource type')
 
+        self.before_patch(args, kwargs, json_data=json_data)
+
         obj_, updated = self._data_layer.update_relationship(json_data,
                                                              model_relationship_field,
                                                              related_id_field,
@@ -431,8 +431,6 @@ def patch(self, *args, **kwargs):
     def delete(self, *args, **kwargs):
         """Delete relationship(s)
         """
-        self.before_delete(args, kwargs)
-
         json_data = request.get_json()
 
         relationship_field, model_relationship_field, related_type_, related_id_field = self._get_relationship_data()
@@ -455,6 +453,8 @@ def delete(self, *args, **kwargs):
                 if obj['type'] != related_type_:
                     raise InvalidType('/data/type', 'The type provided does not match the resource type')
 
+        self.before_delete(args, kwargs, json_data=json_data)
+
         obj_, updated = self._data_layer.delete_relationship(json_data,
                                                              model_relationship_field,
                                                              related_id_field,
@@ -493,19 +493,19 @@ def before_get(self, args, kwargs):
     def after_get(self, result):
         pass
 
-    def before_post(self, args, kwargs):
+    def before_post(self, args, kwargs, json_data=None):
         pass
 
     def after_post(self, result):
         pass
 
-    def before_patch(self, args, kwargs):
+    def before_patch(self, args, kwargs, json_data=None):
         pass
 
     def after_patch(self, result):
         pass
 
-    def before_delete(self, args, kwargs):
+    def before_delete(self, args, kwargs, json_data=None):
         pass
 
     def after_delete(self, result):