fix(download_total): change column date to DateTime

Fixes #540
cnpm · Dec 21, 2014 · 9ed3b3a · 9ed3b3a
1 parent d651c2e
commit 9ed3b3a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/docs/db.sql b/docs/db.sql
@@ -155,13 +155,14 @@ CREATE TABLE IF NOT EXISTS `download_total` (
  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
  `gmt_create` datetime NOT NULL COMMENT 'create time',
  `gmt_modified` datetime NOT NULL COMMENT 'modified time',
- `date` varchar(10) NOT NULL COMMENT 'YYYY-MM-DD format',
+ `date` datetime NOT NULL COMMENT 'YYYY-MM-DD format',
  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'module name',
  `count` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'download count',
  PRIMARY KEY (`id`),
  UNIQUE KEY `date_name` (`date`, `name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='module download total info';
--- ALTER TABLE  `download_total` CHANGE  `name`  `name` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT  'module name';
+-- ALTER TABLE  `download_total` CHANGE  `name`  `name` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT  'module name';
+-- ALTER TABLE  `download_total` CHANGE  `date`  `date` datetime NOT NULL COMMENT 'YYYY-MM-DD format';
 
 CREATE TABLE IF NOT EXISTS `module_deps` (
  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',

diff --git a/models/download_total.js b/models/download_total.js
@@ -18,7 +18,7 @@
 //  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key',
 //  `gmt_create` datetime NOT NULL COMMENT 'create time',
 //  `gmt_modified` datetime NOT NULL COMMENT 'modified time',
-//  `date` varchar(10) NOT NULL COMMENT 'YYYY-MM-DD format',
+//  `date` datetime NOT NULL COMMENT 'YYYY-MM-DD format',
 //  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'module name',
 //  `count` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'download count',
 //  PRIMARY KEY (`id`),
@@ -28,7 +28,7 @@
 module.exports = function (sequelize, DataTypes) {
   return sequelize.define('DownloadTotal', {
     date: {
-      type: DataTypes.STRING(10),
+      type: DataTypes.DATE,
       allowNull: false,
       comment: 'YYYY-MM-DD format',
     },

diff --git a/services/download_total.js b/services/download_total.js
@@ -19,15 +19,18 @@ var models = require('../models');
 var DownloadTotal = models.DownloadTotal;
 
 exports.getModuleTotal = function* (name, start, end) {
-  var dates = getDateRanges(start, end);
-  return yield DownloadTotal.findAll({
+  start += ' 00:00:00';
+  end += ' 23:59:59';
+  var rows = yield DownloadTotal.findAll({
     where: {
       date: {
-        in: dates
+        gte: start,
+        lte: end
       },
       name: name
     }
   });
+  return formatRows(rows);
 };
 
 exports.plusModuleTotal = function* (data) {
@@ -50,26 +53,21 @@ exports.plusModuleTotal = function* (data) {
   return row;
 };
 
-
 exports.getTotal = function* (start, end) {
+  start += ' 00:00:00';
+  end += ' 23:59:59';
   var sql = 'SELECT date, sum(count) AS count FROM download_total \
-    WHERE date in (?) GROUP BY date';
-  return yield models.query(sql, [getDateRanges(start, end)]);
+    WHERE date>=? AND date<=?  GROUP BY date;';
+  var rows = yield models.query(sql, [start, end]);
+  return formatRows(rows);
 };
 
-function getDateRanges(start, end) {
-  var startDate = moment(start, 'YYYY-MM-DD');
-  var ranges = [start];
-  if (start < end) {
-    var next;
-    while (true) {
-      next = startDate.add(1, 'days').format('YYYY-MM-DD');
-      if (next >= end) {
-        break;
-      }
-      ranges.push(next);
-    }
-    ranges.push(end);
-  }
-  return ranges;
+function formatRows(rows) {
+  return rows.map(function (row) {
+    return {
+      name: row.name,
+      count: row.count,
+      date: moment(row.date).format('YYYY-MM-DD'),
+    };
+  });
 }
diff --git a/test/services/download_total.test.js b/test/services/download_total.test.js
@@ -37,12 +37,15 @@ describe('services/download_total.test.js', function () {
         'plusModuleTotal-module', '2014-10-21', '2014-10-21');
       rows.should.length(1);
       rows[0].count.should.equal(1000);
+      rows[0].date.should.equal('2014-10-21');
 
       rows = yield* DownloadTotal.getModuleTotal(
         'plusModuleTotal-module', '2014-10-21', '2014-10-22');
       rows.should.length(2);
       rows[0].count.should.equal(1000);
+      rows[0].date.should.equal('2014-10-21');
       rows[1].count.should.equal(2);
+      rows[1].date.should.equal('2014-10-22');
 
       // save again
       data = {
@@ -55,6 +58,7 @@ describe('services/download_total.test.js', function () {
         'plusModuleTotal-module', '2014-10-21', '2014-10-21');
       rows.should.length(1);
       rows[0].count.should.equal(1003);
+      rows[0].date.should.equal('2014-10-21');
 
       data = {
         date: '2014-10-22',