resolved merge conflict

LizaHCarter · Sep 1, 2014 · 11c7a42 · 11c7a42
1 parent 10638e8
commit 11c7a42
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -48,12 +48,14 @@ exports.profile = function(req, res){
     res.render('users/profile', {items:items});
   });
 };
+
 exports.edit = function(req, res){
   res.render('users/edit');
 };
 
 exports.update = function(req, res){
   res.locals.user.save(req.body, function(){
+    console.log('*******exports.update', req.body);
     res.redirect('/profile');
   });
 };
@@ -65,9 +67,9 @@ exports.index = function(req, res){
 };
 
 exports.trader = function(req, res){
-  User.findOneAndItems({email:req.params.email}, function(err, trader, biddableItems, saleItems){
+  User.findOneAndItems(req.params.email, function(err, trader, biddableItems, saleItems){
     if(trader){
-      res.render('users/trader', {trader:trader, biddableItems:biddableItems, saleItems:saleItems});
+      res.render('users/trader', {trader:trader, saleItems:saleItems, biddableItems:biddableItems});
     }else{
       res.redirect('/users');
     }

diff --git a/app/models/user.js b/app/models/user.js
@@ -36,6 +36,27 @@ User.authenticate = function(o, cb){
   });
 };
 
+User.findAll = function(cb){
+  User.collection.find().toArray(cb);
+};
+
+User.findByEmail = function(email, cb){
+  User.collection.findOne({email:email}, cb);
+};
+
+User.findOneAndItems = function(email, cb){
+  User.collection.findOne({email:email}, function(err, trader){
+    console.log(email);
+    console.log(trader);
+    if(!trader){return cb();}
+    require('./item').collection.find({ownerId:trader._id, isBiddable: true}).toArray(function(err, traderBiddableItems){
+      require('./item').collection.find({ownerId:trader._id, onSale: true}).toArray(function(err2, traderOnSaleItems){
+        cb(null, trader, traderBiddableItems, traderOnSaleItems);
+      });
+    });
+  });
+};
+
 User.prototype.unread = function(cb){
   Message.unread(this._id, cb);
 };
@@ -50,22 +71,6 @@ User.prototype.save = function(o, cb){
   User.collection.save(self, cb);
 };
 
-User.findAll = function(cb){
-  User.collection.find().toArray(cb);
-};
-
-User.findOneAndItems = function(filter, cb){
-  User.collection.findOne(filter, function(err, trader){
-    console.log(filter);
-    console.log(trader);
-    require('./item').collection.find({ownerId:trader._id, isBiddable: true}).toArray(function(err, traderBiddableItems){
-      require('./item').collection.find({ownerId:trader._id, onSale: true}).toArray(function(err2, traderOnSaleItems){
-        cb(null, trader, traderBiddableItems, traderOnSaleItems);
-      });
-    });
-  });
-};
-
 User.prototype.messages = function(cb){
   Message.messages(this._id, cb);
 };

diff --git a/app/static/css/style.css b/app/static/css/style.css
diff --git a/test/unit/user.js b/test/unit/user.js
@@ -54,7 +54,7 @@ describe('User', function(){
 
   describe('.findOneAndItems', function(){
     it('should find a specific user', function(done){
-      User.findOneAndItems({email:'nodeapptest+bob@gmail.com'}, function(err, trader, biddableItems, saleItems){
+      User.findOneAndItems('nodeapptest+bob@gmail.com', function(err, trader, biddableItems, saleItems){
         expect(trader.email).to.equal('nodeapptest+bob@gmail.com');
         expect(biddableItems).to.have.length(1);
         expect(saleItems).to.have.length(1);