Merge pull request #52 from Turistforeningen/fix/standardize-log-resp…

…onse Fix/standardize log response
Turistforeningen · Sep 13, 2016 · 78dd4ad · 78dd4ad
2 parents ef5b2e8 + 1d08824
commit 78dd4ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -80,7 +80,7 @@ router.get('/steder/:sted/logg', (req, res, next) => {
     .where('ntb_steder_id').equals(req.params.sted)
     .limit(50)
     .sort({ timestamp: -1 })
-    .select('-dnt_user_id -location')
+    .then(checkins => checkins.map(c => c.anonymize(req.headers['x-user-id'])))
     .then(data => res.json({ data }))
     .catch(error => next(new HttpError('Database failure', 500, error)));
 });

diff --git a/test/acceptance/checkin.js b/test/acceptance/checkin.js
@@ -203,8 +203,10 @@ describe('GET /steder/:sted/logg', () => {
     JSON.parse(JSON.stringify(checkins[1])),
     JSON.parse(JSON.stringify(checkins[2])),
   ].map(c => {
-    delete c.dnt_user_id;
-    delete c.location;
+    if (c.public === false) {
+      delete c.dnt_user_id;
+      delete c.location;
+    }
     return c;
   });