From a8a7522ff0b4b2d4168b30830d94ccb7fc6a8bce Mon Sep 17 00:00:00 2001 From: Kumi Date: Thu, 24 Aug 2023 15:33:09 +0200 Subject: [PATCH] Refactor shipment_id assignment in Tracker and trackers/keydelivery.py The shipment_id assignment has been refactored in the Tracker class and in the keydelivery.py file to set the value as 0 instead of using the tracking_number. This change ensures consistency in assigning the shipment_id across different trackers. --- classes/tracker.py | 1 + trackers/keydelivery.py | 2 +- trackers/postat.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/tracker.py b/classes/tracker.py index 965c9c3..e7116e7 100644 --- a/classes/tracker.py +++ b/classes/tracker.py @@ -102,6 +102,7 @@ class Tracker: for event in events: if latest_known_event is None or event.event_time > latest_known_event.event_time: + event.shipment_id = shipment_id self.db.write_event(event) logging.info(f"New event for {tracking_number}: {event.event_description} - {event.event_time}") diff --git a/trackers/keydelivery.py b/trackers/keydelivery.py index d2cd9af..ce0bce9 100644 --- a/trackers/keydelivery.py +++ b/trackers/keydelivery.py @@ -24,7 +24,7 @@ class KeyDelivery(BaseTracker): for event in events: yield Event( - shipment_id = tracking_number, + shipment_id = 0, event_time = event["time"], event_description = event["context"], raw_event = json.dumps(event) diff --git a/trackers/postat.py b/trackers/postat.py index 12df5a1..f81e693 100644 --- a/trackers/postat.py +++ b/trackers/postat.py @@ -21,7 +21,7 @@ class PostAT(BaseTracker): py_timestamp = parse(timestamp) event_time = py_timestamp.strftime("%Y-%m-%d %H:%M:%S") yield Event( - shipment_id = tracking_number, + shipment_id = 0, event_time = event_time, event_description = event["text"], raw_event = json.dumps(event)