sql model is now tested

Author: iolufemi

TODO.md

@@ -3,7 +3,7 @@
 |:------|:------:|:------
 | app.js | 62 | Write a complete Documentation for this project
 | config/index.js | 12 | Test for production and development senarios
-| models/Tests.js | 223 | Test transactions
+| models/Tests.js | 95 | Test transactions
 | models/index.js | 14 | Automatically generate tests with the schema structure
 | routes/index.js | 298 | Test API versioning
 | routes/index.js | 299 | Test rate limiting
@@ -14,6 +14,6 @@
 | routes/index.js | 304 | Make Log requests testable and write unit tests for it
 | routes/index.js | 305 | Develop the route loader into a separate node module to be publish on npm
 | routes/index.js | 306 | Develop all services onto separate node module to be publish on npm
+| services/logger/index.js | 36 | Test Error Handler
 | services/queue/clock.js | 11 | work on a clock functionality so kue can support scheduled jobs
-| services/queue/clock.js | 12 | Use the cron package here https://www.npmjs.com/package/cron for timer
-| services/logger/index.js | 36 | Test Error Handler
+| services/queue/clock.js | 12 | Use the cron package here https://www.npmjs.com/package/cron for timer

config/development.js

@@ -29,5 +29,6 @@ module.exports = {
     SQLDatabase: process.env.SQL_DATABASE || 'snipe',
     SQLHost: process.env.SQL_HOST || '192.168.99.100',
     SQLPort: process.env.SQL_PORT || 3306,
-    SQLDriver: process.env.SQL_DRIVER || 'mysql' //'mysql'|'sqlite'|'postgres'|'mssql'
+    SQLDriver: process.env.SQL_DRIVER || 'mysql', //'mysql'|'sqlite'|'postgres'|'mssql'
+    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00'
 };

config/production.js

@@ -29,5 +29,6 @@ module.exports = {
     SQLDatabase: process.env.SQL_DATABASE || 'snipe',
     SQLHost: process.env.SQL_HOST || 'localhost',
     SQLPort: process.env.SQL_PORT || 3306,
-    SQLDriver: process.env.SQL_DRIVER || 'mysql' //'mysql'|'sqlite'|'postgres'|'mssql'
+    SQLDriver: process.env.SQL_DRIVER || 'mysql', //'mysql'|'sqlite'|'postgres'|'mssql'
+    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00'
 };

services/database/sql.js

@@ -7,32 +7,33 @@ var Sequelize = require('sequelize');
 var debug = require('debug')('sql');
 
 var Op = Sequelize.Op;
+// enable only operators that you need
 var operatorsAliases = {
-    $and: Op.and,
-    $or: Op.or,
+    // $and: Op.and,
+    // $or: Op.or,
     $gt: Op.gt,
     $gte: Op.gte,
     $lt: Op.lt,
     $lte: Op.lte,
-    $ne: Op.ne,
-    $eq: Op.eq,
-    $not: Op.not,
-    $between: Op.between,
-    $notBetween: Op.notBetween,
-    $in: Op.in,
-    $notIn: Op.notIn,
+    // $ne: Op.ne,
+    // $eq: Op.eq,
+    // $not: Op.not,
+    // $between: Op.between,
+    // $notBetween: Op.notBetween,
+    // $in: Op.in,
+    // $notIn: Op.notIn,
     $like: Op.like,
-    $notLike: Op.notLike,
-    $iLike: Op.iLike, // PG Only
-    $notILike: Op.notILike, // PG Only 
-    $regexp: Op.regexp, // PG/mySQL Only
-    $notReqexp: Op.notRegexp, // PG/mySQL Only
-    $iRegexp: Op.iRegexp, // PG Only
-    $notIRegexp: Op.notIRegexp, // PG Only
-    $overlap: Op.overlap, // PG Only
-    $contains: Op.contains, // PG Only
-    $contained: Op.contained, // PG Only
-    $any: Op.any // PG Only
+    // $notLike: Op.notLike,
+    // $iLike: Op.iLike, // PG Only
+    // $notILike: Op.notILike, // PG Only 
+    // $regexp: Op.regexp, // PG/mySQL Only
+    // $notReqexp: Op.notRegexp, // PG/mySQL Only
+    // $iRegexp: Op.iRegexp, // PG Only
+    // $notIRegexp: Op.notIRegexp, // PG Only
+    // $overlap: Op.overlap, // PG Only
+    // $contains: Op.contains, // PG Only
+    // $contained: Op.contained, // PG Only
+    // $any: Op.any // PG Only
 };
 
 var options = { operatorsAliases: operatorsAliases };
@@ -45,10 +46,13 @@ options.pool = {
     acquire: 30000,
     idle: 10000
 };
+options.timezone = config.SQLTimezone;
 // SQLite only
 // options.storage = 'path/to/database.sqlite';
 
-options.logging = false;
+options.logging = function(log){
+    return (process.env.NODE_ENV === 'production') ? false : debug(log);
+};
 
 var sequelize = new Sequelize(config.SQLDatabase, config.SQLUsername, config.SQLPassword, options);
 

services/queue/jobs.js

@@ -92,8 +92,7 @@ split = _.flattenDeep(split);
 var task;
 if(model){
     if(isSQL){
-        console.log('mememem: ',dataClone);
-        task = models[model].update(dataClone,{ tags: split.join(', ')} );
+        task = models[model].update({ tags: split.join(', ')}, {where: dataClone} );
     }else{
         if(update){
             task = models[model].update(dataClone,{ $set: { updatedAt: new Date(Date.now()).toISOString() }, $addToSet: {tags: {$each: split}} });