Skip to content

Commit 7f2e9dc

Browse files
committed
fix: rename controller function
1 parent b22e969 commit 7f2e9dc

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

controllers/oooRequests.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import { addLog } from "../models/logs";
2121
import { getRequestByKeyValues, getRequests, updateRequest } from "../models/requests";
2222
import { createUserFutureStatus } from "../models/userFutureStatus";
2323
import { getUserStatus, addFutureStatus } from "../models/userStatus";
24-
import { createOooRequest, validateUserStatus, acknowledgeOooRequest } from "../services/oooRequest";
24+
import { createOooRequest, validateUserStatus } from "../services/oooRequest";
25+
import * as oooRequestService from "../services/oooRequest";
2526
import { CustomResponse } from "../typeDefinitions/global";
2627
import { AcknowledgeOooRequest, OooRequestCreateRequest, OooRequestResponse, OooStatusRequest } from "../types/oooRequest";
2728
import { UpdateRequest } from "../types/requests";
@@ -159,7 +160,7 @@ export const updateOooRequestController = async (req: UpdateRequest, res: Custom
159160
* @param {OooRequestResponse} res - The response object.
160161
* @returns {Promise<OooRequestResponse>} Resolves with success or failure.
161162
*/
162-
export const acknowledgeOooRequestController = async (
163+
export const acknowledgeOooRequest = async (
163164
req: AcknowledgeOooRequest,
164165
res: OooRequestResponse,
165166
next: NextFunction
@@ -182,7 +183,7 @@ export const acknowledgeOooRequestController = async (
182183

183184
try {
184185

185-
const response = await acknowledgeOooRequest(requestId, requestBody, superUserId);
186+
const response = await oooRequestService.acknowledgeOooRequest(requestId, requestBody, superUserId);
186187

187188
return res.status(200).json({
188189
message: response.message,

controllers/requests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from "../constants/requests";
66
import { getRequests } from "../models/requests";
77
import { getPaginatedLink } from "../utils/helper";
8-
import { acknowledgeOooRequestController, createOooRequestController, updateOooRequestController } from "./oooRequests";
8+
import { acknowledgeOooRequest, createOooRequestController, updateOooRequestController } from "./oooRequests";
99
import { AcknowledgeOooRequest, OooRequestCreateRequest, OooRequestResponse } from "../types/oooRequest";
1010
import { CustomResponse } from "../typeDefinitions/global";
1111
import { ExtensionRequestRequest, ExtensionRequestResponse } from "../types/extensionRequests";
@@ -125,7 +125,7 @@ export const updateRequestBeforeAcknowledgedController = async (req: Request, re
125125

126126
switch(type){
127127
case REQUEST_TYPE.OOO:
128-
await acknowledgeOooRequestController(req as AcknowledgeOooRequest, res as OooRequestResponse, next);
128+
await acknowledgeOooRequest(req as AcknowledgeOooRequest, res as OooRequestResponse, next);
129129
break;
130130
case REQUEST_TYPE.ONBOARDING:
131131
await updateOnboardingExtensionRequestController(req as UpdateOnboardingExtensionRequest, res as OnboardingExtensionResponse);

test/unit/models/requests.test.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { expect } from "chai";
22
import cleanDb from "../../utils/cleanDb";
3-
import { createRequest, getRequests, updateRequest, getRequestByKeyValues } from "../../../models/requests";
3+
import { createRequest, getRequests, updateRequest, getRequestByKeyValues, getRequestById } from "../../../models/requests";
44
import {
55
createOooRequests,
66
createOooRequests2,
7+
createOooRequests3,
78
createOooStatusRequests,
89
updateOooApprovedRequests,
910
updateOooRejectedRequests,
1011
} from "./../../fixtures/oooRequest/oooRequest";
11-
import { REQUEST_STATE, REQUEST_TYPE } from "../../../constants/requests";
12+
import { REQUEST_DOES_NOT_EXIST, REQUEST_STATE, REQUEST_TYPE } from "../../../constants/requests";
1213
import userDataFixture from "./../../fixtures/user/user";
1314
import addUser from "../../utils/addUser";
1415
const userData = userDataFixture();
@@ -179,4 +180,20 @@ describe("models/oooRequests", () => {
179180
expect(oooRequestData).to.be.equal(null);
180181
});
181182
});
183+
184+
describe("getRequestById", () => {
185+
186+
it("should return request using request id", async () => {
187+
const oooRequest = await createRequest(createOooRequests3);
188+
const response = await getRequestById(oooRequest.id);
189+
expect(response).to.deep.include(createOooRequests3);
190+
});
191+
192+
it("should return REQUEST_DOES_NOT_EXIST for invalid request id", async () => {
193+
await getRequestById("111111111111").catch((error) => {
194+
expect(error).to.be.not.undefined;
195+
expect(error.message).to.equal(REQUEST_DOES_NOT_EXIST);
196+
});
197+
});
198+
});
182199
});

0 commit comments

Comments
 (0)