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

#31 API basic implementation Intervention fetch

Browse Source 
* enhances intervention fetching and serialization
This commit is contained in:
mpeltriaux 2022-01-21 16:29:59 +01:00
parent cf82f4b223
commit 11de423d05
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/urls/v1/urls.py
View File

@ -11,5 +11,5 @@ from api.views.v1.intervention import APIInterventionViewV1
app_name = "v1" app_name = "v1"
urlpatterns = [ urlpatterns = [
path("intervention/<identifier>", APIInterventionViewV1.as_view(), name="intervention"), path("intervention/<id>", APIInterventionViewV1.as_view(), name="intervention"),
] ]

21
api/views/v1/general.py
View File

@ -50,14 +50,7 @@ class AbstractModelAPIViewV1(AbstractModelAPIView):
Returns: Returns:
""" """
return [ return list(qs.values("amount", "due_on", "comment"))
{
"amount": entry.amount,
"due_on": entry.due_on,
"comment": entry.comment,
}
for entry in qs
]
def deductions_to_json(self, qs: QuerySet): def deductions_to_json(self, qs: QuerySet):
""" Serializes eco account deductions into json """ Serializes eco account deductions into json
@ -70,8 +63,18 @@ class AbstractModelAPIViewV1(AbstractModelAPIView):
""" """
return [ return [
{ {
"eco_account": entry.account.pk, "id": entry.pk,
"eco_account": {
"id": entry.account.pk,
"identifier": entry.account.identifier,
"title": entry.account.title,
},
"surface": entry.surface, "surface": entry.surface,
"intervention": {
"id": entry.intervention.pk,
"identifier": entry.intervention.identifier,
"title": entry.intervention.title,
}
} }
for entry in qs for entry in qs
] ]

14
api/views/v1/intervention.py
View File

@ -7,6 +7,7 @@ Created on: 21.01.22
""" """
import json import json
from django.db.models import QuerySet
from django.http import HttpRequest, JsonResponse from django.http import HttpRequest, JsonResponse
from api.views.v1.general import AbstractModelAPIViewV1 from api.views.v1.general import AbstractModelAPIViewV1
@ -16,22 +17,29 @@ from intervention.models import Intervention
class APIInterventionViewV1(AbstractModelAPIViewV1): class APIInterventionViewV1(AbstractModelAPIViewV1):
model = Intervention model = Intervention
def get(self, request: HttpRequest, identifier): def get(self, request: HttpRequest, id):
_filter = { _filter = {
"identifier": identifier, "id": id,
"users__in": [self.user], "users__in": [self.user],
"deleted__isnull": True, "deleted__isnull": True,
} }
data = self.fetch_and_serialize(_filter) data = self.fetch_and_serialize(_filter)
return JsonResponse(data) return JsonResponse(data)
def compensations_to_json(self, qs: QuerySet):
return list(
qs.values(
"id", "identifier", "title"
)
)
def model_to_json(self, entry: Intervention): def model_to_json(self, entry: Intervention):
entry_json = { entry_json = {
"identifier": entry.identifier, "identifier": entry.identifier,
"title": entry.title, "title": entry.title,
"responsible": self.responsible_to_json(entry.responsible), "responsible": self.responsible_to_json(entry.responsible),
"legal": self.legal_to_json(entry.legal), "legal": self.legal_to_json(entry.legal),
"compensations": list(entry.compensations.all().values_list("pk", flat=True)), "compensations": self.compensations_to_json(entry.compensations.all()),
"payments": self.payments_to_json(entry.payments.all()), "payments": self.payments_to_json(entry.payments.all()),
"deductions": self.deductions_to_json(entry.deductions.all()), "deductions": self.deductions_to_json(entry.deductions.all()),
} }