cleanup

1 files changed, 4 insertions, 25 deletions

diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index fe4dc49..94c4acd 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -68,22 +68,8 @@ var middleware = {
   ensureUserProjectsCount: function(req, res, next){
     var counts = { stock: 0, basic: 0, pro: 0 }
     res.locals.projectCounts = counts
-    Project.count({ user_id: req.user.id, layout_type: 0 }, function(err, count){
-      res.locals.projectCounts.stock = count || 0
-      if (req.user.plan_level > 0) { return middleware.ensureBasicProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureBasicProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.projectCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.projectCounts.pro = count || 0
+    Project.count({ user_id: req.user._id }, function(err, count){
+      res.locals.projectCount = count || 0
       next()
     })
   },
@@ -93,15 +79,8 @@ var middleware = {
     res.locals.layoutCounts = counts
     if (req.user.plan_level == 0) { return next() }
 
-    Layout.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.layoutCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProLayoutsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProLayoutsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.layoutCounts.pro = count || 0
+    Layout.count({ user_id: req.user._id }, function(err, count){
+      res.locals.layoutCount = count || 0
       next()
     })
   },