Skip to content

Commit 97f709b

Browse files
update numberOfHours from model/user.js
1 parent edf5109 commit 97f709b

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

controllers/userStatus.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { fetchUser, getJoinData } = require("../models/users");
1+
const { fetchUser } = require("../models/users");
22
const userStatusModel = require("../models/userStatus");
33
const { getUserIdBasedOnRoute } = require("../utils/userStatus");
44
const { INTERNAL_SERVER_ERROR } = require("../constants/errorMessages");
@@ -103,8 +103,7 @@ const updateUserStatus = async (req, res) => {
103103
try {
104104
const userId = getUserIdBasedOnRoute(req);
105105
if (userId) {
106-
const joinData = await getJoinData(userId);
107-
const dataToUpdate = { ...req.body, monthlyHours: { committed: 4 * joinData[0].intro.numberOfHours } };
106+
const dataToUpdate = req.body;
108107
const updateStatus = await userStatusModel.updateUserStatus(userId, dataToUpdate);
109108
const { userStatusExists, id, data } = updateStatus;
110109
const responseObject = { id, userId, data: null, message: "" };

models/users.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ const addOrUpdate = async (userData, userId = null) => {
7171
const addJoinData = async (userData) => {
7272
try {
7373
await joinModel.add(userData);
74+
await updateUserStatus(userData.userId, {
75+
currentStatus: { state: userState.ONBOARDING },
76+
monthlyHours: { committed: 4 * userData.intro.numberOfHours },
77+
});
7478
} catch (err) {
7579
logger.error("Error in adding data", err);
7680
throw err;

test/integration/userStatus.test.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ const {
1616
oooStatusDataForShortDuration,
1717
generateUserStatusData,
1818
} = require("../fixtures/userStatus/userStatus");
19-
const { addJoinData } = require("../../models/users");
20-
const joinData = require("../fixtures/user/join");
2119

2220
const config = require("config");
2321
const { updateUserStatus } = require("../../models/userStatus");
@@ -36,7 +34,6 @@ describe("UserStatus", function () {
3634
jwt = authService.generateAuthToken({ userId });
3735
superUserId = await addUser(superUser);
3836
superUserAuthToken = authService.generateAuthToken({ userId: superUserId });
39-
await addJoinData(joinData(userId)[0]);
4037
await updateUserStatus(userId, userStatusDataForNewUser);
4138
});
4239

@@ -132,7 +129,6 @@ describe("UserStatus", function () {
132129
toFake: ["Date"],
133130
});
134131
testUserId = await addUser(userData[1]);
135-
await addJoinData(joinData(testUserId)[0]);
136132
testUserJwt = authService.generateAuthToken({ userId: testUserId });
137133
});
138134

@@ -281,7 +277,6 @@ describe("UserStatus", function () {
281277
toFake: ["Date"],
282278
});
283279
testUserId = await addUser(userData[1]);
284-
await addJoinData(joinData(testUserId)[0]);
285280
testUserJwt = authService.generateAuthToken({ userId: testUserId });
286281
});
287282

0 commit comments

Comments
 (0)