#31 API Tests

* adds creation tests with minimum data for intervention, compensation, ema and ecoaccount
* fixes bug where empty geometry would not be created properly using the API
* reworks key fetching from POST data, so inproperly stated keys will lead to an error for the API user, instead of silently working and use default data
* adds some logical checks for deductable_surface of eco account creation using api
* fixes bug that would have occured on creating compensations via api

api/utils/serializer/serializer.py

@@ -123,6 +123,8 @@ class AbstractModelAPISerializer:
         if isinstance(geojson, dict):
             geojson = json.dumps(geojson)
         geometry = geos.fromstr(geojson)
+        if geometry.empty:
+            geometry = None
         return geometry
 
     def get_obj_from_db(self, id, user):

api/utils/serializer/v1/compensation.py

@@ -79,7 +79,7 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
         Returns:
             obj (Compensation)
         """
-        if obj.intervention.id == intervention_id:
+        if obj.intervention is not None and obj.intervention.id == intervention_id:
             # Nothing to do here
             return obj
 

api/utils/serializer/v1/ecoaccount.py

@@ -9,6 +9,7 @@ from django.db import transaction
 
 from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin, \
     LegalAPISerializerV1Mixin, ResponsibilityAPISerializerV1Mixin, DeductableAPISerializerV1Mixin
+from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID
 from compensation.models import EcoAccount
 from intervention.models import Legal, Responsibility
 from konova.models import Geometry
@@ -46,6 +47,26 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             "handler": responsible.handler,
         }
 
+    def set_responsibility(self, obj, responsibility_data: dict):
+        """ Sets the responsible data contents to the provided responsibility_data dict
+
+        Args:
+            obj (Intervention): The intervention object
+            responsibility_data (dict): The new data
+
+        Returns:
+            obj
+        """
+        if responsibility_data is None:
+            return obj
+        obj.responsible.conservation_office = self.konova_code_from_json(
+            responsibility_data["conservation_office"],
+            CODELIST_CONSERVATION_OFFICE_ID,
+        )
+        obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"]
+        obj.responsible.handler = responsibility_data["handler"]
+        return obj
+
     def set_legal(self, obj, legal_data):
         obj.legal.registration_date = legal_data.get("agreement_date", None)
         return obj
@@ -95,7 +116,14 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             properties = json_model["properties"]
             obj.identifier = obj.generate_new_identifier()
             obj.title = properties["title"]
-            obj.deductable_surface = float(properties["deductable_surface"])
+
+            try:
+                obj.deductable_surface = float(properties["deductable_surface"])
+            except TypeError:
+                raise ValueError("Deductable surface (m²) must be a number >= 0")
+            if obj.deductable_surface < 0:
+                raise ValueError("Deductable surface (m²) must be greater or equal 0")
+
             obj = self.set_responsibility(obj, properties["responsible"])
             obj = self.set_legal(obj, properties["legal"])
 

api/utils/serializer/v1/ema.py

@@ -9,6 +9,7 @@ from django.db import transaction
 
 from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin, \
     ResponsibilityAPISerializerV1Mixin
+from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID
 from ema.models import Ema
 from intervention.models import Responsibility
 from konova.models import Geometry
@@ -19,6 +20,13 @@ from user.models import UserActionLogEntry
 class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin, ResponsibilityAPISerializerV1Mixin):
     model = Ema
 
+    def extend_properties_data(self, entry):
+        self.properties_data["responsible"] = self.responsible_to_json(entry.responsible)
+        self.properties_data["before_states"] = self.compensation_state_to_json(entry.before_states.all())
+        self.properties_data["after_states"] = self.compensation_state_to_json(entry.after_states.all())
+        self.properties_data["actions"] = self.compensation_actions_to_json(entry.actions.all())
+        self.properties_data["deadlines"] = self.deadlines_to_json(entry.deadlines.all())
+
     def responsible_to_json(self, responsible: Responsibility):
         return {
             "conservation_office": self.konova_code_to_json(responsible.conservation_office),
@@ -26,12 +34,25 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
             "handler": responsible.handler,
         }
 
-    def extend_properties_data(self, entry):
-        self.properties_data["responsible"] = self.responsible_to_json(entry.responsible)
-        self.properties_data["before_states"] = self.compensation_state_to_json(entry.before_states.all())
-        self.properties_data["after_states"] = self.compensation_state_to_json(entry.after_states.all())
-        self.properties_data["actions"] = self.compensation_actions_to_json(entry.actions.all())
-        self.properties_data["deadlines"] = self.deadlines_to_json(entry.deadlines.all())
+    def set_responsibility(self, obj, responsibility_data: dict):
+        """ Sets the responsible data contents to the provided responsibility_data dict
+
+        Args:
+            obj (Intervention): The intervention object
+            responsibility_data (dict): The new data
+
+        Returns:
+            obj
+        """
+        if responsibility_data is None:
+            return obj
+        obj.responsible.conservation_office = self.konova_code_from_json(
+            responsibility_data["conservation_office"],
+            CODELIST_CONSERVATION_OFFICE_ID,
+        )
+        obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"]
+        obj.responsible.handler = responsibility_data["handler"]
+        return obj
 
     def initialize_objects(self, json_model, user):
         """ Initializes all needed objects from the json_model data

api/utils/serializer/v1/serializer.py

@@ -168,16 +168,16 @@ class ResponsibilityAPISerializerV1Mixin:
         if responsibility_data is None:
             return obj
         obj.responsible.registration_office = self.konova_code_from_json(
-            responsibility_data.get("registration_office", None),
+            responsibility_data["registration_office"],
             CODELIST_REGISTRATION_OFFICE_ID
         )
-        obj.responsible.registration_file_number = responsibility_data.get("registration_file_number", None)
+        obj.responsible.registration_file_number = responsibility_data["registration_file_number"]
         obj.responsible.conservation_office = self.konova_code_from_json(
-            responsibility_data.get("conservation_office", None),
+            responsibility_data["conservation_office"],
             CODELIST_CONSERVATION_OFFICE_ID,
         )
-        obj.responsible.conservation_file_number = responsibility_data.get("conservation_file_number", None)
-        obj.responsible.handler = responsibility_data.get("handler", None)
+        obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"]
+        obj.responsible.handler = responsibility_data["handler"]
         return obj