diff --git a/scripts/profileImageUrlUpdater.js b/scripts/profileImageUrlUpdater.js index 78ebe778..2b35bf1a 100644 --- a/scripts/profileImageUrlUpdater.js +++ b/scripts/profileImageUrlUpdater.js @@ -2,7 +2,7 @@ // https://github.com/sparcs-kaist/taxi-back/issues/173 const { MongoClient } = require("mongodb"); -const { mongo: mongoUrl, aws: awsEnv } = require("../loadenv"); +const { mongo: mongoUrl, aws: awsEnv } = require("../loadenv"); // FIXME: 올바른 경로로 수정해야 합니다. const time = Date.now(); diff --git a/src/middlewares/zod.js b/src/middlewares/zod.js index 63f5668a..b8660634 100644 --- a/src/middlewares/zod.js +++ b/src/middlewares/zod.js @@ -1,4 +1,4 @@ -const logger = require("../modules/logger"); +const logger = require("@/modules/logger").default; const parseZodErrors = (statusCode, errors, res) => { const error_message = errors; diff --git a/src/modules/email.js b/src/modules/email.js index 05bdfe3e..d6a20285 100644 --- a/src/modules/email.js +++ b/src/modules/email.js @@ -1,6 +1,6 @@ const nodemailer = require("nodemailer"); -const logger = require("./logger"); -const { nodeEnv } = require("../../loadenv"); +const logger = require("@/modules/logger").default; +const { nodeEnv } = require("@/loadenv"); /** * production 환경에서 메일을 전송하기 위해 사용되는 agent입니다. diff --git a/src/modules/socket.js b/src/modules/socket.js index 7741e597..c4de7f56 100644 --- a/src/modules/socket.js +++ b/src/modules/socket.js @@ -1,14 +1,14 @@ const { Server } = require("socket.io"); -const sessionMiddleware = require("@/middlewares/session"); -const logger = require("./logger"); -const { getLoginInfo } = require("./auths/login"); -const { roomModel, userModel, chatModel } = require("./stores/mongo"); -const { getS3Url } = require("./stores/aws"); -const { getTokensOfUsers, sendMessageByTokens } = require("./fcm"); +const sessionMiddleware = require("@/middlewares/session").default; +const logger = require("@/modules/logger").default; +const { getLoginInfo } = require("@/modules/auths/login"); +const { roomModel, userModel, chatModel } = require("@/modules/stores/mongo"); +const { getS3Url } = require("@/modules/stores/aws"); +const { getTokensOfUsers, sendMessageByTokens } = require("@/modules/fcm"); const { corsWhiteList } = require("@/loadenv"); -const { chatPopulateOption } = require("./populates/chats"); +const { chatPopulateOption } = require("@/modules/populates/chats"); /** * emitChatEvent의 필수 파라미터가 주어지지 않은 경우 발생하는 예외를 정의하는 클래스입니다. diff --git a/src/routes/admin.js b/src/routes/admin.js index d495497c..81cf20a3 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -18,8 +18,8 @@ const { buildResource } = require("@/modules/adminResource"); const router = express.Router(); // Requires admin property of the user to enter admin page. -router.use(require("@/middlewares/authAdmin")); -router.use(require("@/middlewares/auth")); +router.use(require("@/middlewares/authAdmin").default); +router.use(require("@/middlewares/auth").default); // Registration of the mongoose adapter AdminJS.registerAdapter(AdminJSMongoose); @@ -36,7 +36,7 @@ const resources = [ notificationOptionModel, ] .map(buildResource()) - .concat(require("../lottery").resources); + .concat(/*require("@/lottery").resources*/ []); // Create router for admin page const adminJS = new AdminJS({ resources }); diff --git a/src/routes/auth.js b/src/routes/auth.js index 9ce57404..534814f6 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -1,7 +1,7 @@ const express = require("express"); const router = express.Router(); const { body, query } = require("express-validator"); -const validator = require("@/middlewares/validator"); +const validator = require("@/middlewares/validator").default; const authHandlers = require("@/services/auth"); const authReplaceHandlers = require("@/services/auth.replace"); diff --git a/src/routes/chats.js b/src/routes/chats.js index f27ace38..8af77944 100644 --- a/src/routes/chats.js +++ b/src/routes/chats.js @@ -1,13 +1,13 @@ const express = require("express"); const { body } = require("express-validator"); -const validator = require("@/middlewares/validator"); -const patterns = require("@/modules/patterns"); +const validator = require("@/middlewares/validator").default; +const patterns = require("@/modules/patterns").default; const router = express.Router(); const chatsHandlers = require("@/services/chats"); // 라우터 접근 시 로그인 필요 -router.use(require("@/middlewares/auth")); +router.use(require("@/middlewares/auth").default); /** * 가장 최근에 도착한 60개의 채팅을 가져옵니다. diff --git a/src/routes/docs.js b/src/routes/docs.js index 97a1b288..0a571d8e 100644 --- a/src/routes/docs.js +++ b/src/routes/docs.js @@ -1,6 +1,6 @@ const express = require("express"); const swaggerUi = require("swagger-ui-express"); -const swaggerDocs = require("./docs/swaggerDocs.js"); +const swaggerDocs = require("./docs/swaggerDocs"); const router = express.Router(); router.use(swaggerUi.serve); diff --git a/src/routes/docs/auth.replace.js b/src/routes/docs/auth.replace.js index 8246836b..be8b8174 100644 --- a/src/routes/docs/auth.replace.js +++ b/src/routes/docs/auth.replace.js @@ -1,4 +1,4 @@ -const loginReplacePage = require("../../views/loginReplacePage"); +const loginReplacePage = require("../../views/loginReplacePage").default; const tag = "auth"; const apiPrefix = "/auth(dev)"; diff --git a/src/routes/docs/chats.js b/src/routes/docs/chats.js index 0aaa1c6d..81834042 100644 --- a/src/routes/docs/chats.js +++ b/src/routes/docs/chats.js @@ -1,4 +1,4 @@ -const { objectId } = require("../../modules/patterns"); +const { objectId } = require("../../modules/patterns").default; const tag = "chats"; const apiPrefix = "/chats"; diff --git a/src/routes/docs/logininfo.js b/src/routes/docs/logininfo.js index 7c447760..caec1f96 100644 --- a/src/routes/docs/logininfo.js +++ b/src/routes/docs/logininfo.js @@ -1,4 +1,4 @@ -const { objectId } = require("../../modules/patterns"); +const { objectId } = require("../../modules/patterns").default; const tag = "logininfo"; const apiPrefix = "/logininfo"; diff --git a/src/routes/docs/reports.js b/src/routes/docs/reports.js index a11933ee..3acf99da 100644 --- a/src/routes/docs/reports.js +++ b/src/routes/docs/reports.js @@ -1,4 +1,4 @@ -const { objectId } = require("../../modules/patterns"); +const { objectId } = require("../../modules/patterns").default; const tag = "reports"; const apiPrefix = "/reports"; diff --git a/src/routes/docs/rooms.js b/src/routes/docs/rooms.js index 710bf649..a481bbc1 100644 --- a/src/routes/docs/rooms.js +++ b/src/routes/docs/rooms.js @@ -1,4 +1,4 @@ -const { objectId, room } = require("../../modules/patterns"); +const { objectId, room } = require("../../modules/patterns").default; const tag = "rooms"; const apiPrefix = "/rooms"; diff --git a/src/routes/docs/schemas/reportsSchema.js b/src/routes/docs/schemas/reportsSchema.js index d208dbb7..0e4c43b9 100644 --- a/src/routes/docs/schemas/reportsSchema.js +++ b/src/routes/docs/schemas/reportsSchema.js @@ -1,6 +1,6 @@ const { z } = require("zod"); const { zodToSchemaObject } = require("../utils"); -const { objectId } = require("../../../modules/patterns"); +const { objectId } = require("../../../modules/patterns").default; const reportsZod = { createHandler: z diff --git a/src/routes/docs/schemas/roomsSchema.js b/src/routes/docs/schemas/roomsSchema.js index 39dcd8bf..c4075204 100644 --- a/src/routes/docs/schemas/roomsSchema.js +++ b/src/routes/docs/schemas/roomsSchema.js @@ -1,6 +1,6 @@ const { z } = require("zod"); const { zodToSchemaObject } = require("../utils"); -const { objectId, room } = require("../../../modules/patterns"); +const { objectId, room } = require("../../../modules/patterns").default; const roomsZod = {}; roomsZod["part"] = z diff --git a/src/routes/docs/swaggerDocs.js b/src/routes/docs/swaggerDocs.js index 62639dfa..2bca48c7 100644 --- a/src/routes/docs/swaggerDocs.js +++ b/src/routes/docs/swaggerDocs.js @@ -8,7 +8,7 @@ const authReplaceDocs = require("./auth.replace"); const usersDocs = require("./users"); const roomsDocs = require("./rooms"); const chatsDocs = require("./chats"); -const { port, nodeEnv } = require("../../../loadenv"); +const { port, nodeEnv } = require("../../loadenv"); const serverList = [ { diff --git a/src/routes/docs/utils.js b/src/routes/docs/utils.js index 2f99c13c..bd006150 100644 --- a/src/routes/docs/utils.js +++ b/src/routes/docs/utils.js @@ -1,5 +1,5 @@ const { zodToJsonSchema } = require("zod-to-json-schema"); -const logger = require("../../modules/logger"); +const logger = require("../../modules/logger").default; const zodToSchemaObject = (zodObejct) => { try { diff --git a/src/routes/notifications.js b/src/routes/notifications.js index 89ec5be9..c27c22b3 100644 --- a/src/routes/notifications.js +++ b/src/routes/notifications.js @@ -3,10 +3,10 @@ const router = express.Router(); const { body } = require("express-validator"); const notificationHandlers = require("@/services/notifications"); -const validator = require("@/middlewares/validator"); +const validator = require("@/middlewares/validator").default; // 라우터 접근 시 로그인 필요 -router.use(require("@/middlewares/auth")); +router.use(require("@/middlewares/auth").default); // FCM 토큰 등록 router.post( diff --git a/src/routes/reports.js b/src/routes/reports.js index 0fc8b24a..4d76e2f2 100644 --- a/src/routes/reports.js +++ b/src/routes/reports.js @@ -1,11 +1,11 @@ const express = require("express"); -const { validateBody } = require("../middlewares/zod"); +const { validateBody } = require("@/middlewares/zod"); const { reportsZod } = require("./docs/schemas/reportsSchema"); const router = express.Router(); const reportHandlers = require("@/services/reports"); // 라우터 접근 시 로그인 필요 -router.use(require("@/middlewares/auth")); +router.use(require("@/middlewares/auth").default); router.post( "/create", diff --git a/src/routes/rooms.js b/src/routes/rooms.js index e0c8a631..60a235e2 100644 --- a/src/routes/rooms.js +++ b/src/routes/rooms.js @@ -3,8 +3,8 @@ const { query, body } = require("express-validator"); const router = express.Router(); const roomHandlers = require("@/services/rooms"); -const validator = require("@/middlewares/validator"); -const patterns = require("@/modules/patterns"); +const validator = require("@/middlewares/validator").default; +const patterns = require("@/modules/patterns").default; // 조건(이름, 출발지, 도착지, 날짜)에 맞는 방들을 모두 반환한다. router.get( @@ -31,7 +31,7 @@ router.get( ); // 이후 API 접근 시 로그인 필요 -router.use(require("../middlewares/auth")); +router.use(require("@/middlewares/auth").default); // 특정 id 방 세부사항 보기 router.get( diff --git a/src/routes/users.js b/src/routes/users.js index 9bc1d4eb..aa00bcb2 100755 --- a/src/routes/users.js +++ b/src/routes/users.js @@ -1,7 +1,7 @@ const express = require("express"); const { body } = require("express-validator"); -const validator = require("@/middlewares/validator"); -const patterns = require("@/modules/patterns"); +const validator = require("@/middlewares/validator").default; +const patterns = require("@/modules/patterns").default; const router = express.Router(); const userHandlers = require("@/services/users"); @@ -9,7 +9,7 @@ const userHandlers = require("@/services/users"); const { replaceSpaceInNickname } = require("@/modules/modifyProfile"); // 라우터 접근 시 로그인 필요 -router.use(require("@/middlewares/auth")); +router.use(require("@/middlewares/auth").default); // 이용 약관에 동의합니다. router.post( diff --git a/src/schedules/notifyAfterArrival.js b/src/schedules/notifyAfterArrival.js index 5c1a5a6c..c2c01b25 100644 --- a/src/schedules/notifyAfterArrival.js +++ b/src/schedules/notifyAfterArrival.js @@ -1,7 +1,7 @@ const { roomModel, chatModel } = require("@/modules/stores/mongo"); // const { roomPopulateOption } = require("@/modules/populates/rooms"); const { emitChatEvent } = require("@/modules/socket"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const MS_PER_MINUTE = 60000; diff --git a/src/schedules/notifyBeforeDepart.js b/src/schedules/notifyBeforeDepart.js index 523f6dff..b1b6e87d 100644 --- a/src/schedules/notifyBeforeDepart.js +++ b/src/schedules/notifyBeforeDepart.js @@ -1,6 +1,6 @@ const { roomModel, chatModel } = require("@/modules/stores/mongo"); const { emitChatEvent } = require("@/modules/socket"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const MS_PER_MINUTE = 60000; diff --git a/src/services/auth.js b/src/services/auth.js index c95d263c..96de32c3 100644 --- a/src/services/auth.js +++ b/src/services/auth.js @@ -9,8 +9,8 @@ const { generateProfileImageUrl, getFullUsername, } = require("@/modules/modifyProfile"); -const jwt = require("@/modules/auths/jwt"); -const logger = require("@/modules/logger"); +const jwt = require("@/modules/auths/jwt").default; +const logger = require("@/modules/logger").default; // SPARCS SSO const Client = require("@/modules/auths/sparcssso"); diff --git a/src/services/auth.mobile.js b/src/services/auth.mobile.js index 7dc2798a..8e66db0e 100644 --- a/src/services/auth.mobile.js +++ b/src/services/auth.mobile.js @@ -2,8 +2,8 @@ const { userModel } = require("@/modules/stores/mongo"); const { login } = require("@/modules/auths/login"); const { registerDeviceToken, unregisterDeviceToken } = require("@/modules/fcm"); -const jwt = require("@/modules/auths/jwt"); -const logger = require("@/modules/logger"); +const jwt = require("@/modules/auths/jwt").default; +const logger = require("@/modules/logger").default; const { TOKEN_EXPIRED, TOKEN_INVALID } = require("@/loadenv").jwt; diff --git a/src/services/auth.replace.js b/src/services/auth.replace.js index 1c64e45f..65ae92c7 100644 --- a/src/services/auth.replace.js +++ b/src/services/auth.replace.js @@ -6,11 +6,11 @@ const { generateNickname, generateProfileImageUrl, } = require("@/modules/modifyProfile"); -const logger = require("@/modules/logger"); -const jwt = require("@/modules/auths/jwt"); +const logger = require("@/modules/logger").default; +const jwt = require("@/modules/auths/jwt").default; const { registerDeviceTokenHandler, tryLogin } = require("@/services/auth"); -const loginReplacePage = require("@/views/loginReplacePage"); +const loginReplacePage = require("@/views/loginReplacePage").default; const createUserData = (id) => { const info = { diff --git a/src/services/chats.js b/src/services/chats.js index c21f4b75..f8190cfd 100644 --- a/src/services/chats.js +++ b/src/services/chats.js @@ -1,13 +1,13 @@ const { chatModel, userModel, roomModel } = require("@/modules/stores/mongo"); const { chatPopulateOption } = require("@/modules/populates/chats"); const { roomPopulateOption } = require("@/modules/populates/rooms"); -const aws = require("@/modules/stores/aws"); +const aws = require("@/modules/stores/aws").default; const { transformChatsForRoom, emitChatEvent, emitUpdateEvent, } = require("@/modules/socket"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const chatCount = 60; diff --git a/src/services/locations.js b/src/services/locations.js index ed81ed43..9a2c5e7d 100644 --- a/src/services/locations.js +++ b/src/services/locations.js @@ -1,5 +1,5 @@ const { locationModel } = require("@/modules/stores/mongo"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const getAllLocationsHandler = async (_, res) => { try { diff --git a/src/services/logininfo.js b/src/services/logininfo.js index b074d847..affac40a 100644 --- a/src/services/logininfo.js +++ b/src/services/logininfo.js @@ -1,6 +1,6 @@ const { userModel } = require("@/modules/stores/mongo"); const { getLoginInfo } = require("@/modules/auths/login"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const logininfoHandler = async (req, res) => { try { diff --git a/src/services/notifications.js b/src/services/notifications.js index 7a0b810e..fc2090cf 100644 --- a/src/services/notifications.js +++ b/src/services/notifications.js @@ -1,11 +1,11 @@ const { userModel } = require("@/modules/stores/mongo"); const { notificationOptionModel } = require("@/modules/stores/mongo"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const { registerDeviceToken, validateDeviceToken } = require("@/modules/fcm"); // 이벤트 코드입니다. -// const { contracts } = require("../lottery"); +// const { contracts } = require("@/lottery"); const registerDeviceTokenHandler = async (req, res) => { try { diff --git a/src/services/reports.js b/src/services/reports.js index 7ca7d002..a6dfc42d 100644 --- a/src/services/reports.js +++ b/src/services/reports.js @@ -1,8 +1,8 @@ const { userModel, reportModel, roomModel } = require("@/modules/stores/mongo"); const { reportPopulateOption } = require("@/modules/populates/reports"); const { sendReportEmail } = require("@/modules/stores/aws"); -const logger = require("@/modules/logger"); -const emailPage = require("@/views/emailNoSettlementPage"); +const logger = require("@/modules/logger").default; +const emailPage = require("@/views/emailNoSettlementPage").default; const { notifyReportToReportChannel } = require("@/modules/slackNotification"); const createHandler = async (req, res) => { diff --git a/src/services/rooms.js b/src/services/rooms.js index f2dd1cbf..fe0a5cf8 100644 --- a/src/services/rooms.js +++ b/src/services/rooms.js @@ -4,7 +4,7 @@ const { userModel, } = require("@/modules/stores/mongo"); const { emitChatEvent } = require("@/modules/socket"); -const logger = require("@/modules/logger"); +const logger = require("@/modules/logger").default; const { roomPopulateOption, formatSettlement, @@ -15,12 +15,12 @@ const { } = require("@/modules/slackNotification"); // 이벤트 코드입니다. -// const { eventConfig } = require("../../loadenv"); +// const { eventConfig } = require("@/loadenv"); // const eventPeriod = eventConfig && { // startAt: new Date(eventConfig.period.startAt), // endAt: new Date(eventConfig.period.endAt), // }; -// const { contracts } = require("../lottery"); +// const { contracts } = require("@/lottery"); const createHandler = async (req, res) => { const { name, from, to, time, maxPartLength } = req.body; diff --git a/src/services/users.js b/src/services/users.js index 10008c0a..5fe9bafc 100644 --- a/src/services/users.js +++ b/src/services/users.js @@ -1,13 +1,13 @@ const { userModel } = require("@/modules/stores/mongo"); -const logger = require("@/modules/logger"); -const aws = require("@/modules/stores/aws"); +const logger = require("@/modules/logger").default; +const aws = require("@/modules/stores/aws").default; const { generateNickname, generateProfileImageUrl, } = require("@/modules/modifyProfile"); // 이벤트 코드입니다. -// const { contracts } = require("../lottery"); +// const { contracts } = require("@/lottery"); const agreeOnTermsOfServiceHandler = async (req, res) => { try { diff --git a/test/utils.js b/test/utils.js index e537913b..ba8d2bca 100644 --- a/test/utils.js +++ b/test/utils.js @@ -7,7 +7,7 @@ const { connectDatabase, } = require("../src/modules/stores/mongo"); const { generateProfileImageUrl } = require("../src/modules/modifyProfile"); -const { mongo: mongoUrl } = require("../loadenv"); +const { mongo: mongoUrl } = require("@/loadenv"); connectDatabase(mongoUrl);