Add before after filtering support

Author: relekang

package.json

@@ -24,6 +24,7 @@
   "license": "MIT",
   "repository": "https://github.com/mxstbr/micro-analytics",
   "dependencies": {
+    "date-fns": "^1.25.0",
     "flat-file-db": "^1.0.0",
     "micro": "6.1.0",
     "promise": "^7.1.1",

src/flat-file-adapter.js

@@ -1,13 +1,22 @@
 const flatfile = require('flat-file-db')
 const promise = require('promise')
+const dateFns = require('date-fns')
 
 const db = flatfile.sync(process.env.DB_NAME || 'views.db')
 
 module.exports = {
   put: promise.denodeify(db.put.bind(db)),
 
   has: (key) => Promise.resolve(db.has(key)),
-  get: (key) => Promise.resolve(db.get(key)),
+  get: (key, options) => {
+    const value = db.get(key)
+
+    return value.filter(view => {
+      if (options && options.before && dateFns.isAfter(view.time, options.before)) return false
+      if (options && options.after && dateFns.isBefore(view.time, options.after)) return false
+      return true
+    })
+  },
   keys: () => Promise.resolve(db.keys()),
 
   getAll: async function getAll(options) {
@@ -17,7 +26,7 @@ module.exports = {
     keys
       .filter(key => key.startsWith(options.pathname))
       .forEach((key) => {
-        data[key] = db.get(key)
+        data[key] = module.exports.get(key, { before: options.before, after: options.after })
       })
 
     return data

src/index.js

@@ -10,7 +10,11 @@ module.exports = async function (req, res) {
   if (String(query.all) === 'true') {
     try {
       const data = {
-        data: await db.getAll({ pathname: pathname, filter: query.filter }),
+        data: await db.getAll({
+          pathname: pathname,
+          before: query.before,
+          after: query.after,
+        }),
         time: Date.now()
       }
       send(res, 200, data)

tests/items.test.js

@@ -1,4 +1,5 @@
 const request = require('request-promise')
+const dateFns = require('date-fns')
 const { listen, mockDb } = require('./utils')
 
 jest.mock('flat-file-db', () => mockDb)
@@ -90,5 +91,30 @@ describe('all', () => {
       expect(body.data['/rover2'].views).toBeDefined()
       expect(body.data['/rover2'].views.length).toBe(1)
     })
+
+    it('should filter based on before after', async () => {
+      const baseDate = new Date(2017, 1, 1, 10, 0)
+      const after = dateFns.addMinutes(baseDate, 11).toISOString()
+      const before = dateFns.addMinutes(baseDate, 41).toISOString()
+
+      const d = dateFns.addMinutes(baseDate, 20)
+
+      mockDb._put('/rover', [
+        { time: baseDate.getTime() },
+        { time: dateFns.addMinutes(baseDate, 10).getTime() },
+        { time: dateFns.addMinutes(baseDate, 20).getTime() },
+        { time: dateFns.addMinutes(baseDate, 30).getTime() },
+        { time: dateFns.addMinutes(baseDate, 40).getTime() },
+        { time: dateFns.addMinutes(baseDate, 50).getTime() },
+      ])
+
+      const mapToIsoString = view => new Date(view.time).toISOString()
+      const body = JSON.parse(await request(`${url}/rover?all=true&before=${before}&after=${after}`))
+      expect(body.data['/rover'].map(mapToIsoString)).toEqual([
+        '2017-02-01T09:20:00.000Z',
+        '2017-02-01T09:30:00.000Z',
+        '2017-02-01T09:40:00.000Z'
+      ])
+    })
   })
 })

tests/utils.js

@@ -20,7 +20,8 @@ const DB = () => {
 
     // Custom methods used in tests
     _reset: () => { data = {} },
-    _setDelay: (ms) => { DELAY = ms || 1 }
+    _setDelay: (ms) => { DELAY = ms || 1 },
+    _put: (key, value) => { data[key] = value }
   }
 }