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

Merge pull request #96 from 0hAodha/notanerror

Browse Source 
Fix false "error fetching live train data" error
This commit is contained in:
Aindréas Ó hAodha
2023-08-15 11:18:55 +00:00
committed by GitHub
parent 4a9089fbdc 3be37dad99
commit 975cfa371d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
functions/index.js
View File

@ -20,8 +20,8 @@ exports.getStationData = functions.https.onRequest((request, response) => {
// fetch the "stations" collection // fetch the "stations" collection
admin.firestore().collection('stations').get().then((snapshot) => { admin.firestore().collection('stations').get().then((snapshot) => {
if (snapshot.empty) { if (snapshot.empty) {
functions.logger.log("Error fetching station data from Firestore") functions.logger.log("Empty snapshot received when fetching station data from Firestore")
response.status(404).send({data: "Error fetching station data from Firestore"}) response.status(404).send({data: "Empty snapshot received when fetching station data from Firestore"})
return; return;
} }
// iterate through each of the collection's documents // iterate through each of the collection's documents
@ -185,8 +185,8 @@ exports.getLiveTrainData = functions.https.onRequest((request, response) => {
// fetch the "liveTrainData" collection // fetch the "liveTrainData" collection
admin.firestore().collection('liveTrainData').get().then((snapshot) => { admin.firestore().collection('liveTrainData').get().then((snapshot) => {
if (snapshot.empty) { if (snapshot.empty) {
functions.logger.log("Error fetching live train data from Firestore") functions.logger.log("Empty snapshot received when fetching live train data from Firestore")
response.status(404).send({data: "Successfully fetched live train data from Firestore"}); response.status(404).send({data: "Empty snapshot received when fetching live train data from Firestore"});
return; return;
} }
// iterate through each of the collection's documents // iterate through each of the collection's documents
@ -489,4 +489,4 @@ exports.deletePreferences = functions.https.onCall((data, context) => {
functions.logger.log("Successfully deleted user preferences from Firestore") functions.logger.log("Successfully deleted user preferences from Firestore")
return "Successfully deleted user preferences from Firestore" return "Successfully deleted user preferences from Firestore"
}) })
}) })

4
src/pages/InsightsPage.vue
View File

@ -189,7 +189,7 @@ export default {
const getTrainData = httpsCallable(functions, 'getLiveTrainData'); const getTrainData = httpsCallable(functions, 'getLiveTrainData');
getTrainData().then((response) => { getTrainData().then((response) => {
try { try {
if (!response.data) throw new Error("Error fetching live train data from the database") if (!response.data) console.warn("No train data in response!");
var unorderedTrains = []; var unorderedTrains = [];
var insights = { var insights = {
"totalNumTrains": 0, "totalNumTrains": 0,
@ -405,4 +405,4 @@ td.l, th.l{
content: "Destination"; content: "Destination";
} }
} }
</style> </style>

2
src/pages/MapPage.vue
View File

@ -415,7 +415,7 @@ export default {
const getTrainData = httpsCallable(functions, 'getLiveTrainData'); const getTrainData = httpsCallable(functions, 'getLiveTrainData');
getTrainData().then((response) => { getTrainData().then((response) => {
try { try {
if (!response.data) throw new Error("Error fetching live train data from the database") if (!response.data) console.warn("No train data in response!");
var unorderedTrains = []; var unorderedTrains = [];
var currentMessages = []; var currentMessages = [];
var insights = { var insights = {