fix lint

Author: shubhamsinghbundela

controllers/userStatus.js

@@ -1,4 +1,4 @@
-const { fetchUser } = require("../models/users");
+const { fetchUser, getJoinData } = require("../models/users");
 const userStatusModel = require("../models/userStatus");
 const { getUserIdBasedOnRoute } = require("../utils/userStatus");
 const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
@@ -103,7 +103,8 @@ const updateUserStatus = async (req, res) => {
   try {
     const userId = getUserIdBasedOnRoute(req);
     if (userId) {
-      const dataToUpdate = req.body;
+      const result = await getJoinData(userId);
+      const dataToUpdate = { ...req.body, monthlyHours: { committed: 4 * result[0].intro.numberOfHours } };
       const updateStatus = await userStatusModel.updateUserStatus(userId, dataToUpdate);
       const { userStatusExists, id, data } = updateStatus;
       const responseObject = { id, userId, data: null, message: "" };

controllers/users.js

@@ -1,6 +1,5 @@
 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");
@@ -388,11 +387,6 @@ const addUserIntro = async (req, res) => {
       },
       foundFrom: rawData.foundFrom,
     };
-
-    if (rawData.numberOfHours) {
-      await userStatusModel.updateMonthlyHours(4 * rawData.numberOfHours, req.userData.id);
-    }
-
     await userQuery.addJoinData(data);
 
     return res.status(201).json({

models/userStatus.js

@@ -136,27 +136,6 @@ 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
@@ -219,6 +198,5 @@ module.exports = {
   getUserStatus,
   getAllUserStatus,
   updateUserStatus,
-  updateMonthlyHours,
   updateAllUserStatus,
 };

test/fixtures/userStatus/userStatus.js

@@ -51,18 +51,9 @@ const generateUserStatusData = (state, updatedAt, from, until = "", message = ""
   };
 };
 
-const generateMonthlyHours = (committed = 0) => {
-  return {
-    monthlyHours: {
-      committed,
-    },
-  };
-};
-
 module.exports = {
   userStatusDataForNewUser,
   userStatusDataForOooState,
   oooStatusDataForShortDuration,
   generateUserStatusData,
-  generateMonthlyHours,
 };

test/integration/userStatus.test.js

@@ -15,9 +15,7 @@ const {
   userStatusDataForOooState,
   oooStatusDataForShortDuration,
   generateUserStatusData,
-  generateMonthlyHours,
 } = require("../fixtures/userStatus/userStatus");
-const joinData = require("../fixtures/user/join");
 
 const config = require("config");
 const { updateUserStatus } = require("../../models/userStatus");
@@ -370,20 +368,6 @@ describe("UserStatus", function () {
         });
     });
 
-    it("Should update the Monthly Hours", function (done) {
-      chai
-        .request(app)
-        .patch(`/users/status/self`)
-        .set("cookie", `${cookieName}=${jwt}`)
-        .send(generateMonthlyHours(joinData()[2].numberOfHours))
-        .end((err) => {
-          if (err) {
-            return done(err);
-          }
-          return done();
-        });
-    });
-
     it("Should return 401 for unauthorized request", function (done) {
       chai
         .request(app)
@@ -414,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, OOO, or ONBOARDING`);
+          expect(res.body.message).to.equal(`Invalid State. State must be either IDLE, ACTIVE or OOO`);
           return done();
         });
     });