can now track DHL correctly

wtdaemon.py

@@ -34,6 +34,7 @@ class Tracking:
     def __init__(self, tracking_num):
         self.tracking_num = tracking_num
         self.events = []
+        self.service = ""
         self.eta = None
         return
     
@@ -51,13 +52,37 @@ class Tracking:
         return self.events[-1]
 
 class Poste_tracking(Tracking):
+    codes = {"DR1":"Déclaratif réceptionné",
+                "DR2":"Problème lors de la préparation",
+                "PC1":"Pris en charge",
+                "PC2":"Pris en charge dans le pays d'expédition",
+                "ET1":"En cours de traitement",
+                "ET2":"En cours de traitement dans le pays d'expédition",
+                "ET3":"En cours de traitement dans le pays de destination",
+                "ET4":"En cours de traitement dans un pays de transit",
+                "EP1":"En attente de présentation",
+                "DO1":"Entrée en Douane",
+                "DO2":"Sortie  de Douane",
+                "DO3":"Retenu en Douane",
+                "PB1":"Problème en cours",
+                "PB2":"Problème résolu",
+                "MD2":"Mis en distribution",
+                "ND1":"Non distribuable",
+                "AG1":"En attente d'être retiré au guichet",
+                "RE1":"Retourné à l'expéditeur",
+                "DI0":"Distribué en lot",
+                "DI1":"Distribué",
+                "DI2":"Distribué à l'expéditeur",
+                "DI3":"Retardé"}
     def track(self):
         auth_headers = {'X-Okapi-Key' : OKAPI_POSTE_KEY, 'Accept' : 'application/json'}
         response = requests.get(POSTE_ENDPOINT + self.tracking_num, headers = auth_headers)
         js = response.json()
+        if "product" in js:
+            self.service = js["product"]
         if "shipment" in js:
             for jev in js["shipment"]["event"]:
-                self.events.append(Event(datetime.datetime.fromisoformat(jev["date"]), jev["label"]))
+                self.events.append(Event(datetime.datetime.fromisoformat(jev["date"]), self.codes[jev["code"]],description=jev["label"]))
             if "estimDate" in js["shipment"]:
                 self.eta = datetime.datetime.fromisoformat(js["shipment"]["estimDate"])
 
@@ -66,19 +91,33 @@ class DHL_tracking(Tracking):
         auth_headers = {'DHL-API-Key' : DHL_KEY}
         query = {'trackingNumber' : self.tracking_num}
         response = requests.get(DHL_ENDPOINT, params = query, headers = auth_headers)
-        print(response.json())
+        js = response.json()
+        if "shipments" in js:
+            if len(js["shipments"]) == 1:
+                self.service = js["shipments"][0]["service"]
+                if "estimatedDeliveryTimeFrame" in js["shipments"][0]:
+                    self.eta = datetime.datetime.fromisoformat(js["shipments"][0]["estimatedDeliveryTimeFrame"]["estimatedFrom"])
+                if "estimatedTimeOfDelivery" in js["shipments"][0]:
+                    self.eta = datetime.datetime.fromisoformat(js["shipments"][0]["estimatedTimeOfDelivery"])
+                for jev in js["shipments"][0]["events"]:
+                    loc = ""
+                    if "location" in jev:
+                        loc=jev["location"]["address"]["addressLocality"]
+                    self.events.append(Event(datetime.datetime.fromisoformat(jev["timestamp"]), jev["statusCode"],description=jev["description"], location=loc))
 
 #print('[')
 Ptrack = Poste_tracking("CC550445947DE")
 Ptrack.track()
-print(Ptrack.get_last_event())
+#print(Ptrack.get_last_event())
-print(',')
+#print(',')
 
-Chronotrack = Poste_tracking("XA420959322FR")
+#Chronotrack = Poste_tracking("XA420959322FR")
-Chronotrack.track()
+#Chronotrack.track()
-print(Chronotrack.get_last_event())
+#print(Chronotrack.get_last_event())
-print(',')
+#print(',')
 
-#DHLtrack = DHL_tracking("CC550445947DE")
+DHLtrack = DHL_tracking("CC550445947DE")
-#DHLtrack.track()
+DHLtrack.track()
+#print(DHLtrack.get_history())
+#print(Ptrack.get_history())
 #print(']')