Merge branch 'feature/official-car-sharing-schema' into develop

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing/tables/__init__.py

@@ -4,4 +4,4 @@ from _add_use_case_scripts.car_sharing.tables import add_offer
 from _add_use_case_scripts.car_sharing.tables import add_publication
 from _add_use_case_scripts.car_sharing.tables import add_travel
 from _add_use_case_scripts.car_sharing.tables import add_user
-from _add_use_case_scripts.car_sharing.tables import requestPost
\ No newline at end of file
+from _add_use_case_scripts import requestPost
\ No newline at end of file

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing_official/tables/__init__.py

@@ -10,4 +10,4 @@ from _add_use_case_scripts.car_sharing_official.tables import add_travelStartedB
 from _add_use_case_scripts.car_sharing_official.tables import add_travelSuggestedEndPlaces
 from _add_use_case_scripts.car_sharing_official.tables import add_travelUsers
 from _add_use_case_scripts.car_sharing_official.tables import add_user
-from _add_use_case_scripts.car_sharing_official.tables import requestPost
+from _add_use_case_scripts import requestPost

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing_official/tables/add_car.py

@@ -16,7 +16,7 @@ def add_table(use_case: str, table_name:str):
         "ownerId",
         "seats",
         "state",       
-        "sumOfEvaluations"
+        "sumOfEvaluations",
         "year"
 
     ]
@@ -50,7 +50,7 @@ def add_layers(use_case:str, table_name: str):
                 "ownerId",
                 "seats",
                 "state",       
-                "sumOfEvaluations"
+                "sumOfEvaluations",
                 "year"                            
             ],
             "cluster_properties": [
@@ -78,11 +78,11 @@ def add_layers(use_case:str, table_name: str):
                 "ownerId",
                 "seats",
                 "state",       
-                "sumOfEvaluations"
+                "sumOfEvaluations",
                 "year"                               
             ],
             "cluster_properties": [
-                "OwnerID",
+                "ownerId",
                 "UniqueID"
             ]
         },
@@ -102,7 +102,7 @@ def add_layers(use_case:str, table_name: str):
                 "ownerId",
                 "seats",
                 "state",       
-                "sumOfEvaluations"
+                "sumOfEvaluations",
                 "year"                                     
             ],
             "cluster_properties": [
@@ -126,7 +126,7 @@ def add_layers(use_case:str, table_name: str):
                 "ownerId",
                 "seats",
                 "state",       
-                "sumOfEvaluations"
+                "sumOfEvaluations",
                 "year"                                    
             ],
             "cluster_properties": [
@@ -165,7 +165,7 @@ def add_layers(use_case:str, table_name: str):
                 "ownerId",
                 "seats",
                 "state",       
-                "sumOfEvaluations"
+                "sumOfEvaluations",
                 "year"                                 
             ],
             "cluster_properties": [

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing_official/tables/add_offerEndPlaces.py

@@ -7,16 +7,17 @@ def add_table(use_case: str, table_name: str):
     '''
 
     
-    columns = [
-        # None
-    ]
+    #columns = [
+    #    # None
+    #]    
+    #columns = { c : c for c in columns }
+    columns = dict()
     #TODO unique id is dependent on offferId -> error?
-    columns = { c : c for c in columns }
-    columns["UniqueID"] = "offerId+endPlacesLatitude+endPlacesLongitude"
     columns["offerId"] = "offer//id"
-    columns["endPlacesAddress"]= "endPlaces[0]//address",
-    columns["endPlacesLatitude"]= "endPlaces[0]//latitude",
-    columns["endPlacesLongitude"]= "endPlaces[0]//longitude"
+    columns["UniqueID"] = "offerId+endPlacesLatitude+endPlacesLongitude"    
+    columns["endPlacesAddress"] = "endPlaces[0]//address"
+    columns["endPlacesLatitude"] = "endPlaces[0]//latitude"
+    columns["endPlacesLongitude"] = "endPlaces[0]//longitude"
 
     table = {
         "name": table_name,
@@ -33,7 +34,7 @@ def add_layers(use_case:str, table_name: str):
             "name": "OfferEndPlace_layer",
             "properties": [
                 "UniqueID",
-                "offerID", 
+                "offerId", 
                 "endPlacesAddress",
                 "endPlacesLatitude",
                 "endPlacesLongitude"
@@ -49,7 +50,7 @@ def add_layers(use_case:str, table_name: str):
             "name": "OfferEndAddress_layer",
             "properties": [
                 "UniqueID",
-                "offerID", 
+                "offerId", 
                 "endPlacesAddress",
                 "endPlacesLatitude",
                 "endPlacesLongitude"