Ensure JSON returns correct data types, correctly escaped (#81)

* return numeric travel time (not string) * double quote strings for CSV, not for JSON
CityofToronto · Oct 5, 2023 · 3d9c5a7 · 3d9c5a7
1 parent ecde318
commit 3d9c5a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/backend/app/routes.py b/backend/app/routes.py
@@ -305,7 +305,7 @@ def aggregate_travel_times(start_node, end_node, start_time, end_time, start_dat
 
     connection.close()
     return jsonify({
-        'travel_time': travel_time, # may be null if insufficient data
+        'travel_time': float(travel_time), # may be null if insufficient data
         'route_text': stname,
         'links': links
     })

diff --git a/frontend/src/travelTimeQuery.js b/frontend/src/travelTimeQuery.js
@@ -48,17 +48,25 @@ export class TravelTimeQuery {
     resultsRecord(type='json'){
         const record = {
             URI: this.URI,
-            corridor: `"${this.corridor.name}"`,
-            timeRange: `"${this.timeRange.name}"`,
-            dateRange: `"${this.dateRange.name}"`,
-            daysOfWeek: `"${this.days.name}"`,
+            corridor: this.corridor.name,
+            timeRange: this.timeRange.name,
+            dateRange: this.dateRange.name,
+            daysOfWeek: this.days.name,
             hoursInRange: this.hoursInRange,
             mean_travel_time_minutes: this.#travelTime
         }
         if(type=='json'){
             return record
         }else if(type=='csv'){
-            return Object.values(record).join(',')
+            return Object.values(record)
+                .map( value => {
+
+                    if(typeof value == 'string'){
+                        return `"${value}"`
+                    }
+                    return value
+                } )
+                .join(',')
         }
         return 'invalid type requested'
     }