Update API so it uses new models; fix tests

pfleidi · Jan 17, 2016 · 2d14d07 · 2d14d07
1 parent 6714480
commit 2d14d07
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/models/download.js b/models/download.js
@@ -56,22 +56,12 @@ module.exports = function download(bookshelf) {
   }, {
     /* class methods */
 
-    metaData: function (qb) {
+    stats: function (qb) {
       return this.query(function (qb) {
         qb
         .sum('transferred_bytes as sentBytes')
         .count('* as count');
       });
-    },
-
-    files: function (qb) {
-      return this.query(function (qb) {
-        qb
-        .select('file_name as fileName')
-        .count('* as count')
-        .sum('transferred_bytes as sentBytes')
-        .groupBy('file_name');
-      });
     }
   });
 

diff --git a/models/file.js b/models/file.js
@@ -32,6 +32,19 @@ module.exports = function file(bookshelf) {
     downloads: function () {
       return this.hasMany('Download');
     }
+  }, {
+    /* class methods */
+
+    stats: function (qb) {
+      return this.query((qb) => {
+        qb
+        .select('path')
+        .count('downloads.id as count')
+        .sum('downloads.transferred_bytes as sentBytes')
+        .innerJoin('downloads', 'files.id', 'downloads.file_id')
+        .groupBy('files.path');
+      });
+    }
   });
 
   return bookshelf.model('File', File);

diff --git a/routes/api.js b/routes/api.js
@@ -5,17 +5,19 @@ const Promise = require('bluebird');
 
 module.exports = function api(config, models) {
   let Download = models.Download;
+  let File = models.File;
 
-  function fetchMetaData() {
-    return Download.metaData().fetch().then(function (data) {
+  function fetchDownloadStats() {
+    return Download.stats().fetch()
+    .then(function (data) {
       data.attributes.sentBytes = data.attributes.sentBytes || 0;
 
       return data.attributes;
     });
   }
 
-  function fetchFiles() {
-    let files = Download.files().fetchAll();
+  function fetchFilesStats() {
+    let files = File.stats().fetchAll();
 
     let mappedFiles = files.then(function (files) {
       return files.map(function (file) {
@@ -27,11 +29,13 @@ module.exports = function api(config, models) {
   }
 
   return function (req, res) {
-    Promise.all([fetchMetaData(), fetchFiles()]).then(function (results) {
-      let metaData = results[0];
-      let filesData = results[1];
+    Promise.all(
+      [fetchDownloadStats(), fetchFilesStats()]
+    ).then(function (results) {
+      let downloadStats = results[0];
+      let filesStats = results[1];
 
-      res.json(_.merge(metaData, { files: filesData }));
+      res.json(_.merge(downloadStats, { files: filesStats }));
     });
   };
 };
diff --git a/test/integration/api_test.js b/test/integration/api_test.js
@@ -32,7 +32,9 @@ describe('API', function () {
     var file = '/testfile.img';
 
     beforeEach(function (done) {
-      server.get(file).expect(200, done);
+      server.get(file).expect(200, () => {
+        setTimeout(done, 20);
+      });
     });
 
     it ('returns a valid files list', function (done) {
@@ -46,7 +48,7 @@ describe('API', function () {
 
         "files": [
           {
-            "fileName": file,
+            "path": file,
             "count": 1,
             "sentBytes": 5242880
           }
@@ -62,7 +64,9 @@ describe('API', function () {
       server
       .get(file)
       .set('Range', 'bytes=1000000-2000000')
-      .expect(206, done);
+      .expect(206, () => {
+        setTimeout(done, 20);
+      });
     });
 
     it ('returns a valid files list', function (done) {
@@ -76,7 +80,7 @@ describe('API', function () {
 
         "files": [
           {
-            "fileName": file,
+            "path": file,
             "count": 1,
             "sentBytes": 1000001
           }