Refactor Articles

stetsolutions · Jan 22, 2016 · db574d5 · db574d5
1 parent ce3c057
commit db574d5
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 88 deletions.
diff --git a/modules/articles/server/controllers/articles.server.controller.js b/modules/articles/server/controllers/articles.server.controller.js
@@ -11,16 +11,51 @@ var path = require('path'),
  * Create a article
  */
 exports.create = function(req, res) {
-  console.log('* articles.server.controller - create *');
+  // console.log('* articles.server.controller - create *');
 
   // save and return and instance of article on the res object. 
   db.Article.create({
     title: req.body.title,
     content: req.body.content,
     userId: req.user.id
-  })   
-    .then(function(newArticle) {
-      return res.json(newArticle);
+  })
+  .then(function(newArticle) {
+    return res.json(newArticle);
+  })
+  .catch(function(err) {
+    return res.status(400).send({
+      message: errorHandler.getErrorMessage(err)
+    });
+  });
+};
+
+/**
+ * Delete an article
+ */
+exports.delete = function(req, res) {
+  // console.log('* articles.server.controller - delete *');
+
+  var id = req.params.articleId;
+
+  db.Article
+    .findOne({
+      where: {
+        id: id
+      },
+      include: [
+        db.User
+      ]
+    })
+    .then(function(article) {
+      article.destroy()
+        .then(function() {
+          return res.json(article);
+        })
+        .catch(function(err) {
+          return res.status(400).send({
+            message: errorHandler.getErrorMessage(err)
+          });
+        });
     })
     .catch(function(err) {
       return res.status(400).send({
@@ -29,11 +64,33 @@ exports.create = function(req, res) {
     });
 };
 
+/**
+ * List of Articles
+ */
+exports.list = function(req, res) {
+  // console.log('* articles.server.controller - list *');
+
+  db.Article.findAll({
+    include: [
+      db.User
+    ]
+  })
+  .then(function(articles) {
+    return res.json(articles);
+  })
+  .catch(function(err) {
+    return res.status(400).send({
+      message: errorHandler.getErrorMessage(err)
+    });
+  });
+};
+
 /**
  * Show the current article
  */
 exports.read = function(req, res) {
-  console.log('* articles.server.controller - read *');
+  // console.log('* articles.server.controller - read *');
+
   var id = req.params.articleId;
 
   db.Article.find({
@@ -57,9 +114,8 @@ exports.read = function(req, res) {
 /**
  * Update a article
  */
-
 exports.update = function(req, res) {
-  console.log('* articles.server.controller - update *');
+  // console.log('* articles.server.controller - update *');
 
   var id = req.params.articleId;
 
@@ -72,7 +128,7 @@ exports.update = function(req, res) {
         db.User
       ]
     })
-    .then(function(article){
+    .then(function(article) {
       article.updateAttributes({
         title: req.body.title,
         content: req.body.content
@@ -90,58 +146,5 @@ exports.update = function(req, res) {
       return res.status(400).send({
         message: errorHandler.getErrorMessage(err)
       });
-    }); 
-};
-
-/**
- * Delete an article
- */
-exports.delete = function(req, res) {
-  console.log('* articles.server.controller - delete *');
-  var id = req.params.articleId;
-
-  db.Article
-    .findOne({
-      where: {
-        id: id
-      },
-      include: [
-        db.User
-      ]
-    })
-    .then(function(article){
-      article.destroy()
-      .then(function() {
-        return res.json(article);
-      })
-      .catch(function(err) {
-        return res.status(400).send({
-          message: errorHandler.getErrorMessage(err)
-        });
-      });
-    })
-    .catch(function(err) {
-      return res.status(400).send({
-        message: errorHandler.getErrorMessage(err)
-      });
-    }); 
-};
-
-/**
- * List of Articles
- */
-exports.list = function(req, res) {
-  db.Article.findAll({
-    include: [
-      db.User
-    ]
-  })
-  .then(function(articles) {
-    return res.json(articles);
-  })
-  .catch(function(err) {
-    return res.status(400).send({
-      message: errorHandler.getErrorMessage(err)
     });
-  });
 };
diff --git a/modules/articles/server/models/article.server.model.js b/modules/articles/server/models/article.server.model.js
@@ -1,14 +1,8 @@
 'use strict';
 
-/**
- * Module dependencies
- */
-
-
 /**
  * Article Schema
  */
-
 module.exports = function(sequelize, DataTypes) {
 
   var Article = sequelize.define('Article', {
@@ -30,4 +24,4 @@ module.exports = function(sequelize, DataTypes) {
   });
 
   return Article;
-};
+};
diff --git a/modules/articles/tests/server/article.server.model.tests.js b/modules/articles/tests/server/article.server.model.tests.js
@@ -17,7 +17,7 @@ var roleAdmin, roleUser;
 /**
  * Unit tests
  */
-describe('Article Model Unit Tests:', function () {
+describe('Article "model" Tests:', function () {
 
   before(function(done) {
     user =
@@ -149,9 +149,6 @@ describe('Article Model Unit Tests:', function () {
 
     var limit = 10;
     var offset = 0;
-    //var search = 'user';
-
-    //var query = new RegExp(search, 'i');
 
     db.Article
       .findAll({
@@ -161,19 +158,6 @@ describe('Article Model Unit Tests:', function () {
         include: [
           db.User
         ],
-        // '$or': [{
-        //   firstName: query
-        // }, {
-        //   lastName: query
-        // }, {
-        //   displayName: query
-        // }, {
-        //   username: query
-        // }, {
-        //   email: query
-        // }, {
-        //   roles: query
-        // }],
         'limit': limit,
         'offset': offset,
         'order': [

diff --git a/modules/articles/tests/server/article.server.routes.tests.js b/modules/articles/tests/server/article.server.routes.tests.js
@@ -9,6 +9,7 @@ var _ = require('lodash'),
   fs = require('fs-extra'),
   request = require('supertest'),
   should = require('should');
+
 /**
  * Globals
  */
@@ -19,7 +20,7 @@ var roleAdmin, roleUser;
 /**
  * Article routes tests
  */
-describe('Article CRUD tests', function() {
+describe('Article "routes" Tests:', function() {
   before(function(done) {
     // Get application
     app = express.init(db.sequelize);

diff --git a/modules/users/server/controllers/users/users.admin.server.controller.js b/modules/users/server/controllers/users/users.admin.server.controller.js
@@ -146,7 +146,7 @@ exports.list = function(req, res) {
  * @return {[type]}     [description]
  */
 exports.modify = function(req, res) {
-  console.log('* user.server.controller - modify *');
+  // console.log('* user.server.controller - modify *');
 
   var userId = req.params.userId;
   var roles = req.query.roles;
@@ -208,6 +208,8 @@ exports.modify = function(req, res) {
  * @return {[type]}     [description]
  */
 exports.roles = function (req, res) {
+  // console.log('* user.server.controller - roles *');
+
   db.Role
     .findAll()
     .then(function(roles) {

diff --git a/modules/users/tests/server/user.server.routes.tests.js b/modules/users/tests/server/user.server.routes.tests.js
@@ -19,7 +19,7 @@ var roleAdmin, roleUser;
 /**
  * User routes tests
  */
-describe('User "routes" tests', function() {
+describe('User "routes" Tests:', function() {
 
   before(function(done) {
     // Get application