fix: return actual json objects/dicts inside the fristenlist instead of __str__ representation (#160)

and we should use Pydantic instead of dataclasses
such pain

Co-authored-by: Konstantin <[email protected]>

Author: hf-kklein

src/GenerateAllFristen/__init__.py

@@ -1,6 +1,7 @@
 # we ignore the invalid module name because in this case it's ok that the module/dir has the name of the relative path
 # pylint:disable=invalid-name
 """Contains function generating all fristen for the given year"""
+import dataclasses
 import json
 import logging
 from http import HTTPStatus
@@ -33,7 +34,9 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
 
     try:
         all_fristen = FristenkalenderGenerator().generate_all_fristen(year)
-        all_fristen_json = json.dumps(all_fristen, indent=4, sort_keys=True, default=str)
+        all_fristen_json = json.dumps(
+            [dataclasses.asdict(x) for x in all_fristen], indent=4, sort_keys=True, default=str
+        )
         return func.HttpResponse(
             body=all_fristen_json,
             status_code=HTTPStatus.OK,

src/GenerateFristenForType/__init__.py

@@ -1,6 +1,7 @@
 # we ignore the invalid module name because in this case it's ok that the module/dir has the name of the relative path
 # pylint:disable=invalid-name
 """Contains function generating all fristen for a given type and a given year"""
+import dataclasses
 import json
 import logging
 from http import HTTPStatus
@@ -39,5 +40,7 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
         )
 
     fristen_with_type = FristenkalenderGenerator().generate_fristen_for_type(year, fristen_type)
-    fristen_with_type_json = json.dumps(fristen_with_type, indent=4, sort_keys=True, default=str)
+    fristen_with_type_json = json.dumps(
+        [dataclasses.asdict(x) for x in fristen_with_type], indent=4, sort_keys=True, default=str
+    )
     return func.HttpResponse(body=fristen_with_type_json, status_code=HTTPStatus.OK, mimetype="application/json")

unittests/test_generate_all_fristen.py

@@ -1,3 +1,4 @@
+import json
 from http import HTTPStatus
 
 import azure.functions as func
@@ -25,6 +26,14 @@ def test_ok_get(self, ok_request: func.HttpRequest):
         assert actual_response.status_code == HTTPStatus.OK
         body = actual_response.get_body()
         assert body is not None
+        deserialized_body = json.loads(body)
+        assert isinstance(deserialized_body, list)
+        assert not isinstance(
+            deserialized_body[0], str
+        )  # should not be the python object __str__ "FristWithAttributes(date=datetime.date(2022, 12, 1), label='21WT', ref_not_in_the_same_month=10, description='NKP (VNB ⟶ MGV)')"
+        assert all(
+            isinstance(x, dict) for x in deserialized_body
+        )  # should not be the python object __str__ "FristWithAttributes(date=datetime.date(2022, 12, 1), label='21WT', ref_not_in_the_same_month=10, description='NKP (VNB ⟶ MGV)')"
 
     @pytest.mark.parametrize(
         "bad_request",

unittests/test_generate_fristen_for_type.py

@@ -26,7 +26,13 @@ def test_ok_get(self, ok_request: func.HttpRequest):
         assert actual_response.status_code == HTTPStatus.OK
         actual_fristen_list = json.loads(actual_response.get_body().decode("utf-8"))
         actual_frist = actual_fristen_list[0]
-        expected = "FristWithAttributesAndType(date=datetime.date(2022, 12, 28), label='3LWT', ref_not_in_the_same_month=None, description='Letzter Termin Anmeldung asynchrone Bilanzierung (Strom)', fristen_type=<FristenType.GPKE: 'GPKE'>)"
+        expected = {
+            "date": "2022-12-28",
+            "description": "Letzter Termin Anmeldung asynchrone Bilanzierung (Strom)",
+            "fristen_type": "FristenType.GPKE",
+            "label": "3LWT",
+            "ref_not_in_the_same_month": None,
+        }
         assert actual_frist == expected
 
     @pytest.mark.parametrize(