Merge pull request #238 from gauravsinghaec/master

Update profile code improvement with minor bug fix from back-end.
UdacityFrontEndScholarship · May 16, 2018 · 273c8c3 · 273c8c3
2 parents b3fccf6 + c195c3d
commit 273c8c3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/controllers/userController.js b/controllers/userController.js
@@ -169,22 +169,6 @@ var updatePassword = function(userObj, callback) {
 
 var updateUser = function(userObj, callback) {
     var  item ={
-        indiv: {
-            name: userObj.firstname + ' ' + userObj.lastname,
-            first_name: userObj.firstname,  
-            last_name : userObj.lastname, 
-            age: userObj.age,
-            blood_grp: userObj.bloodgroup,
-            gender: userObj.gender,        
-            last_donation: moment(userObj.last_donation,'DD/MM/YYYY').format('MM/DD/YYYY'),                
-            height: userObj.height,    
-            weight: userObj.weight                    
-        },
-        non_indiv: {
-            org_name: userObj.orgname,
-            license: userObj.license,
-            unit_stock: userObj.stock
-        },
         mobile: userObj.mobile,
         address: {
             addr_type: userObj.addrtype,
@@ -201,7 +185,27 @@ var updateUser = function(userObj, callback) {
         },    
         updated : Date.now() 
     };
-    item.indiv.appointment = userObj.appointment;
+    if (userObj.usertype === 'Individual'){
+        item.indiv = {
+            name: userObj.firstname + ' ' + userObj.lastname,
+            first_name: userObj.firstname,  
+            last_name : userObj.lastname, 
+            age: userObj.age,
+            blood_grp: userObj.bloodgroup,
+            gender: userObj.gender,        
+            last_donation: moment(userObj.last_donation,'DD/MM/YYYY').format('MM/DD/YYYY'),                
+            height: userObj.height,    
+            weight: userObj.weight,
+            appointment : userObj.appointment
+        };
+    }else{
+        item.non_indiv = {
+            org_name: userObj.orgname,
+            license: userObj.license,
+            unit_stock: userObj.stock
+        };
+    }
+
     UserAcct.findByIdAndUpdate(userObj.id, { $set: item }, function(err, result) {
         if (err) {
             callback(err, undefined);

diff --git a/routes/profile/users.js b/routes/profile/users.js
@@ -37,10 +37,10 @@ router.post('/',
     function(req, res, next) {
         if (req.body._method === 'PUT'){
             let userObj = req.body;
-            userObj.id = req.user._id;
+            userObj.id = req.user._id;          
+            userObj.usertype = req.user.user_type;
             userObj.appointment = req.user.indiv.appointment;
             userObj.title = 'Profile';
-            console.log(userObj);
             updateUser(userObj, function(err, result) {
                 if (err) {
                     userObj.alertMessage = "DB Error:"+err.message;