fix: Pass filtering to get

Fixes #33

Author: relekang

packages/micro-analytics-cli/src/handler.js

@@ -35,16 +35,15 @@ async function readMeta(req) {
 
 async function analyticsHandler(req, res) {
   const { pathname, query } = url.parse(req.url, /* parseQueryString */ true);
+  const before = parseInt(query.before, 10) || undefined;
+  const after = parseInt(query.after, 10) || undefined;
+
   res.setHeader('Access-Control-Allow-Origin', '*');
   // Send all views down if "?all" is true
   if (String(query.all) === 'true') {
     try {
       const data = {
-        data: await db.getAll({
-          pathname: pathname,
-          before: parseInt(query.before, 10),
-          after: parseInt(query.after, 10),
-        }),
+        data: await db.getAll({ pathname: pathname, before, after }),
         time: Date.now(),
       };
       send(res, 200, data);
@@ -71,7 +70,10 @@ async function analyticsHandler(req, res) {
   const shouldIncrement = String(query.inc) !== 'false';
   try {
     let meta;
-    const currentViews = (await db.has(pathname)) ? (await db.get(pathname)).views.length : 0;
+    const currentViews = (await db.has(pathname))
+      ? (await db.get(pathname, { before, after })).views.length
+      : 0;
+
     if (req.method === 'POST') {
       meta = await readMeta(req);
     }

packages/micro-analytics-cli/tests/items.test.js

@@ -56,6 +56,31 @@ describe('single', () => {
       expect(data).toMatchObject({ meta: { browser: 'IE 6' } });
     });
   });
+
+  describe.only('filtering', () => {
+    it('should filter based on before after', async () => {
+      const after = new Date('2017-01-01T09:11:00.000Z').getTime();
+      const before = new Date('2017-01-01T09:41:00.000Z').getTime();
+
+      await db.put('/rover', {
+        views: [
+          { time: new Date('2017-01-01T09:00:00.000Z').getTime() },
+          { time: new Date('2017-01-01T09:10:00.000Z').getTime() },
+          { time: new Date('2017-01-01T09:20:00.000Z').getTime() },
+          { time: new Date('2017-01-01T09:30:00.000Z').getTime() },
+          { time: new Date('2017-01-01T09:40:00.000Z').getTime() },
+          { time: new Date('2017-01-01T09:50:00.000Z').getTime() },
+        ],
+      });
+
+      const mapToIsoString = view => new Date(view.time).toISOString();
+      const body = JSON.parse(
+        await request(`${server.url}/rover?inc=false&before=${before}&after=${after}`)
+      );
+
+      expect(body.views).toEqual(3);
+    });
+  });
 });
 
 describe('all', () => {