Skip to content

Commit

Permalink
Merge branch '#159-add-typescript-support' of https://github.com/spar…
Browse files Browse the repository at this point in the history
…cs-kaist/taxi-back into #159-add-typescript-support
  • Loading branch information
TaehyeonPark committed Nov 26, 2024
2 parents d8c6919 + e0e99c6 commit 378add6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/modules/stores/mongo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const roomSchema = new Schema<Room>({
}, // 참여 멤버 및 정산 여부
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);
Expand Down
4 changes: 2 additions & 2 deletions src/modules/stores/sessionStore.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
});

Expand Down
2 changes: 1 addition & 1 deletion src/services/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/services/auth.mobile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/services/auth.replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/services/chats.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 2 additions & 1 deletion src/types/mongo.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Document, Types } from "mongoose";
import type { Document, Types } from "mongoose";

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

0 comments on commit 378add6

Please sign in to comment.