From e93d89b7ac26c06d624ac2a243ff736035157601 Mon Sep 17 00:00:00 2001 From: static Date: Wed, 27 Nov 2024 01:21:33 +0900 Subject: [PATCH 1/3] Fix: redis undefined error --- src/modules/stores/sessionStore.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/stores/sessionStore.ts b/src/modules/stores/sessionStore.ts index 11ec9a78..2eed4e2e 100644 --- a/src/modules/stores/sessionStore.ts +++ b/src/modules/stores/sessionStore.ts @@ -1,6 +1,6 @@ import MongoStore from "connect-mongo"; import RedisStore from "connect-redis"; -import redis from "redis"; +import { createClient } from "redis"; import { redis as redisUrl, mongo as mongoUrl, @@ -11,7 +11,7 @@ import logger from "@/modules/logger"; const getSessionStore = () => { // 환경변수 REDIS_PATH 유무에 따라 session 저장 방식이 변경됩니다. if (redisUrl) { - const client = redis.createClient({ + const client = createClient({ url: redisUrl, }); From 84a732e8b1566833b4fa1c6a84dbfa344279670f Mon Sep 17 00:00:00 2001 From: static Date: Wed, 27 Nov 2024 01:27:29 +0900 Subject: [PATCH 2/3] Fix: jwt undefiend error --- src/services/auth.js | 2 +- src/services/auth.mobile.js | 2 +- src/services/auth.replace.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/auth.js b/src/services/auth.js index cd660ab5..2b9ba658 100644 --- a/src/services/auth.js +++ b/src/services/auth.js @@ -9,7 +9,7 @@ const { generateProfileImageUrl, getFullUsername, } = require("@/modules/modifyProfile"); -const jwt = require("@/modules/auths/jwt").default; +const jwt = require("@/modules/auths/jwt"); const logger = require("@/modules/logger").default; // SPARCS SSO diff --git a/src/services/auth.mobile.js b/src/services/auth.mobile.js index 8e66db0e..6ae14db2 100644 --- a/src/services/auth.mobile.js +++ b/src/services/auth.mobile.js @@ -2,7 +2,7 @@ const { userModel } = require("@/modules/stores/mongo"); const { login } = require("@/modules/auths/login"); const { registerDeviceToken, unregisterDeviceToken } = require("@/modules/fcm"); -const jwt = require("@/modules/auths/jwt").default; +const jwt = require("@/modules/auths/jwt"); 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 65ae92c7..111c7077 100644 --- a/src/services/auth.replace.js +++ b/src/services/auth.replace.js @@ -7,7 +7,7 @@ const { generateProfileImageUrl, } = require("@/modules/modifyProfile"); const logger = require("@/modules/logger").default; -const jwt = require("@/modules/auths/jwt").default; +const jwt = require("@/modules/auths/jwt"); const { registerDeviceTokenHandler, tryLogin } = require("@/services/auth"); const loginReplacePage = require("@/views/loginReplacePage").default; From e0e99c604e6987506990a9069a538cddfd13a139 Mon Sep 17 00:00:00 2001 From: static Date: Wed, 27 Nov 2024 01:58:46 +0900 Subject: [PATCH 3/3] Fix: minor bugs --- src/modules/stores/mongo.ts | 2 +- src/services/chats.js | 2 +- src/types/mongo.d.ts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/stores/mongo.ts b/src/modules/stores/mongo.ts index b4affe32..2c2e17e6 100755 --- a/src/modules/stores/mongo.ts +++ b/src/modules/stores/mongo.ts @@ -155,7 +155,7 @@ const roomSchema = new Schema({ }, // 참여 멤버 및 정산 여부 madeat: { type: Date, required: true }, // 생성 날짜 settlementTotal: { type: Number, default: 0, required: true }, - maxPartLength: { type: Number, require: true, default: 4 }, + maxPartLength: { type: Number, required: true, default: 4 }, }); export const roomModel = model("Room", roomSchema); diff --git a/src/services/chats.js b/src/services/chats.js index f8190cfd..b6bd6467 100644 --- a/src/services/chats.js +++ b/src/services/chats.js @@ -1,7 +1,7 @@ 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").default; +const aws = require("@/modules/stores/aws"); const { transformChatsForRoom, emitChatEvent, diff --git a/src/types/mongo.d.ts b/src/types/mongo.d.ts index 93fcb382..718b342e 100644 --- a/src/types/mongo.d.ts +++ b/src/types/mongo.d.ts @@ -1,4 +1,4 @@ -import { Document, Types } from "mongoose"; +import type { Document, Types } from "mongoose"; export interface User extends Document { /** 사용자의 실명. */ @@ -13,6 +13,7 @@ export interface User extends Document { ongoingRoom?: Types.Array; /** 사용자가 참여한 방 중 완료된 방의 배열. */ doneRoom?: Types.Array; + /** 계정 탈퇴 여부. */ withdraw: boolean; /** 사용자의 전화번호. 2023 가을 이벤트부터 추가됨. */ phoneNumber?: string;