diff --git a/.gitignore b/.gitignore index a224831..ad9eee5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ archive har src/config.py **/__pycache__ +.venv TODO.txt \ No newline at end of file diff --git a/src/classes.py b/src/classes.py index 71258b4..25ae937 100644 --- a/src/classes.py +++ b/src/classes.py @@ -12,7 +12,7 @@ class Travel(): self.departureDateTime = data["departureDateTime"] self.arrivalDateTime = data["arrivalDateTime"] - self.travelClass = data["travelClass"] + self.travelClass = data["travelClass"] # 1st or 2nd class self.trainNumber = data["trainNumber"] self.coachNumber = data["coachNumber"] self.seatNumber = data["seatNumber"] @@ -22,6 +22,11 @@ class Travel(): self.travelStatus = data["travelStatus"] self.tcn = None + self.amount = None + self.exchangeable = None + self.refundable = None + self.seat = None + self.transportationServiceOffer = None def confirm(self, session, headers): """ @@ -58,6 +63,12 @@ class Travel(): }) data = json.loads(r.content.decode("utf-8")) self.tcn = data["tcn"] + + self.amount = data["amount"] + self.exchangeable = data["exchangeable"] + self.refundable = data["refundable"] + self.seat = data["seat"] # facingForward:bool, seatPosition, spaceType, tgvDeck + self.transportationServiceOffer = data["transportationServiceOffer"] return data def tprint(self, s, headers): @@ -72,4 +83,9 @@ class Travel(): "serviceItemId": self.serviceItemId, "tcn": [self.tcn] }) - + + def __str__(self): + return f"n. {self.trainNumber} {self.origin['label']} => {self.destination['label']}" + + def __repr__(self): + return str(self) diff --git a/src/main.py b/src/main.py index 724a483..b120f58 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,6 @@ import json import requests -from datetime import datetime +from datetime import datetime, UTC import utils import config @@ -45,7 +45,7 @@ def summary(s, headers): def travel_consultation(s, headers, date_time=None): if date_time is None: - date_time = datetime.utcnow() + date_time = datetime.now(UTC) return s.post( "https://www.maxjeune-tgvinoui.sncf/api/public/reservation/travel-consultation",