Merge pull request #4203 from hove-io/hotfix/flowbird

NAV-2676

Author: kodflow

source/jormungandr/jormungandr/parking_space_availability/car/forseti.py

@@ -81,8 +81,10 @@ def process_data(self, data, poi):
             if distance < self.distance:
                 return ParkingPlaces(
                     availability=parking.get('availability'),
-                    currency=parking.get('currency'),
-                    amount=parking.get('amount'),
-                    start_time=parking.get('startTime'),
-                    end_time=parking.get('endTime'),
+                    price=ParkingPlaces.Price(
+                        currency=parking.get('currency'),
+                        amount=parking.get('amount'),
+                        start_time=parking.get('startTime'),
+                        end_time=parking.get('endTime'),
+                    ),
                 )

source/jormungandr/jormungandr/parking_space_availability/car/parking_places.py

@@ -30,6 +30,24 @@
 
 
 class ParkingPlaces(object):
+    class Price(object):
+        # Price constructor
+        # Initializes the price details for a parking place
+        #
+        # Parameters:
+        # - currency: str, The currency used for pricing
+        # - amount: float, The price amount
+        # - start_time: datetime, The start time for the pricing
+        # - end_time: datetime, The end time for the pricing
+        #
+        # Returns:
+        # - None
+        def __init__(self, currency=None, amount=None, start_time=None, end_time=None):
+            self.currency = currency
+            self.amount = amount
+            self.start_time = start_time
+            self.end_time = end_time
+
     def __init__(
         self,
         available=None,
@@ -43,10 +61,7 @@ def __init__(
         occupied_electric_vehicle=None,
         state=None,
         availability=None,
-        currency=None,
-        start_time=None,
-        end_time=None,
-        amount=None,
+        price=None,
     ):
         if available is not None:
             self.available = available
@@ -70,14 +85,8 @@ def __init__(
             self.state = state
         if availability is not None:
             self.availability = availability
-        if currency is not None:
-            self.currency = currency
-        if amount is not None:
-            self.amount = amount
-        if start_time is not None:
-            self.start_time = start_time
-        if end_time is not None:
-            self.end_time = end_time
+        if price is not None:
+            self.price = price
         if not total_places and any(n is not None for n in [available, occupied, available_PRM, occupied_PRM]):
             self.total_places = (available or 0) + (occupied or 0) + (available_PRM or 0) + (occupied_PRM or 0)
 
@@ -94,10 +103,7 @@ def __eq__(self, other):
             "occupied_electric_vehicle",
             "state",
             "availability",
-            "currency",
-            "amount",
-            "start_time",
-            "end_time",
+            "price",
             "total_places",
         ]:
             if hasattr(other, item):

source/jormungandr/jormungandr/parking_space_availability/car/tests/forseti_test.py

@@ -60,23 +60,27 @@ def parking_space_availability_forseti_get_informations_test():
                 "coord": {"lat": 42.368227, "lon": -83.0779357},
                 "availability": True,
                 "currency": "USD",
+                "amount": 6000,
                 "startTime": "2019-04-01T00:00:00Z",
                 "endTime": "2019-04-01T23:59:59Z",
-                "amount": 6000,
-            }
+            },
         ],
         "pagination": {"start_page": 0, "items_on_page": 25, "items_per_page": 25, "total_result": 1},
     }
 
     parking_places = ParkingPlaces(
         availability=True,
-        currency='USD',
-        start_time='2019-04-01T00:00:00Z',
-        end_time='2019-04-01T23:59:59Z',
-        amount=6000,
+        price=ParkingPlaces.Price(
+            currency='USD',
+            amount=6000,
+            start_time='2019-04-01T00:00:00Z',
+            end_time='2019-04-01T23:59:59Z',
+        ),
     )
     provider = ForsetiProvider('http://forseti')
     provider._call_webservice = MagicMock(return_value=webservice_response)
     parking = provider.get_informations(poi)
-    assert parking == parking_places
-    print(parking)
+    assert parking.price.currency == parking_places.price.currency
+    assert parking.price.amount == parking_places.price.amount
+    assert parking.price.start_time == parking_places.price.start_time
+    assert parking.price.end_time == parking_places.price.end_time