Changed the way controllers access models.

RestOpenGov · Mar 18, 2013 · c2fa914 · c2fa914
1 parent 99503f3
commit c2fa914
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/webservice/app.js b/webservice/app.js
@@ -10,11 +10,6 @@ var server = restify.createServer({
   version: '0.2.0'
 });
 
-// Inject models to each controller
-for(var key in controllers) {
-  controllers[key].models = models;
-}
-
 // Setup Restify server
 require('./conf/restify.js')(restify, server);
 

diff --git a/webservice/controllers/ideaTypes.js b/webservice/controllers/ideaTypes.js
@@ -1,9 +1,9 @@
 
-var IdeaTypesController = {
+var IdeaType = require('../db.js').models.IdeaType;
 
-  list: function(req, res, next) {
+module.exports = {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
+  list: function(req, res, next) {
 
     IdeaType.findAll().success(function(ideaTypes) {
       res.send(ideaTypes);
@@ -13,23 +13,18 @@ var IdeaTypesController = {
 
   count: function(req, res, next) {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
-
     IdeaType.count().success(function(count) {
       res.send(count.toString());
     });
+
   },
 
   show: function(req, res, next) {
 
-    var IdeaType = IdeaTypesController.models.IdeaType;
-
     IdeaType.find(parseInt(req.params.id, 10)).success(function(ideaType) {
       res.send(ideaType);
     });
 
   }
 
 };
-
-module.exports = IdeaTypesController;
diff --git a/webservice/controllers/users.js b/webservice/controllers/users.js
@@ -1,34 +1,30 @@
 
+var User = require('../db.js').models.User;
 
-var UsersController = {
+module.exports = {
 
   list: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.findAll().success(function(users) {
       res.send(users);
     });
+
   },
 
   count: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.count().success(function(count) {
       res.send(count.toString());
     });
+
   },
 
   show: function(req, res, next) {
 
-    var User = UsersController.models.User;
-
     User.find(parseInt(req.params.id, 10)).success(function(user) {
       res.send(user);
     });
+
   }
 
 };
-
-module.exports = UsersController;