IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

118_API_update #119

Merged
mpeltriaux merged 2 commits from 118_API_update into master 2022-02-16 11:39:17 +01:00
Conversation 0 Commits 2 Files Changed 5 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0677cec709 - Show all commits

12
api/utils/serializer/v1/serializer.py
View File

@ -367,7 +367,9 @@ class AbstractCompensationAPISerializerV1Mixin:
""" """
actions = [] actions = []
for entry in actions_data: for entry in actions_data:
action = entry["action"] action_types = [
self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_ID) for e in entry["action_types"]
]
action_details = [ action_details = [
self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_DETAIL_ID) for e in entry["action_details"] self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_DETAIL_ID) for e in entry["action_details"]
] ]
@ -384,7 +386,7 @@ class AbstractCompensationAPISerializerV1Mixin:
# If this exact data is already existing, we do not create it new. Instead put it's id in the list of # If this exact data is already existing, we do not create it new. Instead put it's id in the list of
# entries, we will use to set the new actions # entries, we will use to set the new actions
action_entry = obj.actions.filter( action_entry = obj.actions.filter(
action_type__atom_id=action, action_type__in=action_types,
amount=amount, amount=amount,
unit=unit, unit=unit,
comment=comment, comment=comment,
@ -396,13 +398,13 @@ class AbstractCompensationAPISerializerV1Mixin:
else: else:
# Create and add id to list # Create and add id to list
action_entry = CompensationAction.objects.create( action_entry = CompensationAction.objects.create(
action_type=self._konova_code_from_json(action, CODELIST_COMPENSATION_ACTION_ID),
amount=amount, amount=amount,
unit=unit, unit=unit,
comment=comment, comment=comment,
) )
actions.append(action_entry.id) actions.append(action_entry.id)
action_entry.action_type.set(action_types)
action_entry.action_type_details.set(action_details) action_entry.action_type_details.set(action_details)
obj.actions.set(actions) obj.actions.set(actions)
return obj return obj
@ -438,7 +440,9 @@ class AbstractCompensationAPISerializerV1Mixin:
""" """
return [ return [
{ {
"action": self._konova_code_to_json(entry.action_type), "action_types": [
self._konova_code_to_json(action) for action in entry.action_type.all()
],
"action_details": [ "action_details": [
self._konova_code_to_json(detail) for detail in entry.action_type_details.all() self._konova_code_to_json(detail) for detail in entry.action_type_details.all()
], ],