Remove get activities route, add error handling for invalid gpx files

Author: danielpeng2

backend/controllers/activities_controller.js

@@ -64,7 +64,7 @@ const uploadActivity = async(req, res, next) => {
         }
         res.json(savedActivities)
       } catch(err) {
-        next(err)
+        return next(err)
       }
     })
   form.parse(req)

backend/repositories/activities_repo.js

@@ -8,10 +8,6 @@ const findActivity = async(id) => {
   return await Activity.findById(id)
 }
 
-const getActivities = async() => {
-  return await Activity.find({})
-}
-
 const saveActivity = async(activityData) => {
   const activity = new Activity(activityData)
   return await activity.save()
@@ -20,6 +16,5 @@ const saveActivity = async(activityData) => {
 module.exports = {
   deleteActivity,
   findActivity,
-  getActivities,
   saveActivity,
 }

backend/routes/activities.js

@@ -1,7 +1,6 @@
 const activitiesRouter = require('express').Router()
 const activitiesController = require('../controllers/activities_controller')
 
-activitiesRouter.get('/', activitiesController.getActivities)
 activitiesRouter.post('/upload', activitiesController.uploadActivity)
 activitiesRouter.delete('/:id', activitiesController.deleteActivity)
 

backend/utils/gpx_parser.js

@@ -50,7 +50,7 @@ const _getActivityDetails = (trk) => {
 
 const parse = (gpx) => new Promise((resolve, reject) => {
   parser.parseString(gpx, (err, result) => {
-    if (err) return reject(err)
+    if (err) return reject({ name: 'GPXParseError' })
     const date = new Date(result.gpx.metadata.time)
     const { coords, distance, name, pace, time } = _getActivityDetails(result.gpx.trk)
     return resolve({

backend/utils/middleware.js

@@ -27,6 +27,10 @@ const errorHandler = (err, req, res, next) => {
     return res.status(401).json({
       error: 'invalid username or password'
     })
+  } else if (err.name === 'GPXParseError') {
+    return res.status(400).json({
+      error: 'invalid GPX file'
+    })
   }
   console.error(err.message)
   next(err)