fixed time series endpoints

CHANGELOG.md

@@ -43,3 +43,4 @@ API Server for CogniCity
 * Updated documentation of Swagger files
 * Updated Babel package
 * Remove username field from GET /cards/:id
+* Fix bug with time series endpoints

src/api/routes/floods/timeseries/model.js

@@ -19,8 +19,8 @@ export default (config, db, logger) => ({
     // Setup query
     let query = `SELECT ts, count(local_area) FROM
     (SELECT (cognicity.rem_get_flood(ts)).local_area, ts
-      FROM  generate_series($1::timestamp with time zone,
-            $2::timestamp with time zone,'1 hour')
+      FROM  generate_series(date_trunc('hour', $1::timestamp with time zone),
+            date_trunc('hour', $2::timestamp with time zone),'1 hour')
       as series(ts)) output
     GROUP BY ts ORDER BY ts`;
 

src/api/routes/reports/timeseries/model.js

@@ -18,8 +18,8 @@ export default (config, db, logger) => ({
   count: (start, end, city) => new Promise((resolve, reject) => {
     // Setup query
     let query = `SELECT ts, count(r.pkey)
-    FROM generate_series($1::timestamp with time zone,
-    $2::timestamp with time zone, '1 hour') ts
+    FROM generate_series(date_trunc('hour', $1::timestamp with time zone),
+    date_trunc('hour', $2::timestamp with time zone), '1 hour') ts
     LEFT JOIN cognicity.all_reports r
     ON date_trunc('hour', r.created_at) = ts
     AND ($3 IS NULL OR tags->>'instance_region_code'=$3)