From 5294462e4c55a1bb97efb147edd10e2c4417edf4 Mon Sep 17 00:00:00 2001
From: Nathan Leniz <terakilobyte@gmail.com>
Date: Tue, 27 Jan 2015 22:25:48 -0500
Subject: [PATCH] Resolving issue with saving to "paired with" user profile

---
 app.js                 | 6 +++++-
 controllers/bonfire.js | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 16d5307f2b..e5503ad7df 100644
--- a/app.js
+++ b/app.js
@@ -288,6 +288,8 @@ app.post('/completed-bonfire/', function (req, res) {
     var isCompletedDate =  Math.round(+new Date() / 1000);
     var bonfireHash = req.body.bonfireInfo.bonfireHash;
     var isSolution = req.body.bonfireInfo.solution;
+    // TODO
+    debug(isCompletedWith, 'Is completed with');
 
     if (isCompletedWith) {
         var paired = User.find({"profile.username": isCompletedWith}).limit(1);
@@ -300,13 +302,15 @@ app.post('/completed-bonfire/', function (req, res) {
                 if (index > -1) {
                     req.user.uncompletedBonfires.splice(index,1)
                 }
+                pairedWith = pairedWith.pop();
 
+                //debug('This is paired with', Object.keys(pairedWith));
+                debug('This is paired with\'s uncompleted bonfires array', pairedWith.uncompletedBonfires);
                 index = pairedWith.uncompletedBonfires.indexOf(bonfireHash);
                 if (index > -1) {
                     pairedWith.uncompletedBonfires.splice(index,1)
                 }
 
-                pairedWith = pairedWith.pop();
                 pairedWith.completedBonfires.push({
                     _id: bonfireHash,
                     completedWith: req.user._id,
diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 5eea2483ba..e36285a199 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -33,9 +33,12 @@ exports.index = function(req, res) {
 };
 
 exports.returnNextBonfire = function(req, res, next) {
-
+    // TODO
+    //var tempUser = false;
     if (!req.user) {
-        req.user = new User();
+        res.redirect('bonfires/meet-bonfire');
+        //tempUser = true;
+        //req.user = new User();
     }
     var currentTime = parseInt(+new Date() / 1000)
     if (currentTime - req.user.lastContentSync > 86400) {