ewhk9887/korean_code_reviews_from_github · Datasets at Hugging Face

code stringlengths 41 34.3k	lang stringclasses 8 values	review stringlengths 1 4.74k
@@ -0,0 +1,101 @@ +@use '../../../../styles/mixin.scss' as mixin; +@use '../../../../styles/color.scss' as clr; + +.feeds { + position: relative; + top: 77px; + width: 60%; + margin-bottom: 80px; + background: #fff; + + .top_menu { + @include mixin.flex($justify: space-between, $align: center); + height: 82px; + + span { + @include mixin.flex($align: center); + margin-left: 20px; + font-weight: bold; + + &:last-child { + margin-right: 22px; + color: #2a2a2a; + font-size: 35px; + } + + img { + width: 42px; + height: 42px; + border-radius: 50%; + margin-right: 20px; + } + } + } + + article { + img { + width: 100%; + height: 818px; + } + + .bottom_menu { + @include mixin.flex($align: center); + position: relative; + height: 62px; + + span > svg { + margin: 0 10px; + font-size: 32px; + color: #414141; + } + + span:last-child > svg { + position: absolute; + top: 15px; + right: 0; + } + + span:first-child > svg > path { + color: #eb4b59; + } + } + } + + .comments { + display: flex; + flex-direction: column; + + span { + padding-left: 10px; + } + } + + .add_comments { + position: absolute; + @include mixin.flex($justify: space-between, $align: center); + bottom: -62px; + width: 100%; + height: 62px; + border-top: 1px solid clr.$clr-border; + font-size: 14px; + + input { + width: 90%; + height: 50%; + margin-left: 15px; + border: none; + } + + button { + margin-right: 15px; + border: none; + color: clr.$clr-primary; + opacity: 0.5; + background: #fff; + + &.activated { + opacity: 1; + } + } + } +}	Unknown	class명은 어떤 형태가 좋을까요?! 해당 class명은 '동작'을 나타내기에 클래스 네임보다는 함수명처럼 느껴집니다!
@@ -1,5 +1,98 @@ import React from 'react'; +import { useState, useEffect } from 'react'; +import { useNavigate } from 'react-router-dom'; +import './Login.scss'; -export default function Login() { - return <div>Hello, Hyeonze!</div>; -} +const Login = () => { + const [idInput, setIdInput] = useState(''); + const [pwInput, setPwInput] = useState(''); + const [isValidatedUser, setIsValidatedUser] = useState(false); + + const navigate = useNavigate(); + const changeIdInput = e => { + const { value } = e.target; + setIdInput(value); + }; + + const changePwInput = e => { + const { value } = e.target; + setPwInput(value); + }; + + useEffect(() => { + setIsValidatedUser(idInput.indexOf('@') !== -1 && pwInput.length > 4); + }, [idInput, pwInput]); + + // 메인으로 이동할 때 로직 + const goToMain = () => { + navigate('/main-hyeonze'); + }; + + // 회원가입시 사용할 로직 + // const signup = () => { + // fetch('http://10.58.4.22:8000/users/signup', { + // method: 'POST', + // body: JSON.stringify({ + // email: idInput, + // password: pwInput, + // }), + // }) + // .then(response => response.json()) + // .then(result => { + // //console.log('결과: ', result.message) + // if (result.message === 'EMAIL_ALREADY_EXISTS') { + // console.log('Error : Duplicated'); + // } + // }); + // }; + + // 로그인시 사용할 로직 + // const login = () => { + // fetch('http://10.58.4.22:8000/users/login', { + // method: 'POST', + // body: JSON.stringify({ + // email: idInput, + // password: pwInput, + // }), + // }) + // .then(response => response.json()) + // .then(result => { + // //console.log('결과: ', result.message) + // if (result.message === 'SUCCESS') { + // console.log('login SUCCESS'); + // } + // }); + // }; + + return ( + <div className="login"> + <div id="wrapper"> + <h1>westagram</h1> + <form className="login_form"> + <input + type="text" + placeholder="전화번호, 사용자 이름 또는 이메일" + className="username" + onChange={changeIdInput} + /> + <input + type="password" + placeholder="비밀번호" + className="userpassword" + onChange={changePwInput} + /> + <input + className={isValidatedUser ? 'activated' : ''} + disabled={!isValidatedUser} + type="button" + value="로그인" + onClick={goToMain} + /> + </form> + <p>비밀번호를 잊으셨나요?</p> + </div> + </div> + ); +}; + +export default Login;	Unknown	- 불필요한 주석처리는 삭제해주세요! - 더불어서 className 자체를 '색'으로 지정하는 것은 좋은 네이밍은 아닌 것 같습니다. 어떤 네이밍이 적합할지 고민하셔서 , 해당 요소가 무엇인지를 잘 나타내는 네이밍으로 수정해주세요. - 플러스! 여기에도 사용하지 않아도 되는 삼항연사자가 숨어있네요! 확인해주세요
@@ -0,0 +1,101 @@ +@use '../../../../styles/mixin.scss' as mixin; +@use '../../../../styles/color.scss' as clr; + +.feeds { + position: relative; + top: 77px; + width: 60%; + margin-bottom: 80px; + background: #fff; + + .top_menu { + @include mixin.flex($justify: space-between, $align: center); + height: 82px; + + span { + @include mixin.flex($align: center); + margin-left: 20px; + font-weight: bold; + + &:last-child { + margin-right: 22px; + color: #2a2a2a; + font-size: 35px; + } + + img { + width: 42px; + height: 42px; + border-radius: 50%; + margin-right: 20px; + } + } + } + + article { + img { + width: 100%; + height: 818px; + } + + .bottom_menu { + @include mixin.flex($align: center); + position: relative; + height: 62px; + + span > svg { + margin: 0 10px; + font-size: 32px; + color: #414141; + } + + span:last-child > svg { + position: absolute; + top: 15px; + right: 0; + } + + span:first-child > svg > path { + color: #eb4b59; + } + } + } + + .comments { + display: flex; + flex-direction: column; + + span { + padding-left: 10px; + } + } + + .add_comments { + position: absolute; + @include mixin.flex($justify: space-between, $align: center); + bottom: -62px; + width: 100%; + height: 62px; + border-top: 1px solid clr.$clr-border; + font-size: 14px; + + input { + width: 90%; + height: 50%; + margin-left: 15px; + border: none; + } + + button { + margin-right: 15px; + border: none; + color: clr.$clr-primary; + opacity: 0.5; + background: #fff; + + &.activated { + opacity: 1; + } + } + } +}	Unknown	이렇게 각 요소에 background color를 각각 다 넣어주신 이유가 있으실까요?
@@ -0,0 +1,92 @@ +{ + "stories": [ + { "imgUrl": "images/joonyoung/stories/story1.jpg", "username": "Enna" }, + { "imgUrl": "images/joonyoung/stories/story2.jpg", "username": "Jesy" }, + { "imgUrl": "images/joonyoung/stories/story3.jpg", "username": "Denial" }, + { "imgUrl": "images/joonyoung/stories/story4.jpg", "username": "Meow" }, + { + "imgUrl": "images/joonyoung/stories/story5.jpg", + "username": "Christina" + }, + { "imgUrl": "images/joonyoung/stories/story6.jpg", "username": "Mally" }, + { "imgUrl": "images/joonyoung/stories/story7.jpg", "username": "Karel" }, + { "imgUrl": "images/joonyoung/stories/story8.jpg", "username": "Bred" }, + { "imgUrl": "images/joonyoung/stories/story9.jpg", "username": "Andrew" }, + { "imgUrl": "images/joonyoung/stories/story10.jpg", "username": "Emily" } + ], + "otherProfileInfos": [ + { + "id": 1, + "username": "wecode28기", + "description": "wecode님외 36명이 follow" + }, + { + "id": 2, + "username": "Younha", + "description": "Enna Kim외 10명이 follow" + }, + { + "id": 3, + "username": "wework", + "description": "wecode28님외 236명이 follow" + } + ], + "feed": [ + { + "id": 1, + "feedUpLoader": "Enna", + "uploaderProfileImg": "./images/joonyoung/stories/story1.jpg", + "uploaderInfo": "Enna's Feed icon", + "carouselImages": [ + "./images/joonyoung/feed/feed1/pexels-fauxels-3184291.jpg", + "./images/joonyoung/feed/feed1/pexels-fauxels-3184302.jpg", + "./images/joonyoung/feed/feed1/pexels-fauxels-3184433.jpg", + "./images/joonyoung/feed/feed1/pexels-min-an-853168.jpg", + "./images/joonyoung/feed/feed1/pexels-this-is-zun-1116302.jpg" + ], + "likes": 1129, + "comments": [ + { + "id": 1, + "user": "28기 양대영님", + "comment": "여러분 치킨계 쓰셔야 합니다..!! 👀 👀" + }, + { + "id": 2, + "user": "28기 이아영님", + "comment": "대영님도 안 쓰셨잖아요?! 🤭" + }, + { + "id": 3, + "user": "28기 박윤국님", + "comment": "🎸 🎸 🎸 (신곡 홍보중)" + } + ] + }, + { + "id": 2, + "feedUpLoader": "James", + "uploaderProfileImg": "./images/joonyoung/stories/story2.jpg", + "uploaderInfo": "It's jesy!", + "carouselImages": [ + "./images/joonyoung/feed/feed2/handtohand.jpg", + "./images/joonyoung/feed/feed2/branch.jpg", + "./images/joonyoung/feed/feed2/pexels-te-lensfix-1371360.jpg", + "./images/joonyoung/feed/feed2/pexels-victor-freitas-803105.jpg" + ], + "likes": 1129, + "comments": [ + { + "id": 1, + "user": "멘토 김INTP님", + "comment": "(안경을 치켜 올리며) git branch merge" + }, + { + "id": 2, + "user": "28기 이ESTJ님", + "comment": "아니 계획을 안짜고 여행을 간다고?" + } + ] + } + ] +}	Unknown	mockData king 준영님👍 정말 감사합니다. 세부 내용은 임의로 변경한 후, 데이터의 형식좀 빌려다 쓰겠습니다 감사합니다!
@@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="UTF-8" /> + <link rel="icon" type="image/svg+xml" href="/vite.svg" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <title>react-shopping-products</title> + <script type="module" crossorigin src="/react-shopping-products/dist/assets/index-B5NHo3G9.js"></script> + <link rel="stylesheet" crossorigin href="/react-shopping-products/dist/assets/index-BlzNY9oW.css"> + </head> + <body> + <div id="root"></div> + </body> +</html>	Unknown	dist 폴더가 git ignore되지 않았군용
@@ -0,0 +1,10 @@ +/** + * generateBasicToken - Basic auth를 위한 토큰을 만드는 함수입니다. + * @param {string} userId - USERNAME입니다. + * @param {string} userPassword - PASSWORD입니다. + * @returns {string} + */ +export function generateBasicToken(userId: string, userPassword: string): string { + const token = btoa(`${userId}:${userPassword}`); + return `Basic ${token}`; +}	TypeScript	섬세한 jsdocs 👍👍👍👍
@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + / +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/* + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + / +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/* + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + / +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/* + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + / +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/* + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}	TypeScript	공통 로직을 묶어주는 것 너무 좋습니다~!
@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + / +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/* + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + / +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/* + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + / +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/* + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + / +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/* + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}	TypeScript	장바구니에 100개 넘게 담을 수 있는 case가 존재할 것 같아요~!
@@ -0,0 +1,50 @@ +.loaderContainer { + height: 60px; + display: flex; + justify-content: center; + align-items: center; +} + +.loader { + width: 60px; + display: flex; + justify-content: space-evenly; +} + +.ball { + list-style: none; + width: 12px; + height: 12px; + border-radius: 50%; + background-color: black; +} + +.ball:nth-child(1) { + animation: bounce1 0.4s ease-in-out infinite; +} + +@keyframes bounce1 { + 50% { + transform: translateY(-18px); + } +} + +.ball:nth-child(2) { + animation: bounce2 0.4s ease-in-out 0.2s infinite; +} + +@keyframes bounce2 { + 50% { + transform: translateY(-18px); + } +} + +.ball:nth-child(3) { + animation: bounce3 0.4s ease-in-out 0.4s infinite; +} + +@keyframes bounce3 { + 50% { + transform: translateY(-18px); + } +}	Unknown	귀여운 애니메이션을 만들었군용 🚀🚀🚀
@@ -0,0 +1,15 @@ +export const productCategories = { + all: '전체', + fashion: '패션', + beverage: '음료', + electronics: '전자제품', + kitchen: '주방용품', + fitness: '피트니스', + books: '도서', +} as const; + +export const sortOptions = { priceAsc: '낮은 가격순', priceDesc: '높은 가격순' } as const; + +export const FIRST_FETCH_PAGE = 0; +export const FIRST_FETCH_SIZE = 20; +export const AFTER_FETCH_SIZE = 4;	TypeScript	상수화 👍👍👍
@@ -0,0 +1,32 @@ +import React, { createContext, useState, useCallback, ReactNode } from 'react'; +import ErrorToast from '../components/ErrorToast/ErrorToast'; + +export interface ToastContextType { + showToast: (message: string) => void; +} + +export const ToastContext = createContext<ToastContextType \| undefined>(undefined); + +interface ToastProviderProps { + children: ReactNode; +} + +export const ToastProvider: React.FC<ToastProviderProps> = ({ children }) => { + const [isOpen, setIsOpen] = useState(false); + const [message, setMessage] = useState(''); + + const showToast = useCallback((message: string) => { + setMessage(message); + setIsOpen(true); + setTimeout(() => { + setIsOpen(false); + }, 3000); + }, []); + + return ( + <ToastContext.Provider value={{ showToast }}> + {children} + {isOpen && <ErrorToast message={message} />} + </ToastContext.Provider> + ); +};	Unknown	별도의 Provider로 만들어 준 것 너무 좋네요
@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + / +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/* + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + / +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/* + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + / +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/* + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + / +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/* + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}	TypeScript	맞아요... 임시방편이었는데 그냥 까먹고 넘어갔네요 ㅜㅜ
@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + / +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/* + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + / +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/* + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + / +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/* + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + / +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/* + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}	TypeScript	그런데.. 이번 장바구니 api는 20개만 담을 수 있게 만들어져있더라구요.. 지금 api 구현사항에 맞출지, 아니면 미래의 변경에도 용이하게 코드를 바꿀지는 생각해 봐야할 문제인 것 같아요. 이 부분을 바꿔야 한다면 위의 >if (key === 'category' && value === 'all') 이 코드에서도 default로 들어갈 수 있는 sort=id,asc도 생각해봐야 할 것 같고요
@@ -0,0 +1,21 @@ +import { SelectHTMLAttributes, PropsWithChildren } from 'react'; +import styles from './Select.module.css'; + +interface Props extends PropsWithChildren<SelectHTMLAttributes<HTMLSelectElement>> { + options: Record<string, string>; +} + +const Select = ({ options, defaultValue, children, ...props }: Props) => { + return ( + <select {...props} className={styles.selectContainer} defaultValue={defaultValue}> + {children} + {Object.keys(options).map((option) => ( + <option key={option} value={option}> + {options[option]} + </option> + ))} + </select> + ); +}; + +export default Select;	Unknown	entries라는 함수도 있으니 찾아보시면 좋을 것 같아요..! ``` js Object.entries(options).map([optionEn,optionKo])=>{ ... } ```
@@ -1 +1,60 @@ # spring-security-authentication + +## 1단계 - SecurityFilterChain 적용 + +인터셉터로 구현한 인증 로직을 필터 형태로 변형한다. +인증 로직이 담긴 필터를 바로 서블릿 필터로 등록하지 않고 아래 이미지를 참고하여 별도의 필터 체인을 구축하여 구현한다. +주요 클래스: DelegatingFilterProxy, FilterChainProxy, SecurityFilterChain, DefaultSecurityFilterChain, VirtualFilterChain(FilterChainProxy의 내부 클래스) + +![SecurityFilterChain.png](docs-img/SecurityFilterChain.png) + +### 요구 사항 +- [X] 기존 Interceptor 인증 로직 변환 + - 제공된 Interceptor 기반 인증 로직을 Filter로 변환 + - 변환된 Filter는 HttpServletRequest와 HttpServletResponse를 처리하며, 인증 여부를 결정 + - 요청이 인증되지 않은 경우, 적절한 HTTP 상태 코드(예: 401 Unauthorized) 반환 + - 인증된 사용자 정보는 요청 객체에 추가하여 이후 필터에서 접근 가능하도록 설정 +- [X] DelegatingFilterProxy 설정 + - Spring Bean으로 DelegatingFilterProxy를 등록하고 이를 통해 FilterChainProxy를 호출하도록 설정 + - DelegatingFilterProxy는 Servlet 컨테이너의 Filter와 Spring 컨텍스트를 연결 +- [X] FilterChainProxy 구현 + - FilterChainProxy는 요청 URI에 따라 적절한 SecurityFilterChain을 선택하여 실행 + - SecurityFilterChain은 Filter 리스트를 포함하며 요청을 처리 +- [X] SecurityFilterChain 리팩터링 + - 각 SecurityFilterChain은 역할에 따라 다른 필터 세트를 관리 + - 인증(Authentication) 필터와 권한(Authorization) 필터를 포함하도록 구성 + +## 2단계 - AuthenticationManager 적용 + +다양한 인증 방식을 처리하기 위해 AuthenticationManager를 활용하여 인증 과정을 추상화한다. +기존의 인증 로직을 분리하고, 인증 방식을 유연하게 확장 가능하도록 구조화한다. +주요 클래스: AuthenticationManager, ProviderManager, AuthenticationProvider, DaoAuthenticationProvider + +![AuthenticationManager.png](docs-img/AuthenticationManager.png) + +### 요구 사항 + +- [X] Authentication와 UsernamePasswordAuthenticationToken 구현 +- [X] 제공된 AuthenticationManager를 기반으로 ProviderManager 구현 +- [X] 제공된 AuthenticationProvider를 기반으로 DaoAuthenticationProvider 구현 +- [X] 기존 인증 필터에서 인증 로직 분리 및 AuthenticationManager로 통합 + +## 3단계 - SecurityContextHolder 적용 +- 인증 성공 후 생성된 Authentication 객체를 기존의 세션 방식 대신 스레드 로컬(Thread Local)에 보관하도록 변경한다. +- 각 필터에서 스레드 로컬에 보관된 인증 정보를 접근할 수 있도록 SecurityContextHolder와 SecurityContext 구조를 구현한다. + +![SecurityContextHolder.png](docs-img/SecurityContextHolder.png) + +### 요구사항 +-[X] SecurityContext 및 SecurityContextHolder 작성 +-[X] BasicAuthenticationFilter에서 SecurityContextHolder 활용 +-[X] 기존 세션 방식에서 스레드 로컬 방식으로 인증 정보 관리 변경 + +## 4단계 - SecurityContextHolderFilter 구현 +* 세션에 보관된 인증 정보를 SecurityContextHolder로 옮기기 위한 SecurityContextHolderFilter를 구현한다. + +### 요구 사항 +- [X] SecurityContextRepository 인터페이스를 기반으로 HttpSessionSecurityContextRepository 구현 +- [X] SecurityContextHolderFilter 작성 및 필터 체인에 등록 +- [X] login_after_members 테스트로 동작 검증 +	Unknown	요구사항을 아주 꼼꼼하게 작성해 주셨네요! 👍
@@ -0,0 +1,33 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import nextstep.security.context.SecurityContext; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.context.SecurityContextRepository; +import org.springframework.web.filter.GenericFilterBean; + +import java.io.IOException; + +public class SecurityContextHolderFilter extends GenericFilterBean { + private final SecurityContextRepository securityContextRepository; + + public SecurityContextHolderFilter(SecurityContextRepository securityContextRepository) { + this.securityContextRepository = securityContextRepository; + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + try { + SecurityContext securityContext = securityContextRepository.loadContext((HttpServletRequest) request); + SecurityContextHolder.setContext(securityContext); + + chain.doFilter(request, response); + } finally { + SecurityContextHolder.clearContext(); + } + } +}	Java	현재 SecurityContextHolderFilter에서 securityContextRepository.saveContext(context, request, response);를 호출하는 방식은 Spring Security의 일반적인 흐름과 맞지 않을 것 같아요 😢 인증이 이루어지지 않았음에도 불구하고 SecurityContext를 저장할 가능성이 있을 것 같은데 개선해보면 어떨까요? 😄
@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}	Java	해당 메서드에 static을 사용하신 이유가 있나요?
@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}	Java	== 연산자를 사용하여 UsernamePasswordAuthenticationToken과 직접 비교하고 있는데요, isAssignableFrom() 로 비교하는 것과 어떠한 차이가 있을까요? 😄
@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}	Java	현재 request.getSession()을 호출하면 세션이 존재하지 않을 경우 자동으로 새 세션을 생성하게 됩니다. 세션이 필요하지 않은 요청에도 불필요한 세션이 생성될 수 있을 것 같은데, getSession(false)를 사용하면 어떤 차이가 있을까요? 🤔 기존 세션이 있는 경우에만 SecurityContext를 로드하도록 개선해보면 어떨까요? 😄
@@ -0,0 +1,60 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import nextstep.security.authentication.Authentication; +import nextstep.security.authentication.AuthenticationManager; +import nextstep.security.authentication.UsernamePasswordAuthenticationToken; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.util.Base64Convertor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +public class BasicAuthenticationFilter extends OncePerRequestFilter { + private static final String BASIC_PREFIX = "basic "; + + private final AuthenticationManager authenticationManager; + + public BasicAuthenticationFilter(AuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + final String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); + if (isNotBasicAuth(authorization)) { + filterChain.doFilter(request, response); + return; + } + try { + String[] usernameAndPassword = extractUsernameAndPassword(authorization); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usernameAndPassword[0], usernameAndPassword[1]); + Authentication authenticate = authenticationManager.authenticate(authenticationToken); + + SecurityContextHolder.getContext().setAuthentication(authenticate); + + filterChain.doFilter(request, response); + } catch (Exception e) { + SecurityContextHolder.clearContext(); + response.setStatus(HttpStatus.UNAUTHORIZED.value()); + } + } + + private String[] extractUsernameAndPassword(String authorization) { + String base64Credentials = authorization.substring(BASIC_PREFIX.length()); + String decodedString = Base64Convertor.decode(base64Credentials); + return decodedString.split(":"); + } + + private boolean isNotBasicAuth(String authorization) { + if (authorization == null) { + return true; + } + return !authorization.toLowerCase().startsWith(BASIC_PREFIX); + } +}	Java	isNotBasicAuth() 메서드의 네이밍을 보면 Basic 인증이 아닐 경우 true를 반환해야 할 것 같지만, 현재 구현에서는 Basic 인증일 때 true를 반환하고 있네요 😄
@@ -0,0 +1,33 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import nextstep.security.context.SecurityContext; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.context.SecurityContextRepository; +import org.springframework.web.filter.GenericFilterBean; + +import java.io.IOException; + +public class SecurityContextHolderFilter extends GenericFilterBean { + private final SecurityContextRepository securityContextRepository; + + public SecurityContextHolderFilter(SecurityContextRepository securityContextRepository) { + this.securityContextRepository = securityContextRepository; + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + try { + SecurityContext securityContext = securityContextRepository.loadContext((HttpServletRequest) request); + SecurityContextHolder.setContext(securityContext); + + chain.doFilter(request, response); + } finally { + SecurityContextHolder.clearContext(); + } + } +}	Java	앗 그러네요 ! 인증을 받자마자 securityContextRepository 에 저장하는게 좋겠네요 [57d0f5](https://github.com/next-step/spring-security-authentication/pull/32/commits/57d0f520733998b10aec3ac441e30bf93b21cfa6) 해당 커밋에 반영하였습니다
@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}	Java	😢 단축키를 잘 못써서 오타가 났나봐요.. [0f8f88b](https://github.com/next-step/spring-security-authentication/pull/32/commits/0f8f88b23614c091cf8dc72c8c06aca34a7c6b4c) 해당커밋에 반영하였습니다~
@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}	Java	isAssignableFrom() 비교 하면 상위타입까지 비교 할 수 있군요! 음... 제가 생각하기에 프레임워크 사용자에 대해서 상속을 통해 UsernamePasswordAuthenticationToken를 확장하여 사용할 수 있을꺼 같네요. 이슬님의 다른의견이 있다면 듣고 싶네요 e36ce53464741014a8391df7e2761816fb381512 사용자에게 확장을 제공하고자 해당 커밋에 변경하였습니다.
@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}	Java	앗.. 상세한 옵션에 대해서는 고려하지 못했었네요 getSession(false)은 세션을 생성하지 않고 null 을 반환 하는 군요 불필요한 세션이 생성되지 않도록 [291d54e](https://github.com/next-step/spring-security-authentication/pull/32/commits/291d54ecda1c0cae213d2bf9432e339a34c8c7f6) 해당 커밋에 수정하였습니다
@@ -0,0 +1,60 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import nextstep.security.authentication.Authentication; +import nextstep.security.authentication.AuthenticationManager; +import nextstep.security.authentication.UsernamePasswordAuthenticationToken; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.util.Base64Convertor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +public class BasicAuthenticationFilter extends OncePerRequestFilter { + private static final String BASIC_PREFIX = "basic "; + + private final AuthenticationManager authenticationManager; + + public BasicAuthenticationFilter(AuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + final String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); + if (isNotBasicAuth(authorization)) { + filterChain.doFilter(request, response); + return; + } + try { + String[] usernameAndPassword = extractUsernameAndPassword(authorization); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usernameAndPassword[0], usernameAndPassword[1]); + Authentication authenticate = authenticationManager.authenticate(authenticationToken); + + SecurityContextHolder.getContext().setAuthentication(authenticate); + + filterChain.doFilter(request, response); + } catch (Exception e) { + SecurityContextHolder.clearContext(); + response.setStatus(HttpStatus.UNAUTHORIZED.value()); + } + } + + private String[] extractUsernameAndPassword(String authorization) { + String base64Credentials = authorization.substring(BASIC_PREFIX.length()); + String decodedString = Base64Convertor.decode(base64Credentials); + return decodedString.split(":"); + } + + private boolean isNotBasicAuth(String authorization) { + if (authorization == null) { + return true; + } + return !authorization.toLowerCase().startsWith(BASIC_PREFIX); + } +}	Java	if 문에 메서드를 true 하게 바꾸려다가 리펙토링 부분만하고 커밋만 찍어버렷네요 ㅎㅎ... [0455587](https://github.com/next-step/spring-security-authentication/pull/32/commits/0455587ca34b85135e20207244a250667422db0b) 반영하였습니다
@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}	Java	saveContext()에서는 세션 저장 역할만 수행하는 것이 더 적절하지 않을까 생각되는데 어떻게 생각하시나요? 😊
@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}	Java	맞아요! 👍 isAssignableFrom()을 사용하면 UsernamePasswordAuthenticationToken을 확장한 커스텀 인증 토큰도 지원할 수 있기 때문에, 확장성을 고려할 때 더 유연한 방식이 될 수 있습니다. 😄
@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}	Java	단순하게 생각했을때 레포지토리에서 저장하는게 깔끔하지 않을까 고민이 되었었는데 코멘트 남겨주신 내용을 보니 새로운 레포지토리 구현체에서는 SecurityContextHolder를 계속 챙겨줘야되는 부담이 생길꺼 같아요! 필터쪽에 이관을 해야할꺼 같아요
@@ -0,0 +1,11 @@ +package baseball.util; + +import java.util.Random; + +public class RamdomNumberGenerator { + private static final Random RANDOM = new Random(); + + public static Integer generate() { + return RANDOM.nextInt(9) + 1; + } +}	Java	무작위의 숫자를 생성하는 클래스를 따로 빼서 테스트를 용이하게 할 수 있게 한 게 좋네요!
@@ -0,0 +1,101 @@ +package baseball.domain; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class NumericBalls implements Iterable { + private List<NumericBall> numericBalls; + + public NumericBalls() { + numericBalls = new ArrayList<>(); + } + + public NumericBalls(List<Integer> numbers) { + validate(numbers); + List<NumericBall> newBalls = new ArrayList<>(); + for (Integer number : numbers) { + newBalls.add(new NumericBall(number)); + } + this.numericBalls = newBalls; + } + + private void validate(List<Integer> numbers) { + if (numbers.size() != 3) { + throw new IllegalArgumentException(); + } + } + + public List<Integer> match(NumericBalls otherBalls) { + List<Integer> matchPoints = new ArrayList<>(); + int matchedCnt = matchBall(otherBalls); + int strikeCnt = strikeCheck(otherBalls); + matchPoints.add(strikeCnt); + matchPoints.add(matchedCnt - strikeCnt); + return matchPoints; + } + + private Integer matchBall(NumericBalls otherBalls) { + Map<Integer, Integer> map = new HashMap<>(); + for (NumericBall num : numericBalls) { + map.put(num.numericBall(), 0); + } + + int ballCnt = 0; + + Iterator otherIterator = otherBalls.iterator(); + while(otherIterator.hasNext()) { + NumericBall otherBall = otherIterator.next(); + if (map.containsKey(otherBall.numericBall())) { + map.put(otherBall.numericBall(), map.get(otherBall.numericBall()) + 1); + } + } + for (Integer value : map.values()) { + ballCnt += value; + } + return ballCnt; + } + + private Integer strikeCheck(NumericBalls otherBalls) { + int strikeCnt = 0; + for (int i = 0; i < numericBalls.size(); i++) { + if (numericBalls.get(i).equals(otherBalls.numericBall(i))) { + strikeCnt++; + } + } + return strikeCnt; + } + + public NumericBall numericBall(int index) { + return numericBalls.get(index); + } + + public int size() { + return numericBalls.size(); + } + + @Override + public Iterator iterator() { + return new NumericBallsIterator(this); + } + + private static class NumericBallsIterator implements Iterator { + private int index = 0; + private NumericBalls numericBalls; + + public NumericBallsIterator(NumericBalls numericBalls) { + this.numericBalls = numericBalls; + } + + @Override + public boolean hasNext() { + return (this.index < this.numericBalls.size()); + } + + @Override + public NumericBall next() { + return numericBalls.numericBall(this.index++); + } + } +}	Java	리스트에 넣고 맵에 다시 넣는 것보다 처음부터 필드를 맵으로 선언하고 맵의 숫자와 인덱스를 비교하면 효율이 더 좋을 것 같아요.
@@ -0,0 +1,23 @@ +package baseball.view; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class InputView { + private static final Scanner SCANNER = new Scanner(System.in); + public static List<Integer> inputNumbers() { + System.out.println("숫자를 입력해 주세요 : "); + List<Integer> nums = new ArrayList<>(); + nums.addAll(parse(List.of(SCANNER.next().split("")))); + return nums; + } + + private static List<Integer> parse(List<String> strArr) { + List<Integer> nums = new ArrayList<>(); + for (String str : strArr) { + nums.add(Integer.parseInt(str)); + } + return nums; + } +}	Java	객체를 상수로 선언하면 코드가 훨씬 간편해지지만, final임에도 값이 바뀔 수 있어 관련이슈가 있을 수도 있습니다. 유의하고 사용해주세요:)
@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}	Java	메시지 관리에 대해서 static이 좋은지 enum이 좋은지 이야기 나눠보면 좋을 것 같습니다. 항상 어떤게 나은지 고민해서 매번 쓸때마다 한번은 이렇게 한번은 저렇게 했었거든요.
@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}	Java	저는 System.out.print~사용하는 부분은 전부 출력으로 사용자에게 보여지는 부분이라고 생각해서 모두 OutputView에 작성하고 있습니다. 사실 첨에 저도 InputView에 써도 될지 고민했는데 이 부분에 대해서는 어떻게 생각하시는지 궁금합니다.
@@ -0,0 +1,38 @@ +package racingcar.view; + +import java.util.stream.Collectors; +import racingcar.domain.RacingCar; +import racingcar.domain.RacingCars; +import racingcar.domain.Winner; + +public class OutputView { + private static final String RACE_RESULT_MESSAGE = "\n실행 결과"; + private static final String DISTANCE_UNIT = "-"; + private static final String RACE_RESULT_FORMAT = "%s : %s%n"; + private static final String WINNER = "최종 우승자 : "; + private static final String DELIMITER = ", "; + + public static void printRaceResultNotice() { + System.out.println(RACE_RESULT_MESSAGE); + } + + public static void printRaceResult(RacingCars racingCars) { + racingCars.getRacingCars() + .forEach(racingCar -> System.out.printf(RACE_RESULT_FORMAT + , racingCar.getCarName(), changeDistanceForm(racingCar.getDistance()))); + System.out.println(); + } + + private static String changeDistanceForm(int distance) { + return DISTANCE_UNIT.repeat(distance); + } + + public static void printWinner(Winner winner) { + System.out.print(WINNER); + String winners = winner.getWinner() + .stream() + .map(RacingCar::getCarName) + .collect(Collectors.joining(DELIMITER)); + System.out.println(winners); + } +}	Java	Winner클래스의 getWinner()에서 아래 연산이 끝난 결과를 리턴하면 getter를 사용하지 않고도 결과를 받아올 수 있다고 생각하는데 어떻게 생각하시나요?
@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class CarNameTest { + @ParameterizedTest + @DisplayName("차량이름은 1-5글자이고 특수문자를 포함하지 않는다.") + @ValueSource(strings = {"abcdef", "", "$", "&", " ", "!", "(", "$", "%"}) + void createCarName(String input) { + assertThatThrownBy(() -> new CarName(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file	Java	assertThatCode를 이용해서 예외가 발생하지 않고 올바르게 되는지 한번 테스트 해보는 것도 추천 드립니다.
@@ -0,0 +1,22 @@ +package racingcar.domain; + +public enum ErrorMessage { + ERROR("[ERROR] "), + INVALID_NAME_LENGTH(ERROR + "차량 이름은 1-5글자 사이여야 합니다."), + INVALID_NAME_TYPE(ERROR + "차량 이름은 특수문자를 포함할 수 없습니다."), + DUPLICATED_NAME(ERROR + "차량 이름은 중복될 수 없습니다."), + INVALID_RACING_CARS_SIZE(ERROR + "경주에는 최소 2대의 차량이 참여해야합니다."), + INVALID_TURN_RANGE(ERROR + "시도횟수는 최소 1회 이상이어야 합니다."), + INVALID_TURN_TYPE(ERROR + "숫자 이외의 값은 입력할 수 없습니다."), + CANT_FIND_CAR(ERROR + "차량을 찾을 수 없습니다."); + + private final String message; + + ErrorMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +}	Java	ERROR은 변함 없을 것 같은데 상수로 두고 생성자 부분에서 this.message = "ERROR" + message로 한다면 메시지 작성할 때 중복을 피하는데 도움 될 것 같습니다.
@@ -0,0 +1,63 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.CANT_FIND_CAR; +import static racingcar.domain.ErrorMessage.DUPLICATED_NAME; +import static racingcar.domain.ErrorMessage.INVALID_RACING_CARS_SIZE; + +import java.util.List; +import java.util.stream.Collectors; + +public class RacingCars { + private static final int MIN_SIZE = 2; + private final List<RacingCar> racingCars; + private RacingCar maxDistanceCar; + + public RacingCars(List<RacingCar> racingCars) { + validateSize(racingCars); + validateDuplicated(racingCars); + this.racingCars = racingCars; + } + + private void validateSize(List<RacingCar> racingCars) { + if (racingCars.size() < MIN_SIZE) { + throw new IllegalArgumentException(INVALID_RACING_CARS_SIZE.getMessage()); + } + } + + private void validateDuplicated(List<RacingCar> racingCars) { + if (isDuplicated(racingCars)) { + throw new IllegalArgumentException(DUPLICATED_NAME.getMessage()); + } + } + + private boolean isDuplicated(List<RacingCar> racingCars) { + int sizeAfterCut = (int) racingCars.stream() + .distinct() + .count(); + return racingCars.size() != sizeAfterCut; + } + + public void startRace() { + racingCars + .forEach(racingCar -> + racingCar.moveForward(RandomNumberGenerator.generateRandomNumber())); + } + + public Winner selectWinner() { + findMaxDistanceCar(); + List<RacingCar> winner = racingCars.stream() + .filter(maxDistanceCar::isWinner) + .collect(Collectors.toList()); + return new Winner(winner); + } + + private void findMaxDistanceCar() { + maxDistanceCar = racingCars.stream() + .max(RacingCar::compareTo) + .orElseThrow(() -> new IllegalArgumentException(CANT_FIND_CAR.getMessage())); + } + + public List<RacingCar> getRacingCars() { + return racingCars; + } +}	Java	return에 바로 작성하면 가독성이 조금 떨어져 보일까요? 이 메소드 처럼 한번만 사용하는 변수라면 변수로 지정하지 않고 바로 작성해도 될 것 같은데... 이러면 가독성이 떨어져 보이기도 할 것 같아 고민이 되서 여쭤봅니다.
@@ -0,0 +1,51 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.INVALID_NAME_LENGTH; +import static racingcar.domain.ErrorMessage.INVALID_NAME_TYPE; + +import java.util.Objects; +import java.util.regex.Pattern; + +public class CarName { + private static final int MAX_LENGTH = 5; + private static final String REGEX = "[0-9\|a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣]*"; + private final String carName; + + public CarName(String carName) { + validateLength(carName); + validateType(carName); + this.carName = carName; + } + + private void validateLength(String carName) { + if (carName.isEmpty() \|\| carName.length() > MAX_LENGTH) { + throw new IllegalArgumentException(INVALID_NAME_LENGTH.getMessage()); + } + } + + private void validateType(String carName) { + if (!Pattern.matches(REGEX, carName)) { + throw new IllegalArgumentException(INVALID_NAME_TYPE.getMessage()); + } + } + + public String getCarName() { + return carName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof CarName carName1)) { + return false; + } + return Objects.equals(carName, carName1.carName); + } + + @Override + public int hashCode() { + return Objects.hash(carName); + } +}	Java	정규표현식에 문자지정한 후 {1,5}을 사용하면 글자 수 제한 하는데도 도움이 될 거에요.
@@ -0,0 +1,35 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class RacingCarsTest { + @ParameterizedTest + @DisplayName("경주에는 최소 2대 이상의 차량이 참여해야 하며 중복될 수 없다.") + @ValueSource(strings = {"상추", "상추,상추"}) + void createRacingCars(String input) { + List<RacingCar> racingCars = InputConvertor.convertToRacingCars(input); + assertThatThrownBy(() -> new RacingCars(racingCars)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + @DisplayName("우승자는 상추와 배추다.") + void selectWinner() { + RacingCar sangchu = new RacingCar(new CarName("상추")); + RacingCar baechu = new RacingCar(new CarName("배추")); + RacingCar moodosa = new RacingCar(new CarName("무도사")); + RacingCars racingCars = new RacingCars(List.of(sangchu, baechu, moodosa)); + sangchu.moveForward(5); + baechu.moveForward(6); + Winner winner = racingCars.selectWinner(); + assertThat(winner.getWinner().get(0).getCarName()).isEqualTo("상추"); + assertThat(winner.getWinner().get(1).getCarName()).isEqualTo("배추"); + } +} \ No newline at end of file	Java	2대 이상인 경우 / 이름 중복되면 안되는 경우에 대해 메소드를 나눠서 테스트 해도 좋을거같슴다
@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class TurnTest { + @ParameterizedTest + @DisplayName("1회 미만, 숫자 이외 값 입력시 예외 발생") + @ValueSource(strings = {"0", "-1", "d", "#", "", " "}) + void createTurn(String input) { + assertThatThrownBy(() -> new Turn(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file	Java	저는 validate 로직에 대해서 1. 숫자만 입력 받아야하는 변수에 문자 입력되는 경우 -> input에서 검증 2. 1회 미만으로 입력받는 메소드 관련 검증 -> turn메소드에서 검증 하는 방식으로 항상 작성해 왔는데 이부분에 대해서 어떻게 생각하는지 궁금합니다 !
@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}	Java	저는 이번에 프리코스를 진행하면서 나름의 기준을 세워봤습니다! 1. enum으로 사용할만큼 상수의 개수가 충분한지? 최소 3개 이상 2. 프로그램이 확장된다면 해당 enum 에 상수가 추가될 가능성이 있는지? 3. 다른 클래스에서도 사용될 가능성이 있는지?
@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}	Java	저도 처음에 1주차 미션을 진행할 때는 사용자에게 보이는 부분이라고 생각하여 OutputView에 작성했었는데 많은 분들 코드를 보다보니 입력을 요청하는 메시지는 InputView에서 처리하시더라구요. 그리고 결정적으로 우테코에서 제공한 요구사항 부분을 보시면 입력을 요구하는 메시지를 InputView에서 사용하는걸 보실 수 있습니다. <img width="914" alt="image" src="https://github.com/parksangchu/java-racingcar-6/assets/142131857/87aa54ff-07c6-4c03-87fe-331d6aba9664">
@@ -0,0 +1,22 @@ +package racingcar.domain; + +public enum ErrorMessage { + ERROR("[ERROR] "), + INVALID_NAME_LENGTH(ERROR + "차량 이름은 1-5글자 사이여야 합니다."), + INVALID_NAME_TYPE(ERROR + "차량 이름은 특수문자를 포함할 수 없습니다."), + DUPLICATED_NAME(ERROR + "차량 이름은 중복될 수 없습니다."), + INVALID_RACING_CARS_SIZE(ERROR + "경주에는 최소 2대의 차량이 참여해야합니다."), + INVALID_TURN_RANGE(ERROR + "시도횟수는 최소 1회 이상이어야 합니다."), + INVALID_TURN_TYPE(ERROR + "숫자 이외의 값은 입력할 수 없습니다."), + CANT_FIND_CAR(ERROR + "차량을 찾을 수 없습니다."); + + private final String message; + + ErrorMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +}	Java	enum 생성자에 대한 이해가 부족했던것 같습니다 ! 좋은 조언 감사합니다 ㅎㅎ
@@ -0,0 +1,63 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.CANT_FIND_CAR; +import static racingcar.domain.ErrorMessage.DUPLICATED_NAME; +import static racingcar.domain.ErrorMessage.INVALID_RACING_CARS_SIZE; + +import java.util.List; +import java.util.stream.Collectors; + +public class RacingCars { + private static final int MIN_SIZE = 2; + private final List<RacingCar> racingCars; + private RacingCar maxDistanceCar; + + public RacingCars(List<RacingCar> racingCars) { + validateSize(racingCars); + validateDuplicated(racingCars); + this.racingCars = racingCars; + } + + private void validateSize(List<RacingCar> racingCars) { + if (racingCars.size() < MIN_SIZE) { + throw new IllegalArgumentException(INVALID_RACING_CARS_SIZE.getMessage()); + } + } + + private void validateDuplicated(List<RacingCar> racingCars) { + if (isDuplicated(racingCars)) { + throw new IllegalArgumentException(DUPLICATED_NAME.getMessage()); + } + } + + private boolean isDuplicated(List<RacingCar> racingCars) { + int sizeAfterCut = (int) racingCars.stream() + .distinct() + .count(); + return racingCars.size() != sizeAfterCut; + } + + public void startRace() { + racingCars + .forEach(racingCar -> + racingCar.moveForward(RandomNumberGenerator.generateRandomNumber())); + } + + public Winner selectWinner() { + findMaxDistanceCar(); + List<RacingCar> winner = racingCars.stream() + .filter(maxDistanceCar::isWinner) + .collect(Collectors.toList()); + return new Winner(winner); + } + + private void findMaxDistanceCar() { + maxDistanceCar = racingCars.stream() + .max(RacingCar::compareTo) + .orElseThrow(() -> new IllegalArgumentException(CANT_FIND_CAR.getMessage())); + } + + public List<RacingCar> getRacingCars() { + return racingCars; + } +}	Java	제가 3주차 미션을 할때 겪었던 에로사항이 메서드내 모든 코드를 축약을 시키다보니 나중에 제가 그 코드를 보았을때 무슨 코드인지 한눈에 알기가 힘들더군요 ㅜㅜ 그래서 4주차때부터는 어느정도 절제해서 축약을 해보니 가독성이 훨씬 높아졌었던 경험이 있어서 이번에도 이런 방식으로 진행을 해봤습니다!
@@ -0,0 +1,38 @@ +package racingcar.view; + +import java.util.stream.Collectors; +import racingcar.domain.RacingCar; +import racingcar.domain.RacingCars; +import racingcar.domain.Winner; + +public class OutputView { + private static final String RACE_RESULT_MESSAGE = "\n실행 결과"; + private static final String DISTANCE_UNIT = "-"; + private static final String RACE_RESULT_FORMAT = "%s : %s%n"; + private static final String WINNER = "최종 우승자 : "; + private static final String DELIMITER = ", "; + + public static void printRaceResultNotice() { + System.out.println(RACE_RESULT_MESSAGE); + } + + public static void printRaceResult(RacingCars racingCars) { + racingCars.getRacingCars() + .forEach(racingCar -> System.out.printf(RACE_RESULT_FORMAT + , racingCar.getCarName(), changeDistanceForm(racingCar.getDistance()))); + System.out.println(); + } + + private static String changeDistanceForm(int distance) { + return DISTANCE_UNIT.repeat(distance); + } + + public static void printWinner(Winner winner) { + System.out.print(WINNER); + String winners = winner.getWinner() + .stream() + .map(RacingCar::getCarName) + .collect(Collectors.joining(DELIMITER)); + System.out.println(winners); + } +}	Java	받아온 데이터를 어떤식으로 처리할지 결정하는 것은 OutputView의 책임이라고 생각해서 해당 방식으로 진행했습니다~ 3주차 공통 피드백에서도 view에서 사용하는 데이터는 getter를 사용하라고 언급이 되어있구요! <img width="619" alt="image" src="https://github.com/parksangchu/java-racingcar-6/assets/142131857/99c1b2c6-7c6d-49ee-8154-e9d7c306bd0b">
@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class CarNameTest { + @ParameterizedTest + @DisplayName("차량이름은 1-5글자이고 특수문자를 포함하지 않는다.") + @ValueSource(strings = {"abcdef", "", "$", "&", " ", "!", "(", "$", "%"}) + void createCarName(String input) { + assertThatThrownBy(() -> new CarName(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file	Java	처음 보는 메서드였는데 한번 사용해보겠습니다! 감사합니다 ㅎㅎ
@@ -0,0 +1,35 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class RacingCarsTest { + @ParameterizedTest + @DisplayName("경주에는 최소 2대 이상의 차량이 참여해야 하며 중복될 수 없다.") + @ValueSource(strings = {"상추", "상추,상추"}) + void createRacingCars(String input) { + List<RacingCar> racingCars = InputConvertor.convertToRacingCars(input); + assertThatThrownBy(() -> new RacingCars(racingCars)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + @DisplayName("우승자는 상추와 배추다.") + void selectWinner() { + RacingCar sangchu = new RacingCar(new CarName("상추")); + RacingCar baechu = new RacingCar(new CarName("배추")); + RacingCar moodosa = new RacingCar(new CarName("무도사")); + RacingCars racingCars = new RacingCars(List.of(sangchu, baechu, moodosa)); + sangchu.moveForward(5); + baechu.moveForward(6); + Winner winner = racingCars.selectWinner(); + assertThat(winner.getWinner().get(0).getCarName()).isEqualTo("상추"); + assertThat(winner.getWinner().get(1).getCarName()).isEqualTo("배추"); + } +} \ No newline at end of file	Java	코드를 줄이려고 너무 욕심을 내다보니 그만 ... ㅜ 아무래도 따로 테스트하는게 가독성 측면에서도 좋을거 같습니다
@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class TurnTest { + @ParameterizedTest + @DisplayName("1회 미만, 숫자 이외 값 입력시 예외 발생") + @ValueSource(strings = {"0", "-1", "d", "#", "", " "}) + void createTurn(String input) { + assertThatThrownBy(() -> new Turn(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file	Java	저도 원래는 그런 방식으로 검증을 진행해오다가 이번에 'InputView에서 domain에서 쓰일 데이터 형태를 아는게 맞을까?'하는 의문이 들어 해당 방식으로 진행을 해봤습니다. 그리고 'RacingCar'와 같은 해당 프로그램의 도메인에서 쓰이는 객체를 생성해서 넘기는 것만 아니라면 int와 같은 기본값 형태는 inputView에서 검증해도 괜찮겠다라는 결론을 냈습니다.
@@ -1,7 +1,14 @@ package christmas; +import christmas.controller.ChristmasController; +import christmas.exception.ExceptionHandler; +import christmas.exception.RetryExceptionHandler; + public class Application { public static void main(String[] args) { - // TODO: 프로그램 구현 + ExceptionHandler handler = new RetryExceptionHandler(); + + ChristmasController controller = new ChristmasController(handler); + controller.service(); } }	Java	메서드는 동사로 하는 것이 좋다고 생각하는데, service() 는 정비하다 라는 의미라고 해요! 물론, 서비스 하다~ 라는 느낌인 건 이해하지만 execute()나 operate() 와 같은 동작을 강조하는 동사를 사용하는 건 어떨까 하는 개인적 의견입니다!
@@ -0,0 +1,25 @@ +package christmas.constant; + +public enum Badge { + NONE("없음", 0), + STAR("별", 5_000), + TREE("트리", 10_000), + SANTA("산타", 20_000); + + + private final String badgeName; + private final long prize; + + Badge(String badgeName, long prize){ + this.badgeName = badgeName; + this.prize = prize; + } + + public String getBadgeName(){ + return badgeName; + } + + public long getPrize(){ + return prize; + } +}	Java	이 부분 참 고민 많이 헀는데요, 저도 "없음" 배지를 만든 뒤 고민해보니 도메인 쪽에서 출력 로직을 알아야하는 것 같아서 없음 배지를 삭제하고, Dto에 비어있는 badgeName 값을 넣는 식으로 구현한 후 OutputView에서 전달받은 이벤트 배지 값이 비어있는 String이면 없애는 식으로 처리했습니다. 수진님은 어떻게 생각하시나요?
@@ -0,0 +1,41 @@ +package christmas.constant; + +public enum Menu { + YANGSONGSOUP("양송이수프", 6000, MenuType.APPETIZER), + TAPAS("타파스", 5500, MenuType.APPETIZER), + CAESAR_SALAD("시저샐러드", 8000, MenuType.APPETIZER), + + T_BONE_STEAK("티본스테이크", 55000, MenuType.MAIN), + BBQ_RIB("바비큐립", 54000, MenuType.MAIN), + SEAFOOD_PASTA("해산물파스타", 35000, MenuType.MAIN), + CHRISTMAS_PASTA("크리스마스파스타", 25000, MenuType.MAIN), + + CHOCO_CAKE("초코케이크", 15000, MenuType.DESSERT), + ICE_CREAM("아이스크림", 5000, MenuType.DESSERT), + + ZERO_COLA("제로콜라", 3000, MenuType.BEVERAGE), + RED_WINE("레드와인", 60000, MenuType.BEVERAGE), + CHAMPAGNE("샴페인", 25000, MenuType.BEVERAGE); + + private final String name; + private final int price; + private final MenuType menuType; + + Menu(String name, int price, MenuType menuType) { + this.name = name; + this.price = price; + this.menuType = menuType; + } + + public String getName() { + return name; + } + + public int getPrice() { + return price; + } + + public MenuType getMenuType() { + return menuType; + } +}	Java	MenuType을 static import 하면 좀 더 짧게 코드를 작성할 수 있을거 같아요!
@@ -0,0 +1,74 @@ +package christmas.controller; + +import christmas.constant.Menu; +import christmas.domain.BenefitStorage; +import christmas.dto.BenefitResult; +import christmas.domain.Customer; +import christmas.domain.EventPlanner; +import christmas.dto.OrderMenu; +import christmas.exception.ExceptionHandler; +import christmas.view.InputView; +import christmas.view.OutputView; +import java.util.Map; + +public class ChristmasController { + + private final ExceptionHandler handler; + private Customer customer; + private EventPlanner eventPlanner; + + + public ChristmasController(ExceptionHandler handler){ + this.handler = handler; + } + + public void service(){ + order(); + searchPromotion(customer); + } + + public void order(){ + int date = getDate(); + Map<Menu, Integer> menu = getMenu(); + customer = new Customer(date, menu); + + displayOrder(date, menu); + } + + private int getDate(){ + return handler.getResult(InputView::readVisitDate); + } + + private Map<Menu, Integer> getMenu(){ + return handler.getResult(InputView::readMenu); + } + + private void searchPromotion(Customer customer){ + eventPlanner = new EventPlanner(); + eventPlanner.findPromotion(customer); + + BenefitStorage benefitStorage = storeBenefits(); + previewEventBenefits(benefitStorage); + } + + private BenefitStorage storeBenefits(){ + if(eventPlanner.hasGiftMenu()){ + return new BenefitStorage(customer.getTotalOrderAmount(), true, eventPlanner.getPromotionResult()); + } + return new BenefitStorage(customer.getTotalOrderAmount(), false, eventPlanner.getPromotionResult()); + } + + private void displayOrder(int date, Map<Menu, Integer> menu){ + OrderMenu orderMenu = new OrderMenu(date, menu); + OutputView.printOrder(orderMenu); + } + + + private void previewEventBenefits(BenefitStorage benefitStorage){ + BenefitResult benefitResult = new BenefitResult(benefitStorage.getBeforeDiscountAmount(), + benefitStorage.isGiftMenu(), benefitStorage.getPromotionResult(), benefitStorage.totalBenefitAmount(), + benefitStorage.afterDiscountAmount(), benefitStorage.determineBadge()); + OutputView.printPreview(benefitResult); + } + +}	Java	사소하지만 네이밍을 `OrderedMenu` 로 하면 어떨까요?
@@ -0,0 +1,74 @@ +package christmas.controller; + +import christmas.constant.Menu; +import christmas.domain.BenefitStorage; +import christmas.dto.BenefitResult; +import christmas.domain.Customer; +import christmas.domain.EventPlanner; +import christmas.dto.OrderMenu; +import christmas.exception.ExceptionHandler; +import christmas.view.InputView; +import christmas.view.OutputView; +import java.util.Map; + +public class ChristmasController { + + private final ExceptionHandler handler; + private Customer customer; + private EventPlanner eventPlanner; + + + public ChristmasController(ExceptionHandler handler){ + this.handler = handler; + } + + public void service(){ + order(); + searchPromotion(customer); + } + + public void order(){ + int date = getDate(); + Map<Menu, Integer> menu = getMenu(); + customer = new Customer(date, menu); + + displayOrder(date, menu); + } + + private int getDate(){ + return handler.getResult(InputView::readVisitDate); + } + + private Map<Menu, Integer> getMenu(){ + return handler.getResult(InputView::readMenu); + } + + private void searchPromotion(Customer customer){ + eventPlanner = new EventPlanner(); + eventPlanner.findPromotion(customer); + + BenefitStorage benefitStorage = storeBenefits(); + previewEventBenefits(benefitStorage); + } + + private BenefitStorage storeBenefits(){ + if(eventPlanner.hasGiftMenu()){ + return new BenefitStorage(customer.getTotalOrderAmount(), true, eventPlanner.getPromotionResult()); + } + return new BenefitStorage(customer.getTotalOrderAmount(), false, eventPlanner.getPromotionResult()); + } + + private void displayOrder(int date, Map<Menu, Integer> menu){ + OrderMenu orderMenu = new OrderMenu(date, menu); + OutputView.printOrder(orderMenu); + } + + + private void previewEventBenefits(BenefitStorage benefitStorage){ + BenefitResult benefitResult = new BenefitResult(benefitStorage.getBeforeDiscountAmount(), + benefitStorage.isGiftMenu(), benefitStorage.getPromotionResult(), benefitStorage.totalBenefitAmount(), + benefitStorage.afterDiscountAmount(), benefitStorage.determineBadge()); + OutputView.printPreview(benefitResult); + } + +}	Java	`customer = new Customer(getDate(), getMenu());` 로 한번에 해도 좋을 거 같아요. `getDate()` 나 `getMenu()` 둘 다 메서드 이름으로 뭐를 하는지 정확히 알 수 있어보입니다.
@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}	Java	Map 타입으로 인스턴스 변수를 가지면 추후 세부 구현 자료구조가 바뀔 때 능동적으로 대처할 수 있을거 같아요!
@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}	Java	어찌보면 Dto에 가까운 성격을 가지는 클래스인데 도메인 로직을 다 넣어둔 느낌을 받았습니다. 결국 출력때 필요한 자료들을 다 가지고 있어서 도메인을 다른 방식으로 분리해보는 것을 고려해보면 어떨까요?
@@ -0,0 +1,71 @@ +package christmas.domain; + +import christmas.constant.MenuType; +import christmas.constant.PromotionType; +import christmas.domain.promotion.ChristmasPromotion; +import christmas.domain.promotion.DdayPromotion; +import christmas.domain.promotion.GiftPromotion; +import christmas.domain.promotion.SpecialPromotion; +import christmas.domain.promotion.WeekDayPromotion; +import christmas.domain.promotion.WeekendPromotion; +import java.util.HashMap; +import java.util.Map; + +public class EventPlanner { + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public EventPlanner(){ + promotionResult = new HashMap<>(); + promotionResult.put(new DdayPromotion(), 0L); + promotionResult.put(new GiftPromotion(), 0L); + promotionResult.put(new SpecialPromotion(), 0L); + promotionResult.put(new WeekDayPromotion(), 0L); + promotionResult.put(new WeekendPromotion(), 0L); + } + + public void findPromotion(Customer customer){ + for(ChristmasPromotion promotion : promotionResult.keySet()){ + checkPromotionConditions(promotion, customer); + } + } + + public boolean hasGiftMenu(){ + return promotionResult.entrySet() + .stream() + .filter(entry -> entry.getKey() instanceof GiftPromotion) + .mapToLong(Map.Entry::getValue) + .sum() > 0; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult(){ + return promotionResult; + } + + private void checkPromotionConditions(ChristmasPromotion promotion, Customer customer){ + long discount = customer.applicablePromotion(promotion); + + if (isContainWeekOrWeekend(promotion)) { + discount *= checkMenuCount(customer, promotion.getPromotionType()); + } + promotionResult.put(promotion, promotionResult.get(promotion) + discount); + } + + private int checkMenuCount(Customer customer, PromotionType promotionType) { + Map<PromotionType, MenuType> promotionTypeMenuTypeMap = Map.of( + PromotionType.WEEKDAY, MenuType.DESSERT, + PromotionType.WEEKEND, MenuType.MAIN + ); + + MenuType menuType = promotionTypeMenuTypeMap.getOrDefault(promotionType, MenuType.NONE); + return customer.countMenuType(menuType); + } + + private boolean isContainWeekOrWeekend(ChristmasPromotion promotion){ + if(promotion.getPromotionType() == PromotionType.WEEKDAY + \|\| promotion.getPromotionType() == PromotionType.WEEKEND) + return true; + + return false; + } + +}	Java	변수 명에 Map 을 사용하는 것보다는 `PromotionsAppliedToEachMenu` 와 같이 사용하는 것은 어떨까요?
@@ -0,0 +1,43 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class DdayPromotion extends ChristmasPromotion{ + + private static final int START_DATE = 1; + private static final int END_DATE = 25; + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + + public DdayPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.DDAY; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(data); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return date >= period.get(0) && date <= period.get(1); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + public long getDiscountAmount(int date) { + return discountAmount + 100L * (date - 1); + } +}	Java	매직넘버를 상수로 두는건 어떨까요?
@@ -0,0 +1,39 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class GiftPromotion extends ChristmasPromotion{ + + private static final long PRICETHRESHOLD = 120000; + private static final int START_DATE = 1; + private static final int END_DATE = 31; + private static final int INIT_DISCOUNT_AMOUNT = 25000; + + public GiftPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.GIFT_CHAMPAGNE; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.GIFT; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return date >= period.get(0) && date <= period.get(1); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= PRICETHRESHOLD; + } + +}	Java	`PRICE_THRESHOLD` 와 같이 나눠주면 가독성이 더 좋아질 것 같습니다!
@@ -0,0 +1,38 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class SpecialPromotion extends ChristmasPromotion{ + + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + public SpecialPromotion(){ + this.period = Arrays.asList(3, 10, 17, 24, 25, 31); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.SPECIAL; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return period.contains(date); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + +}	Java	요것도 매직넘버! 혹은 1~31 값 중 7로 나누었을 때 나머지가 3인 날짜로 초기화해줘도 좋을 거 같아요
@@ -0,0 +1,38 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class SpecialPromotion extends ChristmasPromotion{ + + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + public SpecialPromotion(){ + this.period = Arrays.asList(3, 10, 17, 24, 25, 31); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.SPECIAL; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return period.contains(date); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + +}	Java	공백도 코딩컨벤션이라, 다른 클래스 파일과 맞춰주는게 어떨까요?
@@ -0,0 +1,47 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.time.LocalDate; +import java.time.DayOfWeek; +import java.util.Arrays; + +public class WeekDayPromotion extends ChristmasPromotion{ + + private static final int START_DATE = 1; + private static final int END_DATE = 31; + private static final int INIT_DISCOUNT_AMOUNT = 2023; + private static final int MIN_ORDER_AMOUNT = 10000; + + public WeekDayPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.DESSERT_MENU; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.WEEKDAY; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + LocalDate orderDate = LocalDate.of(2023, 12, date); + + return isWeekday(orderDate); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + private boolean isWeekday(LocalDate date) { + DayOfWeek dayOfWeek = date.getDayOfWeek(); + return dayOfWeek != DayOfWeek.FRIDAY && dayOfWeek != DayOfWeek.SATURDAY; + } +}	Java	내부 상수로 두는 것보다, 생성될 때 위의 상수 값으로 초기화 시키고 객체를 싱글톤으로 관리하는 것도 좋을 것 같아요
@@ -0,0 +1,7 @@ +package christmas.exception; + +import java.util.function.Supplier; + +public interface ExceptionHandler { + <T> T getResult(Supplier<T> supplier); +}	Java	`Supplier` 라는 문법은 처음보네요! 함수형 프로그래밍? 인가 보네요 ㅎㅎ 배워갑니다.
@@ -0,0 +1,28 @@ +package christmas.exception; + +import christmas.view.OutputView; +import java.util.function.Supplier; + +public class RetryExceptionHandler implements ExceptionHandler{ + + @Override + public <T> T getResult(Supplier<T> supplier) { + while (true) { + try { + return supplier.get(); + } catch (IllegalArgumentException e) { + printException(e); + } finally { + afterHandlingException(); + } + } + } + + private void printException(IllegalArgumentException e) { + OutputView.printErrorMessage(e); + } + + private void afterHandlingException() { + OutputView.printEmptyLine(); + } +}	Java	이렇게 하면 try-catch문의 중복 로직을 뺄 수 있겠군요.!
@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE \|\| input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}	Java	해당 메서드는 Map을 반환하기 보다는 void 형식으로 예외를 던질 것 같은 네이밍이라 느껴져요. 역할을 검증 및 반환 두개를 하는 것 같은데 각 역할에 맞는 메서드로 나눠보는 것은 어떻게 생각하시나요?
@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE \|\| input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}	Java	조건문의 조건을 하나의 메서드로 빼는 것도 좋을 것 같습니다.
@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE \|\| input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}	Java	null 을 직접 다루는 것보다, Menu 내에서 이름을 받아서 Menu의 유무를 처리하는 메서드를 만드는 것은 어떨까요?
@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE \|\| input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}	Java	이 부분에서 Exception을 던져주는 것도 좋을 것 같아요!
@@ -0,0 +1,44 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public class BenefitsView { + + public static String giftMenuOutputStatement(boolean giftMenu){ + if(giftMenu) + return OutputMessage.CHAMPAGNE.getMessage(); + + return OutputMessage.DOES_NOT_EXIST.getMessage(); + } + + public static String promotionResultOutputStatement(long totalBenefitAmount, HashMap<ChristmasPromotion, Long> promotionResult){ + if(totalBenefitAmount == 0) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + + return findPromotionDetail(promotionResult).toString(); + } + + public static String badgeOutputStatement(Badge badge){ + if(badge == Badge.NONE) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + return badge.getBadgeName(); + } + + private static StringBuilder findPromotionDetail(HashMap<ChristmasPromotion, Long> promotionResult){ + StringBuilder sb = new StringBuilder(); + for(ChristmasPromotion promotion: promotionResult.keySet()){ + long discount = promotionResult.get(promotion); + if(discount == 0) continue; + + sb.append(String.format(OutputMessage.BENEFIT_DETAILS.getMessage(), + promotion.getPromotionType().getMessage(), discount)); + } + + if(sb.isEmpty()) + return sb.append(OutputMessage.DOES_NOT_EXIST.getMessage()); + return sb; + } +}	Java	if 문 을 {} 로 감싸주는게 코딩 컨벤션으로 알고 있습니다!
@@ -0,0 +1,74 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import christmas.dto.BenefitResult; +import christmas.dto.OrderMenu; +import java.util.HashMap; +import java.util.Map; + +public class OutputView { + + public static void printErrorMessage(IllegalArgumentException e){ + System.out.println(e.getMessage()); + } + + public static void printEmptyLine(){ + System.out.println(); + } + + public static void printOrder(OrderMenu orderMenu){ + printDate(orderMenu.date()); + printEmptyLine(); + printOrderedMenu(orderMenu.menu()); + } + + public static void printPreview(BenefitResult benefits){ + printBeforeDiscountAmount(benefits.beforeDiscountAmount()); + printHasGift(benefits.giftMenu()); + printBenefitsDetail(benefits.beforeDiscountAmount(), benefits.promotionResult()); + printTotalBenefits(benefits.totalBenefitAmount()); + printAfterDiscountAmount(benefits.afterDiscountAmount()); + printBadge(benefits.badge()); + } + + private static void printOrderedMenu(Map<Menu, Integer> orderMenu){ + System.out.println(String.format(OutputMessage.ORDER_MENU_PREFIX.getMessage(), + OrderMenuView.orderMenuOutputStatement(orderMenu))); + } + + private static void printDate(int date){ + System.out.println(String.format(OutputMessage.RESERVATION_DATE.getMessage(), date)); + } + + private static void printBeforeDiscountAmount(long total){ + System.out.println(String.format(OutputMessage.BEFORE_DISCOUNT_AMOUNT.getMessage(), total)); + } + + private static void printHasGift(boolean hasGift){ + System.out.println(String.format(OutputMessage.GIVEAWAY_MENU.getMessage(), + BenefitsView.giftMenuOutputStatement(hasGift))); + + } + + private static void printBenefitsDetail(long price, HashMap<ChristmasPromotion, Long> result){ + System.out.println(String.format(OutputMessage.BENEFIT_DETAILS_PREFIX.getMessage(), + BenefitsView.promotionResultOutputStatement(price, result))); + } + + private static void printTotalBenefits(long price){ + System.out.println(String.format(OutputMessage.TOTAL_BENEFIT_AMOUNT.getMessage(), -price)); + } + + private static void printAfterDiscountAmount(long price){ + System.out.println(String.format(OutputMessage.AFTER_DISCOUNT_AMOUNT.getMessage(), price)); + } + + private static void printBadge(Badge badge){ + System.out.println(String.format(OutputMessage.PROMOTION_BADGE.getMessage(), + BenefitsView.badgeOutputStatement(badge))); + } + +}	Java	예외를 직접 받는 것보다 예외를 던지는 쪽에서 e.getMessage() 로 String 값을 던져주면 메서드가 좀 더 범용성이 있을 것 같습니다.
@@ -0,0 +1,27 @@ +package christmas.constant; + +public enum OutputMessage { + + RESERVATION_DATE("12월 %d일에 우테코 식당에서 받을 이벤트 혜택 미리 보기!"), + ORDER_MENU_PREFIX("<주문 메뉴>%n%s"), + ORDER_MENU("%s %d개\n"), + BEFORE_DISCOUNT_AMOUNT("<할인 전 총주문 금액>%n%,d원\n"), + GIVEAWAY_MENU("<증정 메뉴>%n%s"), + DOES_NOT_EXIST("없음\n"), + CHAMPAGNE("샴페인 1개\n"), + BENEFIT_DETAILS_PREFIX("<혜택 내역>%n%s"), + BENEFIT_DETAILS("%s: %,d원\n"), + TOTAL_BENEFIT_AMOUNT("<총혜택 금액>%n%,d원\n"), + AFTER_DISCOUNT_AMOUNT("<할인 후 예상 결제 금액>%n%,d원\n"), + PROMOTION_BADGE("<12월 이벤트 배지>%n%s\n"); + + private final String message; + + OutputMessage(String message) { + this.message = message; + } + + public String getMessage(){ + return this.message; + } +}	Java	개행문자를 System.lineseparator() 로 처리하는걸 추천드립니다! 운영체제 별로 개행문자 표현이 상이할 수 있거든요!
@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}	Java	이 부분을 Map으로 선언하면 다형성을 좀 더 활용하실 수 있을거에요!
@@ -0,0 +1,26 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.List; + +public abstract class ChristmasPromotion { + + protected List<Integer> period; + protected PromotionItem targetItems; + protected long discountAmount; + protected PromotionType promotionType; + + public long getDiscountAmount() { + return discountAmount; + } + + public PromotionType getPromotionType(){ + return promotionType; + } + + public abstract long applyPromotion(int data, long orderAmount); + protected abstract boolean isApplicable(int date); + protected abstract boolean isEligibleForPromotion(long orderAmount); + +}	Java	이 부분을 추상 클래스로 구현하신 이유를 알수있을까요?? 제가 추상 클래스에 대해 익숙하지 않아서요!
@@ -0,0 +1,17 @@ +package christmas.dto; + +import christmas.constant.Badge; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public record BenefitResult( + + long beforeDiscountAmount, + boolean giftMenu, + HashMap<ChristmasPromotion, Long> promotionResult, + long totalBenefitAmount, + long afterDiscountAmount, + Badge badge) +{ + +}	Java	레코드를 활용하셨네요. 이 부분은 메모해두었다가 저도 적용해보겠습니다! 좋은 코드 감사합니다!
@@ -0,0 +1,9 @@ +package christmas.util; + +public class Parser { + + public static int stringToInteger(String input) { + return Integer.parseInt(input); + } + +}	Java	사소한 컨버팅이라도 객체로 만들어서 활용하신게 좋네요!
@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE \|\| input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}	Java	준님이 말씀하신것 처럼 Menu의 유무를 처리하는 메서드를 구현하시거나, Optional 객체를 활용하시는걸 추천드립니다!
@@ -0,0 +1,44 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public class BenefitsView { + + public static String giftMenuOutputStatement(boolean giftMenu){ + if(giftMenu) + return OutputMessage.CHAMPAGNE.getMessage(); + + return OutputMessage.DOES_NOT_EXIST.getMessage(); + } + + public static String promotionResultOutputStatement(long totalBenefitAmount, HashMap<ChristmasPromotion, Long> promotionResult){ + if(totalBenefitAmount == 0) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + + return findPromotionDetail(promotionResult).toString(); + } + + public static String badgeOutputStatement(Badge badge){ + if(badge == Badge.NONE) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + return badge.getBadgeName(); + } + + private static StringBuilder findPromotionDetail(HashMap<ChristmasPromotion, Long> promotionResult){ + StringBuilder sb = new StringBuilder(); + for(ChristmasPromotion promotion: promotionResult.keySet()){ + long discount = promotionResult.get(promotion); + if(discount == 0) continue; + + sb.append(String.format(OutputMessage.BENEFIT_DETAILS.getMessage(), + promotion.getPromotionType().getMessage(), discount)); + } + + if(sb.isEmpty()) + return sb.append(OutputMessage.DOES_NOT_EXIST.getMessage()); + return sb; + } +}	Java	이 부분을 별도 메서드로 빼서 인덴트를 줄여보는게 어떨까요?? 인텔리제이에서 해당 부분을 드래그한 뒤 cmd+option+m 을 입력하시면 메서드로 추출할 수 있습니다!
@@ -0,0 +1,16 @@ +package christmas.view; + +import christmas.constant.Menu; +import christmas.constant.OutputMessage; +import java.util.Map; + +public class OrderMenuView { + + public static String orderMenuOutputStatement(Map<Menu, Integer> orderMenu){ + StringBuilder sb = new StringBuilder(); + for(Menu menu : orderMenu.keySet()){ + sb.append(String.format(OutputMessage.ORDER_MENU.getMessage(), menu.getName(), orderMenu.get(menu))); + } + return sb.toString(); + } +}	Java	저는 view를 위한 log데이터를 하나의 도메인에서 처리했는데 이렇게 별도의 객체를 생성해서 관리하면 역할과 책임이 명확해지겠네요! 한 수 배워갑니다!
@@ -0,0 +1,71 @@ +import { generateBasicToken } from '../utils/auth'; +import convertCartItem from '../utils/convertCartItem'; + +const API_URL = process.env.VITE_API_URL ?? 'undefined_URL'; +const USER_ID = process.env.VITE_API_USER_ID ?? 'undefined_USER_ID'; +const USER_PASSWORD = + process.env.VITE_API_USER_PASSWORD ?? 'undefined_USER_PASSWORD'; + +export const requestCartItemList = async () => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'GET', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + }); + + if (!response.ok) { + throw new Error('Failed to fetch products:'); + } + const data = await response.json(); + + return convertCartItem(data.content); +}; + +export const requestSetCartItemQuantity = async ( + cartItemId: number, + quantity: number, +) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'PATCH', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + quantity, + }), + }); + + if (!response.ok) { + throw new Error('Failed to setCartItemQuantity'); + } +}; + +export const requestDeleteCartItem = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'DELETE', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + id: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to deleteCartItem'); + } +}; + +// TEST를 위한 cartItem추가 API 실행 +export const requestAddCartItemForTest = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'POST', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + productId: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to addCartItem'); + } +};	TypeScript	요고는 각 api마다 선언해서 사용해주시는 걸로 확인됐는데, 상수로 분리해도 좋을 것 같아요! 🐫
@@ -0,0 +1,87 @@ +import * as S from './CartItem.style'; +import Text from '../common/Text/Text'; +import Button from '../common/Button/Button'; +import Divider from '../common/Divider/Divider'; +import Checkbox from '../common/Checkbox/Checkbox'; +import ImageBox from '../common/ImageBox/ImageBox'; +import useCartItemList from '../../hooks/cartItem/useCartItemList'; +import ChangeQuantity from '../common/ChangeQuantity/ChangeQuantity'; +import { useCartItemQuantity } from '../../hooks/cartItem/useCartItemQuantity'; +import { useSelectedCartItemId } from '../../hooks/cartItem/useSelectedCartItemId'; +import useApiErrorState from '../../hooks/error/useApiErrorState'; + +export type CartItemProps = { + type?: 'cart' \| 'confirm'; + cartItem: CartItem; +}; + +const CartItem = ({ type = 'cart', cartItem }: CartItemProps) => { + const { id, name, price, imageUrl } = cartItem; + const { apiError } = useApiErrorState(); + const { cartItemQuantity, increaseQuantity, decreaseQuantity } = + useCartItemQuantity(); + const { isSelectedId, selectCartItem, unselectCartItem } = + useSelectedCartItemId(); + const { deleteCartItem } = useCartItemList(); + + if ( + apiError?.name === 'FailedDeleteCartItemError' \|\| + apiError?.name === 'FailedSetCartItemQuantityError' + ) { + throw apiError; + } + + return ( + <S.CartItem> + <Divider /> + {type === 'cart' ? ( + <S.ItemHeader> + <Checkbox + state={isSelectedId(id)} + handleClick={ + isSelectedId(id) + ? () => unselectCartItem(id) + : () => selectCartItem(id) + } + /> + <Button size="s" radius="s" onClick={() => deleteCartItem(id)}> + 삭제 + </Button> + </S.ItemHeader> + ) : null} + <S.ItemBody> + <ImageBox + width={112} + height={112} + radius="m" + border="lightGray" + src={imageUrl} + alt="상품 이미지" + /> + <S.ItemDetail> + <S.ItemNameAndCost> + <Text size="s" weight="m"> + {name} + </Text> + <Text size="l" weight="l"> + {`${price.toLocaleString('ko-KR')}원`} + </Text> + </S.ItemNameAndCost> + {type === 'cart' ? ( + <ChangeQuantity + quantity={cartItemQuantity(id)} + increaseQuantity={() => increaseQuantity(id)} + decreaseQuantity={() => decreaseQuantity(id)} + /> + ) : ( + <Text size="s" weight="m"> + {`${cartItemQuantity(id)}개`} + </Text> + )} + </S.ItemDetail> + </S.ItemBody> + </S.CartItem> + ); +}; + +export default CartItem;	Unknown	type을 2개로 분리해서 구현하신 이유가 있을까요? 제가 느끼기에는 컴포넌트를 분리했어도 괜찮지 않나 싶은 생각도 들어서요!
@@ -1,10 +1,41 @@ -import "./App.css"; +import { Suspense } from 'react'; + +import styled from 'styled-components'; +import { ErrorBoundary } from 'react-error-boundary'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; + +import CartPage from './pages/CartPage'; +import ConfirmPurchasePage from './pages/ConfirmPurchasePage'; +import CompletePurchasePage from './pages/CompletePurchasePage'; +import ErrorFallback from './components/ErrorFallback/ErrorFallback'; +import LoadingFallback from './components/LoadingFallback/LoadingFallback'; + +const AppContainer = styled.div` + max-width: 768px; + width: 100%; +`; function App() { return ( - <> - <h1>react-shopping-cart</h1> - </> + <BrowserRouter> + <AppContainer> + <ErrorBoundary FallbackComponent={ErrorFallback}> + <Suspense fallback={<LoadingFallback />}> + <Routes> + <Route path="/" element={<CartPage />} /> + <Route + path="/confirm-purchase" + element={<ConfirmPurchasePage />} + /> + <Route + path="/complete-purchase" + element={<CompletePurchasePage />} + /> + </Routes> + </Suspense> + </ErrorBoundary> + </AppContainer> + </BrowserRouter> ); }	Unknown	사소하지만 RESTful하게 path를 작성해주셨네요 👏👏👏👏
@@ -1,10 +1,41 @@ -import "./App.css"; +import { Suspense } from 'react'; + +import styled from 'styled-components'; +import { ErrorBoundary } from 'react-error-boundary'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; + +import CartPage from './pages/CartPage'; +import ConfirmPurchasePage from './pages/ConfirmPurchasePage'; +import CompletePurchasePage from './pages/CompletePurchasePage'; +import ErrorFallback from './components/ErrorFallback/ErrorFallback'; +import LoadingFallback from './components/LoadingFallback/LoadingFallback'; + +const AppContainer = styled.div` + max-width: 768px; + width: 100%; +`; function App() { return ( - <> - <h1>react-shopping-cart</h1> - </> + <BrowserRouter> + <AppContainer> + <ErrorBoundary FallbackComponent={ErrorFallback}> + <Suspense fallback={<LoadingFallback />}> + <Routes> + <Route path="/" element={<CartPage />} /> + <Route + path="/confirm-purchase" + element={<ConfirmPurchasePage />} + /> + <Route + path="/complete-purchase" + element={<CompletePurchasePage />} + /> + </Routes> + </Suspense> + </ErrorBoundary> + </AppContainer> + </BrowserRouter> ); }	Unknown	사소하지만, 다음 미션부터는 [createBrowserRouter](https://reactrouter.com/en/main/routers/create-browser-router)를 사용해봐도 괜찮을 것 같아서 공유드려요! 관련해서 수야와도 리뷰를 한 적이 있어서 첨부합니다! https://github.com/cys4585/react-shopping-cart/pull/1/files/0636ab3b3126ca9b8873cb7fec59c13b05c81985#r1603187152
@@ -0,0 +1,71 @@ +import { generateBasicToken } from '../utils/auth'; +import convertCartItem from '../utils/convertCartItem'; + +const API_URL = process.env.VITE_API_URL ?? 'undefined_URL'; +const USER_ID = process.env.VITE_API_USER_ID ?? 'undefined_USER_ID'; +const USER_PASSWORD = + process.env.VITE_API_USER_PASSWORD ?? 'undefined_USER_PASSWORD'; + +export const requestCartItemList = async () => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'GET', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + }); + + if (!response.ok) { + throw new Error('Failed to fetch products:'); + } + const data = await response.json(); + + return convertCartItem(data.content); +}; + +export const requestSetCartItemQuantity = async ( + cartItemId: number, + quantity: number, +) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'PATCH', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + quantity, + }), + }); + + if (!response.ok) { + throw new Error('Failed to setCartItemQuantity'); + } +}; + +export const requestDeleteCartItem = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'DELETE', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + id: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to deleteCartItem'); + } +}; + +// TEST를 위한 cartItem추가 API 실행 +export const requestAddCartItemForTest = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'POST', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + productId: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to addCartItem'); + } +};	TypeScript	제가 지난 번에 남겼던 리뷰를 반영해주신것 같아서 기분이 조으네요..ㅎㅎ
@@ -0,0 +1,121 @@ +import { render, screen, fireEvent } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import CartItem, { CartItemProps } from './CartItem'; +import { RecoilRoot } from 'recoil'; +import { useCartItemQuantity } from '../../recoil/cartItem/useCartItemQuantity'; +import { useCartItemSelectedIdList } from '../../recoil/cartItem/useCartItemSelectedIdList'; +import useCartItemList from '../../recoil/cartItemList/useCartItemList'; + +// Mock Recoil hooks +jest.mock('../../recoil/cartItem/useCartItemQuantity'); +jest.mock('../../recoil/cartItem/useCartItemSelectedIdList'); +jest.mock('../../recoil/cartItemList/useCartItemList'); + +const mockedUseCartItemQuantity = useCartItemQuantity as jest.Mock; +const mockedUseCartItemSelectedIdList = useCartItemSelectedIdList as jest.Mock; +const mockedUseCartItemList = useCartItemList as jest.Mock; + +// Sample product data +const product = { + productId: 3, + name: '아디다스', + price: 2000, + imageUrl: 'https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg', + category: 'fashion', +}; + +const mockCartItemProps: CartItemProps = { + product, + quantity: 5, + cartItemId: 1, +}; + +describe('CartItem 컴포넌트', () => { + beforeEach(() => { + mockedUseCartItemQuantity.mockReturnValue({ + quantity: 5, + updateQuantity: jest.fn(), + increaseQuantity: jest.fn(), + decreaseQuantity: jest.fn(), + }); + + mockedUseCartItemSelectedIdList.mockReturnValue({ + getIsSelected: jest.fn().mockReturnValue(false), + addSelectedId: jest.fn(), + removeSelectedId: jest.fn(), + }); + + mockedUseCartItemList.mockReturnValue({ + deleteCartItem: jest.fn(), + }); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + test('컴포넌트가 올바르게 렌더링된다', () => { + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + expect(screen.getByText('아디다스')).toBeInTheDocument(); + expect(screen.getByText('2,000원')).toBeInTheDocument(); + expect(screen.getByText('5')).toBeInTheDocument(); + }); + + test('삭제 버튼을 클릭했을 때 deleteCartItem 함수가 호출된다', () => { + const { deleteCartItem } = mockedUseCartItemList(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + fireEvent.click(screen.getByText('삭제')); + expect(deleteCartItem).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + }); + + test('체크박스를 클릭했을 때 선택 상태가 변경된다', () => { + const { addSelectedId, removeSelectedId, getIsSelected } = mockedUseCartItemSelectedIdList(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + // Initially not selected + getIsSelected.mockReturnValue(false); + const checkbox = screen.getByAltText('Checkbox'); + fireEvent.click(checkbox); + expect(addSelectedId).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + + // Now selected + getIsSelected.mockReturnValue(true); + fireEvent.click(checkbox); + expect(removeSelectedId).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + }); + + test('수량 증가 및 감소 버튼이 제대로 작동한다', () => { + const { increaseQuantity, decreaseQuantity } = mockedUseCartItemQuantity(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + const increaseButton = screen.getByLabelText('plus'); + const decreaseButton = screen.getByLabelText('minus'); + + fireEvent.click(increaseButton); + expect(increaseQuantity).toHaveBeenCalledTimes(1); + + fireEvent.click(decreaseButton); + expect(decreaseQuantity).toHaveBeenCalledTimes(1); + }); +});	Unknown	ui테스트도 작성을 해주셨네요...!! 굿굿~~!
@@ -0,0 +1,87 @@ +import * as S from './CartItem.style'; +import Text from '../common/Text/Text'; +import Button from '../common/Button/Button'; +import Divider from '../common/Divider/Divider'; +import Checkbox from '../common/Checkbox/Checkbox'; +import ImageBox from '../common/ImageBox/ImageBox'; +import useCartItemList from '../../hooks/cartItem/useCartItemList'; +import ChangeQuantity from '../common/ChangeQuantity/ChangeQuantity'; +import { useCartItemQuantity } from '../../hooks/cartItem/useCartItemQuantity'; +import { useSelectedCartItemId } from '../../hooks/cartItem/useSelectedCartItemId'; +import useApiErrorState from '../../hooks/error/useApiErrorState'; + +export type CartItemProps = { + type?: 'cart' \| 'confirm'; + cartItem: CartItem; +}; + +const CartItem = ({ type = 'cart', cartItem }: CartItemProps) => { + const { id, name, price, imageUrl } = cartItem; + const { apiError } = useApiErrorState(); + const { cartItemQuantity, increaseQuantity, decreaseQuantity } = + useCartItemQuantity(); + const { isSelectedId, selectCartItem, unselectCartItem } = + useSelectedCartItemId(); + const { deleteCartItem } = useCartItemList(); + + if ( + apiError?.name === 'FailedDeleteCartItemError' \|\| + apiError?.name === 'FailedSetCartItemQuantityError' + ) { + throw apiError; + } + + return ( + <S.CartItem> + <Divider /> + {type === 'cart' ? ( + <S.ItemHeader> + <Checkbox + state={isSelectedId(id)} + handleClick={ + isSelectedId(id) + ? () => unselectCartItem(id) + : () => selectCartItem(id) + } + /> + <Button size="s" radius="s" onClick={() => deleteCartItem(id)}> + 삭제 + </Button> + </S.ItemHeader> + ) : null} + <S.ItemBody> + <ImageBox + width={112} + height={112} + radius="m" + border="lightGray" + src={imageUrl} + alt="상품 이미지" + /> + <S.ItemDetail> + <S.ItemNameAndCost> + <Text size="s" weight="m"> + {name} + </Text> + <Text size="l" weight="l"> + {`${price.toLocaleString('ko-KR')}원`} + </Text> + </S.ItemNameAndCost> + {type === 'cart' ? ( + <ChangeQuantity + quantity={cartItemQuantity(id)} + increaseQuantity={() => increaseQuantity(id)} + decreaseQuantity={() => decreaseQuantity(id)} + /> + ) : ( + <Text size="s" weight="m"> + {`${cartItemQuantity(id)}개`} + </Text> + )} + </S.ItemDetail> + </S.ItemBody> + </S.CartItem> + ); +}; + +export default CartItem;	Unknown	저도 비슷하게 생각하는데요. 체크, 삭제버튼, 숫자 버튼 등 지금은 경우의 수가 2**3개 밖에 없어서 타입으로 일일히 지정해줄 수 있지만, 요구사항이 늘어나면 타입으로는 버거울수도 있다는 생각이 들어요..!
@@ -0,0 +1,172 @@ +import type { Meta, StoryObj } from '@storybook/react'; +<<<<<<< HEAD +import CartItemList from './CartItemList'; +import { RecoilRoot } from 'recoil'; +import { cartItemListState } from '../../recoil/cartItem/atom'; + +const MOCK_DATA = [ + { + id: 586, + quantity: 4, + name: '나이키', + price: 1000, + imageUrl: + 'https://static.nike.com/a/images/c_limit,w_592,f_auto/t_product_v1/a28864e3-de02-48bb-b861-9c592bc9a68b/%EB%B6%81-1-ep-%EB%86%8D%EA%B5%AC%ED%99%94-UOp6QQvg.png', + }, + { + id: 587, + quantity: 3, + + name: '아디다스', + price: 2000, + imageUrl: 'https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg', + }, + { + id: 588, + quantity: 1, + name: '퓨마', + price: 10000, + imageUrl: 'https://sitem.ssgcdn.com/47/78/22/item/1000031227847_i1_750.jpg', + }, + { + id: 589, + quantity: 4, + + name: '리복', + price: 20000, + imageUrl: + 'https://image.msscdn.net/images/goods_img/20221031/2909092/2909092_6_500.jpg', + }, + { + id: 590, + quantity: 5, + + name: '컨버스', + price: 20000, + imageUrl: 'https://sitem.ssgcdn.com/65/73/69/item/1000163697365_i1_750.jpg', + }, +]; +======= +import CartItemList, { CartItemListProps } from './CartItemList'; +import { RecoilRoot } from 'recoil'; +>>>>>>> todari + +const meta = { + title: 'Components/CartItemList', + component: CartItemList, + tags: ['autodocs'], + argTypes: { +<<<<<<< HEAD + type: { + description: '', + control: { type: 'radio' }, + options: ['cart', 'confirm'], + }, + cartItemList: { + description: '', + control: { type: 'object' }, + }, + }, + args: { + type: 'cart', + cartItemList: MOCK_DATA, + }, +======= + itemList: { + description: '', + control: { type: 'object' }, + } + }, + args: { + itemList: [ + { + "cartItemId": 586, + "quantity": 4, + "product": { + "productId": 2, + "name": "나이키", + "price": 1000, + "imageUrl": "https://static.nike.com/a/images/c_limit,w_592,f_auto/t_product_v1/a28864e3-de02-48bb-b861-9c592bc9a68b/%EB%B6%81-1-ep-%EB%86%8D%EA%B5%AC%ED%99%94-UOp6QQvg.png", + "category": "fashion" + } + }, + { + "cartItemId": 587, + "quantity": 3, + "product": { + "productId": 3, + "name": "아디다스", + "price": 2000, + "imageUrl": "https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 588, + "quantity": 1, + "product": { + "productId": 10, + "name": "퓨마", + "price": 10000, + "imageUrl": "https://sitem.ssgcdn.com/47/78/22/item/1000031227847_i1_750.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 589, + "quantity": 4, + "product": { + "productId": 11, + "name": "리복", + "price": 20000, + "imageUrl": "https://image.msscdn.net/images/goods_img/20221031/2909092/2909092_6_500.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 590, + "quantity": 5, + "product": { + "productId": 12, + "name": "컨버스", + "price": 20000, + "imageUrl": "https://sitem.ssgcdn.com/65/73/69/item/1000163697365_i1_750.jpg", + "category": "fashion" + } + } + ], + } +>>>>>>> todari +} satisfies Meta<typeof CartItemList>; + +export default meta; + +type Story = StoryObj<typeof meta>; + +<<<<<<< HEAD +export const Playground: Story = { + render: ({ type, cartItemList }) => { + return ( + <RecoilRoot + initializeState={({ set }) => set(cartItemListState, MOCK_DATA)} + > + <div style={{ width: '430px' }}> + <CartItemList type={type} cartItemList={cartItemList} /> + </div> + </RecoilRoot> + ); + }, +======= +// TODO : decorator 사용하여 동작할 수 있도록 current: recoil로 인해 작동 x +export const Playground: Story = { + render: ({ ...args }: CartItemListProps) => { + return ( + <RecoilRoot> + <div style={{ width: '430px' }}> + <CartItemList {...args} /> + </div> + </RecoilRoot> + ) + } +>>>>>>> todari +};	Unknown	리베이스의 흔적이ㅠ
@@ -0,0 +1,44 @@ +package christmas.controller; + +import christmas.domain.event.EventCalculator; +import christmas.domain.date.ReservationDate; +import christmas.domain.order.OrderMenuParser; +import christmas.view.InputView; +import christmas.view.OutputView; + +public class ChristmasController { + public void run(){ + OutputView.printStart(); + ReservationDate reservationDate = reservationDate(); + OrderMenuParser orderMenu = orderMenu(); + OutputView.printDate(reservationDate); + OutputView.printOrderMenu(orderMenu); + OutputView.printTotalPrice(orderMenu); + EventCalculator eventCalculator = new EventCalculator(reservationDate, orderMenu); + OutputView.printGiftMenu(orderMenu); + OutputView.printEvent(eventCalculator); + OutputView.printTotalDiscount(eventCalculator); + OutputView.printExpectedDiscount(eventCalculator); + OutputView.printEventBadge(eventCalculator); + } + + private ReservationDate reservationDate() { + while (true) { + try { + return new ReservationDate(InputView.readDate()); + } catch (IllegalArgumentException e) { + System.out.println(e.getMessage()); + } + } + } + + private OrderMenuParser orderMenu(){ + while (true) { + try { + return new OrderMenuParser(InputView.readMenu()); + } catch (IllegalArgumentException e) { + System.out.println(e.getMessage()); + } + } + } +}	Java	한 메서드에서 너무 복잡해 보이네요 메서드를 분리하면 더 좋을거 같아요!
@@ -0,0 +1,22 @@ +package christmas.domain.event; + +import christmas.constant.ChristmasConfig; + +public class ChristmasEvent { + private final int reservationDate; + + public ChristmasEvent(int reservationDate) { + this.reservationDate = reservationDate; + } + + public int calculateDiscount() { + if (isChristmasPeriod()) { + return ChristmasConfig.DISCOUNT_MONEY + ChristmasConfig.INCREASE_MONEY * (reservationDate - ChristmasConfig.START_DAY); + } + return ChristmasConfig.ZERO; + } + + private boolean isChristmasPeriod() { + return reservationDate >= ChristmasConfig.START_DAY && reservationDate <= ChristmasConfig.END_DAY; + } +} \ No newline at end of file	Java	각 이벤트 클래스에서 날짜를 검증하는 것도 좋은데 각각의 이벤트 기간에 포함되는지 처리하는 부분을 ReservationDate 클래스에서 처리해도 좋을거 같아요!
@@ -0,0 +1,77 @@ +import React, { useState } from "react"; +import styled from "styled-components"; +import { Star as StarIcon } from "lucide-react"; + +interface StarRatingProps { + totalStars?: number; + initialRating?: number; + onRatingChange?: (rating: number) => void; +} + +const BackgroundContainer = styled.div` + background-color: #f7f7f7; + width: 807.73px; + height: 251.63px; + display: flex; + align-items: center; + justify-content: center; +`; + +const StarContainer = styled.div` + display: flex; + gap: 4px; +`; + +const StyledStar = styled.div<{ filled: boolean }>` + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + svg { + width: 94.96px; + height: 99.25px; + color: ${(props) => (props.filled ? "#facc15" : "#d1d5db")}; + } +`; + +const StarRating: React.FC<StarRatingProps> = ({ + totalStars = 5, + initialRating = 0, + onRatingChange, +}) => { + const [rating, setRating] = useState(initialRating); + + const handleRating = (index: number) => { + let newRating = rating; + if (index + 1 === rating) { + newRating = index; + } else if (index < rating) { + newRating = index; + } else { + newRating = index + 1; + } + + setRating(newRating); + if (onRatingChange) { + onRatingChange(newRating); + } + }; + + return ( + <BackgroundContainer> + <StarContainer> + {Array.from({ length: totalStars }, (_, index) => ( + <StyledStar + key={index} + filled={index < rating} + onClick={() => handleRating(index)} + > + <StarIcon fill={index < rating ? "#facc15" : "none"} stroke="#facc15" /> + </StyledStar> + ))} + </StarContainer> + </BackgroundContainer> + ); +}; + +export default StarRating;	Unknown	filled 안쪽에 String으로 감싸주세요
@@ -0,0 +1,77 @@ +import React, { useState } from "react"; +import styled from "styled-components"; +import { Star as StarIcon } from "lucide-react"; + +interface StarRatingProps { + totalStars?: number; + initialRating?: number; + onRatingChange?: (rating: number) => void; +} + +const BackgroundContainer = styled.div` + background-color: #f7f7f7; + width: 807.73px; + height: 251.63px; + display: flex; + align-items: center; + justify-content: center; +`; + +const StarContainer = styled.div` + display: flex; + gap: 4px; +`; + +const StyledStar = styled.div<{ filled: boolean }>` + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + svg { + width: 94.96px; + height: 99.25px; + color: ${(props) => (props.filled ? "#facc15" : "#d1d5db")}; + } +`; + +const StarRating: React.FC<StarRatingProps> = ({ + totalStars = 5, + initialRating = 0, + onRatingChange, +}) => { + const [rating, setRating] = useState(initialRating); + + const handleRating = (index: number) => { + let newRating = rating; + if (index + 1 === rating) { + newRating = index; + } else if (index < rating) { + newRating = index; + } else { + newRating = index + 1; + } + + setRating(newRating); + if (onRatingChange) { + onRatingChange(newRating); + } + }; + + return ( + <BackgroundContainer> + <StarContainer> + {Array.from({ length: totalStars }, (_, index) => ( + <StyledStar + key={index} + filled={index < rating} + onClick={() => handleRating(index)} + > + <StarIcon fill={index < rating ? "#facc15" : "none"} stroke="#facc15" /> + </StyledStar> + ))} + </StarContainer> + </BackgroundContainer> + ); +}; + +export default StarRating;	Unknown	제가 후기 페이지 만들면서 이 부분 수정해서 한꺼번에 PR 올리겠습니다
@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>	JavaScript	this.state ... 이거 너무 기니까 이것도 비구조화 할당하시는 게 가독성이 좋을 것 같아요!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	여기 form 태그로 감싸시고 onSubmit 이벤트주시면 엔터키 누를 때 실행되는 메소드 따로 안 만드셔도 pressButton 메소드 하나만으로 댓글 추가시킬 수 있어요!
@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>	JavaScript	말씀하신대로 바꿨습니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	form에 이런 기능이 있는 줄 처음알았습니다! 덕분에 새로운 지식을 얻었습니다. 정말 감사해요!
@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>	JavaScript	idValue를 넘겨주는 걸로 보이는데 idfunc라는 이름은 마치 함수같아서 적합하지 않아보입니다! pwfunc, colorfunc 모두 마찬가지입니다! 그리고 colorfunc라는 값은 id랑 pw통해서 계산 가능해보이는데 그러면 idValue랑 pwValue만 Props로 받고, colorfunc에서 계산 하는 값은 LoginButton 컴포넌트에서 props통해서 바로 계산해서 사용해도 무방해보입니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	api주소가 data안에 들어있는 형태는 비정상적인 것 같습니다! api주소는 일반적으로 백엔드에서 전송해주지 않습니다! comment정보랑 feed정보를 분리시켜놓으셔서 그런 것 같은데, feed안에 comment정보를 그냥 다 넣어주시면 될 것 같습니다! ``` { id: 1, profilesrc: '/images/jaesangChoi/profile1.jpeg', mainfeedsrc: 'https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60', comment:["foo","bar"] }, ``` 이런식으로요! 코멘트란 정보는 피드에 종속되어 있는 정보니까 저런 형태가 적합해보입니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	get method는 기본값이라서 따로 기입안해주셔도 됩니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	댓글은 나중에 삭제될 수도 있으니까 id를 length로 사용하면 삭제 후 다시 추가되는 경우 동일한 id를 가진 댓글이 생길 것 같습니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	함수는 return문 따로 없으면 끝까지 다 읽고나서 알아서 종료되기때문에 임의로 return 키워드를 적을 필요는 없어보입니다!
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	여기는 alt를 한글로 적고 다른 곳은 영어로 적으신 이유가 있으실까요?? 영어로 적어주시는게 좋아보입니다! 한글이 더 좋지만,, 만국 공용어가 영어기 때문에 보편성을 위해서 😂
@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>	JavaScript	t라는 변수명을 가지고는 여기에 할당된 값이 뭐일지 전혀 유추가 안되는 것 같습니다! comments 배열안의 하나하나의 요소들이니까 comment라고 이름지어주는게 좋지 않을까요? ```suggestion {comments.map(comment => { ```

@@ -0,0 +1,101 @@ +@use '../../../../styles/mixin.scss' as mixin; +@use '../../../../styles/color.scss' as clr; + +.feeds { + position: relative; + top: 77px; + width: 60%; + margin-bottom: 80px; + background: #fff; + + .top_menu { + @include mixin.flex($justify: space-between, $align: center); + height: 82px; + + span { + @include mixin.flex($align: center); + margin-left: 20px; + font-weight: bold; + + &:last-child { + margin-right: 22px; + color: #2a2a2a; + font-size: 35px; + } + + img { + width: 42px; + height: 42px; + border-radius: 50%; + margin-right: 20px; + } + } + } + + article { + img { + width: 100%; + height: 818px; + } + + .bottom_menu { + @include mixin.flex($align: center); + position: relative; + height: 62px; + + span > svg { + margin: 0 10px; + font-size: 32px; + color: #414141; + } + + span:last-child > svg { + position: absolute; + top: 15px; + right: 0; + } + + span:first-child > svg > path { + color: #eb4b59; + } + } + } + + .comments { + display: flex; + flex-direction: column; + + span { + padding-left: 10px; + } + } + + .add_comments { + position: absolute; + @include mixin.flex($justify: space-between, $align: center); + bottom: -62px; + width: 100%; + height: 62px; + border-top: 1px solid clr.$clr-border; + font-size: 14px; + + input { + width: 90%; + height: 50%; + margin-left: 15px; + border: none; + } + + button { + margin-right: 15px; + border: none; + color: clr.$clr-primary; + opacity: 0.5; + background: #fff; + + &.activated { + opacity: 1; + } + } + } +}

Unknown

class명은 어떤 형태가 좋을까요?! 해당 class명은 '동작'을 나타내기에 클래스 네임보다는 함수명처럼 느껴집니다!

@@ -1,5 +1,98 @@ import React from 'react'; +import { useState, useEffect } from 'react'; +import { useNavigate } from 'react-router-dom'; +import './Login.scss'; -export default function Login() { - return <div>Hello, Hyeonze!</div>; -} +const Login = () => { + const [idInput, setIdInput] = useState(''); + const [pwInput, setPwInput] = useState(''); + const [isValidatedUser, setIsValidatedUser] = useState(false); + + const navigate = useNavigate(); + const changeIdInput = e => { + const { value } = e.target; + setIdInput(value); + }; + + const changePwInput = e => { + const { value } = e.target; + setPwInput(value); + }; + + useEffect(() => { + setIsValidatedUser(idInput.indexOf('@') !== -1 && pwInput.length > 4); + }, [idInput, pwInput]); + + // 메인으로 이동할 때 로직 + const goToMain = () => { + navigate('/main-hyeonze'); + }; + + // 회원가입시 사용할 로직 + // const signup = () => { + // fetch('http://10.58.4.22:8000/users/signup', { + // method: 'POST', + // body: JSON.stringify({ + // email: idInput, + // password: pwInput, + // }), + // }) + // .then(response => response.json()) + // .then(result => { + // //console.log('결과: ', result.message) + // if (result.message === 'EMAIL_ALREADY_EXISTS') { + // console.log('Error : Duplicated'); + // } + // }); + // }; + + // 로그인시 사용할 로직 + // const login = () => { + // fetch('http://10.58.4.22:8000/users/login', { + // method: 'POST', + // body: JSON.stringify({ + // email: idInput, + // password: pwInput, + // }), + // }) + // .then(response => response.json()) + // .then(result => { + // //console.log('결과: ', result.message) + // if (result.message === 'SUCCESS') { + // console.log('login SUCCESS'); + // } + // }); + // }; + + return ( + <div className="login"> + <div id="wrapper"> + <h1>westagram</h1> + <form className="login_form"> + <input + type="text" + placeholder="전화번호, 사용자 이름 또는 이메일" + className="username" + onChange={changeIdInput} + /> + <input + type="password" + placeholder="비밀번호" + className="userpassword" + onChange={changePwInput} + /> + <input + className={isValidatedUser ? 'activated' : ''} + disabled={!isValidatedUser} + type="button" + value="로그인" + onClick={goToMain} + /> + </form> + <p>비밀번호를 잊으셨나요?</p> + </div> + </div> + ); +}; + +export default Login;

Unknown

- 불필요한 주석처리는 삭제해주세요! - 더불어서 className 자체를 '색'으로 지정하는 것은 좋은 네이밍은 아닌 것 같습니다. 어떤 네이밍이 적합할지 고민하셔서 , 해당 요소가 무엇인지를 잘 나타내는 네이밍으로 수정해주세요. - 플러스! 여기에도 사용하지 않아도 되는 삼항연사자가 숨어있네요! 확인해주세요

@@ -0,0 +1,101 @@ +@use '../../../../styles/mixin.scss' as mixin; +@use '../../../../styles/color.scss' as clr; + +.feeds { + position: relative; + top: 77px; + width: 60%; + margin-bottom: 80px; + background: #fff; + + .top_menu { + @include mixin.flex($justify: space-between, $align: center); + height: 82px; + + span { + @include mixin.flex($align: center); + margin-left: 20px; + font-weight: bold; + + &:last-child { + margin-right: 22px; + color: #2a2a2a; + font-size: 35px; + } + + img { + width: 42px; + height: 42px; + border-radius: 50%; + margin-right: 20px; + } + } + } + + article { + img { + width: 100%; + height: 818px; + } + + .bottom_menu { + @include mixin.flex($align: center); + position: relative; + height: 62px; + + span > svg { + margin: 0 10px; + font-size: 32px; + color: #414141; + } + + span:last-child > svg { + position: absolute; + top: 15px; + right: 0; + } + + span:first-child > svg > path { + color: #eb4b59; + } + } + } + + .comments { + display: flex; + flex-direction: column; + + span { + padding-left: 10px; + } + } + + .add_comments { + position: absolute; + @include mixin.flex($justify: space-between, $align: center); + bottom: -62px; + width: 100%; + height: 62px; + border-top: 1px solid clr.$clr-border; + font-size: 14px; + + input { + width: 90%; + height: 50%; + margin-left: 15px; + border: none; + } + + button { + margin-right: 15px; + border: none; + color: clr.$clr-primary; + opacity: 0.5; + background: #fff; + + &.activated { + opacity: 1; + } + } + } +}

Unknown

이렇게 각 요소에 background color를 각각 다 넣어주신 이유가 있으실까요?

@@ -0,0 +1,92 @@ +{ + "stories": [ + { "imgUrl": "images/joonyoung/stories/story1.jpg", "username": "Enna" }, + { "imgUrl": "images/joonyoung/stories/story2.jpg", "username": "Jesy" }, + { "imgUrl": "images/joonyoung/stories/story3.jpg", "username": "Denial" }, + { "imgUrl": "images/joonyoung/stories/story4.jpg", "username": "Meow" }, + { + "imgUrl": "images/joonyoung/stories/story5.jpg", + "username": "Christina" + }, + { "imgUrl": "images/joonyoung/stories/story6.jpg", "username": "Mally" }, + { "imgUrl": "images/joonyoung/stories/story7.jpg", "username": "Karel" }, + { "imgUrl": "images/joonyoung/stories/story8.jpg", "username": "Bred" }, + { "imgUrl": "images/joonyoung/stories/story9.jpg", "username": "Andrew" }, + { "imgUrl": "images/joonyoung/stories/story10.jpg", "username": "Emily" } + ], + "otherProfileInfos": [ + { + "id": 1, + "username": "wecode28기", + "description": "wecode님외 36명이 follow" + }, + { + "id": 2, + "username": "Younha", + "description": "Enna Kim외 10명이 follow" + }, + { + "id": 3, + "username": "wework", + "description": "wecode28님외 236명이 follow" + } + ], + "feed": [ + { + "id": 1, + "feedUpLoader": "Enna", + "uploaderProfileImg": "./images/joonyoung/stories/story1.jpg", + "uploaderInfo": "Enna's Feed icon", + "carouselImages": [ + "./images/joonyoung/feed/feed1/pexels-fauxels-3184291.jpg", + "./images/joonyoung/feed/feed1/pexels-fauxels-3184302.jpg", + "./images/joonyoung/feed/feed1/pexels-fauxels-3184433.jpg", + "./images/joonyoung/feed/feed1/pexels-min-an-853168.jpg", + "./images/joonyoung/feed/feed1/pexels-this-is-zun-1116302.jpg" + ], + "likes": 1129, + "comments": [ + { + "id": 1, + "user": "28기 양대영님", + "comment": "여러분 치킨계 쓰셔야 합니다..!! 👀 👀" + }, + { + "id": 2, + "user": "28기 이아영님", + "comment": "대영님도 안 쓰셨잖아요?! 🤭" + }, + { + "id": 3, + "user": "28기 박윤국님", + "comment": "🎸 🎸 🎸 (신곡 홍보중)" + } + ] + }, + { + "id": 2, + "feedUpLoader": "James", + "uploaderProfileImg": "./images/joonyoung/stories/story2.jpg", + "uploaderInfo": "It's jesy!", + "carouselImages": [ + "./images/joonyoung/feed/feed2/handtohand.jpg", + "./images/joonyoung/feed/feed2/branch.jpg", + "./images/joonyoung/feed/feed2/pexels-te-lensfix-1371360.jpg", + "./images/joonyoung/feed/feed2/pexels-victor-freitas-803105.jpg" + ], + "likes": 1129, + "comments": [ + { + "id": 1, + "user": "멘토 김INTP님", + "comment": "(안경을 치켜 올리며) git branch merge" + }, + { + "id": 2, + "user": "28기 이ESTJ님", + "comment": "아니 계획을 안짜고 여행을 간다고?" + } + ] + } + ] +}

Unknown

mockData king 준영님👍 정말 감사합니다. 세부 내용은 임의로 변경한 후, 데이터의 형식좀 빌려다 쓰겠습니다 감사합니다!

@@ -0,0 +1,14 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="UTF-8" /> + <link rel="icon" type="image/svg+xml" href="/vite.svg" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <title>react-shopping-products</title> + <script type="module" crossorigin src="/react-shopping-products/dist/assets/index-B5NHo3G9.js"></script> + <link rel="stylesheet" crossorigin href="/react-shopping-products/dist/assets/index-BlzNY9oW.css"> + </head> + <body> + <div id="root"></div> + </body> +</html>

Unknown

dist 폴더가 git ignore되지 않았군용

@@ -0,0 +1,10 @@ +/** + * generateBasicToken - Basic auth를 위한 토큰을 만드는 함수입니다. + * @param {string} userId - USERNAME입니다. + * @param {string} userPassword - PASSWORD입니다. + * @returns {string} + */ +export function generateBasicToken(userId: string, userPassword: string): string { + const token = btoa(`${userId}:${userPassword}`); + return `Basic ${token}`; +}

TypeScript

섬세한 jsdocs 👍👍👍👍

@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + */ +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/** + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + */ +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/** + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + */ +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/** + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + */ +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/** + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}

TypeScript

공통 로직을 묶어주는 것 너무 좋습니다~!

@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + */ +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/** + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + */ +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/** + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + */ +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/** + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + */ +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/** + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}

TypeScript

장바구니에 100개 넘게 담을 수 있는 case가 존재할 것 같아요~!

@@ -0,0 +1,50 @@ +.loaderContainer { + height: 60px; + display: flex; + justify-content: center; + align-items: center; +} + +.loader { + width: 60px; + display: flex; + justify-content: space-evenly; +} + +.ball { + list-style: none; + width: 12px; + height: 12px; + border-radius: 50%; + background-color: black; +} + +.ball:nth-child(1) { + animation: bounce1 0.4s ease-in-out infinite; +} + +@keyframes bounce1 { + 50% { + transform: translateY(-18px); + } +} + +.ball:nth-child(2) { + animation: bounce2 0.4s ease-in-out 0.2s infinite; +} + +@keyframes bounce2 { + 50% { + transform: translateY(-18px); + } +} + +.ball:nth-child(3) { + animation: bounce3 0.4s ease-in-out 0.4s infinite; +} + +@keyframes bounce3 { + 50% { + transform: translateY(-18px); + } +}

Unknown

귀여운 애니메이션을 만들었군용 🚀🚀🚀

@@ -0,0 +1,15 @@ +export const productCategories = { + all: '전체', + fashion: '패션', + beverage: '음료', + electronics: '전자제품', + kitchen: '주방용품', + fitness: '피트니스', + books: '도서', +} as const; + +export const sortOptions = { priceAsc: '낮은 가격순', priceDesc: '높은 가격순' } as const; + +export const FIRST_FETCH_PAGE = 0; +export const FIRST_FETCH_SIZE = 20; +export const AFTER_FETCH_SIZE = 4;

TypeScript

상수화 👍👍👍

@@ -0,0 +1,32 @@ +import React, { createContext, useState, useCallback, ReactNode } from 'react'; +import ErrorToast from '../components/ErrorToast/ErrorToast'; + +export interface ToastContextType { + showToast: (message: string) => void; +} + +export const ToastContext = createContext<ToastContextType | undefined>(undefined); + +interface ToastProviderProps { + children: ReactNode; +} + +export const ToastProvider: React.FC<ToastProviderProps> = ({ children }) => { + const [isOpen, setIsOpen] = useState(false); + const [message, setMessage] = useState(''); + + const showToast = useCallback((message: string) => { + setMessage(message); + setIsOpen(true); + setTimeout(() => { + setIsOpen(false); + }, 3000); + }, []); + + return ( + <ToastContext.Provider value={{ showToast }}> + {children} + {isOpen && <ErrorToast message={message} />} + </ToastContext.Provider> + ); +};

Unknown

별도의 Provider로 만들어 준 것 너무 좋네요

@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + */ +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/** + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + */ +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/** + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + */ +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/** + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + */ +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/** + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}

TypeScript

맞아요... 임시방편이었는데 그냥 까먹고 넘어갔네요 ㅜㅜ

@@ -0,0 +1,95 @@ +import { CartItemType, ProductType } from '../types'; +import { generateBasicToken } from './auth'; + +const API_URL = import.meta.env.VITE_API_URL; +const USER_ID = import.meta.env.VITE_USER_ID; +const USER_PASSWORD = import.meta.env.VITE_USER_PASSWORD; + +/** + * 공통 요청을 처리하는 함수 + * @param {string} endpoint - API endpoint + * @param {RequestInit} options - fetch options + * @returns {Response} - fetch response + */ +async function makeRequest(endpoint: string, options: RequestInit): Promise<Response> { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + + const response = await fetch(`${API_URL}${endpoint}`, { + ...options, + headers: { + ...options.headers, + Authorization: token, + 'Content-Type': 'application/json', + }, + }); + + if (!response.ok) { + throw new Error(`Failed to ${options.method?.toLowerCase()} ${endpoint}`); + } + + return response; +} + +interface FetchProductsParams { + category?: string; + page?: number; + size?: number; + sort?: string; +} + +/** + * fetchCartItems - API에서 상품 목록을 fetch합니다. + * @returns {Promise<ProductType[]>} + */ +export async function fetchProducts(params: FetchProductsParams = {}): Promise<ProductType[]> { + const queryString = Object.entries(params) + .map(([key, value]) => { + if (key === 'category' && value === 'all') { + return; + } else { + return `${key}=${value}`; + } + }) + .join('&'); + const response = await makeRequest(`/products?${queryString}`, { + method: 'GET', + }); + const data = await response.json(); + + return data.content; +} + +/** + * addCartItem - 선택한 상품을 장바구니에 추가합니다. + * @returns {Promise<void>} + */ +export async function addCartItem(productId: number): Promise<void> { + await makeRequest('/cart-items', { + method: 'POST', + body: JSON.stringify({ productId }), + }); +} + +/** + * fetchCartItem - API에서 장바구니 목록을 fetch합니다. + * @returns {Promise<CartItemType[]>} + */ +export async function fetchCartItem(): Promise<CartItemType[]> { + const response = await makeRequest('/cart-items?page=0&size=100', { + method: 'GET', + }); + + const data = await response.json(); + + return data.content; +} + +/** + * deleteCartItem - 선택한 상품을 장바구니에서 삭제합니다. + * @returns {Promise<void>} + */ +export async function deleteCartItem(cartItemId: number): Promise<void> { + await makeRequest(`/cart-items/${cartItemId}`, { + method: 'DELETE', + }); +}

TypeScript

그런데.. 이번 장바구니 api는 20개만 담을 수 있게 만들어져있더라구요.. 지금 api 구현사항에 맞출지, 아니면 미래의 변경에도 용이하게 코드를 바꿀지는 생각해 봐야할 문제인 것 같아요. 이 부분을 바꿔야 한다면 위의 >if (key === 'category' && value === 'all') 이 코드에서도 default로 들어갈 수 있는 sort=id,asc도 생각해봐야 할 것 같고요

@@ -0,0 +1,21 @@ +import { SelectHTMLAttributes, PropsWithChildren } from 'react'; +import styles from './Select.module.css'; + +interface Props extends PropsWithChildren<SelectHTMLAttributes<HTMLSelectElement>> { + options: Record<string, string>; +} + +const Select = ({ options, defaultValue, children, ...props }: Props) => { + return ( + <select {...props} className={styles.selectContainer} defaultValue={defaultValue}> + {children} + {Object.keys(options).map((option) => ( + <option key={option} value={option}> + {options[option]} + </option> + ))} + </select> + ); +}; + +export default Select;

Unknown

entries라는 함수도 있으니 찾아보시면 좋을 것 같아요..! ``` js Object.entries(options).map([optionEn,optionKo])=>{ ... } ```

@@ -1 +1,60 @@ # spring-security-authentication + +## 1단계 - SecurityFilterChain 적용 + +인터셉터로 구현한 인증 로직을 필터 형태로 변형한다. +인증 로직이 담긴 필터를 바로 서블릿 필터로 등록하지 않고 아래 이미지를 참고하여 별도의 필터 체인을 구축하여 구현한다. +주요 클래스: DelegatingFilterProxy, FilterChainProxy, SecurityFilterChain, DefaultSecurityFilterChain, VirtualFilterChain(FilterChainProxy의 내부 클래스) + +![SecurityFilterChain.png](docs-img/SecurityFilterChain.png) + +### 요구 사항 +- [X] 기존 Interceptor 인증 로직 변환 + - 제공된 Interceptor 기반 인증 로직을 Filter로 변환 + - 변환된 Filter는 HttpServletRequest와 HttpServletResponse를 처리하며, 인증 여부를 결정 + - 요청이 인증되지 않은 경우, 적절한 HTTP 상태 코드(예: 401 Unauthorized) 반환 + - 인증된 사용자 정보는 요청 객체에 추가하여 이후 필터에서 접근 가능하도록 설정 +- [X] DelegatingFilterProxy 설정 + - Spring Bean으로 DelegatingFilterProxy를 등록하고 이를 통해 FilterChainProxy를 호출하도록 설정 + - DelegatingFilterProxy는 Servlet 컨테이너의 Filter와 Spring 컨텍스트를 연결 +- [X] FilterChainProxy 구현 + - FilterChainProxy는 요청 URI에 따라 적절한 SecurityFilterChain을 선택하여 실행 + - SecurityFilterChain은 Filter 리스트를 포함하며 요청을 처리 +- [X] SecurityFilterChain 리팩터링 + - 각 SecurityFilterChain은 역할에 따라 다른 필터 세트를 관리 + - 인증(Authentication) 필터와 권한(Authorization) 필터를 포함하도록 구성 + +## 2단계 - AuthenticationManager 적용 + +다양한 인증 방식을 처리하기 위해 AuthenticationManager를 활용하여 인증 과정을 추상화한다. +기존의 인증 로직을 분리하고, 인증 방식을 유연하게 확장 가능하도록 구조화한다. +주요 클래스: AuthenticationManager, ProviderManager, AuthenticationProvider, DaoAuthenticationProvider + +![AuthenticationManager.png](docs-img/AuthenticationManager.png) + +### 요구 사항 + +- [X] Authentication와 UsernamePasswordAuthenticationToken 구현 +- [X] 제공된 AuthenticationManager를 기반으로 ProviderManager 구현 +- [X] 제공된 AuthenticationProvider를 기반으로 DaoAuthenticationProvider 구현 +- [X] 기존 인증 필터에서 인증 로직 분리 및 AuthenticationManager로 통합 + +## 3단계 - SecurityContextHolder 적용 +- 인증 성공 후 생성된 Authentication 객체를 기존의 세션 방식 대신 스레드 로컬(Thread Local)에 보관하도록 변경한다. +- 각 필터에서 스레드 로컬에 보관된 인증 정보를 접근할 수 있도록 SecurityContextHolder와 SecurityContext 구조를 구현한다. + +![SecurityContextHolder.png](docs-img/SecurityContextHolder.png) + +### 요구사항 +-[X] SecurityContext 및 SecurityContextHolder 작성 +-[X] BasicAuthenticationFilter에서 SecurityContextHolder 활용 +-[X] 기존 세션 방식에서 스레드 로컬 방식으로 인증 정보 관리 변경 + +## 4단계 - SecurityContextHolderFilter 구현 +* 세션에 보관된 인증 정보를 SecurityContextHolder로 옮기기 위한 SecurityContextHolderFilter를 구현한다. + +### 요구 사항 +- [X] SecurityContextRepository 인터페이스를 기반으로 HttpSessionSecurityContextRepository 구현 +- [X] SecurityContextHolderFilter 작성 및 필터 체인에 등록 +- [X] login_after_members 테스트로 동작 검증 +

Unknown

요구사항을 아주 꼼꼼하게 작성해 주셨네요! 👍

@@ -0,0 +1,33 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import nextstep.security.context.SecurityContext; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.context.SecurityContextRepository; +import org.springframework.web.filter.GenericFilterBean; + +import java.io.IOException; + +public class SecurityContextHolderFilter extends GenericFilterBean { + private final SecurityContextRepository securityContextRepository; + + public SecurityContextHolderFilter(SecurityContextRepository securityContextRepository) { + this.securityContextRepository = securityContextRepository; + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + try { + SecurityContext securityContext = securityContextRepository.loadContext((HttpServletRequest) request); + SecurityContextHolder.setContext(securityContext); + + chain.doFilter(request, response); + } finally { + SecurityContextHolder.clearContext(); + } + } +}

Java

현재 SecurityContextHolderFilter에서 securityContextRepository.saveContext(context, request, response);를 호출하는 방식은 Spring Security의 일반적인 흐름과 맞지 않을 것 같아요 😢 인증이 이루어지지 않았음에도 불구하고 SecurityContext를 저장할 가능성이 있을 것 같은데 개선해보면 어떨까요? 😄

@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}

Java

해당 메서드에 static을 사용하신 이유가 있나요?

@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}

Java

== 연산자를 사용하여 UsernamePasswordAuthenticationToken과 직접 비교하고 있는데요, isAssignableFrom() 로 비교하는 것과 어떠한 차이가 있을까요? 😄

@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}

Java

현재 request.getSession()을 호출하면 세션이 존재하지 않을 경우 자동으로 새 세션을 생성하게 됩니다. 세션이 필요하지 않은 요청에도 불필요한 세션이 생성될 수 있을 것 같은데, getSession(false)를 사용하면 어떤 차이가 있을까요? 🤔 기존 세션이 있는 경우에만 SecurityContext를 로드하도록 개선해보면 어떨까요? 😄

@@ -0,0 +1,60 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import nextstep.security.authentication.Authentication; +import nextstep.security.authentication.AuthenticationManager; +import nextstep.security.authentication.UsernamePasswordAuthenticationToken; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.util.Base64Convertor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +public class BasicAuthenticationFilter extends OncePerRequestFilter { + private static final String BASIC_PREFIX = "basic "; + + private final AuthenticationManager authenticationManager; + + public BasicAuthenticationFilter(AuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + final String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); + if (isNotBasicAuth(authorization)) { + filterChain.doFilter(request, response); + return; + } + try { + String[] usernameAndPassword = extractUsernameAndPassword(authorization); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usernameAndPassword[0], usernameAndPassword[1]); + Authentication authenticate = authenticationManager.authenticate(authenticationToken); + + SecurityContextHolder.getContext().setAuthentication(authenticate); + + filterChain.doFilter(request, response); + } catch (Exception e) { + SecurityContextHolder.clearContext(); + response.setStatus(HttpStatus.UNAUTHORIZED.value()); + } + } + + private String[] extractUsernameAndPassword(String authorization) { + String base64Credentials = authorization.substring(BASIC_PREFIX.length()); + String decodedString = Base64Convertor.decode(base64Credentials); + return decodedString.split(":"); + } + + private boolean isNotBasicAuth(String authorization) { + if (authorization == null) { + return true; + } + return !authorization.toLowerCase().startsWith(BASIC_PREFIX); + } +}

Java

isNotBasicAuth() 메서드의 네이밍을 보면 Basic 인증이 아닐 경우 true를 반환해야 할 것 같지만, 현재 구현에서는 Basic 인증일 때 true를 반환하고 있네요 😄

@@ -0,0 +1,33 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import nextstep.security.context.SecurityContext; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.context.SecurityContextRepository; +import org.springframework.web.filter.GenericFilterBean; + +import java.io.IOException; + +public class SecurityContextHolderFilter extends GenericFilterBean { + private final SecurityContextRepository securityContextRepository; + + public SecurityContextHolderFilter(SecurityContextRepository securityContextRepository) { + this.securityContextRepository = securityContextRepository; + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + try { + SecurityContext securityContext = securityContextRepository.loadContext((HttpServletRequest) request); + SecurityContextHolder.setContext(securityContext); + + chain.doFilter(request, response); + } finally { + SecurityContextHolder.clearContext(); + } + } +}

Java

앗 그러네요 ! 인증을 받자마자 securityContextRepository 에 저장하는게 좋겠네요 [57d0f5](https://github.com/next-step/spring-security-authentication/pull/32/commits/57d0f520733998b10aec3ac441e30bf93b21cfa6) 해당 커밋에 반영하였습니다

@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}

Java

😢 단축키를 잘 못써서 오타가 났나봐요.. [0f8f88b](https://github.com/next-step/spring-security-authentication/pull/32/commits/0f8f88b23614c091cf8dc72c8c06aca34a7c6b4c) 해당커밋에 반영하였습니다~

@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}

Java

isAssignableFrom() 비교 하면 상위타입까지 비교 할 수 있군요! 음... 제가 생각하기에 프레임워크 사용자에 대해서 상속을 통해 UsernamePasswordAuthenticationToken를 확장하여 사용할 수 있을꺼 같네요. 이슬님의 다른의견이 있다면 듣고 싶네요 e36ce53464741014a8391df7e2761816fb381512 사용자에게 확장을 제공하고자 해당 커밋에 변경하였습니다.

@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}

Java

앗.. 상세한 옵션에 대해서는 고려하지 못했었네요 getSession(false)은 세션을 생성하지 않고 null 을 반환 하는 군요 불필요한 세션이 생성되지 않도록 [291d54e](https://github.com/next-step/spring-security-authentication/pull/32/commits/291d54ecda1c0cae213d2bf9432e339a34c8c7f6) 해당 커밋에 수정하였습니다

@@ -0,0 +1,60 @@ +package nextstep.security.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import nextstep.security.authentication.Authentication; +import nextstep.security.authentication.AuthenticationManager; +import nextstep.security.authentication.UsernamePasswordAuthenticationToken; +import nextstep.security.context.SecurityContextHolder; +import nextstep.security.util.Base64Convertor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +public class BasicAuthenticationFilter extends OncePerRequestFilter { + private static final String BASIC_PREFIX = "basic "; + + private final AuthenticationManager authenticationManager; + + public BasicAuthenticationFilter(AuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + final String authorization = request.getHeader(HttpHeaders.AUTHORIZATION); + if (isNotBasicAuth(authorization)) { + filterChain.doFilter(request, response); + return; + } + try { + String[] usernameAndPassword = extractUsernameAndPassword(authorization); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(usernameAndPassword[0], usernameAndPassword[1]); + Authentication authenticate = authenticationManager.authenticate(authenticationToken); + + SecurityContextHolder.getContext().setAuthentication(authenticate); + + filterChain.doFilter(request, response); + } catch (Exception e) { + SecurityContextHolder.clearContext(); + response.setStatus(HttpStatus.UNAUTHORIZED.value()); + } + } + + private String[] extractUsernameAndPassword(String authorization) { + String base64Credentials = authorization.substring(BASIC_PREFIX.length()); + String decodedString = Base64Convertor.decode(base64Credentials); + return decodedString.split(":"); + } + + private boolean isNotBasicAuth(String authorization) { + if (authorization == null) { + return true; + } + return !authorization.toLowerCase().startsWith(BASIC_PREFIX); + } +}

Java

if 문에 메서드를 true 하게 바꾸려다가 리펙토링 부분만하고 커밋만 찍어버렷네요 ㅎㅎ... [0455587](https://github.com/next-step/spring-security-authentication/pull/32/commits/0455587ca34b85135e20207244a250667422db0b) 반영하였습니다

@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}

Java

saveContext()에서는 세션 저장 역할만 수행하는 것이 더 적절하지 않을까 생각되는데 어떻게 생각하시나요? 😊

@@ -0,0 +1,46 @@ +package nextstep.security.authentication; + +import nextstep.security.UserDetails; +import nextstep.security.UserDetailsService; + +import java.util.Objects; + +public class DaoAuthenticationProvider implements AuthenticationProvider { + private final UserDetailsService userDetailsService; + + public DaoAuthenticationProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + check(authentication); + + final String username = authentication.getPrincipal().toString(); + final String password = authentication.getCredentials().toString(); + final UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (Objects.equals(password, userDetails.getPassword())) { + return UsernamePasswordAuthenticationToken.ofAuthenticated(username, password); + } + + throw new AuthenticationException(); + } + + private void check(Authentication authentication) { + if (authentication == null) { + throw new AuthenticationException(); + } + if (authentication.getPrincipal() == null) { + throw new AuthenticationException(); + } + if (authentication.getCredentials() == null) { + throw new AuthenticationException(); + } + } + + @Override + public boolean supports(Class<?> authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication); + } +}

Java

맞아요! 👍 isAssignableFrom()을 사용하면 UsernamePasswordAuthenticationToken을 확장한 커스텀 인증 토큰도 지원할 수 있기 때문에, 확장성을 고려할 때 더 유연한 방식이 될 수 있습니다. 😄

@@ -0,0 +1,39 @@ +package nextstep.security.context; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + +public class HttpSessionSecurityContextRepository implements SecurityContextRepository { + private static final String DEFAULT_SESSION_KEY = "SPRING_SECURITY_CONTEXT"; + + private final String sessionKey; + + public HttpSessionSecurityContextRepository() { + this(DEFAULT_SESSION_KEY); + } + + public HttpSessionSecurityContextRepository(String sessionKey) { + if (sessionKey == null) { + sessionKey = DEFAULT_SESSION_KEY; + } + this.sessionKey = sessionKey; + } + + @Override + public SecurityContext loadContext(HttpServletRequest request) { + HttpSession session = request.getSession(false); + if (session == null) { + return SecurityContextHolder.createEmptyContext(); + } + return (SecurityContext) session.getAttribute(sessionKey); + } + + @Override + public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) { + HttpSession session = request.getSession(); + session.setAttribute(sessionKey, context); + + SecurityContextHolder.setContext(context); + } +}

Java

단순하게 생각했을때 레포지토리에서 저장하는게 깔끔하지 않을까 고민이 되었었는데 코멘트 남겨주신 내용을 보니 새로운 레포지토리 구현체에서는 SecurityContextHolder를 계속 챙겨줘야되는 부담이 생길꺼 같아요! 필터쪽에 이관을 해야할꺼 같아요

@@ -0,0 +1,11 @@ +package baseball.util; + +import java.util.Random; + +public class RamdomNumberGenerator { + private static final Random RANDOM = new Random(); + + public static Integer generate() { + return RANDOM.nextInt(9) + 1; + } +}

Java

무작위의 숫자를 생성하는 클래스를 따로 빼서 테스트를 용이하게 할 수 있게 한 게 좋네요!

@@ -0,0 +1,101 @@ +package baseball.domain; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class NumericBalls implements Iterable { + private List<NumericBall> numericBalls; + + public NumericBalls() { + numericBalls = new ArrayList<>(); + } + + public NumericBalls(List<Integer> numbers) { + validate(numbers); + List<NumericBall> newBalls = new ArrayList<>(); + for (Integer number : numbers) { + newBalls.add(new NumericBall(number)); + } + this.numericBalls = newBalls; + } + + private void validate(List<Integer> numbers) { + if (numbers.size() != 3) { + throw new IllegalArgumentException(); + } + } + + public List<Integer> match(NumericBalls otherBalls) { + List<Integer> matchPoints = new ArrayList<>(); + int matchedCnt = matchBall(otherBalls); + int strikeCnt = strikeCheck(otherBalls); + matchPoints.add(strikeCnt); + matchPoints.add(matchedCnt - strikeCnt); + return matchPoints; + } + + private Integer matchBall(NumericBalls otherBalls) { + Map<Integer, Integer> map = new HashMap<>(); + for (NumericBall num : numericBalls) { + map.put(num.numericBall(), 0); + } + + int ballCnt = 0; + + Iterator otherIterator = otherBalls.iterator(); + while(otherIterator.hasNext()) { + NumericBall otherBall = otherIterator.next(); + if (map.containsKey(otherBall.numericBall())) { + map.put(otherBall.numericBall(), map.get(otherBall.numericBall()) + 1); + } + } + for (Integer value : map.values()) { + ballCnt += value; + } + return ballCnt; + } + + private Integer strikeCheck(NumericBalls otherBalls) { + int strikeCnt = 0; + for (int i = 0; i < numericBalls.size(); i++) { + if (numericBalls.get(i).equals(otherBalls.numericBall(i))) { + strikeCnt++; + } + } + return strikeCnt; + } + + public NumericBall numericBall(int index) { + return numericBalls.get(index); + } + + public int size() { + return numericBalls.size(); + } + + @Override + public Iterator iterator() { + return new NumericBallsIterator(this); + } + + private static class NumericBallsIterator implements Iterator { + private int index = 0; + private NumericBalls numericBalls; + + public NumericBallsIterator(NumericBalls numericBalls) { + this.numericBalls = numericBalls; + } + + @Override + public boolean hasNext() { + return (this.index < this.numericBalls.size()); + } + + @Override + public NumericBall next() { + return numericBalls.numericBall(this.index++); + } + } +}

Java

리스트에 넣고 맵에 다시 넣는 것보다 처음부터 필드를 맵으로 선언하고 맵의 숫자와 인덱스를 비교하면 효율이 더 좋을 것 같아요.

@@ -0,0 +1,23 @@ +package baseball.view; + +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + +public class InputView { + private static final Scanner SCANNER = new Scanner(System.in); + public static List<Integer> inputNumbers() { + System.out.println("숫자를 입력해 주세요 : "); + List<Integer> nums = new ArrayList<>(); + nums.addAll(parse(List.of(SCANNER.next().split("")))); + return nums; + } + + private static List<Integer> parse(List<String> strArr) { + List<Integer> nums = new ArrayList<>(); + for (String str : strArr) { + nums.add(Integer.parseInt(str)); + } + return nums; + } +}

Java

객체를 상수로 선언하면 코드가 훨씬 간편해지지만, final임에도 값이 바뀔 수 있어 관련이슈가 있을 수도 있습니다. 유의하고 사용해주세요:)

@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}

Java

메시지 관리에 대해서 static이 좋은지 enum이 좋은지 이야기 나눠보면 좋을 것 같습니다. 항상 어떤게 나은지 고민해서 매번 쓸때마다 한번은 이렇게 한번은 저렇게 했었거든요.

@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}

Java

저는 System.out.print~사용하는 부분은 전부 출력으로 사용자에게 보여지는 부분이라고 생각해서 모두 OutputView에 작성하고 있습니다. 사실 첨에 저도 InputView에 써도 될지 고민했는데 이 부분에 대해서는 어떻게 생각하시는지 궁금합니다.

@@ -0,0 +1,38 @@ +package racingcar.view; + +import java.util.stream.Collectors; +import racingcar.domain.RacingCar; +import racingcar.domain.RacingCars; +import racingcar.domain.Winner; + +public class OutputView { + private static final String RACE_RESULT_MESSAGE = "\n실행 결과"; + private static final String DISTANCE_UNIT = "-"; + private static final String RACE_RESULT_FORMAT = "%s : %s%n"; + private static final String WINNER = "최종 우승자 : "; + private static final String DELIMITER = ", "; + + public static void printRaceResultNotice() { + System.out.println(RACE_RESULT_MESSAGE); + } + + public static void printRaceResult(RacingCars racingCars) { + racingCars.getRacingCars() + .forEach(racingCar -> System.out.printf(RACE_RESULT_FORMAT + , racingCar.getCarName(), changeDistanceForm(racingCar.getDistance()))); + System.out.println(); + } + + private static String changeDistanceForm(int distance) { + return DISTANCE_UNIT.repeat(distance); + } + + public static void printWinner(Winner winner) { + System.out.print(WINNER); + String winners = winner.getWinner() + .stream() + .map(RacingCar::getCarName) + .collect(Collectors.joining(DELIMITER)); + System.out.println(winners); + } +}

Java

Winner클래스의 getWinner()에서 아래 연산이 끝난 결과를 리턴하면 getter를 사용하지 않고도 결과를 받아올 수 있다고 생각하는데 어떻게 생각하시나요?

@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class CarNameTest { + @ParameterizedTest + @DisplayName("차량이름은 1-5글자이고 특수문자를 포함하지 않는다.") + @ValueSource(strings = {"abcdef", "", "$", "&", " ", "!", "(", "$", "%"}) + void createCarName(String input) { + assertThatThrownBy(() -> new CarName(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file

Java

assertThatCode를 이용해서 예외가 발생하지 않고 올바르게 되는지 한번 테스트 해보는 것도 추천 드립니다.

@@ -0,0 +1,22 @@ +package racingcar.domain; + +public enum ErrorMessage { + ERROR("[ERROR] "), + INVALID_NAME_LENGTH(ERROR + "차량 이름은 1-5글자 사이여야 합니다."), + INVALID_NAME_TYPE(ERROR + "차량 이름은 특수문자를 포함할 수 없습니다."), + DUPLICATED_NAME(ERROR + "차량 이름은 중복될 수 없습니다."), + INVALID_RACING_CARS_SIZE(ERROR + "경주에는 최소 2대의 차량이 참여해야합니다."), + INVALID_TURN_RANGE(ERROR + "시도횟수는 최소 1회 이상이어야 합니다."), + INVALID_TURN_TYPE(ERROR + "숫자 이외의 값은 입력할 수 없습니다."), + CANT_FIND_CAR(ERROR + "차량을 찾을 수 없습니다."); + + private final String message; + + ErrorMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +}

Java

ERROR은 변함 없을 것 같은데 상수로 두고 생성자 부분에서 this.message = "ERROR" + message로 한다면 메시지 작성할 때 중복을 피하는데 도움 될 것 같습니다.

@@ -0,0 +1,63 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.CANT_FIND_CAR; +import static racingcar.domain.ErrorMessage.DUPLICATED_NAME; +import static racingcar.domain.ErrorMessage.INVALID_RACING_CARS_SIZE; + +import java.util.List; +import java.util.stream.Collectors; + +public class RacingCars { + private static final int MIN_SIZE = 2; + private final List<RacingCar> racingCars; + private RacingCar maxDistanceCar; + + public RacingCars(List<RacingCar> racingCars) { + validateSize(racingCars); + validateDuplicated(racingCars); + this.racingCars = racingCars; + } + + private void validateSize(List<RacingCar> racingCars) { + if (racingCars.size() < MIN_SIZE) { + throw new IllegalArgumentException(INVALID_RACING_CARS_SIZE.getMessage()); + } + } + + private void validateDuplicated(List<RacingCar> racingCars) { + if (isDuplicated(racingCars)) { + throw new IllegalArgumentException(DUPLICATED_NAME.getMessage()); + } + } + + private boolean isDuplicated(List<RacingCar> racingCars) { + int sizeAfterCut = (int) racingCars.stream() + .distinct() + .count(); + return racingCars.size() != sizeAfterCut; + } + + public void startRace() { + racingCars + .forEach(racingCar -> + racingCar.moveForward(RandomNumberGenerator.generateRandomNumber())); + } + + public Winner selectWinner() { + findMaxDistanceCar(); + List<RacingCar> winner = racingCars.stream() + .filter(maxDistanceCar::isWinner) + .collect(Collectors.toList()); + return new Winner(winner); + } + + private void findMaxDistanceCar() { + maxDistanceCar = racingCars.stream() + .max(RacingCar::compareTo) + .orElseThrow(() -> new IllegalArgumentException(CANT_FIND_CAR.getMessage())); + } + + public List<RacingCar> getRacingCars() { + return racingCars; + } +}

Java

return에 바로 작성하면 가독성이 조금 떨어져 보일까요? 이 메소드 처럼 한번만 사용하는 변수라면 변수로 지정하지 않고 바로 작성해도 될 것 같은데... 이러면 가독성이 떨어져 보이기도 할 것 같아 고민이 되서 여쭤봅니다.

@@ -0,0 +1,51 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.INVALID_NAME_LENGTH; +import static racingcar.domain.ErrorMessage.INVALID_NAME_TYPE; + +import java.util.Objects; +import java.util.regex.Pattern; + +public class CarName { + private static final int MAX_LENGTH = 5; + private static final String REGEX = "[0-9|a-zA-Zㄱ-ㅎㅏ-ㅣ가-힣]*"; + private final String carName; + + public CarName(String carName) { + validateLength(carName); + validateType(carName); + this.carName = carName; + } + + private void validateLength(String carName) { + if (carName.isEmpty() || carName.length() > MAX_LENGTH) { + throw new IllegalArgumentException(INVALID_NAME_LENGTH.getMessage()); + } + } + + private void validateType(String carName) { + if (!Pattern.matches(REGEX, carName)) { + throw new IllegalArgumentException(INVALID_NAME_TYPE.getMessage()); + } + } + + public String getCarName() { + return carName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof CarName carName1)) { + return false; + } + return Objects.equals(carName, carName1.carName); + } + + @Override + public int hashCode() { + return Objects.hash(carName); + } +}

Java

정규표현식에 문자지정한 후 {1,5}을 사용하면 글자 수 제한 하는데도 도움이 될 거에요.

@@ -0,0 +1,35 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class RacingCarsTest { + @ParameterizedTest + @DisplayName("경주에는 최소 2대 이상의 차량이 참여해야 하며 중복될 수 없다.") + @ValueSource(strings = {"상추", "상추,상추"}) + void createRacingCars(String input) { + List<RacingCar> racingCars = InputConvertor.convertToRacingCars(input); + assertThatThrownBy(() -> new RacingCars(racingCars)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + @DisplayName("우승자는 상추와 배추다.") + void selectWinner() { + RacingCar sangchu = new RacingCar(new CarName("상추")); + RacingCar baechu = new RacingCar(new CarName("배추")); + RacingCar moodosa = new RacingCar(new CarName("무도사")); + RacingCars racingCars = new RacingCars(List.of(sangchu, baechu, moodosa)); + sangchu.moveForward(5); + baechu.moveForward(6); + Winner winner = racingCars.selectWinner(); + assertThat(winner.getWinner().get(0).getCarName()).isEqualTo("상추"); + assertThat(winner.getWinner().get(1).getCarName()).isEqualTo("배추"); + } +} \ No newline at end of file

Java

2대 이상인 경우 / 이름 중복되면 안되는 경우에 대해 메소드를 나눠서 테스트 해도 좋을거같슴다

@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class TurnTest { + @ParameterizedTest + @DisplayName("1회 미만, 숫자 이외 값 입력시 예외 발생") + @ValueSource(strings = {"0", "-1", "d", "#", "", " "}) + void createTurn(String input) { + assertThatThrownBy(() -> new Turn(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file

Java

저는 validate 로직에 대해서 1. 숫자만 입력 받아야하는 변수에 문자 입력되는 경우 -> input에서 검증 2. 1회 미만으로 입력받는 메소드 관련 검증 -> turn메소드에서 검증 하는 방식으로 항상 작성해 왔는데 이부분에 대해서 어떻게 생각하는지 궁금합니다 !

@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}

Java

저는 이번에 프리코스를 진행하면서 나름의 기준을 세워봤습니다! 1. enum으로 사용할만큼 상수의 개수가 충분한지? 최소 3개 이상 2. 프로그램이 확장된다면 해당 enum 에 상수가 추가될 가능성이 있는지? 3. 다른 클래스에서도 사용될 가능성이 있는지?

@@ -0,0 +1,18 @@ +package racingcar.view; + +import camp.nextstep.edu.missionutils.Console; + +public class InputView { + private static final String ASK_CAR_NAMES = "경주할 자동차 이름을 입력하세요.(이름은 쉼표(,) 기준으로 구분)"; + private static final String ASK_TURN = "시도할 회수는 몇회인가요?"; + + public static String readCarNames() { + System.out.println(ASK_CAR_NAMES); + return Console.readLine(); + } + + public static String readTurn() { + System.out.println(ASK_TURN); + return Console.readLine(); + } +}

Java

저도 처음에 1주차 미션을 진행할 때는 사용자에게 보이는 부분이라고 생각하여 OutputView에 작성했었는데 많은 분들 코드를 보다보니 입력을 요청하는 메시지는 InputView에서 처리하시더라구요. 그리고 결정적으로 우테코에서 제공한 요구사항 부분을 보시면 입력을 요구하는 메시지를 InputView에서 사용하는걸 보실 수 있습니다. <img width="914" alt="image" src="https://github.com/parksangchu/java-racingcar-6/assets/142131857/87aa54ff-07c6-4c03-87fe-331d6aba9664">

@@ -0,0 +1,22 @@ +package racingcar.domain; + +public enum ErrorMessage { + ERROR("[ERROR] "), + INVALID_NAME_LENGTH(ERROR + "차량 이름은 1-5글자 사이여야 합니다."), + INVALID_NAME_TYPE(ERROR + "차량 이름은 특수문자를 포함할 수 없습니다."), + DUPLICATED_NAME(ERROR + "차량 이름은 중복될 수 없습니다."), + INVALID_RACING_CARS_SIZE(ERROR + "경주에는 최소 2대의 차량이 참여해야합니다."), + INVALID_TURN_RANGE(ERROR + "시도횟수는 최소 1회 이상이어야 합니다."), + INVALID_TURN_TYPE(ERROR + "숫자 이외의 값은 입력할 수 없습니다."), + CANT_FIND_CAR(ERROR + "차량을 찾을 수 없습니다."); + + private final String message; + + ErrorMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +}

Java

enum 생성자에 대한 이해가 부족했던것 같습니다 ! 좋은 조언 감사합니다 ㅎㅎ

@@ -0,0 +1,63 @@ +package racingcar.domain; + +import static racingcar.domain.ErrorMessage.CANT_FIND_CAR; +import static racingcar.domain.ErrorMessage.DUPLICATED_NAME; +import static racingcar.domain.ErrorMessage.INVALID_RACING_CARS_SIZE; + +import java.util.List; +import java.util.stream.Collectors; + +public class RacingCars { + private static final int MIN_SIZE = 2; + private final List<RacingCar> racingCars; + private RacingCar maxDistanceCar; + + public RacingCars(List<RacingCar> racingCars) { + validateSize(racingCars); + validateDuplicated(racingCars); + this.racingCars = racingCars; + } + + private void validateSize(List<RacingCar> racingCars) { + if (racingCars.size() < MIN_SIZE) { + throw new IllegalArgumentException(INVALID_RACING_CARS_SIZE.getMessage()); + } + } + + private void validateDuplicated(List<RacingCar> racingCars) { + if (isDuplicated(racingCars)) { + throw new IllegalArgumentException(DUPLICATED_NAME.getMessage()); + } + } + + private boolean isDuplicated(List<RacingCar> racingCars) { + int sizeAfterCut = (int) racingCars.stream() + .distinct() + .count(); + return racingCars.size() != sizeAfterCut; + } + + public void startRace() { + racingCars + .forEach(racingCar -> + racingCar.moveForward(RandomNumberGenerator.generateRandomNumber())); + } + + public Winner selectWinner() { + findMaxDistanceCar(); + List<RacingCar> winner = racingCars.stream() + .filter(maxDistanceCar::isWinner) + .collect(Collectors.toList()); + return new Winner(winner); + } + + private void findMaxDistanceCar() { + maxDistanceCar = racingCars.stream() + .max(RacingCar::compareTo) + .orElseThrow(() -> new IllegalArgumentException(CANT_FIND_CAR.getMessage())); + } + + public List<RacingCar> getRacingCars() { + return racingCars; + } +}

Java

제가 3주차 미션을 할때 겪었던 에로사항이 메서드내 모든 코드를 축약을 시키다보니 나중에 제가 그 코드를 보았을때 무슨 코드인지 한눈에 알기가 힘들더군요 ㅜㅜ 그래서 4주차때부터는 어느정도 절제해서 축약을 해보니 가독성이 훨씬 높아졌었던 경험이 있어서 이번에도 이런 방식으로 진행을 해봤습니다!

@@ -0,0 +1,38 @@ +package racingcar.view; + +import java.util.stream.Collectors; +import racingcar.domain.RacingCar; +import racingcar.domain.RacingCars; +import racingcar.domain.Winner; + +public class OutputView { + private static final String RACE_RESULT_MESSAGE = "\n실행 결과"; + private static final String DISTANCE_UNIT = "-"; + private static final String RACE_RESULT_FORMAT = "%s : %s%n"; + private static final String WINNER = "최종 우승자 : "; + private static final String DELIMITER = ", "; + + public static void printRaceResultNotice() { + System.out.println(RACE_RESULT_MESSAGE); + } + + public static void printRaceResult(RacingCars racingCars) { + racingCars.getRacingCars() + .forEach(racingCar -> System.out.printf(RACE_RESULT_FORMAT + , racingCar.getCarName(), changeDistanceForm(racingCar.getDistance()))); + System.out.println(); + } + + private static String changeDistanceForm(int distance) { + return DISTANCE_UNIT.repeat(distance); + } + + public static void printWinner(Winner winner) { + System.out.print(WINNER); + String winners = winner.getWinner() + .stream() + .map(RacingCar::getCarName) + .collect(Collectors.joining(DELIMITER)); + System.out.println(winners); + } +}

Java

받아온 데이터를 어떤식으로 처리할지 결정하는 것은 OutputView의 책임이라고 생각해서 해당 방식으로 진행했습니다~ 3주차 공통 피드백에서도 view에서 사용하는 데이터는 getter를 사용하라고 언급이 되어있구요! <img width="619" alt="image" src="https://github.com/parksangchu/java-racingcar-6/assets/142131857/99c1b2c6-7c6d-49ee-8154-e9d7c306bd0b">

@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class CarNameTest { + @ParameterizedTest + @DisplayName("차량이름은 1-5글자이고 특수문자를 포함하지 않는다.") + @ValueSource(strings = {"abcdef", "", "$", "&", " ", "!", "(", "$", "%"}) + void createCarName(String input) { + assertThatThrownBy(() -> new CarName(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file

Java

처음 보는 메서드였는데 한번 사용해보겠습니다! 감사합니다 ㅎㅎ

@@ -0,0 +1,35 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class RacingCarsTest { + @ParameterizedTest + @DisplayName("경주에는 최소 2대 이상의 차량이 참여해야 하며 중복될 수 없다.") + @ValueSource(strings = {"상추", "상추,상추"}) + void createRacingCars(String input) { + List<RacingCar> racingCars = InputConvertor.convertToRacingCars(input); + assertThatThrownBy(() -> new RacingCars(racingCars)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + @DisplayName("우승자는 상추와 배추다.") + void selectWinner() { + RacingCar sangchu = new RacingCar(new CarName("상추")); + RacingCar baechu = new RacingCar(new CarName("배추")); + RacingCar moodosa = new RacingCar(new CarName("무도사")); + RacingCars racingCars = new RacingCars(List.of(sangchu, baechu, moodosa)); + sangchu.moveForward(5); + baechu.moveForward(6); + Winner winner = racingCars.selectWinner(); + assertThat(winner.getWinner().get(0).getCarName()).isEqualTo("상추"); + assertThat(winner.getWinner().get(1).getCarName()).isEqualTo("배추"); + } +} \ No newline at end of file

Java

코드를 줄이려고 너무 욕심을 내다보니 그만 ... ㅜ 아무래도 따로 테스트하는게 가독성 측면에서도 좋을거 같습니다

@@ -0,0 +1,17 @@ +package racingcar.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class TurnTest { + @ParameterizedTest + @DisplayName("1회 미만, 숫자 이외 값 입력시 예외 발생") + @ValueSource(strings = {"0", "-1", "d", "#", "", " "}) + void createTurn(String input) { + assertThatThrownBy(() -> new Turn(input)) + .isInstanceOf(IllegalArgumentException.class); + } +} \ No newline at end of file

Java

저도 원래는 그런 방식으로 검증을 진행해오다가 이번에 'InputView에서 domain에서 쓰일 데이터 형태를 아는게 맞을까?'하는 의문이 들어 해당 방식으로 진행을 해봤습니다. 그리고 'RacingCar'와 같은 해당 프로그램의 도메인에서 쓰이는 객체를 생성해서 넘기는 것만 아니라면 int와 같은 기본값 형태는 inputView에서 검증해도 괜찮겠다라는 결론을 냈습니다.

@@ -1,7 +1,14 @@ package christmas; +import christmas.controller.ChristmasController; +import christmas.exception.ExceptionHandler; +import christmas.exception.RetryExceptionHandler; + public class Application { public static void main(String[] args) { - // TODO: 프로그램 구현 + ExceptionHandler handler = new RetryExceptionHandler(); + + ChristmasController controller = new ChristmasController(handler); + controller.service(); } }

Java

메서드는 동사로 하는 것이 좋다고 생각하는데, service() 는 정비하다 라는 의미라고 해요! 물론, 서비스 하다~ 라는 느낌인 건 이해하지만 execute()나 operate() 와 같은 동작을 강조하는 동사를 사용하는 건 어떨까 하는 개인적 의견입니다!

@@ -0,0 +1,25 @@ +package christmas.constant; + +public enum Badge { + NONE("없음", 0), + STAR("별", 5_000), + TREE("트리", 10_000), + SANTA("산타", 20_000); + + + private final String badgeName; + private final long prize; + + Badge(String badgeName, long prize){ + this.badgeName = badgeName; + this.prize = prize; + } + + public String getBadgeName(){ + return badgeName; + } + + public long getPrize(){ + return prize; + } +}

Java

이 부분 참 고민 많이 헀는데요, 저도 "없음" 배지를 만든 뒤 고민해보니 도메인 쪽에서 출력 로직을 알아야하는 것 같아서 없음 배지를 삭제하고, Dto에 비어있는 badgeName 값을 넣는 식으로 구현한 후 OutputView에서 전달받은 이벤트 배지 값이 비어있는 String이면 없애는 식으로 처리했습니다. 수진님은 어떻게 생각하시나요?

@@ -0,0 +1,41 @@ +package christmas.constant; + +public enum Menu { + YANGSONGSOUP("양송이수프", 6000, MenuType.APPETIZER), + TAPAS("타파스", 5500, MenuType.APPETIZER), + CAESAR_SALAD("시저샐러드", 8000, MenuType.APPETIZER), + + T_BONE_STEAK("티본스테이크", 55000, MenuType.MAIN), + BBQ_RIB("바비큐립", 54000, MenuType.MAIN), + SEAFOOD_PASTA("해산물파스타", 35000, MenuType.MAIN), + CHRISTMAS_PASTA("크리스마스파스타", 25000, MenuType.MAIN), + + CHOCO_CAKE("초코케이크", 15000, MenuType.DESSERT), + ICE_CREAM("아이스크림", 5000, MenuType.DESSERT), + + ZERO_COLA("제로콜라", 3000, MenuType.BEVERAGE), + RED_WINE("레드와인", 60000, MenuType.BEVERAGE), + CHAMPAGNE("샴페인", 25000, MenuType.BEVERAGE); + + private final String name; + private final int price; + private final MenuType menuType; + + Menu(String name, int price, MenuType menuType) { + this.name = name; + this.price = price; + this.menuType = menuType; + } + + public String getName() { + return name; + } + + public int getPrice() { + return price; + } + + public MenuType getMenuType() { + return menuType; + } +}

Java

MenuType을 static import 하면 좀 더 짧게 코드를 작성할 수 있을거 같아요!

@@ -0,0 +1,74 @@ +package christmas.controller; + +import christmas.constant.Menu; +import christmas.domain.BenefitStorage; +import christmas.dto.BenefitResult; +import christmas.domain.Customer; +import christmas.domain.EventPlanner; +import christmas.dto.OrderMenu; +import christmas.exception.ExceptionHandler; +import christmas.view.InputView; +import christmas.view.OutputView; +import java.util.Map; + +public class ChristmasController { + + private final ExceptionHandler handler; + private Customer customer; + private EventPlanner eventPlanner; + + + public ChristmasController(ExceptionHandler handler){ + this.handler = handler; + } + + public void service(){ + order(); + searchPromotion(customer); + } + + public void order(){ + int date = getDate(); + Map<Menu, Integer> menu = getMenu(); + customer = new Customer(date, menu); + + displayOrder(date, menu); + } + + private int getDate(){ + return handler.getResult(InputView::readVisitDate); + } + + private Map<Menu, Integer> getMenu(){ + return handler.getResult(InputView::readMenu); + } + + private void searchPromotion(Customer customer){ + eventPlanner = new EventPlanner(); + eventPlanner.findPromotion(customer); + + BenefitStorage benefitStorage = storeBenefits(); + previewEventBenefits(benefitStorage); + } + + private BenefitStorage storeBenefits(){ + if(eventPlanner.hasGiftMenu()){ + return new BenefitStorage(customer.getTotalOrderAmount(), true, eventPlanner.getPromotionResult()); + } + return new BenefitStorage(customer.getTotalOrderAmount(), false, eventPlanner.getPromotionResult()); + } + + private void displayOrder(int date, Map<Menu, Integer> menu){ + OrderMenu orderMenu = new OrderMenu(date, menu); + OutputView.printOrder(orderMenu); + } + + + private void previewEventBenefits(BenefitStorage benefitStorage){ + BenefitResult benefitResult = new BenefitResult(benefitStorage.getBeforeDiscountAmount(), + benefitStorage.isGiftMenu(), benefitStorage.getPromotionResult(), benefitStorage.totalBenefitAmount(), + benefitStorage.afterDiscountAmount(), benefitStorage.determineBadge()); + OutputView.printPreview(benefitResult); + } + +}

Java

사소하지만 네이밍을 `OrderedMenu` 로 하면 어떨까요?

@@ -0,0 +1,74 @@ +package christmas.controller; + +import christmas.constant.Menu; +import christmas.domain.BenefitStorage; +import christmas.dto.BenefitResult; +import christmas.domain.Customer; +import christmas.domain.EventPlanner; +import christmas.dto.OrderMenu; +import christmas.exception.ExceptionHandler; +import christmas.view.InputView; +import christmas.view.OutputView; +import java.util.Map; + +public class ChristmasController { + + private final ExceptionHandler handler; + private Customer customer; + private EventPlanner eventPlanner; + + + public ChristmasController(ExceptionHandler handler){ + this.handler = handler; + } + + public void service(){ + order(); + searchPromotion(customer); + } + + public void order(){ + int date = getDate(); + Map<Menu, Integer> menu = getMenu(); + customer = new Customer(date, menu); + + displayOrder(date, menu); + } + + private int getDate(){ + return handler.getResult(InputView::readVisitDate); + } + + private Map<Menu, Integer> getMenu(){ + return handler.getResult(InputView::readMenu); + } + + private void searchPromotion(Customer customer){ + eventPlanner = new EventPlanner(); + eventPlanner.findPromotion(customer); + + BenefitStorage benefitStorage = storeBenefits(); + previewEventBenefits(benefitStorage); + } + + private BenefitStorage storeBenefits(){ + if(eventPlanner.hasGiftMenu()){ + return new BenefitStorage(customer.getTotalOrderAmount(), true, eventPlanner.getPromotionResult()); + } + return new BenefitStorage(customer.getTotalOrderAmount(), false, eventPlanner.getPromotionResult()); + } + + private void displayOrder(int date, Map<Menu, Integer> menu){ + OrderMenu orderMenu = new OrderMenu(date, menu); + OutputView.printOrder(orderMenu); + } + + + private void previewEventBenefits(BenefitStorage benefitStorage){ + BenefitResult benefitResult = new BenefitResult(benefitStorage.getBeforeDiscountAmount(), + benefitStorage.isGiftMenu(), benefitStorage.getPromotionResult(), benefitStorage.totalBenefitAmount(), + benefitStorage.afterDiscountAmount(), benefitStorage.determineBadge()); + OutputView.printPreview(benefitResult); + } + +}

Java

`customer = new Customer(getDate(), getMenu());` 로 한번에 해도 좋을 거 같아요. `getDate()` 나 `getMenu()` 둘 다 메서드 이름으로 뭐를 하는지 정확히 알 수 있어보입니다.

@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}

Java

Map 타입으로 인스턴스 변수를 가지면 추후 세부 구현 자료구조가 바뀔 때 능동적으로 대처할 수 있을거 같아요!

@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}

Java

어찌보면 Dto에 가까운 성격을 가지는 클래스인데 도메인 로직을 다 넣어둔 느낌을 받았습니다. 결국 출력때 필요한 자료들을 다 가지고 있어서 도메인을 다른 방식으로 분리해보는 것을 고려해보면 어떨까요?

@@ -0,0 +1,71 @@ +package christmas.domain; + +import christmas.constant.MenuType; +import christmas.constant.PromotionType; +import christmas.domain.promotion.ChristmasPromotion; +import christmas.domain.promotion.DdayPromotion; +import christmas.domain.promotion.GiftPromotion; +import christmas.domain.promotion.SpecialPromotion; +import christmas.domain.promotion.WeekDayPromotion; +import christmas.domain.promotion.WeekendPromotion; +import java.util.HashMap; +import java.util.Map; + +public class EventPlanner { + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public EventPlanner(){ + promotionResult = new HashMap<>(); + promotionResult.put(new DdayPromotion(), 0L); + promotionResult.put(new GiftPromotion(), 0L); + promotionResult.put(new SpecialPromotion(), 0L); + promotionResult.put(new WeekDayPromotion(), 0L); + promotionResult.put(new WeekendPromotion(), 0L); + } + + public void findPromotion(Customer customer){ + for(ChristmasPromotion promotion : promotionResult.keySet()){ + checkPromotionConditions(promotion, customer); + } + } + + public boolean hasGiftMenu(){ + return promotionResult.entrySet() + .stream() + .filter(entry -> entry.getKey() instanceof GiftPromotion) + .mapToLong(Map.Entry::getValue) + .sum() > 0; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult(){ + return promotionResult; + } + + private void checkPromotionConditions(ChristmasPromotion promotion, Customer customer){ + long discount = customer.applicablePromotion(promotion); + + if (isContainWeekOrWeekend(promotion)) { + discount *= checkMenuCount(customer, promotion.getPromotionType()); + } + promotionResult.put(promotion, promotionResult.get(promotion) + discount); + } + + private int checkMenuCount(Customer customer, PromotionType promotionType) { + Map<PromotionType, MenuType> promotionTypeMenuTypeMap = Map.of( + PromotionType.WEEKDAY, MenuType.DESSERT, + PromotionType.WEEKEND, MenuType.MAIN + ); + + MenuType menuType = promotionTypeMenuTypeMap.getOrDefault(promotionType, MenuType.NONE); + return customer.countMenuType(menuType); + } + + private boolean isContainWeekOrWeekend(ChristmasPromotion promotion){ + if(promotion.getPromotionType() == PromotionType.WEEKDAY + || promotion.getPromotionType() == PromotionType.WEEKEND) + return true; + + return false; + } + +}

Java

변수 명에 Map 을 사용하는 것보다는 `PromotionsAppliedToEachMenu` 와 같이 사용하는 것은 어떨까요?

@@ -0,0 +1,43 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class DdayPromotion extends ChristmasPromotion{ + + private static final int START_DATE = 1; + private static final int END_DATE = 25; + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + + public DdayPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.DDAY; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(data); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return date >= period.get(0) && date <= period.get(1); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + public long getDiscountAmount(int date) { + return discountAmount + 100L * (date - 1); + } +}

Java

매직넘버를 상수로 두는건 어떨까요?

@@ -0,0 +1,39 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class GiftPromotion extends ChristmasPromotion{ + + private static final long PRICETHRESHOLD = 120000; + private static final int START_DATE = 1; + private static final int END_DATE = 31; + private static final int INIT_DISCOUNT_AMOUNT = 25000; + + public GiftPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.GIFT_CHAMPAGNE; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.GIFT; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return date >= period.get(0) && date <= period.get(1); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= PRICETHRESHOLD; + } + +}

Java

`PRICE_THRESHOLD` 와 같이 나눠주면 가독성이 더 좋아질 것 같습니다!

@@ -0,0 +1,38 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class SpecialPromotion extends ChristmasPromotion{ + + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + public SpecialPromotion(){ + this.period = Arrays.asList(3, 10, 17, 24, 25, 31); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.SPECIAL; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return period.contains(date); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + +}

Java

요것도 매직넘버! 혹은 1~31 값 중 7로 나누었을 때 나머지가 3인 날짜로 초기화해줘도 좋을 거 같아요

@@ -0,0 +1,38 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.Arrays; + +public class SpecialPromotion extends ChristmasPromotion{ + + private static final int INIT_DISCOUNT_AMOUNT = 1000; + private static final int MIN_ORDER_AMOUNT = 10000; + + public SpecialPromotion(){ + this.period = Arrays.asList(3, 10, 17, 24, 25, 31); + this.targetItems = PromotionItem.TOTAL_ORDER_AMOUNT; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.SPECIAL; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + return period.contains(date); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + +}

Java

공백도 코딩컨벤션이라, 다른 클래스 파일과 맞춰주는게 어떨까요?

@@ -0,0 +1,47 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.time.LocalDate; +import java.time.DayOfWeek; +import java.util.Arrays; + +public class WeekDayPromotion extends ChristmasPromotion{ + + private static final int START_DATE = 1; + private static final int END_DATE = 31; + private static final int INIT_DISCOUNT_AMOUNT = 2023; + private static final int MIN_ORDER_AMOUNT = 10000; + + public WeekDayPromotion(){ + this.period = Arrays.asList(START_DATE, END_DATE); + this.targetItems = PromotionItem.DESSERT_MENU; + this.discountAmount = INIT_DISCOUNT_AMOUNT; + this.promotionType = PromotionType.WEEKDAY; + } + + @Override + public long applyPromotion(int data, long orderAmount){ + if(isApplicable(data) && isEligibleForPromotion(orderAmount)){ + return getDiscountAmount(); + } + return 0L; + } + + @Override + protected boolean isApplicable(int date) { + LocalDate orderDate = LocalDate.of(2023, 12, date); + + return isWeekday(orderDate); + } + + @Override + protected boolean isEligibleForPromotion(long orderAmount){ + return orderAmount >= MIN_ORDER_AMOUNT; + } + + private boolean isWeekday(LocalDate date) { + DayOfWeek dayOfWeek = date.getDayOfWeek(); + return dayOfWeek != DayOfWeek.FRIDAY && dayOfWeek != DayOfWeek.SATURDAY; + } +}

Java

내부 상수로 두는 것보다, 생성될 때 위의 상수 값으로 초기화 시키고 객체를 싱글톤으로 관리하는 것도 좋을 것 같아요

@@ -0,0 +1,7 @@ +package christmas.exception; + +import java.util.function.Supplier; + +public interface ExceptionHandler { + <T> T getResult(Supplier<T> supplier); +}

Java

`Supplier` 라는 문법은 처음보네요! 함수형 프로그래밍? 인가 보네요 ㅎㅎ 배워갑니다.

@@ -0,0 +1,28 @@ +package christmas.exception; + +import christmas.view.OutputView; +import java.util.function.Supplier; + +public class RetryExceptionHandler implements ExceptionHandler{ + + @Override + public <T> T getResult(Supplier<T> supplier) { + while (true) { + try { + return supplier.get(); + } catch (IllegalArgumentException e) { + printException(e); + } finally { + afterHandlingException(); + } + } + } + + private void printException(IllegalArgumentException e) { + OutputView.printErrorMessage(e); + } + + private void afterHandlingException() { + OutputView.printEmptyLine(); + } +}

Java

이렇게 하면 try-catch문의 중복 로직을 뺄 수 있겠군요.!

@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE || input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}

Java

해당 메서드는 Map을 반환하기 보다는 void 형식으로 예외를 던질 것 같은 네이밍이라 느껴져요. 역할을 검증 및 반환 두개를 하는 것 같은데 각 역할에 맞는 메서드로 나눠보는 것은 어떻게 생각하시나요?

@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE || input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}

Java

조건문의 조건을 하나의 메서드로 빼는 것도 좋을 것 같습니다.

@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE || input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}

Java

null 을 직접 다루는 것보다, Menu 내에서 이름을 받아서 Menu의 유무를 처리하는 메서드를 만드는 것은 어떨까요?

@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE || input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}

Java

이 부분에서 Exception을 던져주는 것도 좋을 것 같아요!

@@ -0,0 +1,44 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public class BenefitsView { + + public static String giftMenuOutputStatement(boolean giftMenu){ + if(giftMenu) + return OutputMessage.CHAMPAGNE.getMessage(); + + return OutputMessage.DOES_NOT_EXIST.getMessage(); + } + + public static String promotionResultOutputStatement(long totalBenefitAmount, HashMap<ChristmasPromotion, Long> promotionResult){ + if(totalBenefitAmount == 0) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + + return findPromotionDetail(promotionResult).toString(); + } + + public static String badgeOutputStatement(Badge badge){ + if(badge == Badge.NONE) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + return badge.getBadgeName(); + } + + private static StringBuilder findPromotionDetail(HashMap<ChristmasPromotion, Long> promotionResult){ + StringBuilder sb = new StringBuilder(); + for(ChristmasPromotion promotion: promotionResult.keySet()){ + long discount = promotionResult.get(promotion); + if(discount == 0) continue; + + sb.append(String.format(OutputMessage.BENEFIT_DETAILS.getMessage(), + promotion.getPromotionType().getMessage(), discount)); + } + + if(sb.isEmpty()) + return sb.append(OutputMessage.DOES_NOT_EXIST.getMessage()); + return sb; + } +}

Java

if 문 을 {} 로 감싸주는게 코딩 컨벤션으로 알고 있습니다!

@@ -0,0 +1,74 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import christmas.dto.BenefitResult; +import christmas.dto.OrderMenu; +import java.util.HashMap; +import java.util.Map; + +public class OutputView { + + public static void printErrorMessage(IllegalArgumentException e){ + System.out.println(e.getMessage()); + } + + public static void printEmptyLine(){ + System.out.println(); + } + + public static void printOrder(OrderMenu orderMenu){ + printDate(orderMenu.date()); + printEmptyLine(); + printOrderedMenu(orderMenu.menu()); + } + + public static void printPreview(BenefitResult benefits){ + printBeforeDiscountAmount(benefits.beforeDiscountAmount()); + printHasGift(benefits.giftMenu()); + printBenefitsDetail(benefits.beforeDiscountAmount(), benefits.promotionResult()); + printTotalBenefits(benefits.totalBenefitAmount()); + printAfterDiscountAmount(benefits.afterDiscountAmount()); + printBadge(benefits.badge()); + } + + private static void printOrderedMenu(Map<Menu, Integer> orderMenu){ + System.out.println(String.format(OutputMessage.ORDER_MENU_PREFIX.getMessage(), + OrderMenuView.orderMenuOutputStatement(orderMenu))); + } + + private static void printDate(int date){ + System.out.println(String.format(OutputMessage.RESERVATION_DATE.getMessage(), date)); + } + + private static void printBeforeDiscountAmount(long total){ + System.out.println(String.format(OutputMessage.BEFORE_DISCOUNT_AMOUNT.getMessage(), total)); + } + + private static void printHasGift(boolean hasGift){ + System.out.println(String.format(OutputMessage.GIVEAWAY_MENU.getMessage(), + BenefitsView.giftMenuOutputStatement(hasGift))); + + } + + private static void printBenefitsDetail(long price, HashMap<ChristmasPromotion, Long> result){ + System.out.println(String.format(OutputMessage.BENEFIT_DETAILS_PREFIX.getMessage(), + BenefitsView.promotionResultOutputStatement(price, result))); + } + + private static void printTotalBenefits(long price){ + System.out.println(String.format(OutputMessage.TOTAL_BENEFIT_AMOUNT.getMessage(), -price)); + } + + private static void printAfterDiscountAmount(long price){ + System.out.println(String.format(OutputMessage.AFTER_DISCOUNT_AMOUNT.getMessage(), price)); + } + + private static void printBadge(Badge badge){ + System.out.println(String.format(OutputMessage.PROMOTION_BADGE.getMessage(), + BenefitsView.badgeOutputStatement(badge))); + } + +}

Java

예외를 직접 받는 것보다 예외를 던지는 쪽에서 e.getMessage() 로 String 값을 던져주면 메서드가 좀 더 범용성이 있을 것 같습니다.

@@ -0,0 +1,27 @@ +package christmas.constant; + +public enum OutputMessage { + + RESERVATION_DATE("12월 %d일에 우테코 식당에서 받을 이벤트 혜택 미리 보기!"), + ORDER_MENU_PREFIX("<주문 메뉴>%n%s"), + ORDER_MENU("%s %d개\n"), + BEFORE_DISCOUNT_AMOUNT("<할인 전 총주문 금액>%n%,d원\n"), + GIVEAWAY_MENU("<증정 메뉴>%n%s"), + DOES_NOT_EXIST("없음\n"), + CHAMPAGNE("샴페인 1개\n"), + BENEFIT_DETAILS_PREFIX("<혜택 내역>%n%s"), + BENEFIT_DETAILS("%s: %,d원\n"), + TOTAL_BENEFIT_AMOUNT("<총혜택 금액>%n%,d원\n"), + AFTER_DISCOUNT_AMOUNT("<할인 후 예상 결제 금액>%n%,d원\n"), + PROMOTION_BADGE("<12월 이벤트 배지>%n%s\n"); + + private final String message; + + OutputMessage(String message) { + this.message = message; + } + + public String getMessage(){ + return this.message; + } +}

Java

개행문자를 System.lineseparator() 로 처리하는걸 추천드립니다! 운영체제 별로 개행문자 표현이 상이할 수 있거든요!

@@ -0,0 +1,55 @@ +package christmas.domain; + +import christmas.constant.Badge; +import christmas.constant.Menu; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.Arrays; +import java.util.HashMap; + +public class BenefitStorage { + + private final long beforeDiscountAmount; + private final boolean giftMenu; + private final HashMap<ChristmasPromotion, Long> promotionResult; + + public BenefitStorage(long beforeDiscountAmount, boolean giftMenu, HashMap<ChristmasPromotion, Long> promotionResult){ + this.beforeDiscountAmount = beforeDiscountAmount; + this.giftMenu = giftMenu; + this.promotionResult = promotionResult; + } + + public long totalBenefitAmount() { + return promotionResult.values().stream().mapToLong(Long::longValue).sum(); + } + + public long afterDiscountAmount() { + long totalBenefit = totalBenefitAmount(); + + if (giftMenu) { + totalBenefit -= Menu.CHAMPAGNE.getPrice(); + } + + return beforeDiscountAmount - totalBenefit; + } + + public Badge determineBadge() { + long totalBenefit = totalBenefitAmount(); + + return Arrays.stream(Badge.values()) + .filter(badge -> totalBenefit >= badge.getPrize()) + .reduce((first, second) -> second) + .orElse(Badge.NONE); + } + + public long getBeforeDiscountAmount() { + return beforeDiscountAmount; + } + + public boolean isGiftMenu() { + return giftMenu; + } + + public HashMap<ChristmasPromotion, Long> getPromotionResult() { + return promotionResult; + } +}

Java

이 부분을 Map으로 선언하면 다형성을 좀 더 활용하실 수 있을거에요!

@@ -0,0 +1,26 @@ +package christmas.domain.promotion; + +import christmas.constant.PromotionItem; +import christmas.constant.PromotionType; +import java.util.List; + +public abstract class ChristmasPromotion { + + protected List<Integer> period; + protected PromotionItem targetItems; + protected long discountAmount; + protected PromotionType promotionType; + + public long getDiscountAmount() { + return discountAmount; + } + + public PromotionType getPromotionType(){ + return promotionType; + } + + public abstract long applyPromotion(int data, long orderAmount); + protected abstract boolean isApplicable(int date); + protected abstract boolean isEligibleForPromotion(long orderAmount); + +}

Java

이 부분을 추상 클래스로 구현하신 이유를 알수있을까요?? 제가 추상 클래스에 대해 익숙하지 않아서요!

@@ -0,0 +1,17 @@ +package christmas.dto; + +import christmas.constant.Badge; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public record BenefitResult( + + long beforeDiscountAmount, + boolean giftMenu, + HashMap<ChristmasPromotion, Long> promotionResult, + long totalBenefitAmount, + long afterDiscountAmount, + Badge badge) +{ + +}

Java

레코드를 활용하셨네요. 이 부분은 메모해두었다가 저도 적용해보겠습니다! 좋은 코드 감사합니다!

@@ -0,0 +1,9 @@ +package christmas.util; + +public class Parser { + + public static int stringToInteger(String input) { + return Integer.parseInt(input); + } + +}

Java

사소한 컨버팅이라도 객체로 만들어서 활용하신게 좋네요!

@@ -0,0 +1,119 @@ +package christmas.validator; + +import christmas.constant.Menu; +import christmas.constant.MenuType; +import christmas.exception.ErrorCode; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class InputValidator { + + private static int START_DATE = 1; + private static int END_DATE = 31; + private static String COMMA = ","; + private static String HYPHEN = "-"; + private static int MENU_FORMAT_LENGTH = 2; + private static int MINIMUM_ORDER_COUNT = 1; + private static int MAXIMUN_ORDER_COUNT = 20; + + public static void validateVisitDate(String input){ + validateInteger(input); + validateNumberInRange(Integer.parseInt(input)); + } + + public static Map<Menu, Integer> validateMenuOrder(String input, Map<Menu, Integer> orderMenu){ + String[] orders = input.split(COMMA); + Set<Menu> uniqueMenu = new HashSet<>(); + + for (String order : orders) { + validate(order, orderMenu, uniqueMenu); + } + + validateOnlyBeverage(orderMenu); + validateMaxOrder(orderMenu); + + return orderMenu; + } + + private static void validate(String order, Map<Menu, Integer> orderMenu, Set<Menu> uniqueMenu){ + String[] parts = validateMenuOrderFormat(order.trim()); + + String menuName = parts[0]; + String quantity = parts[1]; + + Menu menu = getMenuByName(menuName); + + validateMenuFound(menu); + validateMinimumOrder(quantity); + validateDuplicateMenu(menu, uniqueMenu); + + orderMenu.put(menu, Integer.parseInt(quantity)); + } + + private static void validateInteger(String input){ + if(!input.chars().allMatch(Character::isDigit)){ + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + } + + private static void validateNumberInRange(int input){ + if(input > END_DATE || input < START_DATE) + throw new IllegalArgumentException(ErrorCode.INVALID_DATE.getMessage()); + } + + private static String[] validateMenuOrderFormat(String orders){ + String[] parts = orders.split(HYPHEN); + if (parts.length != MENU_FORMAT_LENGTH) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + return parts; + } + + private static void validateMenuFound(Menu menu){ + if(menu == null) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMinimumOrder(String quantity){ + if(!quantity.chars().allMatch(Character::isDigit)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + + if(Integer.parseInt(quantity) < MINIMUM_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateMaxOrder(Map<Menu, Integer> orderMenu){ + int orderCount = 0; + for(Menu menu: orderMenu.keySet()) { + orderCount += orderMenu.get(menu); + } + + if(orderCount > MAXIMUN_ORDER_COUNT) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + private static void validateDuplicateMenu(Menu menu, Set<Menu> uniqueMenu){ + if(!uniqueMenu.add(menu)) + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + + + private static void validateOnlyBeverage(Map<Menu, Integer> orderMenu){ + boolean allBeverages = orderMenu.keySet().stream() + .allMatch(menu -> menu.getMenuType() == MenuType.BEVERAGE); + + if (allBeverages) { + throw new IllegalArgumentException(ErrorCode.INVALID_MENU.getMessage()); + } + } + + private static Menu getMenuByName(String name) { + for (Menu menu : Menu.values()) { + if (menu.getName().equalsIgnoreCase(name)) { + return menu; + } + } + return null; + } +}

Java

준님이 말씀하신것 처럼 Menu의 유무를 처리하는 메서드를 구현하시거나, Optional 객체를 활용하시는걸 추천드립니다!

@@ -0,0 +1,44 @@ +package christmas.view; + +import christmas.constant.Badge; +import christmas.constant.OutputMessage; +import christmas.domain.promotion.ChristmasPromotion; +import java.util.HashMap; + +public class BenefitsView { + + public static String giftMenuOutputStatement(boolean giftMenu){ + if(giftMenu) + return OutputMessage.CHAMPAGNE.getMessage(); + + return OutputMessage.DOES_NOT_EXIST.getMessage(); + } + + public static String promotionResultOutputStatement(long totalBenefitAmount, HashMap<ChristmasPromotion, Long> promotionResult){ + if(totalBenefitAmount == 0) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + + return findPromotionDetail(promotionResult).toString(); + } + + public static String badgeOutputStatement(Badge badge){ + if(badge == Badge.NONE) + return OutputMessage.DOES_NOT_EXIST.getMessage(); + return badge.getBadgeName(); + } + + private static StringBuilder findPromotionDetail(HashMap<ChristmasPromotion, Long> promotionResult){ + StringBuilder sb = new StringBuilder(); + for(ChristmasPromotion promotion: promotionResult.keySet()){ + long discount = promotionResult.get(promotion); + if(discount == 0) continue; + + sb.append(String.format(OutputMessage.BENEFIT_DETAILS.getMessage(), + promotion.getPromotionType().getMessage(), discount)); + } + + if(sb.isEmpty()) + return sb.append(OutputMessage.DOES_NOT_EXIST.getMessage()); + return sb; + } +}

Java

이 부분을 별도 메서드로 빼서 인덴트를 줄여보는게 어떨까요?? 인텔리제이에서 해당 부분을 드래그한 뒤 cmd+option+m 을 입력하시면 메서드로 추출할 수 있습니다!

@@ -0,0 +1,16 @@ +package christmas.view; + +import christmas.constant.Menu; +import christmas.constant.OutputMessage; +import java.util.Map; + +public class OrderMenuView { + + public static String orderMenuOutputStatement(Map<Menu, Integer> orderMenu){ + StringBuilder sb = new StringBuilder(); + for(Menu menu : orderMenu.keySet()){ + sb.append(String.format(OutputMessage.ORDER_MENU.getMessage(), menu.getName(), orderMenu.get(menu))); + } + return sb.toString(); + } +}

Java

저는 view를 위한 log데이터를 하나의 도메인에서 처리했는데 이렇게 별도의 객체를 생성해서 관리하면 역할과 책임이 명확해지겠네요! 한 수 배워갑니다!

@@ -0,0 +1,71 @@ +import { generateBasicToken } from '../utils/auth'; +import convertCartItem from '../utils/convertCartItem'; + +const API_URL = process.env.VITE_API_URL ?? 'undefined_URL'; +const USER_ID = process.env.VITE_API_USER_ID ?? 'undefined_USER_ID'; +const USER_PASSWORD = + process.env.VITE_API_USER_PASSWORD ?? 'undefined_USER_PASSWORD'; + +export const requestCartItemList = async () => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'GET', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + }); + + if (!response.ok) { + throw new Error('Failed to fetch products:'); + } + const data = await response.json(); + + return convertCartItem(data.content); +}; + +export const requestSetCartItemQuantity = async ( + cartItemId: number, + quantity: number, +) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'PATCH', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + quantity, + }), + }); + + if (!response.ok) { + throw new Error('Failed to setCartItemQuantity'); + } +}; + +export const requestDeleteCartItem = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'DELETE', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + id: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to deleteCartItem'); + } +}; + +// TEST를 위한 cartItem추가 API 실행 +export const requestAddCartItemForTest = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'POST', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + productId: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to addCartItem'); + } +};

TypeScript

요고는 각 api마다 선언해서 사용해주시는 걸로 확인됐는데, 상수로 분리해도 좋을 것 같아요! 🐫

@@ -0,0 +1,87 @@ +import * as S from './CartItem.style'; +import Text from '../common/Text/Text'; +import Button from '../common/Button/Button'; +import Divider from '../common/Divider/Divider'; +import Checkbox from '../common/Checkbox/Checkbox'; +import ImageBox from '../common/ImageBox/ImageBox'; +import useCartItemList from '../../hooks/cartItem/useCartItemList'; +import ChangeQuantity from '../common/ChangeQuantity/ChangeQuantity'; +import { useCartItemQuantity } from '../../hooks/cartItem/useCartItemQuantity'; +import { useSelectedCartItemId } from '../../hooks/cartItem/useSelectedCartItemId'; +import useApiErrorState from '../../hooks/error/useApiErrorState'; + +export type CartItemProps = { + type?: 'cart' | 'confirm'; + cartItem: CartItem; +}; + +const CartItem = ({ type = 'cart', cartItem }: CartItemProps) => { + const { id, name, price, imageUrl } = cartItem; + const { apiError } = useApiErrorState(); + const { cartItemQuantity, increaseQuantity, decreaseQuantity } = + useCartItemQuantity(); + const { isSelectedId, selectCartItem, unselectCartItem } = + useSelectedCartItemId(); + const { deleteCartItem } = useCartItemList(); + + if ( + apiError?.name === 'FailedDeleteCartItemError' || + apiError?.name === 'FailedSetCartItemQuantityError' + ) { + throw apiError; + } + + return ( + <S.CartItem> + <Divider /> + {type === 'cart' ? ( + <S.ItemHeader> + <Checkbox + state={isSelectedId(id)} + handleClick={ + isSelectedId(id) + ? () => unselectCartItem(id) + : () => selectCartItem(id) + } + /> + <Button size="s" radius="s" onClick={() => deleteCartItem(id)}> + 삭제 + </Button> + </S.ItemHeader> + ) : null} + <S.ItemBody> + <ImageBox + width={112} + height={112} + radius="m" + border="lightGray" + src={imageUrl} + alt="상품 이미지" + /> + <S.ItemDetail> + <S.ItemNameAndCost> + <Text size="s" weight="m"> + {name} + </Text> + <Text size="l" weight="l"> + {`${price.toLocaleString('ko-KR')}원`} + </Text> + </S.ItemNameAndCost> + {type === 'cart' ? ( + <ChangeQuantity + quantity={cartItemQuantity(id)} + increaseQuantity={() => increaseQuantity(id)} + decreaseQuantity={() => decreaseQuantity(id)} + /> + ) : ( + <Text size="s" weight="m"> + {`${cartItemQuantity(id)}개`} + </Text> + )} + </S.ItemDetail> + </S.ItemBody> + </S.CartItem> + ); +}; + +export default CartItem;

Unknown

type을 2개로 분리해서 구현하신 이유가 있을까요? 제가 느끼기에는 컴포넌트를 분리했어도 괜찮지 않나 싶은 생각도 들어서요!

@@ -1,10 +1,41 @@ -import "./App.css"; +import { Suspense } from 'react'; + +import styled from 'styled-components'; +import { ErrorBoundary } from 'react-error-boundary'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; + +import CartPage from './pages/CartPage'; +import ConfirmPurchasePage from './pages/ConfirmPurchasePage'; +import CompletePurchasePage from './pages/CompletePurchasePage'; +import ErrorFallback from './components/ErrorFallback/ErrorFallback'; +import LoadingFallback from './components/LoadingFallback/LoadingFallback'; + +const AppContainer = styled.div` + max-width: 768px; + width: 100%; +`; function App() { return ( - <> - <h1>react-shopping-cart</h1> - </> + <BrowserRouter> + <AppContainer> + <ErrorBoundary FallbackComponent={ErrorFallback}> + <Suspense fallback={<LoadingFallback />}> + <Routes> + <Route path="/" element={<CartPage />} /> + <Route + path="/confirm-purchase" + element={<ConfirmPurchasePage />} + /> + <Route + path="/complete-purchase" + element={<CompletePurchasePage />} + /> + </Routes> + </Suspense> + </ErrorBoundary> + </AppContainer> + </BrowserRouter> ); }

Unknown

사소하지만 RESTful하게 path를 작성해주셨네요 👏👏👏👏

@@ -1,10 +1,41 @@ -import "./App.css"; +import { Suspense } from 'react'; + +import styled from 'styled-components'; +import { ErrorBoundary } from 'react-error-boundary'; +import { BrowserRouter, Route, Routes } from 'react-router-dom'; + +import CartPage from './pages/CartPage'; +import ConfirmPurchasePage from './pages/ConfirmPurchasePage'; +import CompletePurchasePage from './pages/CompletePurchasePage'; +import ErrorFallback from './components/ErrorFallback/ErrorFallback'; +import LoadingFallback from './components/LoadingFallback/LoadingFallback'; + +const AppContainer = styled.div` + max-width: 768px; + width: 100%; +`; function App() { return ( - <> - <h1>react-shopping-cart</h1> - </> + <BrowserRouter> + <AppContainer> + <ErrorBoundary FallbackComponent={ErrorFallback}> + <Suspense fallback={<LoadingFallback />}> + <Routes> + <Route path="/" element={<CartPage />} /> + <Route + path="/confirm-purchase" + element={<ConfirmPurchasePage />} + /> + <Route + path="/complete-purchase" + element={<CompletePurchasePage />} + /> + </Routes> + </Suspense> + </ErrorBoundary> + </AppContainer> + </BrowserRouter> ); }

Unknown

사소하지만, 다음 미션부터는 [createBrowserRouter](https://reactrouter.com/en/main/routers/create-browser-router)를 사용해봐도 괜찮을 것 같아서 공유드려요! 관련해서 수야와도 리뷰를 한 적이 있어서 첨부합니다! https://github.com/cys4585/react-shopping-cart/pull/1/files/0636ab3b3126ca9b8873cb7fec59c13b05c81985#r1603187152

@@ -0,0 +1,71 @@ +import { generateBasicToken } from '../utils/auth'; +import convertCartItem from '../utils/convertCartItem'; + +const API_URL = process.env.VITE_API_URL ?? 'undefined_URL'; +const USER_ID = process.env.VITE_API_USER_ID ?? 'undefined_USER_ID'; +const USER_PASSWORD = + process.env.VITE_API_USER_PASSWORD ?? 'undefined_USER_PASSWORD'; + +export const requestCartItemList = async () => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'GET', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + }); + + if (!response.ok) { + throw new Error('Failed to fetch products:'); + } + const data = await response.json(); + + return convertCartItem(data.content); +}; + +export const requestSetCartItemQuantity = async ( + cartItemId: number, + quantity: number, +) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'PATCH', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + quantity, + }), + }); + + if (!response.ok) { + throw new Error('Failed to setCartItemQuantity'); + } +}; + +export const requestDeleteCartItem = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items/${cartItemId}`, { + method: 'DELETE', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + id: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to deleteCartItem'); + } +}; + +// TEST를 위한 cartItem추가 API 실행 +export const requestAddCartItemForTest = async (cartItemId: number) => { + const token = generateBasicToken(USER_ID, USER_PASSWORD); + const response = await fetch(`${API_URL}/cart-items`, { + method: 'POST', + headers: { Authorization: token, 'Content-Type': 'application/json' }, + body: JSON.stringify({ + productId: cartItemId, + }), + }); + + if (!response.ok) { + throw new Error('Failed to addCartItem'); + } +};

TypeScript

제가 지난 번에 남겼던 리뷰를 반영해주신것 같아서 기분이 조으네요..ㅎㅎ

@@ -0,0 +1,121 @@ +import { render, screen, fireEvent } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import CartItem, { CartItemProps } from './CartItem'; +import { RecoilRoot } from 'recoil'; +import { useCartItemQuantity } from '../../recoil/cartItem/useCartItemQuantity'; +import { useCartItemSelectedIdList } from '../../recoil/cartItem/useCartItemSelectedIdList'; +import useCartItemList from '../../recoil/cartItemList/useCartItemList'; + +// Mock Recoil hooks +jest.mock('../../recoil/cartItem/useCartItemQuantity'); +jest.mock('../../recoil/cartItem/useCartItemSelectedIdList'); +jest.mock('../../recoil/cartItemList/useCartItemList'); + +const mockedUseCartItemQuantity = useCartItemQuantity as jest.Mock; +const mockedUseCartItemSelectedIdList = useCartItemSelectedIdList as jest.Mock; +const mockedUseCartItemList = useCartItemList as jest.Mock; + +// Sample product data +const product = { + productId: 3, + name: '아디다스', + price: 2000, + imageUrl: 'https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg', + category: 'fashion', +}; + +const mockCartItemProps: CartItemProps = { + product, + quantity: 5, + cartItemId: 1, +}; + +describe('CartItem 컴포넌트', () => { + beforeEach(() => { + mockedUseCartItemQuantity.mockReturnValue({ + quantity: 5, + updateQuantity: jest.fn(), + increaseQuantity: jest.fn(), + decreaseQuantity: jest.fn(), + }); + + mockedUseCartItemSelectedIdList.mockReturnValue({ + getIsSelected: jest.fn().mockReturnValue(false), + addSelectedId: jest.fn(), + removeSelectedId: jest.fn(), + }); + + mockedUseCartItemList.mockReturnValue({ + deleteCartItem: jest.fn(), + }); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + test('컴포넌트가 올바르게 렌더링된다', () => { + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + expect(screen.getByText('아디다스')).toBeInTheDocument(); + expect(screen.getByText('2,000원')).toBeInTheDocument(); + expect(screen.getByText('5')).toBeInTheDocument(); + }); + + test('삭제 버튼을 클릭했을 때 deleteCartItem 함수가 호출된다', () => { + const { deleteCartItem } = mockedUseCartItemList(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + fireEvent.click(screen.getByText('삭제')); + expect(deleteCartItem).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + }); + + test('체크박스를 클릭했을 때 선택 상태가 변경된다', () => { + const { addSelectedId, removeSelectedId, getIsSelected } = mockedUseCartItemSelectedIdList(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + // Initially not selected + getIsSelected.mockReturnValue(false); + const checkbox = screen.getByAltText('Checkbox'); + fireEvent.click(checkbox); + expect(addSelectedId).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + + // Now selected + getIsSelected.mockReturnValue(true); + fireEvent.click(checkbox); + expect(removeSelectedId).toHaveBeenCalledWith(mockCartItemProps.cartItemId); + }); + + test('수량 증가 및 감소 버튼이 제대로 작동한다', () => { + const { increaseQuantity, decreaseQuantity } = mockedUseCartItemQuantity(); + + render( + <RecoilRoot> + <CartItem {...mockCartItemProps} /> + </RecoilRoot>, + ); + + const increaseButton = screen.getByLabelText('plus'); + const decreaseButton = screen.getByLabelText('minus'); + + fireEvent.click(increaseButton); + expect(increaseQuantity).toHaveBeenCalledTimes(1); + + fireEvent.click(decreaseButton); + expect(decreaseQuantity).toHaveBeenCalledTimes(1); + }); +});

Unknown

ui테스트도 작성을 해주셨네요...!! 굿굿~~!

@@ -0,0 +1,87 @@ +import * as S from './CartItem.style'; +import Text from '../common/Text/Text'; +import Button from '../common/Button/Button'; +import Divider from '../common/Divider/Divider'; +import Checkbox from '../common/Checkbox/Checkbox'; +import ImageBox from '../common/ImageBox/ImageBox'; +import useCartItemList from '../../hooks/cartItem/useCartItemList'; +import ChangeQuantity from '../common/ChangeQuantity/ChangeQuantity'; +import { useCartItemQuantity } from '../../hooks/cartItem/useCartItemQuantity'; +import { useSelectedCartItemId } from '../../hooks/cartItem/useSelectedCartItemId'; +import useApiErrorState from '../../hooks/error/useApiErrorState'; + +export type CartItemProps = { + type?: 'cart' | 'confirm'; + cartItem: CartItem; +}; + +const CartItem = ({ type = 'cart', cartItem }: CartItemProps) => { + const { id, name, price, imageUrl } = cartItem; + const { apiError } = useApiErrorState(); + const { cartItemQuantity, increaseQuantity, decreaseQuantity } = + useCartItemQuantity(); + const { isSelectedId, selectCartItem, unselectCartItem } = + useSelectedCartItemId(); + const { deleteCartItem } = useCartItemList(); + + if ( + apiError?.name === 'FailedDeleteCartItemError' || + apiError?.name === 'FailedSetCartItemQuantityError' + ) { + throw apiError; + } + + return ( + <S.CartItem> + <Divider /> + {type === 'cart' ? ( + <S.ItemHeader> + <Checkbox + state={isSelectedId(id)} + handleClick={ + isSelectedId(id) + ? () => unselectCartItem(id) + : () => selectCartItem(id) + } + /> + <Button size="s" radius="s" onClick={() => deleteCartItem(id)}> + 삭제 + </Button> + </S.ItemHeader> + ) : null} + <S.ItemBody> + <ImageBox + width={112} + height={112} + radius="m" + border="lightGray" + src={imageUrl} + alt="상품 이미지" + /> + <S.ItemDetail> + <S.ItemNameAndCost> + <Text size="s" weight="m"> + {name} + </Text> + <Text size="l" weight="l"> + {`${price.toLocaleString('ko-KR')}원`} + </Text> + </S.ItemNameAndCost> + {type === 'cart' ? ( + <ChangeQuantity + quantity={cartItemQuantity(id)} + increaseQuantity={() => increaseQuantity(id)} + decreaseQuantity={() => decreaseQuantity(id)} + /> + ) : ( + <Text size="s" weight="m"> + {`${cartItemQuantity(id)}개`} + </Text> + )} + </S.ItemDetail> + </S.ItemBody> + </S.CartItem> + ); +}; + +export default CartItem;

Unknown

저도 비슷하게 생각하는데요. 체크, 삭제버튼, 숫자 버튼 등 지금은 경우의 수가 2**3개 밖에 없어서 타입으로 일일히 지정해줄 수 있지만, 요구사항이 늘어나면 타입으로는 버거울수도 있다는 생각이 들어요..!

@@ -0,0 +1,172 @@ +import type { Meta, StoryObj } from '@storybook/react'; +<<<<<<< HEAD +import CartItemList from './CartItemList'; +import { RecoilRoot } from 'recoil'; +import { cartItemListState } from '../../recoil/cartItem/atom'; + +const MOCK_DATA = [ + { + id: 586, + quantity: 4, + name: '나이키', + price: 1000, + imageUrl: + 'https://static.nike.com/a/images/c_limit,w_592,f_auto/t_product_v1/a28864e3-de02-48bb-b861-9c592bc9a68b/%EB%B6%81-1-ep-%EB%86%8D%EA%B5%AC%ED%99%94-UOp6QQvg.png', + }, + { + id: 587, + quantity: 3, + + name: '아디다스', + price: 2000, + imageUrl: 'https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg', + }, + { + id: 588, + quantity: 1, + name: '퓨마', + price: 10000, + imageUrl: 'https://sitem.ssgcdn.com/47/78/22/item/1000031227847_i1_750.jpg', + }, + { + id: 589, + quantity: 4, + + name: '리복', + price: 20000, + imageUrl: + 'https://image.msscdn.net/images/goods_img/20221031/2909092/2909092_6_500.jpg', + }, + { + id: 590, + quantity: 5, + + name: '컨버스', + price: 20000, + imageUrl: 'https://sitem.ssgcdn.com/65/73/69/item/1000163697365_i1_750.jpg', + }, +]; +======= +import CartItemList, { CartItemListProps } from './CartItemList'; +import { RecoilRoot } from 'recoil'; +>>>>>>> todari + +const meta = { + title: 'Components/CartItemList', + component: CartItemList, + tags: ['autodocs'], + argTypes: { +<<<<<<< HEAD + type: { + description: '', + control: { type: 'radio' }, + options: ['cart', 'confirm'], + }, + cartItemList: { + description: '', + control: { type: 'object' }, + }, + }, + args: { + type: 'cart', + cartItemList: MOCK_DATA, + }, +======= + itemList: { + description: '', + control: { type: 'object' }, + } + }, + args: { + itemList: [ + { + "cartItemId": 586, + "quantity": 4, + "product": { + "productId": 2, + "name": "나이키", + "price": 1000, + "imageUrl": "https://static.nike.com/a/images/c_limit,w_592,f_auto/t_product_v1/a28864e3-de02-48bb-b861-9c592bc9a68b/%EB%B6%81-1-ep-%EB%86%8D%EA%B5%AC%ED%99%94-UOp6QQvg.png", + "category": "fashion" + } + }, + { + "cartItemId": 587, + "quantity": 3, + "product": { + "productId": 3, + "name": "아디다스", + "price": 2000, + "imageUrl": "https://sitem.ssgcdn.com/74/25/04/item/1000373042574_i1_750.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 588, + "quantity": 1, + "product": { + "productId": 10, + "name": "퓨마", + "price": 10000, + "imageUrl": "https://sitem.ssgcdn.com/47/78/22/item/1000031227847_i1_750.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 589, + "quantity": 4, + "product": { + "productId": 11, + "name": "리복", + "price": 20000, + "imageUrl": "https://image.msscdn.net/images/goods_img/20221031/2909092/2909092_6_500.jpg", + "category": "fashion" + } + }, + { + "cartItemId": 590, + "quantity": 5, + "product": { + "productId": 12, + "name": "컨버스", + "price": 20000, + "imageUrl": "https://sitem.ssgcdn.com/65/73/69/item/1000163697365_i1_750.jpg", + "category": "fashion" + } + } + ], + } +>>>>>>> todari +} satisfies Meta<typeof CartItemList>; + +export default meta; + +type Story = StoryObj<typeof meta>; + +<<<<<<< HEAD +export const Playground: Story = { + render: ({ type, cartItemList }) => { + return ( + <RecoilRoot + initializeState={({ set }) => set(cartItemListState, MOCK_DATA)} + > + <div style={{ width: '430px' }}> + <CartItemList type={type} cartItemList={cartItemList} /> + </div> + </RecoilRoot> + ); + }, +======= +// TODO : decorator 사용하여 동작할 수 있도록 current: recoil로 인해 작동 x +export const Playground: Story = { + render: ({ ...args }: CartItemListProps) => { + return ( + <RecoilRoot> + <div style={{ width: '430px' }}> + <CartItemList {...args} /> + </div> + </RecoilRoot> + ) + } +>>>>>>> todari +};

Unknown

리베이스의 흔적이ㅠ

@@ -0,0 +1,44 @@ +package christmas.controller; + +import christmas.domain.event.EventCalculator; +import christmas.domain.date.ReservationDate; +import christmas.domain.order.OrderMenuParser; +import christmas.view.InputView; +import christmas.view.OutputView; + +public class ChristmasController { + public void run(){ + OutputView.printStart(); + ReservationDate reservationDate = reservationDate(); + OrderMenuParser orderMenu = orderMenu(); + OutputView.printDate(reservationDate); + OutputView.printOrderMenu(orderMenu); + OutputView.printTotalPrice(orderMenu); + EventCalculator eventCalculator = new EventCalculator(reservationDate, orderMenu); + OutputView.printGiftMenu(orderMenu); + OutputView.printEvent(eventCalculator); + OutputView.printTotalDiscount(eventCalculator); + OutputView.printExpectedDiscount(eventCalculator); + OutputView.printEventBadge(eventCalculator); + } + + private ReservationDate reservationDate() { + while (true) { + try { + return new ReservationDate(InputView.readDate()); + } catch (IllegalArgumentException e) { + System.out.println(e.getMessage()); + } + } + } + + private OrderMenuParser orderMenu(){ + while (true) { + try { + return new OrderMenuParser(InputView.readMenu()); + } catch (IllegalArgumentException e) { + System.out.println(e.getMessage()); + } + } + } +}

Java

한 메서드에서 너무 복잡해 보이네요 메서드를 분리하면 더 좋을거 같아요!

@@ -0,0 +1,22 @@ +package christmas.domain.event; + +import christmas.constant.ChristmasConfig; + +public class ChristmasEvent { + private final int reservationDate; + + public ChristmasEvent(int reservationDate) { + this.reservationDate = reservationDate; + } + + public int calculateDiscount() { + if (isChristmasPeriod()) { + return ChristmasConfig.DISCOUNT_MONEY + ChristmasConfig.INCREASE_MONEY * (reservationDate - ChristmasConfig.START_DAY); + } + return ChristmasConfig.ZERO; + } + + private boolean isChristmasPeriod() { + return reservationDate >= ChristmasConfig.START_DAY && reservationDate <= ChristmasConfig.END_DAY; + } +} \ No newline at end of file

Java

각 이벤트 클래스에서 날짜를 검증하는 것도 좋은데 각각의 이벤트 기간에 포함되는지 처리하는 부분을 ReservationDate 클래스에서 처리해도 좋을거 같아요!

@@ -0,0 +1,77 @@ +import React, { useState } from "react"; +import styled from "styled-components"; +import { Star as StarIcon } from "lucide-react"; + +interface StarRatingProps { + totalStars?: number; + initialRating?: number; + onRatingChange?: (rating: number) => void; +} + +const BackgroundContainer = styled.div` + background-color: #f7f7f7; + width: 807.73px; + height: 251.63px; + display: flex; + align-items: center; + justify-content: center; +`; + +const StarContainer = styled.div` + display: flex; + gap: 4px; +`; + +const StyledStar = styled.div<{ filled: boolean }>` + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + svg { + width: 94.96px; + height: 99.25px; + color: ${(props) => (props.filled ? "#facc15" : "#d1d5db")}; + } +`; + +const StarRating: React.FC<StarRatingProps> = ({ + totalStars = 5, + initialRating = 0, + onRatingChange, +}) => { + const [rating, setRating] = useState(initialRating); + + const handleRating = (index: number) => { + let newRating = rating; + if (index + 1 === rating) { + newRating = index; + } else if (index < rating) { + newRating = index; + } else { + newRating = index + 1; + } + + setRating(newRating); + if (onRatingChange) { + onRatingChange(newRating); + } + }; + + return ( + <BackgroundContainer> + <StarContainer> + {Array.from({ length: totalStars }, (_, index) => ( + <StyledStar + key={index} + filled={index < rating} + onClick={() => handleRating(index)} + > + <StarIcon fill={index < rating ? "#facc15" : "none"} stroke="#facc15" /> + </StyledStar> + ))} + </StarContainer> + </BackgroundContainer> + ); +}; + +export default StarRating;

Unknown

filled 안쪽에 String으로 감싸주세요

@@ -0,0 +1,77 @@ +import React, { useState } from "react"; +import styled from "styled-components"; +import { Star as StarIcon } from "lucide-react"; + +interface StarRatingProps { + totalStars?: number; + initialRating?: number; + onRatingChange?: (rating: number) => void; +} + +const BackgroundContainer = styled.div` + background-color: #f7f7f7; + width: 807.73px; + height: 251.63px; + display: flex; + align-items: center; + justify-content: center; +`; + +const StarContainer = styled.div` + display: flex; + gap: 4px; +`; + +const StyledStar = styled.div<{ filled: boolean }>` + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + svg { + width: 94.96px; + height: 99.25px; + color: ${(props) => (props.filled ? "#facc15" : "#d1d5db")}; + } +`; + +const StarRating: React.FC<StarRatingProps> = ({ + totalStars = 5, + initialRating = 0, + onRatingChange, +}) => { + const [rating, setRating] = useState(initialRating); + + const handleRating = (index: number) => { + let newRating = rating; + if (index + 1 === rating) { + newRating = index; + } else if (index < rating) { + newRating = index; + } else { + newRating = index + 1; + } + + setRating(newRating); + if (onRatingChange) { + onRatingChange(newRating); + } + }; + + return ( + <BackgroundContainer> + <StarContainer> + {Array.from({ length: totalStars }, (_, index) => ( + <StyledStar + key={index} + filled={index < rating} + onClick={() => handleRating(index)} + > + <StarIcon fill={index < rating ? "#facc15" : "none"} stroke="#facc15" /> + </StyledStar> + ))} + </StarContainer> + </BackgroundContainer> + ); +}; + +export default StarRating;

Unknown

제가 후기 페이지 만들면서 이 부분 수정해서 한꺼번에 PR 올리겠습니다

@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>

JavaScript

this.state ... 이거 너무 기니까 이것도 비구조화 할당하시는 게 가독성이 좋을 것 같아요!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

여기 form 태그로 감싸시고 onSubmit 이벤트주시면 엔터키 누를 때 실행되는 메소드 따로 안 만드셔도 pressButton 메소드 하나만으로 댓글 추가시킬 수 있어요!

@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>

JavaScript

말씀하신대로 바꿨습니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

form에 이런 기능이 있는 줄 처음알았습니다! 덕분에 새로운 지식을 얻었습니다. 정말 감사해요!

@@ -3,28 +3,50 @@ import './Login.scss'; import Login_Button from './Login_Button/Login_Button'; class Login extends Component { + constructor(props) { + super(props); + this.state = { + id: 'a', + pw: 0, + }; + } + + handleInput = e => { + const { value, name } = e.target; + this.setState({ + [name]: value, + }); + }; + render() { + const { handleInput } = this; + const { id, pw } = this.state; + return ( <div className="log_in_box"> <div className="title">westagram</div> <div className="log_in"> <div className="id"> <input + onChange={handleInput} className="id_input" + name="id" type="text" placeholder="전화번호, 사용자 이름 또는 이메일" /> </div> <div className="password"> <input + onChange={handleInput} className="password_input" + name="pw" type="password" placeholder="비밀번호" /> </div> </div> - <Login_Button /> + <Login_Button idvalue={this.state.id} pwvalue={this.state.pw} /> <p> 비밀번호를 잊으셨나요? </p> </div>

JavaScript

idValue를 넘겨주는 걸로 보이는데 idfunc라는 이름은 마치 함수같아서 적합하지 않아보입니다! pwfunc, colorfunc 모두 마찬가지입니다! 그리고 colorfunc라는 값은 id랑 pw통해서 계산 가능해보이는데 그러면 idValue랑 pwValue만 Props로 받고, colorfunc에서 계산 하는 값은 LoginButton 컴포넌트에서 props통해서 바로 계산해서 사용해도 무방해보입니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

api주소가 data안에 들어있는 형태는 비정상적인 것 같습니다! api주소는 일반적으로 백엔드에서 전송해주지 않습니다! comment정보랑 feed정보를 분리시켜놓으셔서 그런 것 같은데, feed안에 comment정보를 그냥 다 넣어주시면 될 것 같습니다! ``` { id: 1, profilesrc: '/images/jaesangChoi/profile1.jpeg', mainfeedsrc: 'https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60', comment:["foo","bar"] }, ``` 이런식으로요! 코멘트란 정보는 피드에 종속되어 있는 정보니까 저런 형태가 적합해보입니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

get method는 기본값이라서 따로 기입안해주셔도 됩니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

댓글은 나중에 삭제될 수도 있으니까 id를 length로 사용하면 삭제 후 다시 추가되는 경우 동일한 id를 가진 댓글이 생길 것 같습니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

함수는 return문 따로 없으면 끝까지 다 읽고나서 알아서 종료되기때문에 임의로 return 키워드를 적을 필요는 없어보입니다!

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

여기는 alt를 한글로 적고 다른 곳은 영어로 적으신 이유가 있으실까요?? 영어로 적어주시는게 좋아보입니다! 한글이 더 좋지만,, 만국 공용어가 영어기 때문에 보편성을 위해서 😂

@@ -1,14 +1,51 @@ import React, { Component } from 'react'; +import Comment from './Comment/Comment'; import './Feeds.scss'; class Feeds extends Component { + constructor(props) { + super(props); + this.state = { + comment: '', + comments: [], + idnumber: 1, + }; + } + + componentDidMount = () => { + this.setState({ comments: this.props.comments }); + }; + + handleComment = e => { + this.setState({ + comment: e.target.value, + }); + }; + + addComment = e => { + e.preventDefault(); + + this.setState({ + comments: this.state.comments.concat({ + id: this.state.idnumber + 3, + text: this.state.comment, + }), + comment: '', + idnumber: this.state.idnumber + 1, + }); + }; + render() { + const { comments, comment } = this.state; + const { handleComment, addComment } = this; + // console.log(this.state); + return ( <div className="feeds"> <article> <div className="feeds_profile"> <div className="feeds_profile_image"> - <img alt="프로필" src="/images/jaesangChoi/profile1.jpeg" /> + <img alt="profile" src={this.props.profilesrc} /> </div> <p className="feeds_profile_name"> <span className="feeds_profile_main_name"> @@ -23,28 +60,28 @@ class Feeds extends Component { <img alt="sunset" className="main_feed_img" - src="https://images.unsplash.com/photo-1623659993428-0c5504a16ca5?ixid=MnwxMjA3fDB8MHxlZGl0b3JpYWwtZmVlZHw0Mnx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=500&q=60" + src={this.props.mainfeedsrc} /> </div> <div className="comment_icon_box"> <div className="left_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> <img - alt="코멘트아이콘" + alt="comment_icon" src="/images/jaesangChoi/commentary.png" /> - <img alt="공유아이콘" src="/images/jaesangChoi/send.png" /> + <img alt="share_icon" src="/images/jaesangChoi/send.png" /> </div> <div className="right_icon"> - <img alt="북마크아이콘" src="/images/jaesangChoi/bookmark.png" /> + <img alt="bookmark_icon" src="/images/jaesangChoi/bookmark.png" /> </div> </div> <div className="comment_profile"> <div className="comment_profile_icon"> <img - alt="프로필" + alt="profile" src="/images/jaesangChoi/comment_profile.jpeg" /> </div> @@ -67,25 +104,33 @@ class Feeds extends Component { 좋았잖아~~~~~ </div> <div className="second_comment_icon"> - <img alt="하트아이콘" src="/images/jaesangChoi/heart2.png" /> + <img alt="heart_icon" src="/images/jaesangChoi/heart2.png" /> </div> </div> <div className="third_comment">42분 전</div> + <ul className="comment_list"> + {comments.map(comment => { + return <Comment key={comment.id} text={comment.text} />; + })} + </ul> + <div className="push_comment"> <div className="push_comment_icon"> - <img alt="스마일아이콘" src="/images/jaesangChoi/smile.png" /> + <img alt="smile_icon" src="/images/jaesangChoi/smile.png" /> </div> - <div className="push_comment_text"> + <form className="push_comment_text" onSubmit={addComment}> <input + onChange={handleComment} + value={comment} className="input_comment" type="text" placeholder="댓글달기..." /> - </div> + </form> <div className="push_comment_button"> - <button>게시</button> + <button onClick={addComment}>게시</button> </div> </div> </article>

JavaScript

t라는 변수명을 가지고는 여기에 할당된 값이 뭐일지 전혀 유추가 안되는 것 같습니다! comments 배열안의 하나하나의 요소들이니까 comment라고 이름지어주는게 좋지 않을까요? ```suggestion {comments.map(comment => { ```