aindreas/fyp
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server]: Add additional fields to fetch_transient_data

Browse Source
This commit is contained in:
Aindréas Ó hAodha
2025-03-24 18:00:01 +00:00
parent e7af6295fe
commit c6282aca14
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/functions/fetch_transient_data/lambda_function.py
View File

@ -46,6 +46,10 @@ def fetch_trains():
train_status = train["TrainStatus"] train_status = train["TrainStatus"]
public_message = train["PublicMessage"] public_message = train["PublicMessage"]
split_message = public_message.split("\\n")
trainDetails = split_message[1].split("(")[0]
trainUpdate = split_message[2]
# Regex to extract punctuality: Matches positive/negative number followed by "mins late" # Regex to extract punctuality: Matches positive/negative number followed by "mins late"
match = re.search(r"(-?\d+)\s+mins\s+late", public_message) match = re.search(r"(-?\d+)\s+mins\s+late", public_message)
punctuality = int(match.group(1)) if match else 0 # Default to 0 if no match punctuality = int(match.group(1)) if match else 0 # Default to 0 if no match
@ -88,7 +92,9 @@ def fetch_trains():
"trainDirection": train["Direction"], "trainDirection": train["Direction"],
"trainPunctuality": punctuality, "trainPunctuality": punctuality,
"trainPunctualityStatus": punctuality_status, "trainPunctualityStatus": punctuality_status,
"latenessMessage": lateness_message "latenessMessage": lateness_message,
"trainDetails": trainDetails,
"trainUpdate": trainUpdate
}) })
return trains return trains

8
server/src/test/fetch_transient_data/test_fetch_transient_data.py
View File

@ -59,7 +59,7 @@ class TestTransientData(unittest.TestCase):
<TrainLongitude>-6.0</TrainLongitude> <TrainLongitude>-6.0</TrainLongitude>
<TrainStatus>R</TrainStatus> <TrainStatus>R</TrainStatus>
<TrainDate>2025-03-09</TrainDate> <TrainDate>2025-03-09</TrainDate>
<PublicMessage>5 mins late</PublicMessage> <PublicMessage>P322\\n17:10 - M3 Parkway to Docklands (1 mins late)\\nArrived Castleknock next stop Navan Road Parkway</PublicMessage>
<Direction>Northbound</Direction> <Direction>Northbound</Direction>
</objTrainPositions> </objTrainPositions>
</ArrayOfObjTrainPositions> </ArrayOfObjTrainPositions>
@ -77,7 +77,7 @@ class TestTransientData(unittest.TestCase):
"TrainLongitude": "-6.0", "TrainLongitude": "-6.0",
"TrainStatus": "R", "TrainStatus": "R",
"TrainDate": "2025-03-09", "TrainDate": "2025-03-09",
"PublicMessage": "5 mins late", "PublicMessage": "P322\\n17:10 - M3 Parkway to Docklands (1 mins late)\\nArrived Castleknock next stop Navan Road Parkway",
"Direction": "Northbound" "Direction": "Northbound"
} }
] ]
@ -89,9 +89,9 @@ class TestTransientData(unittest.TestCase):
self.assertEqual(result[0]['trainCode'], 'A123') self.assertEqual(result[0]['trainCode'], 'A123')
self.assertEqual(result[0]['trainStatus'], 'R') self.assertEqual(result[0]['trainStatus'], 'R')
self.assertEqual(result[0]['trainStatusFull'], 'Running') self.assertEqual(result[0]['trainStatusFull'], 'Running')
self.assertEqual(result[0]['trainPunctuality'], 5) self.assertEqual(result[0]['trainPunctuality'], 1)
self.assertEqual(result[0]['trainPunctualityStatus'], 'late') self.assertEqual(result[0]['trainPunctualityStatus'], 'late')
self.assertEqual(result[0]['latenessMessage'], '5 minutes late') self.assertEqual(result[0]['latenessMessage'], '1 minute late')
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()