Merge 7f85115 into e4183f5

OnroerendErfgoed · May 3, 2023 · 39801c0 · 39801c0
2 parents e4183f5 + 7f85115
commit 39801c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/crabpy_pyramid/renderers/adressenregister.py b/crabpy_pyramid/renderers/adressenregister.py
@@ -12,7 +12,7 @@ def list_gewesten_adapter(obj, request):
     Adapter for rendering a list of
     :class:`crabpy.gateway.adressenregister.Gewest` to json.
     """
-    return {"id": obj.id, "naam": obj.naam}
+    return {"id": obj.id, "naam": obj.naam, "niscode": obj.niscode}
 
 
 def list_provincie_adapter(obj, request):
@@ -46,7 +46,11 @@ def list_gemeente_adapter(obj, request):
     Adapter for rendering a list of
     :class:`crabpy.gateway.adressenregister.Gemeenten` to json.
     """
-    return {"niscode": obj.niscode, "naam": obj.naam, "uri": obj.uri}
+    return {
+        "niscode": obj.niscode,
+        "naam": obj.naam,
+        "provincie": {"niscode": obj.provincie_niscode}
+    }
 
 
 def list_straten_adapter(obj, request):
@@ -118,6 +122,7 @@ def item_gewest_adapter(obj, request):
     """
     return {
         "id": obj.id,
+        "niscode": obj.niscode,
         "naam": obj.naam,
         "centroid": obj.centroid,
         "bounding_box": obj.bounding_box,
@@ -145,10 +150,9 @@ def item_gemeente_adapter(obj, request):
     """
     return {
         "niscode": obj.niscode,
-        "uri": obj.uri,
         "naam": obj.naam(),
-        "taal": obj.taal,
-        "status": obj.status,
+        "provincie": {"niscode": obj.provincie_niscode},
+        "gewest": {"niscode": obj.gewest.niscode}
     }
 
 

diff --git a/crabpy_pyramid/tests/test_functional.py b/crabpy_pyramid/tests/test_functional.py
@@ -421,9 +421,9 @@ def test_list_gewesten(self):
         self.assertCountEqual(
             res.json,
             [
-                {"id": 1, "naam": "Brussels Hoofdstedelijk Gewest"},
-                {"id": 2, "naam": "Vlaams Gewest"},
-                {"id": 3, "naam": "Waals Gewest"},
+                {"id": 1, "niscode": "4000",  "naam": "Brussels Hoofdstedelijk Gewest"},
+                {"id": 2, "niscode": "2000", "naam": "Vlaams Gewest"},
+                {"id": 3, "niscode": "3000", "naam": "Waals Gewest"},
             ],
         )
 
@@ -498,6 +498,7 @@ def test_list_gemeenten_by_provincie(self):
                     "niscode": "11001",
                     "naam": "Aartselaar",
                     "uri": "https://data.vlaanderen.be/id/gemeente/11001",
+                    "provincie": {"niscode": "10000"},
                 }
             ],
         )