Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ node_modules
dist
dist-ssr
*.local
.env

# Editor directories and files
.vscode/*
Expand Down
10 changes: 6 additions & 4 deletions frontend/apps/client/src/features/discussion/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import type {
DiscussionCalendarRequest,
DiscussionCalendarResponse,
DiscussionConfirmRequest,
DiscussionConfirmResponse, DiscussionParticipantResponse,
DiscussionParticipantResponse,
DiscussionRankRequest,
DiscussionRankResponse,
DiscussionRequest,
DiscussionResponse,
DiscussionResponse } from '../model';
import {
DiscussionConfirmResponse,
} from '../model';

export const discussionApi = {
Expand Down Expand Up @@ -62,11 +64,11 @@ export const candidateApi = {
{ id, body }: { id: string; body: DiscussionConfirmRequest },
): Promise<DiscussionConfirmResponse> => {
const response = await request.post(`/api/v1/discussion/${id}/confirm`, { body });
return response.parse(response);
return DiscussionConfirmResponse.parse(response);
},

getDiscussionConfirm: async (id: string): Promise<DiscussionConfirmResponse> => {
const response = await request.get(`/api/v1/discussion/${id}/shared-event`);
return response.parse(response);
return DiscussionConfirmResponse.parse(response);
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { request } from '@utils/fetch';
import { InvitationJoinResponseSchema, InvitationResponseSchema } from '../model/invitation';

export const invitationApi = {
getInvitationInfo: async (discussionId: string) => {
getInvitationInfo: async (discussionId: number) => {
const response = await request.get(`/api/v1/discussion/${discussionId}/invite`);
const validData = InvitationResponseSchema.parse(response);
return validData;
},
postInviatationJoin: async (discussionId: string, password?: string) => {
postInviatationJoin: async (discussionId: number, password?: string) => {
const response = await request.post(`/api/v1/discussion/${discussionId}/join`, {
body: { password: password },
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/client/src/features/discussion/api/keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const participantKeys = {
detail: (id: string) => [...participantKeys.all, id],
};

export const invitationQueryKey = (discussionId: string) => ['invitation', discussionId];
export const invitationQueryKey = (discussionId: number) => ['invitation', discussionId];

export const sharedEventKeys = {
all: ['sharedEvents'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const useDiscussionMutation = () => {
export const useInvitationJoinMutation = () => {
const { mutate } = useMutation({
mutationFn: ({ body }: {
body: { discussionId: string; password?: string };
body: { discussionId: number; password?: string };
}) => invitationApi.postInviatationJoin(body.discussionId, body.password),
});
return { mutate };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ export const useDiscussionHostQuery = (discussionId: string) => {

return { isHost, isPending };
};
export const useInviteInfoQuery = (discussionId: string) =>
export const useInviteInfoQuery = (discussionId: number) =>
useQuery<InviteResponse>(invitationQueryOption(discussionId));
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { candidateApi } from '.';
import { invitationApi } from './invitationApi';
import { candidateKeys, invitationQueryKey } from './keys';

export const invitationQueryOption = (discussionId: string) => ({
export const invitationQueryOption = (discussionId: number) => ({
queryKey: invitationQueryKey(discussionId),
queryFn: () => invitationApi.getInvitationInfo(discussionId),
});
Expand Down
6 changes: 3 additions & 3 deletions frontend/apps/client/src/features/discussion/model/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const DiscussionRequest = z.object({
const DiscussionConfirmRequest = SharedEventDTO.omit({ id: true });

const DiscussionResponse = z.object({
id: z.string(),
id: z.number(),
title: z.string(),
dateRangeStart: z.string().regex(DATE_BAR),
dateRangeEnd: z.string().regex(DATE_BAR),
Expand Down Expand Up @@ -77,8 +77,8 @@ const DiscussionRankResponse = z.object({
eventsRankedOfTime: z.array(DiscussionDTO),
});

const DiscussionConfirmResponse = z.object({
discussionId: z.string(),
export const DiscussionConfirmResponse = z.object({
discussionId: z.number(),
title: z.string(),
meetingMethodOrLocation: z.string().nullable(),
sharedEventDto: SharedEventDTO.transform((event) => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { inputStyle } from './index.css';
import TimerButton from './TimerButton';

interface SubmitFormProps {
discussionId: string;
discussionId: number;
canJoin: boolean;
requirePW: boolean;
unlockDateTime: Date | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import SubmitForm from './SubmitForm';

export interface DiscussionInviteCardProps {
discussionId: string;
discussionId: number;
hostName: string;
title: string;
canJoin: boolean;
Expand Down Expand Up @@ -61,7 +61,7 @@ const DiscussionInviteCardContents = (props: DiscussionInviteCardContentsProps)

interface DiscussionInviteCardFooterProps {
canJoin: boolean;
discussionId: string;
discussionId: number;
requirePassword: boolean;
timeUnlocked: Date | null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { z } from 'zod';
import { SharedEventDtoSchema } from './SharedEventDto';

const FinishedScheduleSchema = z.object({
discussionId: z.string(),
discussionId: z.number(),
title: z.string(),
meetingMethodOrLocation: z.union([z.string(), z.null()]),
sharedEventDto: z.union([SharedEventDtoSchema, z.null()]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { zCoerceToDate } from '@utils/zod';
import { z } from 'zod';

const OngoingScheduleSchema = z.object({
discussionId: z.string(),
discussionId: z.number(),
title: z.string(),
dateRangeStart: zCoerceToDate,
dateRangeEnd: zCoerceToDate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ParticipantWithEventsSchema } from '@/features/timeline-schedule/model'
import { SharedEventDtoSchema } from './SharedEventDto';

export const UpcomingScheduleSchema = z.object({
discussionId: z.string(),
discussionId: z.number(),
title: z.string(),
meetingMethodOrLocation: z.union([z.string(), z.null()]),
sharedEventDto: SharedEventDtoSchema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const RecommendedScheduleItem = ({
candidate, discussionId, startDTStr, endDTStr, adjustCount,
}: {
candidate: DiscussionDTO;
discussionId: string;
discussionId: number;
startDTStr: string;
endDTStr: string;
adjustCount: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
} from './ScheduleDetails.css';

interface ScheduleDetailsProps {
discussionId: string;
discussionId: number;
}

// TODO: Date 타입 변환 후 변경사항 적용
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const CandidateDetailRequestSchema = z.object({
});

export const CandidateDetailResponseSchema = z.object({
discussionId: z.string(),
discussionId: z.number(),
startDateTime: zCoerceToDate,
endDateTime: zCoerceToDate,
participants: z.array(ParticipantWithEventsSchema),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const DiscussionInvitePage = ({ invitation }: { invitation: InviteResponse }) =>
<DiscussionInviteCard
canJoin={!isFull}
dateRange={{ start: dateRangeStart, end: dateRangeEnd }}
discussionId={id}
discussionId={+id}
hostName={host}
meetingDuration={duration}
requirePassword={requirePassword}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { type DateRangeReturn, useSelectDateRange } from '@hooks/useSelectDateRa
import type { Dispatch, SetStateAction } from 'react';

interface DiscussionContextProps {
selectedId: string | null;
setSelectedId: Dispatch<SetStateAction<string | null>>;
selectedId: number | null;
setSelectedId: Dispatch<SetStateAction<number | null>>;
}

export const {
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/client/src/pages/MyCalendarPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { TableProvider } from './TableContext';

const MyCalendarPage = () => {
const [selectedId, setSelectedId] = useState<string | null>(null);
const [selectedId, setSelectedId] = useState<number | null>(null);

return (
<div className={containerStyle}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const DiscussionInvite = () => {

export const Route = createFileRoute('/_main/discussion/invite/$id')({
loader: async ({ params: { id }, context }) => {
const invitation = await context.queryClient.fetchQuery(invitationQueryOption(id));
const invitation = await context.queryClient.fetchQuery(invitationQueryOption(Number(id)));
return { invitation };
},
component: DiscussionInvite,
Expand Down
1 change: 0 additions & 1 deletion frontend/apps/client/src/utils/error/HTTPError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export class HTTPError extends Error {

isUnAuthorizedError = () => this.#status === 401;
isForbiddenError = () => this.#status === 403;
isNotFoundError = () => this.#status === 404;
isTooManyRequestsError = () => this.#status === 429;

isInvalidRefreshTokenError = () => this.#code.startsWith('RT');
Expand Down
3 changes: 1 addition & 2 deletions frontend/apps/client/src/utils/error/handleError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ export const handleError = (error: unknown) => {
queueMicrotask(() => {
addNoti({ type: 'error', title: error.message });
});

if (error.isUnAuthorizedError()) window.location.href = '/login';
if (error.isForbiddenError()) window.location.href = '/landing';
if (error.isNotFoundError()) window.location.href = '/not-found';
return false;
}

if (error instanceof Error) {

queueMicrotask(() => {
addNoti({ type: 'error', title: error.message });
});
Expand Down
6 changes: 3 additions & 3 deletions frontend/apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"start": "cross-env NODE_ENV=start tsup --watch"
},
"dependencies": {
"express": "^5.1.0",
"http-proxy-middleware": "^3.0.3"
"express": "^5.1.0"
},
"devDependencies": {
"@types/express": "^5.0.2",
"typescript": "^5.6.2",
"@endolphin/tsup-config": "workspace:^"
"@endolphin/tsup-config": "workspace:^",
"@endolphin/vitest-config": "workspace:^"
}
}
18 changes: 0 additions & 18 deletions frontend/apps/server/src/envconfig.ts

This file was deleted.

11 changes: 2 additions & 9 deletions frontend/apps/server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import { fileURLToPath } from 'node:url';
import express from 'express';
import type { ViteDevServer } from 'vite';

import { discussionIdTransformer, discussionIdVerifier } from './middlewares/discussionId';
import { isProduction } from './utils/isProduction';

const isProduction = process.env.NODE_ENV === 'production';
const port = process.env.PORT || 5173;
const base = process.env.BASE || '/';

Expand Down Expand Up @@ -71,14 +69,9 @@ const serveHTML = async () => {
};

const createServer = async () => {
// 응답 body를 JSON으로 파싱 (middleware 내부에서 req.body 형태로 사용)
app.use(express.json());
// discussion id를 인코딩 및 디코딩하는 모듈 적용
app.use('/api', discussionIdVerifier);
app.use('/api', discussionIdTransformer);
await addMiddleware();
await serveHTML();

if (!isProduction) {
const httpsOptions = {
key: fs.readFileSync(keypath),
Expand Down

This file was deleted.

35 changes: 0 additions & 35 deletions frontend/apps/server/src/middlewares/discussionId/index.ts

This file was deleted.

Loading