From 3a9e413d344dc883304b22e9cfe4bebbe3b2811a Mon Sep 17 00:00:00 2001
From: Tim Van Campenhout <tim.vancampenhout@realdolmen.com>
Date: Tue, 25 Apr 2023 13:43:10 +0200
Subject: [PATCH 1/2] #173 gemeente statisch gewest nisc

---
 crabpy_pyramid/renderers/adressenregister.py | 14 +++++++++-----
 crabpy_pyramid/tests/test_functional.py      |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/crabpy_pyramid/renderers/adressenregister.py b/crabpy_pyramid/renderers/adressenregister.py
index 3bc778c..e2c32b6 100644
--- 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,12 @@ 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,
+        "uri": obj.uri,
+        "provincie": {"niscode": obj.provincie_niscode}
+    }
 
 
 def list_straten_adapter(obj, request):
@@ -118,6 +123,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 +151,8 @@ 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},
     }
 
 
diff --git a/crabpy_pyramid/tests/test_functional.py b/crabpy_pyramid/tests/test_functional.py
index da94f67..8f56284 100644
--- 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"},
                 }
             ],
         )

From 7f8511530328870296f5f8c16baa03dc2d47caa7 Mon Sep 17 00:00:00 2001
From: Tim Van Campenhout <tim.vancampenhout@realdolmen.com>
Date: Wed, 3 May 2023 10:18:52 +0200
Subject: [PATCH 2/2] #173 review fix

---
 crabpy_pyramid/renderers/adressenregister.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crabpy_pyramid/renderers/adressenregister.py b/crabpy_pyramid/renderers/adressenregister.py
index e2c32b6..ace6a21 100644
--- a/crabpy_pyramid/renderers/adressenregister.py
+++ b/crabpy_pyramid/renderers/adressenregister.py
@@ -49,7 +49,6 @@ def list_gemeente_adapter(obj, request):
     return {
         "niscode": obj.niscode,
         "naam": obj.naam,
-        "uri": obj.uri,
         "provincie": {"niscode": obj.provincie_niscode}
     }
 
@@ -153,6 +152,7 @@ def item_gemeente_adapter(obj, request):
         "niscode": obj.niscode,
         "naam": obj.naam(),
         "provincie": {"niscode": obj.provincie_niscode},
+        "gewest": {"niscode": obj.gewest.niscode}
     }