Merge pull request #1031 from shubhamsigdar1/fix/userstatus

add data userstatus and numberOfHours to firestore after signup

Author: ankushdharkar

constants/userStatus.js

@@ -2,6 +2,7 @@ const userState = {
   ACTIVE: "ACTIVE",
   IDLE: "IDLE",
   OOO: "OOO",
+  ONBOARDING: "ONBOARDING",
 };
 
 module.exports = { userState };

controllers/users.js

@@ -390,7 +390,7 @@ const addUserIntro = async (req, res) => {
     await userQuery.addJoinData(data);
 
     return res.status(201).json({
-      message: "User data added successfully",
+      message: "User join data and newstatus data added and updated successfully",
     });
   } catch (err) {
     logger.error("Could not save user data");

middlewares/validators/userStatus.js

@@ -7,8 +7,8 @@ const validateUserStatusData = async (todaysTime, req, res, next) => {
     currentStatus: Joi.object().keys({
       state: Joi.string()
         .trim()
-        .valid(userState.IDLE, userState.ACTIVE, userState.OOO)
-        .error(new Error(`Invalid State. State must be either IDLE, ACTIVE or OOO`)),
+        .valid(userState.IDLE, userState.ACTIVE, userState.OOO, userState.ONBOARDING)
+        .error(new Error(`Invalid State. State must be either IDLE, ACTIVE, OOO, or ONBOARDING`)),
       updatedAt: Joi.number().required(),
       from: Joi.number()
         .min(todaysTime)

models/users.js

@@ -6,8 +6,10 @@ const walletConstants = require("../constants/wallets");
 
 const firestore = require("../utils/firestore");
 const { fetchWallet, createWallet } = require("../models/wallets");
+const { updateUserStatus } = require("../models/userStatus");
 const { arraysHaveCommonItem } = require("../utils/array");
 const { ALLOWED_FILTER_PARAMS } = require("../constants/users");
+const { userState } = require("../constants/userStatus");
 const { BATCH_SIZE_IN_CLAUSE } = require("../constants/firebase");
 const userModel = firestore.collection("users");
 const joinModel = firestore.collection("applicants");
@@ -69,6 +71,10 @@ const addOrUpdate = async (userData, userId = null) => {
 const addJoinData = async (userData) => {
   try {
     await joinModel.add(userData);
+    await updateUserStatus(userData.userId, {
+      currentStatus: { state: userState.ONBOARDING },
+      monthlyHours: { committed: 4 * userData.intro.numberOfHours },
+    });
   } catch (err) {
     logger.error("Error in adding data", err);
     throw err;
@@ -288,7 +294,7 @@ const initializeUser = async (userId) => {
   if (!userWallet) {
     await createWallet(userId, walletConstants.INITIAL_WALLET);
   }
-
+  await updateUserStatus(userId, { currentStatus: { state: userState.ONBOARDING }, monthlyHours: { committed: 0 } });
   return true;
 };
 

test/fixtures/user/join.js

@@ -12,6 +12,16 @@ const userStatusDataForNewUser = {
   },
 };
 
+const userStatusDataAfterSignup = {
+  currentStatus: { state: "ONBOARDING" },
+  monthlyHours: { committed: 0 },
+};
+
+const userStatusDataAfterFillingJoinSection = {
+  currentStatus: { state: "ONBOARDING" },
+  monthlyHours: { committed: 40 },
+};
+
 const oooStatusDataForShortDuration = {
   currentStatus: {
     message: "",
@@ -53,6 +63,8 @@ const generateUserStatusData = (state, updatedAt, from, until = "", message = ""
 
 module.exports = {
   userStatusDataForNewUser,
+  userStatusDataAfterSignup,
+  userStatusDataAfterFillingJoinSection,
   userStatusDataForOooState,
   oooStatusDataForShortDuration,
   generateUserStatusData,

test/fixtures/userStatus/userStatus.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();
         });
     });

test/integration/userStatus.test.js

@@ -2,6 +2,7 @@ const chai = require("chai");
 const { expect } = chai;
 const chaiHttp = require("chai-http");
 
+const firestore = require("../../utils/firestore");
 const app = require("../../server");
 const authService = require("../../services/authService");
 const addUser = require("../utils/addUser");
@@ -15,7 +16,13 @@ const searchParamValues = require("../fixtures/user/search")();
 
 const config = require("config");
 const joinData = require("../fixtures/user/join");
+const {
+  userStatusDataAfterSignup,
+  userStatusDataAfterFillingJoinSection,
+} = require("../fixtures/userStatus/userStatus");
 const { addJoinData, addOrUpdate } = require("../../models/users");
+const userStatusModel = require("../../models/userStatus");
+
 const cookieName = config.get("userToken.cookieName");
 chai.use(chaiHttp);
 
@@ -688,6 +695,12 @@ describe("Users", function () {
   });
 
   describe("PUT /users/self/intro", function () {
+    let userStatusData;
+    beforeEach(async function () {
+      await userStatusModel.updateUserStatus(userId, userStatusDataAfterSignup);
+      const updateStatus = await userStatusModel.updateUserStatus(userId, userStatusDataAfterFillingJoinSection);
+      userStatusData = (await firestore.collection("usersStatus").doc(updateStatus.id).get()).data();
+    });
     it("should return 409 if the data already present", function (done) {
       addJoinData(joinData(userId)[3]);
       chai
@@ -718,7 +731,11 @@ describe("Users", function () {
           }
           expect(res).to.have.status(201);
           expect(res.body).to.be.a("object");
-          expect(res.body.message).to.equal("User data added successfully");
+          expect(res.body.message).to.equal("User join data and newstatus data added and updated successfully");
+          expect(userStatusData).to.have.own.property("currentStatus");
+          expect(userStatusData).to.have.own.property("monthlyHours");
+          expect(userStatusData.currentStatus.state).to.equal("ONBOARDING");
+          expect(userStatusData.monthlyHours.committed).to.equal(40);
           return done();
         });
     });