# 139 Parcel reference improved

* improves frontend layout to display more details on district, municipal and parce group
* improves ordering of parcels
* refactors parcel related models
* improves parcel fetching
* extends and simplifies sanitize_db parcel related code

konova/models/geometry.py

@@ -99,7 +99,7 @@ class Geometry(BaseResource):
         Returns:
 
         """
-        from konova.models import Parcel, District, ParcelIntersection
+        from konova.models import Parcel, District, ParcelIntersection, Municipal, ParcelGroup
         parcel_fetcher = ParcelWFSFetcher(
             geometry_id=self.id,
         )
@@ -115,16 +115,28 @@ class Geometry(BaseResource):
             # which needs to be deleted and just keep the numerical values
             ## THIS CAN BE REMOVED IN THE FUTURE, WHEN 'Flur' WON'T OCCUR ANYMORE!
             flr_val = fetched_parcel["ave:flur"].replace("Flur ", "")
+            district = District.objects.get_or_create(
+                key=fetched_parcel["ave:kreisschl"],
+                name=fetched_parcel["ave:kreis"],
+            )[0]
+            municipal = Municipal.objects.get_or_create(
+                key=fetched_parcel["ave:gmdschl"],
+                name=fetched_parcel["ave:gemeinde"],
+                district=district,
+            )[0]
+            parcel_group = ParcelGroup.objects.get_or_create(
+                key=fetched_parcel["ave:gemaschl"],
+                name=fetched_parcel["ave:gemarkung"],
+                municipal=municipal,
+            )[0]
             parcel_obj = Parcel.objects.get_or_create(
-                gmrkng=fetched_parcel["ave:gemarkung"],
+                district=district,
+                municipal=municipal,
+                parcel_group=parcel_group,
                 flr=flr_val,
                 flrstck_nnr=fetched_parcel['ave:flstnrnen'],
                 flrstck_zhlr=fetched_parcel['ave:flstnrzae'],
             )[0]
-            district = District.objects.get_or_create(
-                gmnd=fetched_parcel["ave:gemeinde"],
-                krs=fetched_parcel["ave:kreis"],
-            )[0]
             parcel_obj.district = district
             parcel_obj.updated_on = _now
             parcel_obj.save()
@@ -155,9 +167,10 @@ class Geometry(BaseResource):
         parcels = self.parcels.filter(
             parcelintersection__calculated_on__isnull=False,
         ).prefetch_related(
-            "district"
+            "district",
+            "municipal",
         ).order_by(
-            "gmrkng",
+            "municipal__name",
         )
 
         return parcels