Skip to content

Commit

Permalink
Fix: runtime errors
Browse files Browse the repository at this point in the history
  • Loading branch information
kmc7468 committed Mar 20, 2024
1 parent 86f8b4a commit 2a32d96
Show file tree
Hide file tree
Showing 34 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion scripts/profileImageUrlUpdater.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/zod.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require("../modules/logger");
const logger = require("@/modules/logger").default;

const parseZodErrors = (statusCode, errors, res) => {
const error_message = errors;
Expand Down
4 changes: 2 additions & 2 deletions src/modules/email.js
Original file line number Diff line number Diff line change
@@ -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입니다.
Expand Down
14 changes: 7 additions & 7 deletions src/modules/socket.js
Original file line number Diff line number Diff line change
@@ -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의 필수 파라미터가 주어지지 않은 경우 발생하는 예외를 정의하는 클래스입니다.
Expand Down
6 changes: 3 additions & 3 deletions src/routes/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 });
Expand Down
2 changes: 1 addition & 1 deletion src/routes/auth.js
Original file line number Diff line number Diff line change
@@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/routes/chats.js
Original file line number Diff line number Diff line change
@@ -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개의 채팅을 가져옵니다.
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/auth.replace.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const loginReplacePage = require("../../views/loginReplacePage");
const loginReplacePage = require("../../views/loginReplacePage").default;
const tag = "auth";
const apiPrefix = "/auth(dev)";

Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/chats.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { objectId } = require("../../modules/patterns");
const { objectId } = require("../../modules/patterns").default;

const tag = "chats";
const apiPrefix = "/chats";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/logininfo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { objectId } = require("../../modules/patterns");
const { objectId } = require("../../modules/patterns").default;

const tag = "logininfo";
const apiPrefix = "/logininfo";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/reports.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { objectId } = require("../../modules/patterns");
const { objectId } = require("../../modules/patterns").default;

const tag = "reports";
const apiPrefix = "/reports";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/rooms.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { objectId, room } = require("../../modules/patterns");
const { objectId, room } = require("../../modules/patterns").default;

const tag = "rooms";
const apiPrefix = "/rooms";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/schemas/reportsSchema.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/schemas/roomsSchema.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/swaggerDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/routes/docs/utils.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/routes/notifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/routes/reports.js
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/routes/rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -31,7 +31,7 @@ router.get(
);

// 이후 API 접근 시 로그인 필요
router.use(require("../middlewares/auth"));
router.use(require("@/middlewares/auth").default);

// 특정 id 방 세부사항 보기
router.get(
Expand Down
6 changes: 3 additions & 3 deletions src/routes/users.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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");

const { replaceSpaceInNickname } = require("@/modules/modifyProfile");

// 라우터 접근 시 로그인 필요
router.use(require("@/middlewares/auth"));
router.use(require("@/middlewares/auth").default);

// 이용 약관에 동의합니다.
router.post(
Expand Down
2 changes: 1 addition & 1 deletion src/schedules/notifyAfterArrival.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/schedules/notifyBeforeDepart.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/services/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/services/auth.mobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/services/auth.replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions src/services/chats.js
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/services/locations.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/services/logininfo.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/services/notifications.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/services/reports.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand Down
6 changes: 3 additions & 3 deletions src/services/rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/services/users.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 2a32d96

Please sign in to comment.