Changeset 1034:4836f52b49cd for src/mlx/rpc.py

Timestamp:

03/14/22 09:58:58 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Updated the flight type handling (re #357)

File:

• src/mlx/rpc.py (modified) (3 diffs)

src/mlx/rpc.py

@@ -257 +257 @@
             raise Exception("Invalid flight status code: '" + status + "'")
 
+    @staticmethod
+    def _convertFlightType(ft):
+        """Convert the in-database flight-type to one of our constants."""
+        ft = int(ft)
+        if ft==0:
+            return const.FLIGHTTYPE_SCHEDULED
+        elif ft==1:
+            return const.FLIGHTTYPE_VIP
+        elif ft==2:
+            return const.FLIGHTTYPE_CHARTER
+        else:
+            return const.FLIGHTTYPE_SCHEDULED
+
     # FIXME: copied from web.BookedFlight
     @staticmethod
@@ -275 +288 @@
     # FIXME: copied from web.BookedFlight
     STATUS_REJECTED = 4
-
-    # Flight type: scheduled
-    FLIGHT_TYPE_SCHEDULED = 0
-
-    # Flight type: VIP
-    FLIGHT_TYPE_VIP = 1
-
-    # Flight type: charter
-    FLIGHT_TYPE_CHARTER = 2
 
     # The instructions for the construction
@@ -296 +300 @@
         "cargoWeight" : int,
         "mailWeight" : int,
-        "flightType" : int,
+        "flightType" : lambda value: BookedFlight._convertFlightType(value),
         "dow": int,
         "maxPassengers": int,