more progress. model now works with sql

Author: iolufemi

TODO.md

@@ -3,6 +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/index.js | 14 | Automatically generate tests with the schema structure
 | routes/index.js | 298 | Test API versioning
 | routes/index.js | 299 | Test rate limiting
@@ -13,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/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/database/sql.js

@@ -4,6 +4,7 @@ var config = require('../../config');
 var log = require('../../services/logger');
 var mongoose = require('mongoose');
 var Sequelize = require('sequelize');
+var debug = require('debug')('sql');
 
 var Op = Sequelize.Op;
 var operatorsAliases = {
@@ -47,6 +48,8 @@ options.pool = {
 // SQLite only
 // options.storage = 'path/to/database.sqlite';
 
+options.logging = false;
+
 var sequelize = new Sequelize(config.SQLDatabase, config.SQLUsername, config.SQLPassword, options);
 
 sequelize

services/queue/jobs.js

@@ -45,16 +45,22 @@ jobs.updateRequestLog = function(response, done){
 // Creates search tags for all db records
 jobs.createSearchTags = function(data, done){
     log.info('Creating search index for: ', data._id);
+    var dataClone = _.extend({},data);
     var model = data.model;
+    var isSQL = data.isSQL;
+
     var update = data.update ? true : false;
-    if(data && data.update){
-        delete data.update;
+    if(dataClone && dataClone.update){
+        delete dataClone.update;
     }
-    if(data && data.model){
-        delete data.model;
+    if(dataClone && dataClone.model){
+        delete dataClone.model;
     }
-    
-    var ourDoc = data;
+    if(dataClone && dataClone.isSQL){
+        delete dataClone.isSQL;
+    }
+
+    var ourDoc = dataClone;
     var split = [];
 
     for(var n in ourDoc){
@@ -78,20 +84,29 @@ jobs.createSearchTags = function(data, done){
 split = _.flattenDeep(split);
 
 var task;
-if(update){
-    task = models[model].update(data,{ $set: { updatedAt: new Date(Date.now()).toISOString() }, $addToSet: {tags: {$each: split}} });
+if(model){
+    if(isSQL){
+        task = models[model].update(dataClone,{ tags: split.join(', ')} );
+    }else{
+        if(update){
+            task = models[model].update(dataClone,{ $set: { updatedAt: new Date(Date.now()).toISOString() }, $addToSet: {tags: {$each: split}} });
+        }else{
+            task = models[model].update(dataClone,{ $set: { tags: split} });
+        }
+    }
+
+    task
+    .then(function(res){
+      return done(false, res);
+  })
+    .catch(function(err){
+      log.error(err);
+      return done(new Error(err.message));
+  });
 }else{
-    task = models[model].update(data,{ $set: { tags: split} });
+    return done(new Error('No Model Passed!'));
 }
 
-task
-.then(function(res){
-  return done(false, res);
-})
-.catch(function(err){
-  log.error(err);
-  return done(new Error(err.message));
-});
 };
 
 // Backup Data to Trash