changes after randhir review

Author: shubhamsinghbundela

controllers/users.js

@@ -1,5 +1,6 @@
 const chaincodeQuery = require("../models/chaincodes");
 const userQuery = require("../models/users");
+const userStatusModel = require("../models/userStatus");
 const profileDiffsQuery = require("../models/profileDiffs");
 const logsQuery = require("../models/logs");
 const imageService = require("../services/imageService");
@@ -389,7 +390,7 @@ const addUserIntro = async (req, res) => {
     };
 
     if (rawData.numberOfHours) {
-      await userQuery.updateMonthlyHours(rawData.numberOfHours, req.userData.id);
+      await userStatusModel.updateMonthlyHours(4 * rawData.numberOfHours, req.userData.id);
     }
 
     await userQuery.addJoinData(data);

models/userStatus.js

@@ -136,6 +136,27 @@ const updateUserStatus = async (userId, newStatusData) => {
   }
 };
 
+/**
+ * Sets the monthlyHours field of passed UserId to numberOfHours
+ *
+ * @param monthlyHours { integer }: numberOfHours
+ * @param userId { string }: User id
+ */
+
+const updateMonthlyHours = async (numberOfHours, userId) => {
+  const userStatusDocs = await userStatusModel.where("userId", "==", userId).limit(1).get();
+  const [userStatusDoc] = userStatusDocs.docs;
+  if (userStatusDoc) {
+    const docId = userStatusDoc.id;
+    return userStatusModel.doc(docId).update({
+      monthlyHours: {
+        committed: numberOfHours,
+      },
+    });
+  }
+  return {};
+};
+
 /**
  * @param userId { String }: Id of the User
  * @param newStatusData { Object }: Data to be Updated
@@ -193,4 +214,11 @@ const updateAllUserStatus = async () => {
   }
 };
 
-module.exports = { deleteUserStatus, getUserStatus, getAllUserStatus, updateUserStatus, updateAllUserStatus };
+module.exports = {
+  deleteUserStatus,
+  getUserStatus,
+  getAllUserStatus,
+  updateUserStatus,
+  updateMonthlyHours,
+  updateAllUserStatus,
+};

models/users.js

@@ -312,27 +312,6 @@ const updateUserPicture = async (image, userId) => {
   }
 };
 
-/**
- * Sets the monthlyHours field of passed UserId to userNumberOfHours
- *
- * @param monthlyHours { integer }: userNumberOfHours
- * @param userId { string }: User id
- */
-
-const updateMonthlyHours = async (userNumberOfHours, userId) => {
-  const userStatusDocs = await userStatusModel.where("userId", "==", userId).limit(1).get();
-  const [userStatusDoc] = userStatusDocs.docs;
-  if (userStatusDoc) {
-    const docId = userStatusDoc.id;
-    return userStatusModel.doc(docId).update({
-      monthlyHours: {
-        committed: 4 * userNumberOfHours,
-      },
-    });
-  }
-  return {};
-};
-
 /**
  * fetch the users image by passing array of users
  *
@@ -445,7 +424,6 @@ module.exports = {
   setIncompleteUserDetails,
   initializeUser,
   updateUserPicture,
-  updateMonthlyHours,
   fetchUserImage,
   addJoinData,
   getJoinData,

test/integration/userStatus.test.js

@@ -398,7 +398,7 @@ describe("UserStatus", function () {
           expect(res).to.have.status(400);
           expect(res.body).to.be.an("object");
           expect(res.body.error).to.equal(`Bad Request`);
-          expect(res.body.message).to.equal(`Invalid State. State must be either IDLE, ACTIVE or OOO`);
+          expect(res.body.message).to.equal(`Invalid State. State must be either IDLE, ACTIVE, OOO, or ONBOARDING`);
           return done();
         });
     });