Skip to content

Commit 6fe128c

Browse files
committed
refactor: update import statements to use .js extensions for consistency
1 parent 2e1c29e commit 6fe128c

File tree

5 files changed

+113
-103
lines changed

5 files changed

+113
-103
lines changed

controllers/oooRequests.ts

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1+
import { logType } from "../constants/logs.js";
12
import {
2-
REQUEST_LOG_TYPE,
3-
LOG_ACTION,
4-
REQUEST_CREATED_SUCCESSFULLY,
53
ERROR_WHILE_CREATING_REQUEST,
6-
REQUEST_STATE,
7-
REQUEST_TYPE,
84
ERROR_WHILE_UPDATING_REQUEST,
5+
LOG_ACTION,
6+
OOO_STATUS_ALREADY_EXIST,
7+
REQUEST_ALREADY_PENDING,
98
REQUEST_APPROVED_SUCCESSFULLY,
9+
REQUEST_CREATED_SUCCESSFULLY,
10+
REQUEST_LOG_TYPE,
1011
REQUEST_REJECTED_SUCCESSFULLY,
12+
REQUEST_STATE,
13+
REQUEST_TYPE,
1114
UNAUTHORIZED_TO_CREATE_OOO_REQUEST,
12-
REQUEST_ALREADY_PENDING,
1315
USER_STATUS_NOT_FOUND,
14-
OOO_STATUS_ALREADY_EXIST,
15-
} from "../constants/requests";
16-
import { statusState } from "../constants/userStatus";
17-
import { logType } from "../constants/logs";
18-
import { addLog } from "../models/logs";
19-
import { getRequestByKeyValues, getRequests, updateRequest } from "../models/requests";
20-
import { createUserFutureStatus } from "../models/userFutureStatus";
21-
import { getUserStatus, addFutureStatus } from "../models/userStatus";
22-
import { createOooRequest, validateUserStatus } from "../services/oooRequest";
23-
import { CustomResponse } from "../typeDefinitions/global";
24-
import { OooRequestCreateRequest, OooRequestResponse, OooStatusRequest } from "../types/oooRequest";
25-
import { UpdateRequest } from "../types/requests";
16+
} from "../constants/requests.js";
17+
import { statusState } from "../constants/userStatus.js";
18+
import { addLog } from "../models/logs.js";
19+
import { getRequestByKeyValues, getRequests, updateRequest } from "../models/requests.js";
20+
import { createUserFutureStatus } from "../models/userFutureStatus.js";
21+
import { addFutureStatus, getUserStatus } from "../models/userStatus.js";
22+
import { createOooRequest, validateUserStatus } from "../services/oooRequest.js";
23+
import { CustomResponse } from "../typeDefinitions/global.js";
24+
import { OooRequestCreateRequest, OooRequestResponse, OooStatusRequest } from "../types/oooRequest.js";
25+
import { UpdateRequest } from "../types/requests.js";
26+
import logger from "../utils/logger.js";
2627

2728
/**
2829
* Controller to handle the creation of OOO requests.

models/tasks.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import firestore from "../utils/firestore.js";
22
import { chunks } from "../utils/array.js";
33
import { DOCUMENT_WRITE_SIZE } from "../constants/constants.js";
44
import { fromFirestoreData, toFirestoreData, buildTasks } from "../utils/tasks.js";
5-
import { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, TASK_SIZE } from "../constants/tasks.js";
5+
import { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, TASK_SIZE, COMPLETED_TASK_STATUS } from "../constants/tasks.js";
66
import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages.js";
77
import { BATCH_SIZE_IN_CLAUSE } from "../constants/firebase.js";
88
import * as userUtils from "../utils/users.js";
@@ -12,11 +12,6 @@ const tasksModel = firestore.collection("tasks");
1212
const userModel = firestore.collection("users");
1313
const ItemModel = firestore.collection("itemTags");
1414
const dependencyModel = firestore.collection("taskDependencies");
15-
const userUtils = require("../utils/users");
16-
const { chunks } = require("../utils/array");
17-
const { DOCUMENT_WRITE_SIZE } = require("../constants/constants");
18-
const { fromFirestoreData, toFirestoreData, buildTasks } = require("../utils/tasks");
19-
const { TASK_TYPE, TASK_STATUS, TASK_STATUS_OLD, TASK_SIZE, COMPLETED_TASK_STATUS } = require("../constants/tasks");
2015
const {
2116
IN_PROGRESS,
2217
NEEDS_REVIEW,

services/oooRequest.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import { logType } from "../constants/logs";
2-
import {
1+
import { logType } from "../constants/logs.js";
2+
import {
33
LOG_ACTION,
44
OOO_STATUS_ALREADY_EXIST,
55
REQUEST_LOG_TYPE,
66
REQUEST_STATE,
77
USER_STATUS_NOT_FOUND,
8-
} from "../constants/requests";
9-
import { userState } from "../constants/userStatus";
10-
import { createRequest } from "../models/requests";
11-
import { OooStatusRequest, OooStatusRequestBody } from "../types/oooRequest";
12-
import { UserStatus } from "../types/userStatus";
13-
import { addLog } from "./logService";
8+
} from "../constants/requests.js";
9+
import { userState } from "../constants/userStatus.js";
10+
import { createRequest } from "../models/requests.js";
11+
import { OooStatusRequest, OooStatusRequestBody } from "../types/oooRequest.js";
12+
import { UserStatus } from "../types/userStatus.js";
13+
import logger from "../utils/logger.js";
14+
import { addLog } from "./logService.js";
1415

1516
/**
1617
* Validates the user status.

test/integration/requests.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import _ from "lodash";
55
import config from "config";
66
import app from "../../server";
77
import cleanDb from "../utils/cleanDb";
8-
import authService from "../../services/authService";
8+
import {generateAuthToken} from "../../services/authService";
99
import userDataFixture from "../fixtures/user/user";
1010
import sinon from "sinon";
1111
const cookieName = config.get("userToken.cookieName");
@@ -35,12 +35,13 @@ import {
3535
USER_STATUS_NOT_FOUND,
3636
OOO_STATUS_ALREADY_EXIST,
3737
} from "../../constants/requests";
38-
import { updateTask } from "../../models/tasks";
38+
import updateTask from "../../models/tasks";
3939
import { validTaskAssignmentRequest, validTaskCreqtionRequest } from "../fixtures/taskRequests/taskRequests";
4040
import { deleteUserStatus, updateUserStatus } from "../../models/userStatus";
4141
import * as requestsQuery from "../../models/requests";
4242
import { userState } from "../../constants/userStatus";
4343
import * as logUtils from "../../services/logService";
44+
import taskModel from "../../models/tasks.js";
4445

4546
const userData = userDataFixture();
4647
chai.use(chaiHttp);
@@ -98,7 +99,7 @@ describe("/requests OOO", function () {
9899
const userIdPromises = [addUser(userData[16])];
99100
const [userId] = await Promise.all(userIdPromises);
100101

101-
authToken = authService.generateAuthToken({ userId });
102+
authToken = generateAuthToken({ userId });
102103

103104
const testUserStatus = {
104105
currentStatus: {
@@ -143,7 +144,7 @@ describe("/requests OOO", function () {
143144
});
144145

145146
it("should return 403 if user is not part of discord", function (done) {
146-
const authTokenForArchivedUserId = authService.generateAuthToken(
147+
const authTokenForArchivedUserId = generateAuthToken(
147148
{ userId: testArchivedUserId }
148149
);
149150
chai

0 commit comments

Comments
 (0)