Skip to content

Commit 378add6

Browse files
committed
Merge branch '#159-add-typescript-support' of https://github.com/sparcs-kaist/taxi-back into #159-add-typescript-support
2 parents d8c6919 + e0e99c6 commit 378add6

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

src/modules/stores/mongo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const roomSchema = new Schema<Room>({
155155
}, // 참여 멤버 및 정산 여부
156156
madeat: { type: Date, required: true }, // 생성 날짜
157157
settlementTotal: { type: Number, default: 0, required: true },
158-
maxPartLength: { type: Number, require: true, default: 4 },
158+
maxPartLength: { type: Number, required: true, default: 4 },
159159
});
160160

161161
export const roomModel = model("Room", roomSchema);

src/modules/stores/sessionStore.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import MongoStore from "connect-mongo";
22
import RedisStore from "connect-redis";
3-
import redis from "redis";
3+
import { createClient } from "redis";
44
import {
55
redis as redisUrl,
66
mongo as mongoUrl,
@@ -11,7 +11,7 @@ import logger from "@/modules/logger";
1111
const getSessionStore = () => {
1212
// 환경변수 REDIS_PATH 유무에 따라 session 저장 방식이 변경됩니다.
1313
if (redisUrl) {
14-
const client = redis.createClient({
14+
const client = createClient({
1515
url: redisUrl,
1616
});
1717

src/services/auth.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const {
99
generateProfileImageUrl,
1010
getFullUsername,
1111
} = require("@/modules/modifyProfile");
12-
const jwt = require("@/modules/auths/jwt").default;
12+
const jwt = require("@/modules/auths/jwt");
1313
const logger = require("@/modules/logger").default;
1414

1515
// SPARCS SSO

src/services/auth.mobile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { userModel } = require("@/modules/stores/mongo");
22
const { login } = require("@/modules/auths/login");
33

44
const { registerDeviceToken, unregisterDeviceToken } = require("@/modules/fcm");
5-
const jwt = require("@/modules/auths/jwt").default;
5+
const jwt = require("@/modules/auths/jwt");
66
const logger = require("@/modules/logger").default;
77

88
const { TOKEN_EXPIRED, TOKEN_INVALID } = require("@/loadenv").jwt;

src/services/auth.replace.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const {
77
generateProfileImageUrl,
88
} = require("@/modules/modifyProfile");
99
const logger = require("@/modules/logger").default;
10-
const jwt = require("@/modules/auths/jwt").default;
10+
const jwt = require("@/modules/auths/jwt");
1111

1212
const { registerDeviceTokenHandler, tryLogin } = require("@/services/auth");
1313
const loginReplacePage = require("@/views/loginReplacePage").default;

src/services/chats.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { chatModel, userModel, roomModel } = require("@/modules/stores/mongo");
22
const { chatPopulateOption } = require("@/modules/populates/chats");
33
const { roomPopulateOption } = require("@/modules/populates/rooms");
4-
const aws = require("@/modules/stores/aws").default;
4+
const aws = require("@/modules/stores/aws");
55
const {
66
transformChatsForRoom,
77
emitChatEvent,

src/types/mongo.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Document, Types } from "mongoose";
1+
import type { Document, Types } from "mongoose";
22

33
export interface User extends Document {
44
/** 사용자의 실명. */
@@ -13,6 +13,7 @@ export interface User extends Document {
1313
ongoingRoom?: Types.Array<Types.ObjectId>;
1414
/** 사용자가 참여한 방 중 완료된 방의 배열. */
1515
doneRoom?: Types.Array<Types.ObjectId>;
16+
/** 계정 탈퇴 여부. */
1617
withdraw: boolean;
1718
/** 사용자의 전화번호. 2023 가을 이벤트부터 추가됨. */
1819
phoneNumber?: string;

0 commit comments

Comments
 (0)