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
4 changes: 3 additions & 1 deletion src/app/mocks/handlers.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export const handlers = [];
import { signupHandlers } from "./signup-handlers";

export const handlers = [...signupHandlers];
9 changes: 9 additions & 0 deletions src/app/mocks/signup-handlers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { checkEmailHandler } from "@pages/auth/signup/api/check-email/index.mock";
import { checkNicknameHandler } from "@pages/auth/signup/api/check-nickname/index.mock";
import { signupHandler } from "@pages/auth/signup/api/signup/index.mock";

export const signupHandlers = [
checkEmailHandler,
checkNicknameHandler,
signupHandler,
];
16 changes: 16 additions & 0 deletions src/pages/auth/signup/api/check-email/index.mock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { CHECK_EMAIL_ENDPOINT } from "@pages/auth/signup/api/check-email";
import { http, HttpResponse } from "msw";

export const checkEmailHandler = http.get(
CHECK_EMAIL_ENDPOINT,
({ request }) => {
const url = new URL(request.url);
const email = url.searchParams.get("email");

return HttpResponse.json({
success: true,
available: true,
message: "사용 가능한 이메일입니다.",
});
},
);
4 changes: 3 additions & 1 deletion src/pages/auth/signup/api/check-email/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { apiRequester } from "@shared/api/api-requester";

export const CHECK_EMAIL_ENDPOINT = `/api/signup/check-email`;

export const checkEmail = (email: string) => {
return apiRequester<{
success: boolean;
available: boolean;
message: string;
}>(`/api/signup/check-email?email=${email}`, {
}>(`${CHECK_EMAIL_ENDPOINT}?email=${email}`, {
method: "GET",
});
};
16 changes: 16 additions & 0 deletions src/pages/auth/signup/api/check-nickname/index.mock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { CHECK_NICKNAME_ENDPOINT } from "@pages/auth/signup/api/check-nickname";
import { http, HttpResponse } from "msw";

export const checkNicknameHandler = http.get(
CHECK_NICKNAME_ENDPOINT,
({ request }) => {
const url = new URL(request.url);
const nickname = url.searchParams.get("nickname");

return HttpResponse.json({
success: true,
available: true,
message: "사용 가능한 닉네임입니다.",
});
},
);
4 changes: 3 additions & 1 deletion src/pages/auth/signup/api/check-nickname/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { apiRequester } from "@shared/api/api-requester";

export const CHECK_NICKNAME_ENDPOINT = `/api/signup/check-nickname`;

export const checkNickname = (nickname: string) => {
return apiRequester<{
success: boolean;
available: boolean;
message: string;
}>(`/api/signup/check-nickname?nickname=${nickname}`, {
}>(`${CHECK_NICKNAME_ENDPOINT}?nickname=${nickname}`, {
method: "GET",
});
};
8 changes: 8 additions & 0 deletions src/pages/auth/signup/api/signup/index.mock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { SIGNUP_ENDPOINT } from "@pages/auth/signup/api/signup";
import { http, HttpResponse } from "msw";

export const signupHandler = http.post(SIGNUP_ENDPOINT, ({}) => {
return HttpResponse.json({
success: true,
});
});
4 changes: 3 additions & 1 deletion src/pages/auth/signup/api/signup/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { SignUpFormValues } from "../../model/signup-form-values";
import { apiRequester } from "@shared/api/api-requester";

export const SIGNUP_ENDPOINT = "/api/signup";

export const signup = (payload: SignUpFormValues) => {
return apiRequester<{
success: boolean;
available: boolean;
message: string;
}>(`/api/signup`, {
}>(SIGNUP_ENDPOINT, {
method: "POST",
body: JSON.stringify(payload),
});
Expand Down
61 changes: 20 additions & 41 deletions src/pages/auth/signup/ui/email-field/index.tsx
Original file line number Diff line number Diff line change
@@ -1,65 +1,44 @@
import { checkEmail } from "@pages/auth/signup/api/check-email";
import { useFormContext, useFormState } from "react-hook-form";
import { TextField } from "@shared/ui/text-field";
import { ApiError, HttpStatus } from "@shared/api";
import { ChangeEvent } from "react";

type EmailFieldProps = {
isValidDuplicateEmail: boolean;
setIsValidDuplicateEmail: (v: boolean) => void;
value: string;
onChange: (e: ChangeEvent<HTMLInputElement>) => void;
errorMessage?: string;
successMessage?: string;
isCheckDisabled: boolean;
checkDuplicateEmail: () => void;
};

export const EmailField = ({
value,
onChange,
errorMessage,
isValidDuplicateEmail,
setIsValidDuplicateEmail,
successMessage,
isCheckDisabled,
checkDuplicateEmail,
}: EmailFieldProps) => {
const { control, register, getValues, setError } = useFormContext<{
email: string;
}>();
const { touchedFields, errors } = useFormState<{ email: string }>({
control,
});
return (
<TextField
id={"id"}
error={!!touchedFields.email ? errors.email?.message : undefined}
success={isValidDuplicateEmail ? "사용 가능한 이메일입니다." : undefined}
error={!!value ? errorMessage : undefined}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

!!value 조건문으로 인해 이메일 필드가 비어있을 때 발생하는 에러 메시지(예: '이메일을 입력해주세요')가 화면에 표시되지 않는 문제가 발생할 수 있습니다. errorMessage가 존재한다면 값의 유무와 상관없이 표시되도록 수정하는 것이 좋습니다.

Suggested change
error={!!value ? errorMessage : undefined}
error={errorMessage}

success={isValidDuplicateEmail ? successMessage : undefined}
>
<div className="flex flex-col gap-2">
<TextField.Label>아이디</TextField.Label>
<div className="flex gap-3">
<TextField.Input
placeholder="이메일 주소 형식으로 입력해 주세요."
{...register("email", {
onChange: () => setIsValidDuplicateEmail(false),
})}
value={value}
onChange={onChange}
/>
<TextField.Button
disabled={
!touchedFields.email || errors.email?.type === "invalid_format"
}
aria-label="이메일 중복 확인"
disabled={isCheckDisabled}
onClick={() => {
const email = getValues("email");
checkEmail(email)
.then((response) => {
if (response.available) {
setIsValidDuplicateEmail(true);
} else {
setError("email", {
type: "duplicate",
message: response.message,
});
}
})
.catch((error) => {
if (error instanceof ApiError) {
if (error.status === HttpStatus.BAD_REQUEST) {
setError("email", {
type: "invalid_format",
message: error.message,
});
}
}
});
checkDuplicateEmail();
}}
>
중복 확인
Expand Down
1 change: 1 addition & 0 deletions src/pages/auth/signup/ui/nickname-field/nickname-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const NicknameField = ({
})}
/>
<TextField.Button
aria-label="닉네임 중복 확인"
type="button"
disabled={
!touchedFields.nickname ||
Expand Down
92 changes: 92 additions & 0 deletions src/pages/auth/signup/ui/signup-page/index.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { SignupPage } from "@pages/auth/signup/ui/signup-page";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { render, screen, waitFor } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { userEvent } from "@testing-library/user-event";
import { http, HttpResponse } from "msw";
import { server } from "@app/mocks/server";

const TEST_EMAIL = "test@example.com";
const TEST_NICKNAME = "데품타";
const TEST_PASSWORD = "abcd1234";
const TEST_CONFIRM_PASSWORD = "abcd1234";
const TEST_WRONG_CONFIRM_PASSWORD = "abc123123";

describe("회원가입 폼", () => {
beforeEach(() => {
render(
<QueryClientProvider client={new QueryClient()}>
<SignupPage />
</QueryClientProvider>,
);
});

it("모든 필수 필드를 렌더링한다", () => {
expect(screen.getByLabelText("아이디")).toBeInTheDocument();
expect(screen.getByLabelText("닉네임")).toBeInTheDocument();
expect(screen.getByLabelText("비밀번호")).toBeInTheDocument();
expect(screen.getByLabelText("비밀번호 확인")).toBeInTheDocument();
expect(screen.getByLabelText("동의함")).toBeInTheDocument(); //이용약관
});

//복잡한 제출 로직 테스트
it("모든 필수 필드 입력 시 제출을 허용한다", async () => {
const signupSpy = vi.fn();
server.use(
http.post("/api/signup", async ({ request }) => {
signupSpy(await request.json());
return HttpResponse.json({
success: true,
message: "회원가입이 완료되었습니다.",
});
}),
);
const user = userEvent.setup();
expect(screen.getByRole("button", { name: "회원가입" })).toBeDisabled();

// 이메일 검증
await user.type(screen.getByLabelText("아이디"), TEST_EMAIL);
await user.tab();
await user.click(screen.getByRole("button", { name: "이메일 중복 확인" }));
expect(
await screen.findByText("사용 가능한 이메일입니다."),
).toBeInTheDocument();

// 닉네임 검증
await user.type(screen.getByLabelText("닉네임"), TEST_NICKNAME);
await user.tab();
await user.click(screen.getByRole("button", { name: "닉네임 중복 확인" }));
expect(
await screen.findByText("사용 가능한 닉네임입니다."),
).toBeInTheDocument();

// 비밀번호, 비밀번호 확인
await user.type(screen.getByLabelText("비밀번호"), TEST_PASSWORD);
await user.type(
screen.getByLabelText("비밀번호 확인"),
TEST_CONFIRM_PASSWORD,
);

// 약관 동의 체크
await user.click(screen.getByLabelText("동의함"));

// 버튼 활성화 테스트
expect(screen.getByRole("button", { name: "회원가입" })).toBeEnabled();

// 제출
await user.click(screen.getByRole("button", { name: "회원가입" }));
await waitFor(() => {
expect(signupSpy).toHaveBeenCalledWith(
expect.objectContaining({
email: TEST_EMAIL,
nickname: TEST_NICKNAME,
password: TEST_PASSWORD,
confirmPassword: TEST_CONFIRM_PASSWORD,
}),
);
});
});
// 유효성검사 테스트

// 조건부렌더링 테스트
});
48 changes: 44 additions & 4 deletions src/pages/auth/signup/ui/signup-page/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { PATH } from "@shared/routes";
import { Button } from "@shared/ui";

import Link from "next/link";
import { FormProvider, useForm } from "react-hook-form";
import { FormProvider, useController, useForm } from "react-hook-form";

import { useState } from "react";
import { ChangeEvent, useState } from "react";
import { useRouter } from "next/navigation";

import { EmailField } from "@pages/auth/signup/ui/email-field";
Expand All @@ -22,6 +22,8 @@ import { TermsAgreementField } from "@pages/auth/signup/ui/term-agreement-field"
import { useSignup } from "@pages/auth/signup/model/use-signup";

import { SideBanner } from "@widgets/side-banner";
import { checkEmail } from "@pages/auth/signup/api/check-email";
import { ApiError, HttpStatus } from "@shared/api";

export const SignupPage = () => {
const methods = useForm<SignUpFormValues>({
Expand All @@ -38,7 +40,9 @@ export const SignupPage = () => {
const router = useRouter();
const {
handleSubmit,
formState: { isValid },
control,
setError,
formState: { isValid, errors },
} = methods;
const [isValidDuplicateEmail, setIsValidDuplicateEmail] = useState(false);
const [isValidDuplicateNickname, setIsValidDuplicateNickname] =
Expand All @@ -49,6 +53,35 @@ export const SignupPage = () => {
const isFormValid =
isValidDuplicateEmail && isValidDuplicateNickname && isValid;

const { field: emailField } = useController({
control,
name: "email",
});

const checkDuplicateEmail = () => {
const email = emailField.value;
checkEmail(email)
.then((response) => {
if (response.available) {
setIsValidDuplicateEmail(true);
} else {
setError("email", {
type: "duplicate",
message: response.message,
});
}
})
.catch((error) => {
if (error instanceof ApiError) {
if (error.status === HttpStatus.BAD_REQUEST) {
setError("email", {
type: "invalid_format",
message: error.message,
});
}
}
});
};
return (
<div className="flex h-full">
<SideBanner />
Expand All @@ -72,7 +105,14 @@ export const SignupPage = () => {
{/* 이메일 */}
<EmailField
isValidDuplicateEmail={isValidDuplicateEmail}
setIsValidDuplicateEmail={setIsValidDuplicateEmail}
value={emailField.value}
errorMessage={errors.email?.message}
successMessage={"사용 가능한 이메일입니다."}
onChange={(e) => emailField.onChange(e.target.value)}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

이메일 입력값이 변경될 때 중복 확인 상태(isValidDuplicateEmail)를 false로 초기화해야 합니다. 그렇지 않으면 사용자가 중복 확인을 마친 후 이메일을 수정하더라도 이전의 확인 결과가 유효한 것으로 간주되어 잘못된 데이터로 가입이 시도될 수 있습니다.

Suggested change
onChange={(e) => emailField.onChange(e.target.value)}
onChange={(e) => {
emailField.onChange(e.target.value);
setIsValidDuplicateEmail(false);
}}

isCheckDisabled={
!emailField.value || errors.email?.type === "invalid_format"
}
checkDuplicateEmail={checkDuplicateEmail}
/>
{/* 닉네임 */}
<NicknameField
Expand Down
4 changes: 2 additions & 2 deletions src/pages/auth/signup/ui/term-agreement-field/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ export const TermsAgreementField = ({}) => {
return (
<section className="flex flex-col gap-2">
<div className="flex justify-between">
<span>이용약관</span>
<p>이용약관</p>
<div className="flex gap-1 items-center">
<label
htmlFor="terms"
className={cn(
"text-small text-medium text-primary/30",
isTermsAgreementChecked && "text-primary/100"
isTermsAgreementChecked && "text-primary/100",
)}
>
동의함
Expand Down
Loading
Loading