code stringlengths 41 34.3k | lang stringclasses 8
values | review stringlengths 1 4.74k |
|---|---|---|
@@ -0,0 +1,12 @@
+package domain.point;
+
+import java.util.Random;
+
+public class RandomPointGenerator {
+
+ private static Random random = new Random();
+
+ public static boolean generate() {
+ return random.nextBoolean();
+ }
+} | Java | ์ญํ ์ Random ์ ๊ฐ์ผ wrapper ํด๋์ค์ธ๋ฐ Point ๋ผ๋ ์ ํ์ ์ด๋ฆ์ผ๋ก ์ฃผ๊ฒ ๋๋ ๊ฒ ๊ฐ์ต๋๋ค.
RandomGenerator util ๋ก ๋ณด๋ฉด ์ด๋จ๊น์ |
@@ -0,0 +1,80 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class LineTest {
+
+ @Test
+ @DisplayName("ํ ํฌ์ธํธ์ ์ผ์ชฝ ์ฐ๊ฒฐ ๋ค๋ฆฌ๊ฐ ์กด์ฌํ๊ณ ์ค๋ฅธ์ชฝ ์ฐ๊ฒฐ ๋ค๋ฆฌ๊ฐ ์กด์ฌํ์ง ์์ ๊ฒฝ์ฐ ๋ฐฉํฅ์ ์ผ์ชฝ์ผ๋ก ๋ฐํํ๋ค.")
+ void testIfLeftBridgeExistAndRightBridgeNotExistReturnDirectionLeft() {
+ // given
+ Point prePoint = Point.first(true);
+ Point nextPoint = Point.next(prePoint, false);
+ Point lastPoint = Point.last(nextPoint);
+
+ List<Point> points = new ArrayList<>();
+ points.add(prePoint);
+ points.add(nextPoint);
+ points.add(lastPoint);
+
+ Line line = new Line(points);
+
+ // when
+ Direction currentPointDirection = line.findCurrentPointDirection(1);
+
+ // then
+ assertThat(currentPointDirection).isEqualTo(Direction.LEFT);
+ }
+
+ @Test
+ @DisplayName("ํ ํฌ์ธํธ์ ์ค๋ฅธ์ชฝ ์ฐ๊ฒฐ ๋ค๋ฆฌ๊ฐ ์กด์ฌํ๊ณ ์ผ์ชฝ ์ฐ๊ฒฐ ๋ค๋ฆฌ๊ฐ ์กด์ฌํ์ง ์์ ๊ฒฝ์ฐ ๋ฐฉํฅ์ ์ค๋ฅธ์ชฝ์ผ๋ก ๋ฐํํ๋ค.")
+ void testIfRightBridgeExistAndLeftBridgeNotExistReturnDirectionRight() {
+ // given
+ Point prePoint = Point.first(false);
+ Point nextPoint = Point.next(prePoint, true);
+ Point lastPoint = Point.last(nextPoint);
+
+ List<Point> points = new ArrayList<>();
+ points.add(prePoint);
+ points.add(nextPoint);
+ points.add(lastPoint);
+
+ Line line = new Line(points);
+
+ // when
+ Direction currentPointDirection = line.findCurrentPointDirection(1);
+
+ // then
+ assertThat(currentPointDirection).isEqualTo(Direction.RIGHT);
+ }
+
+ @Test
+ @DisplayName("ํ ํฌ์ธํธ์ ์์ชฝ ๋ค๋ฆฌ๊ฐ ๋ชจ๋ ์กด์ฌํ์ง ์์ ๊ฒฝ์ฐ ๋ฐฉํฅ์ ์๋๋ก ๋ฐํํ๋ค.")
+ void testIfBothBridgeNotExistReturnDirectionDown() {
+ // given
+ Point prePoint = Point.first(false);
+ Point nextPoint = Point.next(prePoint, false);
+ Point lastPoint = Point.last(nextPoint);
+
+ List<Point> points = new ArrayList<>();
+ points.add(prePoint);
+ points.add(nextPoint);
+ points.add(lastPoint);
+
+ Line line = new Line(points);
+
+ // when
+ Direction currentPointDirection = line.findCurrentPointDirection(1);
+
+ // then
+ assertThat(currentPointDirection).isEqualTo(Direction.DOWN);
+ }
+}
\ No newline at end of file | Java | good ํ
์คํธ ์ ์์ฑํ์
จ๋ค์ |
@@ -13,33 +13,40 @@ export interface ButtonProps {
export const Button = ({
children,
label,
- bgColor = 'main',
+ // ๋ฒํผ์ ๊ธฐ๋ณธ ์คํ์ผ์ ๊ณ ๋ คํ์ ๋ transparent๊ฐ ๊ธฐ๋ณธ์ ์ธ bgColor๋ก ์
๋ ฅ๋๊ธฐ ๋๋ฌธ์, main์ ๋ฐ๋ก ์
๋ ฅ๊ฐ์ผ๋ก ๋ฃ์ด์ฃผ๊ฒ ์๋ํ๋๊ฒ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค.
+ bgColor = 'transparent',
disabled,
className,
...props
}: ButtonProps) => {
const ariaLabel = typeof children === 'string' ? children : label;
+ // ์ฌ๋ฌ๊ฐ์ง ๋ถ๊ธฐ์ฒ๋ฆฌ๊ฐ ๋์ด ์ ์ธ์ ์ผ๋ก ์คํ์ผ์ ์ ์ฉํ ์ ์๊ฒ ์ ์ง์ฃผ์
จ๋๋ฐ, ๋ง์ฝ ์ ์ง๋ณด์๋ฅผ ์ํด ์ฝ๋๋ฅผ ๊ณ ์ณ์ผํ๋ ์ํฉ์ด๋ผ๋ฉด ํด๋น ์ฝ๋๊ฐ ๊ฐ๋
์ฑ์ด ์์ข์ ์ ์๋ค๋ ์๊ฐ์ ํ์ต๋๋ค.
+ // ๋ฐ๋ผ์ ์ฝ๋๋ฅผ ์ชผ๊ฐ์ด ๊ฐ๋ฐ์๊ฐ ์ธ์ธํ๊ฒ ์คํ์ผ์ ๋ค์ฌ๋ค๋ณด์ง ์๊ณ ์ ์ธ์ ์ธ ํค์๋๋ก ์คํ์ผ์ ์ ์ฉํ ์ ์๋๋ก ๊ตฌ๋ถํด๋ณด์์ต๋๋ค.
+
+ // ๊ธฐ๋ณธ ์คํ์ผ
+ const baseStyles =
+ 'leading-none transition duration-200 ease-in-out cursor-pointer rounded-lg text-white';
+
+ // ๋ฐฐ๊ฒฝ ์คํ์ผ
+ const bgColorStyles = {
+ transparent: 'ml-auto opacity-70',
+ underline:
+ 'text-main border-solid border-b border-main bg-transparent hover:text-main-hover',
+ main: !disabled ? 'bg-main hover:bg-main-hover' : '',
+ sub: !disabled ? 'bg-sub hover:bg-sub-hover' : '',
+ white: !disabled ? 'bg-white hover:bg-white-hover text-black' : '',
+ disabled: 'bg-disabled cursor-not-allowed',
+ };
+
+ // ์ถ๊ฐ ์กฐ๊ฑด๋ถ ์คํ์ผ
+ const conditionalStyles = {
+ 'p-2.5': typeof children === 'string',
+ };
+
const classes = twMerge(
- clsx(
- 'leading-none transition duration-200 ease-in-out cursor-pointer',
- bgColor === 'transparent'
- ? 'ml-auto opacity-70'
- : bgColor === 'underline'
- ? 'text-main border-solid border-b border-main bg-transparent hover:text-main-hover'
- : 'text-base text-white font-medium rounded-lg border-none',
- {
- 'bg-main hover:bg-main-hover': bgColor === 'main' && !disabled,
- 'bg-sub hover:bg-sub-hover': bgColor === 'sub' && !disabled,
- 'bg-white hover:bg-white-hover text-black':
- bgColor === 'white' && !disabled,
- 'bg-disabled cursor-not-allowed': bgColor === 'disabled' || disabled,
- },
- {
- 'p-2.5': typeof children === 'string',
- },
- ),
- className,
+ clsx(baseStyles, bgColorStyles[bgColor], conditionalStyles),
+ className, // ์ธ๋ถ์์ ์ ๋ฌ๋ ์ถ๊ฐ ํด๋์ค
);
return ( | Unknown | ์คํ์ผ ํค์๋๋ ์ ์ธ์ ์ผ๋ก ์์ฑํ๋ ๊ฐ๋
์ฑ์ด ์ข์์ก๋ค์ ๊ฐ์ฌํฉ๋๋ค! |
@@ -1,21 +1,37 @@
import React from 'react';
import clsx from 'clsx';
-import {twMerge} from 'tailwind-merge';
+import { twMerge } from 'tailwind-merge';
interface MainProps {
isMobile?: boolean;
className?: string;
children: React.ReactNode;
}
-export const Main = ({isMobile = false, className, children}: MainProps) => {
- const classes = twMerge(
- clsx(
- 'flex items-center justify-center min-h-screen bg-white p-4',
- isMobile ? 'flex-col gap-6' : 'gap-24',
- ),
- className,
- );
+export const Main = ({ isMobile = false, className, children }: MainProps) => {
+ // Main์ ์ด ํ๋ก์ ํธ ์ ์ฒด์ Layout์ผ๋ก ์ก์ผ์
จ๋๋ฐ, ์ด๋ด ๊ฒฝ์ฐ์๋ isMobile์ props๋ก ๋ฐ๋๊ฒ๋ณด๋ค ๋ด๋ถ์์ isMobile์ ํ๋จํด๋ณด๋๊ฒ ์ด๋จ๊น์?
+ // ๊ทธ๋ ๊ฒ ๋๋ค๋ฉด ๊ฐ๋ฐ์๊ฐ ์ผ์ผํ props๋ก isMobile์ ๋๊ฒจ์ค ํ์๊ฐ ์์ผ๋ ๋ ํธํด์ง ๊ฒ ๊ฐ์ต๋๋ค.
+ // ์ด๊ณณ์๋ clsx์ twMerge๋ฅผ ๋์์ ์ฌ์ฉํ์ง ๋ง๊ณ ํ๋๋ง ์ฌ์ฉํด๋ ์ถฉ๋ถํ ๊ฒ ๊ฐ์ต๋๋ค.
- return <main className={classes}>{children}</main>;
+ return (
+ <main
+ className={twMerge(
+ 'flex items-center justify-center min-h-screen bg-white p-4',
+ isMobile ? 'flex-col gap-6' : 'gap-24',
+ )}
+ >
+ {children}
+ </main>
+ );
+ return (
+ <main
+ className={clsx(
+ 'flex items-center justify-center min-h-screen bg-white p-4',
+ isMobile ? 'flex-col gap-6' : 'gap-24',
+ className,
+ )}
+ >
+ {children}
+ </main>
+ );
}; | Unknown | isMobile์ ๋ํ ์์ ๋ ๊ณ ๋ คํด๋ณด๊ฒ ์ต๋๋ค~! |
@@ -1,21 +1,37 @@
import React from 'react';
import clsx from 'clsx';
-import {twMerge} from 'tailwind-merge';
+import { twMerge } from 'tailwind-merge';
interface MainProps {
isMobile?: boolean;
className?: string;
children: React.ReactNode;
}
-export const Main = ({isMobile = false, className, children}: MainProps) => {
- const classes = twMerge(
- clsx(
- 'flex items-center justify-center min-h-screen bg-white p-4',
- isMobile ? 'flex-col gap-6' : 'gap-24',
- ),
- className,
- );
+export const Main = ({ isMobile = false, className, children }: MainProps) => {
+ // Main์ ์ด ํ๋ก์ ํธ ์ ์ฒด์ Layout์ผ๋ก ์ก์ผ์
จ๋๋ฐ, ์ด๋ด ๊ฒฝ์ฐ์๋ isMobile์ props๋ก ๋ฐ๋๊ฒ๋ณด๋ค ๋ด๋ถ์์ isMobile์ ํ๋จํด๋ณด๋๊ฒ ์ด๋จ๊น์?
+ // ๊ทธ๋ ๊ฒ ๋๋ค๋ฉด ๊ฐ๋ฐ์๊ฐ ์ผ์ผํ props๋ก isMobile์ ๋๊ฒจ์ค ํ์๊ฐ ์์ผ๋ ๋ ํธํด์ง ๊ฒ ๊ฐ์ต๋๋ค.
+ // ์ด๊ณณ์๋ clsx์ twMerge๋ฅผ ๋์์ ์ฌ์ฉํ์ง ๋ง๊ณ ํ๋๋ง ์ฌ์ฉํด๋ ์ถฉ๋ถํ ๊ฒ ๊ฐ์ต๋๋ค.
- return <main className={classes}>{children}</main>;
+ return (
+ <main
+ className={twMerge(
+ 'flex items-center justify-center min-h-screen bg-white p-4',
+ isMobile ? 'flex-col gap-6' : 'gap-24',
+ )}
+ >
+ {children}
+ </main>
+ );
+ return (
+ <main
+ className={clsx(
+ 'flex items-center justify-center min-h-screen bg-white p-4',
+ isMobile ? 'flex-col gap-6' : 'gap-24',
+ className,
+ )}
+ >
+ {children}
+ </main>
+ );
}; | Unknown | ์กฐ๊ฑด๋ถ ์ฒ๋ฆฌ๋ฅผ ์ํด์ clsx๋ ํ์ํด๋ณด์
๋๋ค! Main์ className์ด ์์ผ๋ก๋ ์ถ๊ฐ๋์ง ์์ ๊ฑฐ๋ผ๋ฉด clsx๋ง ์์ด๋ ๋ ๊ฒ ๊ฐ์ต๋๋ค~ |
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+ <meta charset="UTF-8">
+ <title>๋ด๊ฐ ์์ฑํ ๋ฆฌ๋ทฐ ๋ชฉ๋ก</title>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
+ <style>
+ body { font-family: Arial, sans-serif; margin: 20px; }
+ h1 { margin-bottom: 20px; }
+
+ /* Grid ๋ ์ด์์ ์ค์ */
+ .review-block {
+ display: grid;
+ grid-template-columns: auto 1fr;
+ grid-template-rows: auto auto auto;
+ grid-gap: 10px;
+ border-bottom: 1px solid #000;
+ padding: 15px 0;
+ }
+ .review-header {
+ display: contents; /* Grid ์์ดํ
์ผ๋ก ์ง์ ๋ฐฐ์นํ๊ธฐ ์ํด ์ฌ์ฉ */
+ }
+ .book-image {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ width: 80px;
+ height: auto;
+ margin-right: 15px;
+ align-self: start;
+ }
+ .book-title {
+ grid-row: 1;
+ grid-column: 2;
+ align-self: center;
+ }
+ .book-title a {
+ font-size: 1.2em;
+ font-weight: bold;
+ text-decoration: none;
+ color: #333;
+ }
+ .meta-info {
+ grid-row: 2;
+ grid-column: 2;
+ color: #555;
+ display: flex;
+ align-items: center;
+ }
+ .stars {
+ color: #FFD700;
+ margin-right: 10px;
+ }
+ .fixed-width {
+ display: inline-block;
+ width: 120px;
+ vertical-align: middle;
+ }
+ .timestamp {
+ margin-left: 10px;
+ }
+ .review-content {
+ grid-row: 3;
+ grid-column: 1 / span 2;
+ line-height: 1.5;
+ position: relative;
+ }
+ .toggle-more-btn {
+ background: #eee; border: none; color: #333;
+ padding: 3px 5px; border-radius: 3px; cursor: pointer;
+ font-size: 12px; margin-top: 5px;
+ }
+ </style>
+</head>
+<body>
+<h1>๋ด๊ฐ ์์ฑํ ๋ฆฌ๋ทฐ ๋ชฉ๋ก</h1>
+
+<div th:if="${#lists.isEmpty(myReviews)}">
+ <p>์์ฑํ ๋ฆฌ๋ทฐ๊ฐ ์์ต๋๋ค.</p>
+</div>
+
+<div th:unless="${#lists.isEmpty(myReviews)}">
+ <div th:each="review : ${myReviews}" class="review-block">
+ <!-- ๋์ ์ด๋ฏธ์ง -->
+ <img th:src="${review.bookImageUrl != null ? review.bookImageUrl : '/images/no_image.png'}"
+ alt="Book Image" class="book-image" />
+
+ <!-- ๋์ ์ ๋ชฉ -->
+ <div class="book-title">
+ <a th:href="@{/book/bookDetail(bookId=${review.bookId})}"
+ th:text="${review.bookName}">์ฑ
์ ๋ชฉ</a>
+ </div>
+
+ <!-- ํ์ ๊ณผ ์์ฑ์ผ์ -->
+ <div class="meta-info">
+ <span class="stars fixed-width" th:if="${review.grade > 0}">
+ <span th:each="star : ${#numbers.sequence(1, review.grade)}">
+ <i class="fa fa-star"></i>
+ </span>
+ </span>
+ <span class="fixed-width" th:if="${review.grade == 0}">ํ์ ์์</span>
+ <span class="timestamp" th:text="${#temporals.format(review.createdAt, 'yyyy-MM-dd HH:mm')}"></span>
+ </div>
+
+ <!-- ๋ฆฌ๋ทฐ ๋ด์ฉ (100์ ์ด๊ณผ ์ ๋๋ณด๊ธฐ/์ ๊ธฐ ๋ฒํผ ์ถ๊ฐ) -->
+ <div class="review-content" th:if="${review.description != null}">
+ <span class="short-text"
+ th:text="${review.description.length() > 100 ? review.description.substring(0, 100) + '...' : review.description}">
+ </span>
+ <span class="full-text" style="display:none"
+ th:text="${review.description}"></span>
+ <button class="toggle-more-btn" th:if="${review.description.length() > 100}">๋๋ณด๊ธฐ</button>
+ </div>
+ </div>
+</div>
+
+<script>
+ document.addEventListener("DOMContentLoaded", function() {
+ document.querySelectorAll('.toggle-more-btn').forEach(function(button) {
+ button.addEventListener('click', function(){
+ let container = this.closest('.review-content');
+ let shortText = container.querySelector('.short-text');
+ let fullText = container.querySelector('.full-text');
+ if(this.textContent === '๋๋ณด๊ธฐ') {
+ shortText.style.display = 'none';
+ fullText.style.display = 'inline';
+ this.textContent = '์ ๊ธฐ';
+ } else {
+ shortText.style.display = 'inline';
+ fullText.style.display = 'none';
+ this.textContent = '๋๋ณด๊ธฐ';
+ }
+ });
+ });
+ });
+</script>
+</body>
+</html> | Unknown | ๋์ค์ ์๊ฐ์ด ๋๋ค๋ฉด <style> ํ๊ทธ๋ฅผ css ํ์ผ๋ก ๋ฐ๋ก ๋ถ๋ฆฌํด์ ์ฌ์ฉํด๋ ์ข์๊ฒ๊ฐ์์ |
@@ -1,7 +1,87 @@
import React from 'react';
+import { useState } from 'react';
+import { useNavigate, Link } from 'react-router-dom';
+import Nav from '../../../Components/Nav';
+import './Login.scss';
-const Login = () => {
- return <div>Login</div>;
-};
+function Login() {
+ const [input, setInput] = useState({
+ id: '',
+ pwd: '',
+ });
+
+ const { id, pwd } = input;
+
+ const handleInput = e => {
+ const { name, value } = e.target;
+ // FIXME: setState argument -> callback function
+ setInput(input => {
+ return {
+ ...input,
+ [name]: value,
+ };
+ });
+ };
+
+ const mainPageLink = useNavigate();
+
+ const goToMainPage = () => {
+ mainPageLink('/main-YounSeop');
+ };
+
+ const checkLoginApi = () => {
+ fetch('http://10.58.3.156:8000/user/login', {
+ method: 'POST',
+ body: JSON.stringify({
+ user_email: input.id,
+ password: input.pw,
+ }),
+ })
+ .then(response => response.json())
+ .then(result => {
+ if (result.Token) {
+ localStorage.setItem('Token', result.Token);
+ goToMainPage();
+ }
+ });
+ // FIXME: status code
+ };
+
+ return (
+ <>
+ <Nav />
+ <div className="login">
+ <div className="wrapper">
+ <h1 className="westaLogo">Westagram</h1>
+ <div className="loginBox">
+ <input
+ type="text"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ๋ฉ์ผ"
+ name="id"
+ value={input.id}
+ onChange={handleInput}
+ />
+ <input
+ type="password"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ name="pwd"
+ onChange={handleInput}
+ />
+ <button
+ id="loginBtn"
+ disabled={!id.includes('@') && pwd.length}
+ onClick={checkLoginApi}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </div>
+ <Link to="/" className="forgotPw">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+ </>
+ );
+}
export default Login; | JavaScript | a tag Link๋ก ๋ฐ๊ฟ์ฃผ์ธ์~ |
@@ -1,7 +1,87 @@
import React from 'react';
+import { useState } from 'react';
+import { useNavigate, Link } from 'react-router-dom';
+import Nav from '../../../Components/Nav';
+import './Login.scss';
-const Login = () => {
- return <div>Login</div>;
-};
+function Login() {
+ const [input, setInput] = useState({
+ id: '',
+ pwd: '',
+ });
+
+ const { id, pwd } = input;
+
+ const handleInput = e => {
+ const { name, value } = e.target;
+ // FIXME: setState argument -> callback function
+ setInput(input => {
+ return {
+ ...input,
+ [name]: value,
+ };
+ });
+ };
+
+ const mainPageLink = useNavigate();
+
+ const goToMainPage = () => {
+ mainPageLink('/main-YounSeop');
+ };
+
+ const checkLoginApi = () => {
+ fetch('http://10.58.3.156:8000/user/login', {
+ method: 'POST',
+ body: JSON.stringify({
+ user_email: input.id,
+ password: input.pw,
+ }),
+ })
+ .then(response => response.json())
+ .then(result => {
+ if (result.Token) {
+ localStorage.setItem('Token', result.Token);
+ goToMainPage();
+ }
+ });
+ // FIXME: status code
+ };
+
+ return (
+ <>
+ <Nav />
+ <div className="login">
+ <div className="wrapper">
+ <h1 className="westaLogo">Westagram</h1>
+ <div className="loginBox">
+ <input
+ type="text"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ๋ฉ์ผ"
+ name="id"
+ value={input.id}
+ onChange={handleInput}
+ />
+ <input
+ type="password"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ name="pwd"
+ onChange={handleInput}
+ />
+ <button
+ id="loginBtn"
+ disabled={!id.includes('@') && pwd.length}
+ onClick={checkLoginApi}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </div>
+ <Link to="/" className="forgotPw">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+ </>
+ );
+}
export default Login; | JavaScript | import ์์ ์ ๋ฆฌํ๋ฉด ์ข์๊ฑฐ ๊ฐ์์ |
@@ -0,0 +1,29 @@
+import React from 'react';
+import Story from './Story';
+import Recommend from './Recommend';
+import Footer from './Footer';
+
+const Aside = () => {
+ return (
+ <aside className="mainRight">
+ <div className="asideWrapper">
+ <div className="profile">
+ <img
+ src="images/younseop/post-user.jpg"
+ alt="post user"
+ className="imgUserPhoto"
+ />
+ <div className="profileTextWrapper">
+ <span className="profileName">wecode_bootcamp</span>
+ <span className="profileLocation">Wecode | ์์ฝ๋</span>
+ </div>
+ </div>
+ <Story />
+ <Recommend />
+ <Footer />
+ </div>
+ </aside>
+ );
+};
+
+export default Aside; | JavaScript | ๊ตฌ์กฐ๋ณ๋ก ์ปดํฌ๋ํธํ ํด์ ๊ตฌํํ์ ๊ฒ ๋ฐฐ์๊ฐ๋๋ค~ |
@@ -0,0 +1,29 @@
+import React from 'react';
+import Story from './Story';
+import Recommend from './Recommend';
+import Footer from './Footer';
+
+const Aside = () => {
+ return (
+ <aside className="mainRight">
+ <div className="asideWrapper">
+ <div className="profile">
+ <img
+ src="images/younseop/post-user.jpg"
+ alt="post user"
+ className="imgUserPhoto"
+ />
+ <div className="profileTextWrapper">
+ <span className="profileName">wecode_bootcamp</span>
+ <span className="profileLocation">Wecode | ์์ฝ๋</span>
+ </div>
+ </div>
+ <Story />
+ <Recommend />
+ <Footer />
+ </div>
+ </aside>
+ );
+};
+
+export default Aside; | JavaScript | ```suggestion
<img
src="images/younseop/post-user.jpg"
alt="imgUserPhoto"
className="imgUserPhoto"
```
alt ๊ฐ์๋ ์๊ฐ์ฅ์ ์ธ๋ค๋ ์ธ์ํ ์ ์๊ฒ ๊ผญ ๋ฌด์จ ๋ด์ฉ์ธ์ง ๋ช
์ํด์ฃผ์
ํฉ๋๋ค! |
@@ -0,0 +1,117 @@
+import React, { useState, useEffect } from 'react';
+import Comments from './Comments';
+
+const Feed = ({ data }) => {
+ const [input, setInput] = useState('');
+ const [comment, setComment] = useState([]);
+ const [defaultcmt, setDefaultCmt] = useState([]);
+
+ const handleInputChange = e => {
+ const { value } = e.target;
+ setInput(value);
+ };
+
+ const handleUpload = e => {
+ e.preventDefault();
+ setComment([...comment, input]);
+ setInput('');
+ };
+
+ useEffect(() => {
+ fetch(`http://localhost:3000/data/younseop/defaultComment${data.id}.json`)
+ .then(response => response.json())
+ .then(commentsData => setDefaultCmt(commentsData));
+ }, []);
+
+ return (
+ <div className="feeds">
+ <article className="post" key={data.id}>
+ <div className="postProfile">
+ <div className="userInfo">
+ <img
+ src="images/younseop/post-user.jpg"
+ alt=""
+ className="user-photo"
+ />
+ <span>{data.username}</span>
+ </div>
+ <img
+ className="iconNamedMore"
+ src="images/younseop/more-icon.svg"
+ alt=""
+ />
+ </div>
+ <div className="imgWrapper">
+ <img src="images/younseop/post-user.jpg" alt="post user" />
+ </div>
+ <div className="btnsWrapper">
+ <div className="left-ic-wrapper">
+ <button className="btnNamedLike">
+ <img src="images/younseop/heart-regular.svg" alt="like" />
+ </button>
+ <button className="btnNamedComment">
+ <img src="images/younseop/comment.svg" alt="comment" />
+ </button>
+ <button className="btnNamedShare">
+ <img src="images/younseop/share.svg" alt="share" />
+ </button>
+ </div>
+ <button className="btnNamedBookmark">
+ <img src="images/younseop/bookmark.svg" alt="bookmark" />
+ </button>
+ </div>
+ <div className="likeList">
+ <img
+ src="images/younseop/post-user.jpg"
+ alt=""
+ className="user-photo"
+ />
+ <div className="likeListText">
+ <span className="likeUser">wecode</span>
+ <span>๋</span>
+ <span className="likeNumber">์ธ 10๋ช
</span>
+ <span>์ด ์ข์ํฉ๋๋ค.</span>
+ </div>
+ </div>
+ <div className="descWrapper">
+ <span className="postUser">{data.username}</span>
+ <span>{data.comment}</span>
+ </div>
+ <ul className="commentsWrapper">
+ {defaultcmt.map(data => (
+ <li className="postComment" key={data.id}>
+ <div>
+ <p className="comment">
+ <span className="commentUser">{data.username}</span>
+ <span>{data.comment}</span>
+ </p>
+ </div>
+ </li>
+ ))}
+ {comment.map((comment, id) => {
+ return <Comments names="unknown" comments={comment} key={id} />;
+ })}
+ </ul>
+ <p className="postTime">42๋ถ ์ </p>
+ <form method="post" className="writeComment" onSubmit={handleUpload}>
+ <input
+ type="text"
+ className="writeArea"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ value={input}
+ onChange={handleInputChange}
+ />
+ <button
+ type="submit"
+ id="submit"
+ disabled={input.length > 0 ? false : true}
+ >
+ ๊ฒ์
+ </button>
+ </form>
+ </article>
+ </div>
+ );
+};
+
+export default Feed; | JavaScript | ```suggestion
const handleInputChange = e => {
const { value } = e.target;
setInput(value);
};
```
destructuring ํ ๋น์ผ๋ก ๋ณด๋ค ๊น๋ํ ์ฝ๋๋ก ์ฌ์ฉํ ์ ์์ต๋๋ค! (๊น๋ํ์ง๋ ์ ๋ชจ๋ฅด๊ฒ ์ง๋ง..) |
@@ -0,0 +1,29 @@
+import React, { useState, useEffect } from 'react';
+
+const Footer = () => {
+ const [footers, setFooters] = useState([]);
+
+ useEffect(() => {
+ fetch('http://localhost:3000/data/younseop/footer.json')
+ .then(response => response.json())
+ .then(result => setFooters(result));
+ }, []);
+
+ return (
+ <footer>
+ <p>
+ {footers.map(info => {
+ // FIXME: Link component
+ return (
+ <a href="/" key={info.id}>
+ {info.content}
+ </a>
+ );
+ })}
+ </p>
+ <span>โ 2022 WESTAGRAM</span>
+ </footer>
+ );
+};
+
+export default Footer; | JavaScript | ```suggestion
const FOOTER_LIST = [
{ id: 1, content: 'Westagram ์ ๋ณด ยท ' },
{ id: 2, content: '์ง์ ยท ' },
{ id: 3, content: 'ํ๋ณด ์ผํฐ ยท ' },
{ id: 4, content: 'API ยท ' },
{ id: 5, content: '์ฑ์ฉ์ ๋ณด ยท ' },
{ id: 6, content: '๊ฐ์ธ์ ๋ณด์ฒ๋ฆฌ๋ฐฉ์นจ ยท ' },
{ id: 7, content: '์ฝ๊ด ยท ' },
{ id: 8, content: '๋๋ ํฐ๋ฆฌ ยท ' },
{ id: 9, content: 'ํ๋กํ ยท ' },
{ id: 10, content: 'ํด์ํ๊ทธ ยท ' },
{ id: 11, content: '์ธ์ด' },
];
```
public/data ํด๋์ json ํ์ผ๋ก mock data ์์ฑํ์
์ fetch ํด ์ค์ ๋ค์ props๋ก ๋๊ธฐ๋ ํธ์ด ๋ ํจ์จ์ ์ผ ๊ฒ ๊ฐ์ต๋๋ค! |
@@ -0,0 +1,83 @@
+import React, { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import Pagination from "@/components/Common/Pagination";
+import ReviewModal from "@/components/Modal/ReviewModal";
+import Tab from "@/components/Tab";
+import WriteReviewCard from "@/components/Cards/writeReviewCard";
+
+const fetchReviews = async () => {
+ return [
+ {
+ id: 1,
+ name: "๊น์ฝ๋ ๊ธฐ์ฌ๋",
+ date: "2024.07.01",
+ price: "210,000์",
+ },
+ {
+ id: 2,
+ name: "์ด์ฝ๋ ๊ธฐ์ฌ๋",
+ date: "2024.07.03",
+ price: "250,000์",
+ },
+ ];
+};
+
+export default function AwaitingReview() {
+ const [reviews, setReviews] = useState([]);
+ const [currentPage, setCurrentPage] = useState(1);
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [selectedReview, setSelectedReview] = useState(null);
+
+ const ITEMS_PER_PAGE = 6;
+
+ const { data } = useQuery(
+ ["reviews", currentPage],
+ () => fetchReviews(currentPage, ITEMS_PER_PAGE),
+ {
+ keepPreviousData: true,
+ }
+ );
+
+
+
+ const handlePageChange = (page: number) => {
+ setCurrentPage(page);
+ };
+
+ const handleWriteReview = (review: any) => {
+ setSelectedReview(review);
+ setIsModalOpen(true);
+ };
+
+ return (
+ <div className="p-6">
+ <div>
+ <Tab />
+ </div>
+
+ <div className="grid gap-6">
+ {data.reviews.map((review: any) => (
+ <div key={review.id} className="p-4 border rounded-lg shadow-sm">
+ <WriteReviewCard
+ item={review}
+ onClick={() => handleWriteReview(review)}
+ />
+ </div>
+ ))}
+ </div>
+
+ <Pagination
+ currentPage={currentPage}
+ totalPages={Math.ceil(data.total / ITEMS_PER_PAGE)}
+ onPageChange={handlePageChange}
+ />
+
+ {isModalOpen && (
+ <ReviewModal
+ review={selectedReview}
+ closeModal={() => setIsModalOpen(false)}
+ />
+ )}
+ </div>
+ );
+}
\ No newline at end of file | Unknown | ์ด ๋ถ๋ถ์ ํน์ Tab ๋ถ๋ถ์ด๋ผ๋ฉด ์ ๊ฐ ๋ง๋ค์ด ๋์ Tab ์ปดํฌ๋ํธ ์์ผ๋ ๊ทธ๊ฑฐ ์ฌ์ฉํ์๋ฉด ๋ ๊ฑฐ์์! ํน์ ํ์ด์ง ๊ฒฝ๋ก๋ง๋ค ํด๋น ํญ ๋ฉ๋ด ์ฝ์
๋๋๋กํด์ ์๋ฌด ์ค์ ์ํด๋ ์๋์ผ๋ก ๋ฐ๋ ๊ฒ๋๋ค! |
@@ -0,0 +1,83 @@
+import React, { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import Pagination from "@/components/Common/Pagination";
+import ReviewModal from "@/components/Modal/ReviewModal";
+import Tab from "@/components/Tab";
+import WriteReviewCard from "@/components/Cards/writeReviewCard";
+
+const fetchReviews = async () => {
+ return [
+ {
+ id: 1,
+ name: "๊น์ฝ๋ ๊ธฐ์ฌ๋",
+ date: "2024.07.01",
+ price: "210,000์",
+ },
+ {
+ id: 2,
+ name: "์ด์ฝ๋ ๊ธฐ์ฌ๋",
+ date: "2024.07.03",
+ price: "250,000์",
+ },
+ ];
+};
+
+export default function AwaitingReview() {
+ const [reviews, setReviews] = useState([]);
+ const [currentPage, setCurrentPage] = useState(1);
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [selectedReview, setSelectedReview] = useState(null);
+
+ const ITEMS_PER_PAGE = 6;
+
+ const { data } = useQuery(
+ ["reviews", currentPage],
+ () => fetchReviews(currentPage, ITEMS_PER_PAGE),
+ {
+ keepPreviousData: true,
+ }
+ );
+
+
+
+ const handlePageChange = (page: number) => {
+ setCurrentPage(page);
+ };
+
+ const handleWriteReview = (review: any) => {
+ setSelectedReview(review);
+ setIsModalOpen(true);
+ };
+
+ return (
+ <div className="p-6">
+ <div>
+ <Tab />
+ </div>
+
+ <div className="grid gap-6">
+ {data.reviews.map((review: any) => (
+ <div key={review.id} className="p-4 border rounded-lg shadow-sm">
+ <WriteReviewCard
+ item={review}
+ onClick={() => handleWriteReview(review)}
+ />
+ </div>
+ ))}
+ </div>
+
+ <Pagination
+ currentPage={currentPage}
+ totalPages={Math.ceil(data.total / ITEMS_PER_PAGE)}
+ onPageChange={handlePageChange}
+ />
+
+ {isModalOpen && (
+ <ReviewModal
+ review={selectedReview}
+ closeModal={() => setIsModalOpen(false)}
+ />
+ )}
+ </div>
+ );
+}
\ No newline at end of file | Unknown | ์ค์ฐ ๊ฐ์ฌํฉ๋๋ค ๋ค ๋ฐ๊ฟ์ผ๊ฒ ๋ค์ |
@@ -1,5 +1,5 @@
import { DataForReviewRequestCode } from '@/apis/group';
-import { Button } from '@/components';
+import { Button, BlinkLoader } from '@/components';
import { HOM_EVENT_NAME } from '@/constants';
import { debounce, trackEventInAmplitude } from '@/utils';
@@ -42,7 +42,7 @@ const URLGeneratorButton = ({
onClick={handleURLCreationButtonClick}
disabled={!isFormValid && !mutation.isPending}
>
- {mutation.isPending ? '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...' : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
+ {mutation.isPending ? <BlinkLoader>๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...</BlinkLoader> : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
</Button>
);
}; | Unknown | children์ผ๋ก pending์ผ ๋ ๋ณด์ฌ์ค ๋ฌธ๊ตฌ๋ฅผ ๋ฐ๋ ๊ฒ ์กฐ๊ธ ๋ ์์ฐ์ค๋ฌ์ ๋ณด์ด๋๋ฐ content๋ฅผ ๋ฐ๋ ์ด์ ๋ ์ ๋๋ฉ์ด์
ํจ๊ณผ๋ฅผ ๋ฃ๊ธฐ ์ํจ์ด์๊ฒ ์ฃ ?! |
@@ -1,5 +1,5 @@
import { DataForReviewRequestCode } from '@/apis/group';
-import { Button } from '@/components';
+import { Button, BlinkLoader } from '@/components';
import { HOM_EVENT_NAME } from '@/constants';
import { debounce, trackEventInAmplitude } from '@/utils';
@@ -42,7 +42,7 @@ const URLGeneratorButton = ({
onClick={handleURLCreationButtonClick}
disabled={!isFormValid && !mutation.isPending}
>
- {mutation.isPending ? '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...' : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
+ {mutation.isPending ? <BlinkLoader>๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...</BlinkLoader> : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
</Button>
);
}; | Unknown | ์ฒ์์๋ ์ ์ฉ๋ฒ์๋ฅผ 'ํ
์คํธ'๋ก ํ์ ํด์, before์ content์ ๋ฃ์์ด์.
์ฌ๋ฆฌ๊ฐ ๋ก๋ฉ์ ๊ตฌํํ๊ณ ์๋ค๊ณ ๋ค์ผ๋ ๊น๋ฐ์ด๋ ๋ก๋ฉ ์ ์ฉ ๋ฒ์๋ฅผ ํ
์คํธ ์ด์ธ์ Node๋ก ๋ํ๋ ๊ด์ฐฎ๊ฒ ๋ค๋ ์๊ฐ์ด ๋ค์์ด์.
ํ์ฌ ํผ๊ทธ๋ง ์์์๋ ๊น๋ฐ์ด๋ ๋ก๋ฉ์ด ํ
์คํธ์ธ์์ ์ฌ์ฉํ๋ ๊ณณ์ด ์์ง๋ง, ์ ๋๋ฉ์ด์
์์ฒด๊ฐ ํ
์คํธ์ด์ธ์ ๋ชจ๋ ์์์๋ ์ ์ฉ๋๋ ์ํฉ์ด์ฌ์, children์ ๋ฐ๋๋ก props ๋ณ๊ฒฝํ๊ณ ์ปดํฌ๋ํธ๋ช
๋ BlinkLoader๋ก ๋ณ๊ฒฝํ์ด์. |
@@ -1,5 +1,5 @@
import { DataForReviewRequestCode } from '@/apis/group';
-import { Button } from '@/components';
+import { Button, BlinkLoader } from '@/components';
import { HOM_EVENT_NAME } from '@/constants';
import { debounce, trackEventInAmplitude } from '@/utils';
@@ -42,7 +42,7 @@ const URLGeneratorButton = ({
onClick={handleURLCreationButtonClick}
disabled={!isFormValid && !mutation.isPending}
>
- {mutation.isPending ? '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...' : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
+ {mutation.isPending ? <BlinkLoader>๋ฆฌ๋ทฐ ๋งํฌ ์์ฑ ์ค...</BlinkLoader> : '๋ฆฌ๋ทฐ ๋งํฌ ์์ฑํ๊ธฐ'}
</Button>
);
}; | Unknown | ๊ตฟ๊ตฟ๐ ์ ๋ loading ์๋ก ํ์ ๋ฃ์ด์ผ๊ฒ ๋ค์.
children์ ๋ฐ์ผ๋ ์ด๋ฏธ์ง๊ฐ ํฌํจ๋ ๋ก๋ฉ ์ปดํฌ๋ํธ๋ ์ฝ๊ฒ ์ฌ์ฉํ ์ ์์ ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,13 @@
+import React from 'react';
+
+import { EssentialPropsWithChildren } from '@/types';
+
+import * as S from './style';
+
+interface BlinkLoaderProps extends EssentialPropsWithChildren, S.LoaderProps {}
+
+const BlinkLoader = ({ children, $animationDurationTime }: BlinkLoaderProps) => {
+ return <S.Loader $animationDurationTime={$animationDurationTime}>{children}</S.Loader>;
+};
+
+export default BlinkLoader; | Unknown | ์ปดํฌ๋ํธ์์ ๋ฐ๋ Props๋ช
์ `$`๋ฅผ ์ ๋ถ์ด๊ณ , style props๋ช
์๋ง `$`๋ฅผ ๋ถ์ด๊ธฐ๋ก ํ๋ ๊ฒ ๊ฐ์์. ํ์ ์ง์๋์ง ๊ธฐ์ต์ด ํ์ค์น ์์์ ์ฝ๋ฉํธ ๋จ๊ฒจ์๐
|
@@ -0,0 +1,13 @@
+import React from 'react';
+
+import { EssentialPropsWithChildren } from '@/types';
+
+import * as S from './style';
+
+interface BlinkLoaderProps extends EssentialPropsWithChildren, S.LoaderProps {}
+
+const BlinkLoader = ({ children, $animationDurationTime }: BlinkLoaderProps) => {
+ return <S.Loader $animationDurationTime={$animationDurationTime}>{children}</S.Loader>;
+};
+
+export default BlinkLoader; | Unknown | children์ผ๋ก ๋ ๋ง์ ์์๋ค์ด ์ฌ ์ ์๊ฒ ํ์ฅ๋์ด ๋ค์ํ๊ฒ ์ฌ์ฉ๋ ์ ์์ ๊ฒ ๊ฐ์์๐๐ป |
@@ -0,0 +1,13 @@
+import React from 'react';
+
+import { EssentialPropsWithChildren } from '@/types';
+
+import * as S from './style';
+
+interface BlinkLoaderProps extends EssentialPropsWithChildren, S.LoaderProps {}
+
+const BlinkLoader = ({ children, $animationDurationTime }: BlinkLoaderProps) => {
+ return <S.Loader $animationDurationTime={$animationDurationTime}>{children}</S.Loader>;
+};
+
+export default BlinkLoader; | Unknown | > ์ปดํฌ๋ํธ์์ ๋ฐ๋ Props๋ช
์ `$`๋ฅผ ์ ๋ถ์ด๊ณ , style props๋ช
์๋ง `$`๋ฅผ ๋ถ์ด๊ธฐ๋ก ํ๋ ๊ฒ ๊ฐ์์. ํ์ ์ง์๋์ง ๊ธฐ์ต์ด ํ์ค์น ์์์ ์ฝ๋ฉํธ ๋จ๊ฒจ์๐
๊ทธ๋ฐ ๋
ผ์๊ฐ ์์๋์ง ์ ๋ ์ ๊ธฐ์ต์ด ๋์ง ์๋ค์. ๋ค๋ง, ์ ๋ฒ์ ์งํํ ํ์์ฉ ๊ณตํต UI ์์
์์ ์คํ์ผ ์ปดํฌ๋ํธ์ props๋ฅผ ํ์ฅ ๋ฐ์์ ์ฌ์ฉํ๋ ์ฝ๋๋ค์ด ์์๊ณ ์คํ์ผ Props์ ๋ณ๋ค๋ฅผ props๋ฅผ ๋ฐ๋๊ฒ ์๋๋ผ์ ์คํ์ผ ์ปดํฌ๋ํธ props๋ฅผ ํ์ฅ๋ฐ๋ ๊ฒ์ผ๋ก ํ์ด์.
๋ง์ฝ ์ด ๋ถ๋ถ์ ๋ํ ์ฝ๋ ์ปจ๋ฒค์
ํ์๊ฐ ๋๊ปด์ง๋ค๋ฉด, ํ๋ก ํธ ํ์์์ ๋
ผ์ํด๋ณด์ฃ |
@@ -6,8 +6,14 @@ import { checkIsValidImage, checkIsValidScore } from '../../validChecker';
const reviewRouter = Router();
-reviewRouter.get('/', checkRequiredFieldsQuery(['userId', 'page']), async (req, res) => {
- const { userId, page, pageSize: pageSize = 10 } = req.query;
+ interface QueryType {
+ userId?: string;
+ travelId?: string;
+ }
+
+
+reviewRouter.get('/', checkRequiredFieldsQuery(['page']), async (req, res) => {
+ const { userId, travelId, page, pageSize: pageSize = 10 } = req.query;
const page_ = Number(page);
const pageSize_ = Number(pageSize);
@@ -16,12 +22,17 @@ reviewRouter.get('/', checkRequiredFieldsQuery(['userId', 'page']), async (req,
return;
}
+
+ const findQuery:QueryType = {};
+ if (userId) findQuery.userId = String(userId);
+ if(travelId) findQuery.travelId = String(travelId);
+
try {
const skip = (page_ - 1) * pageSize_;
- const totalReviews = await Review.countDocuments({ userId });
+ const totalReviews = await Review.countDocuments(findQuery);
const totalPages = Math.ceil(totalReviews / pageSize_);
- const reviews = await Review.find({ userId })
+ const reviews = await Review.find(findQuery)
.sort({ createdDate: -1 })
.skip(skip)
.limit(pageSize_)
@@ -30,14 +41,21 @@ reviewRouter.get('/', checkRequiredFieldsQuery(['userId', 'page']), async (req,
const reviewsWithTravelInfo = await Promise.all(
reviews.map(async (review) => {
const travel = await Travel.findOne({ id: review.travelId }).lean();
+ const user = await User.findById(review.userId).lean();
return {
id: review._id,
travelId: review.travelId,
reviewImg: review.reviewImg,
content: review.content,
travelScore: review.travelScore,
createdDate: review.createdDate,
- travelTitle: travel?.travelTitle || '',
+ travelTitle: travel?.travelTitle || '',
+ userName: user?.userName,
+ socialName: user?.socialName,
+ userProfileImage: user?.userProfileImage,
+ userEmail: user?.userEmail,
+ isVerifiedUser: user?.isVerifiedUser,
+ mbti: user?.mbti,
};
}),
); | TypeScript | _:warning: Potential issue_
**[๋ฏผ๊ฐ ์ ๋ณด ๋ฐํ ๊ฐ๋ฅ์ฑ]**
`userEmail`์ ๊ทธ๋๋ก ์๋ต์ ํฌํจํ๋ฉด ์ฌ์ฉ์ ์ด๋ฉ์ผ์ด ๋
ธ์ถ๋ ์ ์์ด, PII(๊ฐ์ธ์ ๋ณด) ๋ณดํธ ์ธก๋ฉด์์ ๊ณ ๋ ค๊ฐ ํ์ํฉ๋๋ค.
์ฌ์ฉ์ ์ด๋ฉ์ผ์ด ์ธ๋ถ API ์๋ต์ ํฌํจ๋์ด๋ ๊ด์ฐฎ์์ง๋ฅผ ๋ค์ ํ ๋ฒ ๊ฒํ ํด ๋ณด์ธ์. ํ์ํ๋ค๋ฉด ๋ง์คํน ์ฒ๋ฆฌ๋ ๋ฐํ ์ ํ์ ๊ถ์ฅํฉ๋๋ค.
<!-- This is an auto-generated comment by CodeRabbit --> |
@@ -0,0 +1,83 @@
+package nextstep.security.config;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.filter.GenericFilterBean;
+
+import java.io.IOException;
+import java.util.List;
+
+public class FilterChainProxy extends GenericFilterBean {
+
+ private final List<SecurityFilterChain> filterChains;
+
+ private VirtualFilterChainDecorator virtualFilterChainDecorator = new VirtualFilterChainDecorator();
+
+ public FilterChainProxy(List<SecurityFilterChain> filterChains) {
+ this.filterChains = filterChains;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ List<Filter> filters = getFilters(request);
+
+ if (filters == null || filters.isEmpty()) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ this.virtualFilterChainDecorator.decorate(filterChain, filters).doFilter(request, response);
+ }
+
+ private List<Filter> getFilters(HttpServletRequest request) {
+ return this.filterChains.stream()
+ .filter(chain -> chain.matches(request))
+ .findAny()
+ .map(SecurityFilterChain::getFilters)
+ .orElse(null);
+ }
+
+ public static final class VirtualFilterChainDecorator {
+
+ public FilterChain decorate(FilterChain original, List<Filter> filters) {
+ return new VirtualFilterChain(original, filters);
+ }
+
+ }
+
+ private static class VirtualFilterChain implements FilterChain {
+
+ private final FilterChain originalChain;
+ private final List<Filter> additionalFilters;
+ private final int size;
+
+ private int currentPosition = 0;
+
+ public VirtualFilterChain(FilterChain originalChain, List<Filter> additionalFilters) {
+ this.originalChain = originalChain;
+ this.additionalFilters = additionalFilters;
+ this.size = additionalFilters.size();
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+ if (this.currentPosition == this.size) {
+ this.originalChain.doFilter(request, response);
+ return;
+ }
+ this.currentPosition++;
+ Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
+
+ nextFilter.doFilter(request, response, this);
+ }
+
+ }
+
+} | Java | > ๊ถ๊ธํ์ ์ ์ VirtualFilterChain ์ FilterChainDecorator๋ฅผ ์
ํ spring security์์๋ ์ฌ์ฉํ๊ณ ์๋์ง ์
๋๋ค.
VirtualFilterChain์ ์ญํ ๊ณผ FilterChainDecorator์ ์ญํ ์ ์ญํ ์ด ๋ฌ๋ผ์ ๊ทธ๋ฐ๋ฐ์.
VirtualFilterChain๋ ํน์ ์กฐ๊ฑด์ ๊ธฐ๋ฐ์ผ๋ก ํํฐ๋ค์ ์คํํ๋ ์ญํ ์ ํ๊ณ , FilterChainDecorator๋ ๊ธฐ์กด FilterChain์ ์ถ๊ฐ์ ์ธ ๋ก์ง์ ์ฝ์
ํ๊ฑฐ๋ ์์ ํ ์ ์๋๋ก ๋์์ฃผ๋ ์ญํ ์ ํฉ๋๋ค.
์์๋ฅผ ๋ค์ด๋ณด์๋ฉด /a ์์ฒญ๊ณผ /b ์์ฒญ์ ๋ค๋ฅธ ๋ณด์ ํํฐ๋ฅผ ์ ์ฉํ๋ค๊ณ ์๊ฐํ์ ๋ `VirtualFilterChain`๊ฐ ๊ฐ ํํฐ๋ฅผ ์คํํ๋ ์ญํ ์ ๋ด๋นํ๊ฒ ๋๊ณ ,
์ด๋ฏธ ๊ตฌํ๋ ํํฐ๋ฅผ ๊ฐ์ธ์ ๊ฐ๋ฅ์ ํ์ฅํ ๋ ์ฌ์ฉํ๋ ๊ฒ์ด `FilterChainDecorator`์ ์ญํ ์ด ๋ฉ๋๋ค.
์ฆ ํํฐ ์ฒด์ธ์ ๋์ ์ผ๋ก ์กฐ์ํ๋ค๋ ์ ์์ ๋์ผํ์ง๋ง, ๋ชฉ์ ๊ณผ ์ฌ์ฉ ๋ฐฉ์์ด ๋ค๋ฅผ ๊ฒ ๊ฐ์์ ใ
ใ
|
@@ -0,0 +1,83 @@
+package nextstep.security.config;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.filter.GenericFilterBean;
+
+import java.io.IOException;
+import java.util.List;
+
+public class FilterChainProxy extends GenericFilterBean {
+
+ private final List<SecurityFilterChain> filterChains;
+
+ private VirtualFilterChainDecorator virtualFilterChainDecorator = new VirtualFilterChainDecorator();
+
+ public FilterChainProxy(List<SecurityFilterChain> filterChains) {
+ this.filterChains = filterChains;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ List<Filter> filters = getFilters(request);
+
+ if (filters == null || filters.isEmpty()) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ this.virtualFilterChainDecorator.decorate(filterChain, filters).doFilter(request, response);
+ }
+
+ private List<Filter> getFilters(HttpServletRequest request) {
+ return this.filterChains.stream()
+ .filter(chain -> chain.matches(request))
+ .findAny()
+ .map(SecurityFilterChain::getFilters)
+ .orElse(null);
+ }
+
+ public static final class VirtualFilterChainDecorator {
+
+ public FilterChain decorate(FilterChain original, List<Filter> filters) {
+ return new VirtualFilterChain(original, filters);
+ }
+
+ }
+
+ private static class VirtualFilterChain implements FilterChain {
+
+ private final FilterChain originalChain;
+ private final List<Filter> additionalFilters;
+ private final int size;
+
+ private int currentPosition = 0;
+
+ public VirtualFilterChain(FilterChain originalChain, List<Filter> additionalFilters) {
+ this.originalChain = originalChain;
+ this.additionalFilters = additionalFilters;
+ this.size = additionalFilters.size();
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+ if (this.currentPosition == this.size) {
+ this.originalChain.doFilter(request, response);
+ return;
+ }
+ this.currentPosition++;
+ Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
+
+ nextFilter.doFilter(request, response, this);
+ }
+
+ }
+
+} | Java | > FilterChainDecorator ๋์์ธ ํจํด์ ๋ฐ์ฝ๋ ์ดํฐ ํจํด๊ณผ๋ ๋ค๋ฅธ ๊ทธ๋ฅ ๋ํผ์ญํ ์ ํ๋ ์ธํฐํ์ด์ค์ธ๊ฒ ๊ฐ์๋ฐ ์ด๋ฆ์ ์ฐ๊ด์ฑ์ด ์๋์ง ๊ถ๊ธํฉ๋๋ค.
์ ์์ ์ธ ๋ฐ์ฝ๋ ์ดํฐ ํจํด์ ์๋์ง๋ง FilterChain์ ๊ฐ์ธ์ ๊ธฐ์กด ํํฐ๋ฅผ ์์ ํ์ง ์๊ณ ์ถ๊ฐ์ ์ธ ํํฐ๋ฅผ ์คํํ๋ค๋ ๊ด์ ์์ ๋ฐ์ฝ๋ ์ดํฐ์ ์ญํ ์ ํ๊ณ ์๋ค๊ณ ๋ณด์ฌ์ง๋๋ค.
๋ฐ๋ผ์ `๋ฐ์ฝ๋ ์ดํฐ ๋์์ธ ํจํด์ ์๋ฒฝํ ๊ตฌํ์ฒด์ด๋ค!`๋ ์๋์ง๋ง, ๋ฐ์ฝ๋ ์ดํฐ ํจํด์์ ์๊ธฐํ๋ ํต์ฌ ๊ฐ๋
์ธ `์๋ณธ์ ์ ์งํ ์ํ๋ก ํ์ฅ์ด ๊ฐ๋ฅํ๋ค.` ๋ผ๋ ์ ์์๋ ๋ฐ์ฝ๋ ์ดํฐ๋ผ๋ ์ด๋ฆ์ด ์ด์ํ์ง ์์ ๊ฒ ๊ฐ๋ค๋ ์๊ฒฌ ๋๋ฆฝ๋๋ค :) |
@@ -0,0 +1,83 @@
+package nextstep.security.config;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.filter.GenericFilterBean;
+
+import java.io.IOException;
+import java.util.List;
+
+public class FilterChainProxy extends GenericFilterBean {
+
+ private final List<SecurityFilterChain> filterChains;
+
+ private VirtualFilterChainDecorator virtualFilterChainDecorator = new VirtualFilterChainDecorator();
+
+ public FilterChainProxy(List<SecurityFilterChain> filterChains) {
+ this.filterChains = filterChains;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ List<Filter> filters = getFilters(request);
+
+ if (filters == null || filters.isEmpty()) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ this.virtualFilterChainDecorator.decorate(filterChain, filters).doFilter(request, response);
+ }
+
+ private List<Filter> getFilters(HttpServletRequest request) {
+ return this.filterChains.stream()
+ .filter(chain -> chain.matches(request))
+ .findAny()
+ .map(SecurityFilterChain::getFilters)
+ .orElse(null);
+ }
+
+ public static final class VirtualFilterChainDecorator {
+
+ public FilterChain decorate(FilterChain original, List<Filter> filters) {
+ return new VirtualFilterChain(original, filters);
+ }
+
+ }
+
+ private static class VirtualFilterChain implements FilterChain {
+
+ private final FilterChain originalChain;
+ private final List<Filter> additionalFilters;
+ private final int size;
+
+ private int currentPosition = 0;
+
+ public VirtualFilterChain(FilterChain originalChain, List<Filter> additionalFilters) {
+ this.originalChain = originalChain;
+ this.additionalFilters = additionalFilters;
+ this.size = additionalFilters.size();
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+ if (this.currentPosition == this.size) {
+ this.originalChain.doFilter(request, response);
+ return;
+ }
+ this.currentPosition++;
+ Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
+
+ nextFilter.doFilter(request, response, this);
+ }
+
+ }
+
+} | Java | > security ํจํค์ง์์ securityconfig๋ผ๋ ํด๋์ค์ delegatingfilterproxy, filterchianproxy ๋น๋ค์ ์ค์ ํ๊ณ userService ๋น๋ง app ํจํค์ง ์์์ ์ค์ ํ์ต๋๋ค. ๊ทธ๋ฐ๋ฐ ํํฐ ๋ฑ๋ก์ด ์๋๋๋ผ๊ณ ์.(filterchainproxy)
์ด๊ฒ์ ๋ํด ๋ช
ํํ๊ฒ ์ ๊ทธ๋ฐ๊ฑด์ง ์ด์ ๋ฅผ ๋ชจ๋ฅด๊ฒ ์ต๋๋ค.
์ ํํ ๊ฒ์ ํด๋น ์ฝ๋๋ฅผ ๋ด์ผ๊ฒ ์ง๋ง.. ๊ฐ๋ณ๊ฒ ์ถ์ธกํด ๋ณด์๋ฉด
1. SecurityAuthenticationApplication์์ componentScan์ ๋ณ๊ฒฝํ์ง ์์๋ค.
2. ์ค์ ํ Config์ `@Configuration`์ ๋ถ์ด์ง ์์๋ค.
๋ ์ค ํ๋๊ฐ ์๋๊น ๊ฐํ ์์ธกํด๋ด
๋๋ค.. ใ
ใ
|
@@ -0,0 +1,32 @@
+package nextstep.security.config;
+
+import nextstep.security.UserDetails;
+
+import java.security.Principal;
+
+// Implementations which use this class should be immutable.
+public abstract class AbstractAuthenticationToken implements Authentication{
+
+ private Object details;
+
+ @Override
+ public String getName() {
+ if (this.getPrincipal() instanceof UserDetails userDetails) {
+ return userDetails.getUsername();
+ }
+ if (this.getPrincipal() instanceof Principal principal) {
+ return principal.getName();
+ }
+ return (this.getPrincipal() == null) ? "" : this.getPrincipal().toString();
+ }
+
+ public void setDetails(Object details) {
+ this.details = details;
+ }
+
+ @Override
+ public Object getDetails() {
+ return this.details;
+ }
+
+} | Java | principal์ด ์ถ๊ฐ๋ ๋ ๋ง๋ค ํด๋น ํด๋์ค๋ฅผ ์์ ํด์ผ ํ๋ ๊ฒ์ ๋ฌธ์ ๊ฐ ์์ด ๋ณด์ด๋๋ฐ์.
์์ฑ ์์ ์ principal์์ ํ์ํ ๊ฐ๋ง ์ถ์ถํ์ฌ ๋๊ฒจ ๋ฐ๋๋ค๋ฉด ํด๋น ๋ฌธ์ ๋ฅผ ํด๊ฒฐํ ์ ์์ ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,81 @@
+package nextstep.security.config;
+
+
+import java.io.Serializable;
+import java.security.Principal;
+
+/**
+ * ์ผ๋จ ์์ฒญ์ด AuthenticationManager์ authenticate(Authentication) ๋ฉ์๋์ ์ํด์ ์งํ๋๋ค๋ฉด
+ * ์ธ์ฆ ์์ฒญ์ด๋ authenticated principaldใ
๋ํ ํ ํฐ์ ๋ํ๋ธ๋ค.
+
+ * ์ผ๋จ request๊ฐ authenticated ๋๋ฉด, ์ด Authentication ๊ฐ์ฒด๋ SecurityContextHolder์ SecurityContext์ threadlocal์ ์ ์ฅ๋๋ค.
+ * spring security์ authentication ๋ฉ์ปค๋์ฆ์ ์ฌ์ฉํ์ง ์๊ณ ์๋์ ๊ฐ์ด Authentication ์ธ์คํด์ค๋ฅผ ์์ฑํด์ ๋ช
์์ ์ผ๋ก ์ฌ์ฉ๊ฐ๋ฅํ๋ค
+ * <pre>
+ * SecurityContext context = SecurityContextHolder.createEmptyContext();
+ * context.setAuthentication(anAuthentication);
+ * SecurityContextHolder.setContext(context);
+ * </pre>
+ *
+ * Authentication ๊ฐ์ฒด๊ฐ authenticated ํ๋กํผํฐ ๊ฐ์ด true๋ก ์ง์ ๋์ง ์๋ํ,
+ * ๋ง๋๋ security interceptor๋ง๋ค ์ธ์ฆ๋๋ค.
+
+ * ๋๋ถ๋ถ์ ๊ฒฝ์ฐ์ framework๊ฐ security context์ Authentication ๊ฐ์ฒด๋ฅผ ๋ฅผ ํฌ๋ช
ํ๊ฒ ๊ด๋ฆฌํด์ค๊ฒ์ด๋ค.
+ **/
+public interface Authentication extends Principal, Serializable {
+
+ /**
+ * principal์ด ์ฌ๋ฐ๋ฅธ์ง ํ์ธํ๋ crendentials.
+ * ์ฃผ๋ก password์ด๋ AuthenticationManager์ ๊ด๋ จ๋ ์ด๋๊ฒ์ด๋ ๊ฐ๋ฅํ๋ค.
+ * caller๊ฐ ์ด credentials๋ฅผ ์ฑ์ด๋ค.
+ *
+ * @return the credentials that prove the identity of the principal
+ */
+ Object getCredentials();
+
+ /**
+ * ์ธ์ฆ ์์ฒญ์ ๋ํ ์ถ๊ฐ์ ์ธ details๋ฅผ ์ ์ฅํ๋ค.
+ * IP ์ฃผ์๋ ์ธ์ฆ์ ์ผ๋ จ๋ฒํธ ๋ฑ
+ *
+ * @return ์ธ์ฆ ์์ฒญ์ ๋ํ ์ถ๊ฐ์ ์ธ details. ์ฌ์ฉํ์ง ์์ผ๋ฉด null
+ */
+ Object getDetails();
+
+ /**
+ *
+ * ์ธ์ฆ๋๋ principal(์ฃผ์ฒด)์ ์ ์.
+ * username / password๋ก ์ธ์ฆ ์์ฒญ์ ๊ฒฝ์ฐ, username์ด ๋๋ค.
+ * AuthenticationManager implementation ์ ๋๋ง์ ์ ๋ณด๋ฅผ ๊ฐ์ง๊ณ ์๋ Authentication๋ฅผ principal๋ก ๋ฐํํ๋ค.
+ * UserDetails ๊ฐ์ฒด๋ฅผ principal๋ก ์ฌ์ฉ
+ * @return ์ธ์ฆ์ ๋์์ธ Principal์ด๋ ์ธ์ฆ๋ Principal
+ */
+ Object getPrincipal();
+
+ /**
+ * AbstractSecurityInterceptor๊ฐ ์ธ์ฆ ํ ํฐ์ AuthenticationManager์๊ฒ ์ ์ํด์ผ ํ๋์ง ์ฌ๋ถ๋ฅผ ๋ํ๋ด๋ ๋ฐ ์ฌ์ฉ๋๋ค.
+ * ์ผ๋ฐ์ ์ผ๋ก AuthenticationManager (AuthenticationProvider์ค ํ๋) ๋ ์ฑ๊ณต์ ์ธ ์ธ์ฆ ํ ๋ถ๋ณ ์ธ์ฆ ํ ํฐ์ ๋ฐํํ๋ฉฐ,
+ * ๊ทธ ๊ฒฝ์ฐ ํ ํฐ์ด ์์ ํ๊ฒ ์ด method์ true๋ก ๋ฐํํ ์ ์๋ค.
+ * true๋ฅผ ๋ฐํํ๋ ๊ฒ์ performance๋ฅผ ๋์ด๊ณ AuthenticationManager๋ฅผ ๋งค ์์ฒญ๋ง๋ค ํธ์ถํ๋๊ฒ์ ๋์ด์ ๋ถํ์ํ๊ฒ ๋๋ค.
+ *
+ * ๋ณด์์ ์ธ ์ด์ ๋ก ์ด ์ธํฐํ์ด์ค ๊ตฌํ์ฒด๋ ๋ถ๋ณ์ด๊ฑฐ๋ ์ฒ์ ์์ฑ๋๋ถํฐ ๋ณํ์ง ์๋ ํ๋กํผํฐ๋ฅผ ๋ณด์ฅํ๋ ๋ฐฉ๋ฒ์ด ์์ง ์์ํ true๋ฅผ ๋ฐํํ๋ ๊ฒ์ ๋งค์ฐ ์ฃผ์ํด์ผ ํ๋ค.
+ *
+ * @return true if the token has been authenticated and the
+ * <code>AbstractSecurityInterceptor</code> does not need to present the token to the
+ * <code>AuthenticationManager</code> again for re-authentication.
+ */
+ boolean isAuthenticated();
+
+ /**
+ * <p>
+ * Implementations should <b>always</b> allow this method to be called with a
+ * <code>false</code> parameter, as this is used by various classes to specify the
+ * authentication token should not be trusted. If an implementation wishes to reject
+ * an invocation with a <code>true</code> parameter (which would indicate the
+ * authentication token is trusted - a potential security risk) the implementation
+ * should throw an {@link IllegalArgumentException}.
+ * @param isAuthenticated ๋ ํ ํฐ์ ์ ๋ขฐํด์ผํ๋ ๊ฒฝ์ฐ ์ผ๋ true๋ฅผ ๋ฐํํ๋ค.
+ * ํ ํฐ์ ์ ๋ขฐํ์ง ๋ง์์ผํ๋ ๊ฒฝ์ฐ false๋ฅผ ๋ฐํํ๋ค.
+ * @throws IllegalArgumentException | authentication token์ ์ ๋ขฐํ๋๋ก ๋ง๋๋ ์๋๊ฐ ์คํจํ์๊ฒฝ์ฐ IllegalArgumentException ๋ฐ์
+ */
+ void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException;
+
+} | Java | ํ์ตํ ๋ด์ฉ์ด ๋จ์์์ด์ ์ข๋ค์ ๐ฏ |
@@ -0,0 +1,42 @@
+package nextstep.security.config;
+
+import nextstep.security.AuthenticationException;
+import nextstep.security.UserDetailService;
+import nextstep.security.UserDetails;
+
+public class DaoAuthenticationProvider implements AuthenticationProvider{
+
+ private final UserDetailService userDetailService;
+ private final PasswordEncoder passwordEncoder;
+
+ public DaoAuthenticationProvider(UserDetailService userDetailService, PasswordEncoder passwordEncoder) {
+ this.userDetailService = userDetailService;
+ this.passwordEncoder = passwordEncoder;
+ }
+
+ public DaoAuthenticationProvider(UserDetailService userDetailService) {
+ this.userDetailService = userDetailService;
+ this.passwordEncoder = null;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+ if (!supports(authentication.getClass())) {
+ return null;
+ }
+ String username = (String) authentication.getPrincipal();
+ String password = (String) authentication.getCredentials();
+
+ UserDetails user = userDetailService.getUserByUsername(username);
+ if (!password.equals(user.getPassword())) {
+ throw new AuthenticationException("Passwords do not match");
+ }
+ return new UsernamePasswordAuthenticationToken(username, password, user);
+ }
+
+ @Override
+ public boolean supports(Class<?> authentication) { // todo ์ instanceOf๊ฐ ์๋ ์ด๋ ๊ฒ ํด๋์ค๋ก ๋น๊ต๋ฅผ ํ๋๊ฑธ๊น?
+ return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication);
+ }
+
+} | Java | ํด๋น ํด๋์ค๋ฅผ ์ฌ์ฉํ๊ณ ์์ง ์๊ตฐ์! |
@@ -0,0 +1,45 @@
+package nextstep.security.config;
+
+import nextstep.security.ProviderNotFoundException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderManager implements AuthenticationManager {
+
+ private List<AuthenticationProvider> providers = Collections.emptyList();
+
+ public ProviderManager(List<AuthenticationProvider> providers) {
+ this.providers = providers;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) {
+ Class<? extends Authentication> authenticationClassToTest = authentication.getClass();
+ Authentication result = null;
+ for (AuthenticationProvider provider : this.providers) {
+ if (!provider.supports(authenticationClassToTest)) {
+ continue;
+ }
+ result = provider.authenticate(authentication);
+ if (result != null) { // ์ธ์ฆ๋ ๊ฐ์ ๊ฐ ์๋ค๋ฉด
+ copyDetails(authentication, result);
+ result.setAuthenticated(true); // todo ์ฑ
์ ํ์ธ ํ๋ฒ ํ์
+ break;
+ }
+ }
+ if (result == null) {
+ throw new ProviderNotFoundException("์ง์ํ๋ provider๊ฐ ์์ต๋๋ค!");
+ }
+ return result;
+ }
+
+ // ์ธ์ฆ๋ ํ ํฐ์ detail ๊ฐ์ด ์๋ค๋ฉด detail ๋ฃ์ด์ฃผ๊ธฐ
+ private void copyDetails(Authentication source, Authentication dest) {
+ if ((dest instanceof AbstractAuthenticationToken token) && (dest.getDetails() == null)) {
+ token.setDetails(source.getDetails());
+ }
+ }
+
+}
+ | Java | ์ง์ํ๋ provider๋ฅผ ์ฐพ์๋ authenticate ์ null์ด ์๋ต๋๋ค๋ฉด ํด๋น ์์ธ ๋ฉ์์ง๊ฐ ์ถ๋ ฅ๋๊ฒ ๋ค์.
์๋ํ ๋ด์ฉ์ด ๋ง์๊น์? |
@@ -0,0 +1,45 @@
+package nextstep.security.config;
+
+import nextstep.security.ProviderNotFoundException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderManager implements AuthenticationManager {
+
+ private List<AuthenticationProvider> providers = Collections.emptyList();
+
+ public ProviderManager(List<AuthenticationProvider> providers) {
+ this.providers = providers;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) {
+ Class<? extends Authentication> authenticationClassToTest = authentication.getClass();
+ Authentication result = null;
+ for (AuthenticationProvider provider : this.providers) {
+ if (!provider.supports(authenticationClassToTest)) {
+ continue;
+ }
+ result = provider.authenticate(authentication);
+ if (result != null) { // ์ธ์ฆ๋ ๊ฐ์ ๊ฐ ์๋ค๋ฉด
+ copyDetails(authentication, result);
+ result.setAuthenticated(true); // todo ์ฑ
์ ํ์ธ ํ๋ฒ ํ์
+ break;
+ }
+ }
+ if (result == null) {
+ throw new ProviderNotFoundException("์ง์ํ๋ provider๊ฐ ์์ต๋๋ค!");
+ }
+ return result;
+ }
+
+ // ์ธ์ฆ๋ ํ ํฐ์ detail ๊ฐ์ด ์๋ค๋ฉด detail ๋ฃ์ด์ฃผ๊ธฐ
+ private void copyDetails(Authentication source, Authentication dest) {
+ if ((dest instanceof AbstractAuthenticationToken token) && (dest.getDetails() == null)) {
+ token.setDetails(source.getDetails());
+ }
+ }
+
+}
+ | Java | ProviderManager๋ ์ฌ๋ฌ ๊ฐ์ AuthenticationProvider๋ฅผ ๊ด๋ฆฌํ๊ณ , ์ฌ๋ฐ๋ฅธ Provider๋ฅผ ์ ํํ์ฌ ์ธ์ฆ์ ์ํํ๋ ์ญํ ์ ๋ด๋นํ๊ฒ ๋๋๋ฐ์.
์ด ์ญํ ์ ProviderManager์ด ์๋ AuthenticationProvider์ ์ญํ ์ ๋ ์ ์ ํด ๋ณด์ด๋๋ฐ ์ด๋ป๊ฒ ์๊ฐํ์๋์? |
@@ -0,0 +1,84 @@
+package nextstep.security.filter;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.security.AuthenticationException;
+import nextstep.security.config.Authentication;
+import nextstep.security.config.AuthenticationManager;
+import nextstep.security.config.BasicAuthenticationToken;
+import nextstep.security.config.SecurityContextHolder;
+
+import java.util.List;
+
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+
+public class BasicAuthFilter implements Filter {
+
+ private static final List<String> TARGET_URL = List.of("/members");
+
+ private final AuthenticationManager authenticationManager;
+
+ public BasicAuthFilter(AuthenticationManager authenticationManager) {
+ this.authenticationManager = authenticationManager;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException {
+ boolean isHttpServlet = servletRequest instanceof HttpServletRequest && servletResponse instanceof HttpServletResponse;
+ if (isHttpServlet) {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ try {
+ boolean notTarget = isNotTarget(request);
+ if (notTarget) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ // ํ๊ฒ์ผ ๊ฒฝ์ฐ
+ checkAuthentication(request);
+ filterChain.doFilter(request, response);
+ } catch (Exception e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ }
+ return;
+ }
+ throw new ServletException("BasicAuthFilter only supports HTTP requests");
+ }
+
+ private boolean isNotTarget(HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ return TARGET_URL.stream()
+ .filter(requestURI::startsWith)
+ .findAny()
+ .isEmpty();
+ }
+
+ private void checkAuthentication(HttpServletRequest request) {
+ try {
+ String authorizationHeader = getAuthorizationHeader(request);
+ if (authorizationHeader == null) throw new AuthenticationException("Missing authorization header");
+
+ Authentication authentication = authenticationManager.authenticate(new BasicAuthenticationToken(authorizationHeader));
+ if (!authentication.isAuthenticated()) {
+ throw new AuthenticationException();
+ }
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+ } catch (AuthenticationException e) {
+ SecurityContextHolder.clearContext();
+ throw e;
+ }
+
+ }
+
+ private static String getAuthorizationHeader(HttpServletRequest request) {
+ return request.getHeader(AUTHORIZATION);
+ }
+
+
+} | Java | ์ฝ๋์ depth๊ฐ ๊ธธ์ด์ง๋ฉด ์ฝ๋์ ๊ฐ๋
์ฑ์ด ๋จ์ด์ง๊ฒ ๋๋๋ฐ์.
๊ทธ๋ฐ ๊ด์ ์์ early returnํ๋ ์ฝ๋๋ฅผ ์์ฑํ๋ค๋ฉด ๊ฐ๋
์ฑ์ด ์ฌ๋ผ๊ฐ ๊ฒ ๊ฐ์ต๋๋ค!
```suggestion
if (!isHttpServlet) {
throw new ServletException("BasicAuthFilter only supports HTTP requests");
}
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
try {
boolean notTarget = isNotTarget(request);
if (notTarget) {
filterChain.doFilter(request, response);
return;
}
checkAuthentication(request);
filterChain.doFilter(request, response);
} catch (Exception e) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
``` |
@@ -0,0 +1,49 @@
+package nextstep.security.interceptor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.security.AuthenticationException;
+import nextstep.security.UserDetailService;
+import nextstep.security.UserDetails;
+import nextstep.security.util.Base64Convertor;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+public class BasicAuthInterceptor implements HandlerInterceptor {
+
+ private final UserDetailService userDetailService;
+
+ public BasicAuthInterceptor(UserDetailService userDetailService) {
+ this.userDetailService = userDetailService;
+ }
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+ try {
+ String authorizationHeader = request.getHeader("Authorization");
+ String authType = authorizationHeader.split(" ")[0];
+ String credentials = authorizationHeader.split(" ")[1];
+ String decodedString = Base64Convertor.decode(credentials);
+ checkAuthType(authType);
+
+ String[] usernameAndPassword = decodedString.split(":");
+ String username = usernameAndPassword[0];
+ String password = usernameAndPassword[1];
+
+ UserDetails userDetail = userDetailService.getUserByUsername(username);
+ if (!userDetail.getPassword().equals(password)) {
+ throw new AuthenticationException();
+ }
+ return true;
+ } catch (Exception e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ return false;
+ }
+ }
+
+ private void checkAuthType(String authType) {
+ if (!authType.equalsIgnoreCase(HttpServletRequest.BASIC_AUTH)) {
+ throw new AuthenticationException();
+ }
+ }
+
+} | Java | BasicAuthInterceptor์ FormLoginInterceptor๋ ์ฌ์ฉ๋์ง ์๋ ๊ฒ ๊ฐ์๋ฐ, ์ด๋ค ์ด์ ๋ก ์ถ๊ฐํ์
จ์๊น์? |
@@ -0,0 +1,83 @@
+package nextstep.security.config;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.filter.GenericFilterBean;
+
+import java.io.IOException;
+import java.util.List;
+
+public class FilterChainProxy extends GenericFilterBean {
+
+ private final List<SecurityFilterChain> filterChains;
+
+ private VirtualFilterChainDecorator virtualFilterChainDecorator = new VirtualFilterChainDecorator();
+
+ public FilterChainProxy(List<SecurityFilterChain> filterChains) {
+ this.filterChains = filterChains;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ List<Filter> filters = getFilters(request);
+
+ if (filters == null || filters.isEmpty()) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ this.virtualFilterChainDecorator.decorate(filterChain, filters).doFilter(request, response);
+ }
+
+ private List<Filter> getFilters(HttpServletRequest request) {
+ return this.filterChains.stream()
+ .filter(chain -> chain.matches(request))
+ .findAny()
+ .map(SecurityFilterChain::getFilters)
+ .orElse(null);
+ }
+
+ public static final class VirtualFilterChainDecorator {
+
+ public FilterChain decorate(FilterChain original, List<Filter> filters) {
+ return new VirtualFilterChain(original, filters);
+ }
+
+ }
+
+ private static class VirtualFilterChain implements FilterChain {
+
+ private final FilterChain originalChain;
+ private final List<Filter> additionalFilters;
+ private final int size;
+
+ private int currentPosition = 0;
+
+ public VirtualFilterChain(FilterChain originalChain, List<Filter> additionalFilters) {
+ this.originalChain = originalChain;
+ this.additionalFilters = additionalFilters;
+ this.size = additionalFilters.size();
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+ if (this.currentPosition == this.size) {
+ this.originalChain.doFilter(request, response);
+ return;
+ }
+ this.currentPosition++;
+ Filter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
+
+ nextFilter.doFilter(request, response, this);
+ }
+
+ }
+
+} | Java | > > security ํจํค์ง์์ securityconfig๋ผ๋ ํด๋์ค์ delegatingfilterproxy, filterchianproxy ๋น๋ค์ ์ค์ ํ๊ณ userService ๋น๋ง app ํจํค์ง ์์์ ์ค์ ํ์ต๋๋ค. ๊ทธ๋ฐ๋ฐ ํํฐ ๋ฑ๋ก์ด ์๋๋๋ผ๊ณ ์.(filterchainproxy)
> > ์ด๊ฒ์ ๋ํด ๋ช
ํํ๊ฒ ์ ๊ทธ๋ฐ๊ฑด์ง ์ด์ ๋ฅผ ๋ชจ๋ฅด๊ฒ ์ต๋๋ค.
>
> ์ ํํ ๊ฒ์ ํด๋น ์ฝ๋๋ฅผ ๋ด์ผ๊ฒ ์ง๋ง.. ๊ฐ๋ณ๊ฒ ์ถ์ธกํด ๋ณด์๋ฉด
>
> 1. SecurityAuthenticationApplication์์ componentScan์ ๋ณ๊ฒฝํ์ง ์์๋ค.
> 2. ์ค์ ํ Config์ `@Configuration`์ ๋ถ์ด์ง ์์๋ค.
>
> ๋ ์ค ํ๋๊ฐ ์๋๊น ๊ฐํ ์์ธกํด๋ด
๋๋ค.. ใ
ใ
์ ๋น์ฐํ @SpringBootApplication ๋ถ์ application ํด๋์คํ์๋ง componentscan ๋์์ด ๋๋.. ์ด์ ๋ณด์ด๋๊ฒ ๊ฐ๋ค์. ๊ฐ์ฌํฉ๋๋ค..ใ
|
@@ -0,0 +1,42 @@
+package nextstep.security.config;
+
+import nextstep.security.AuthenticationException;
+import nextstep.security.UserDetailService;
+import nextstep.security.UserDetails;
+
+public class DaoAuthenticationProvider implements AuthenticationProvider{
+
+ private final UserDetailService userDetailService;
+ private final PasswordEncoder passwordEncoder;
+
+ public DaoAuthenticationProvider(UserDetailService userDetailService, PasswordEncoder passwordEncoder) {
+ this.userDetailService = userDetailService;
+ this.passwordEncoder = passwordEncoder;
+ }
+
+ public DaoAuthenticationProvider(UserDetailService userDetailService) {
+ this.userDetailService = userDetailService;
+ this.passwordEncoder = null;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+ if (!supports(authentication.getClass())) {
+ return null;
+ }
+ String username = (String) authentication.getPrincipal();
+ String password = (String) authentication.getCredentials();
+
+ UserDetails user = userDetailService.getUserByUsername(username);
+ if (!password.equals(user.getPassword())) {
+ throw new AuthenticationException("Passwords do not match");
+ }
+ return new UsernamePasswordAuthenticationToken(username, password, user);
+ }
+
+ @Override
+ public boolean supports(Class<?> authentication) { // todo ์ instanceOf๊ฐ ์๋ ์ด๋ ๊ฒ ํด๋์ค๋ก ๋น๊ต๋ฅผ ํ๋๊ฑธ๊น?
+ return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication);
+ }
+
+} | Java | ๋ค passwordencoder๋ ์ถํ ๋ฏธ์
์งํํ๋ฉด์ ์กฐ๊ธ ๋ ๋ฏ์ด๋ณผ ์์ ์
๋๋ค! |
@@ -0,0 +1,45 @@
+package nextstep.security.config;
+
+import nextstep.security.ProviderNotFoundException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderManager implements AuthenticationManager {
+
+ private List<AuthenticationProvider> providers = Collections.emptyList();
+
+ public ProviderManager(List<AuthenticationProvider> providers) {
+ this.providers = providers;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) {
+ Class<? extends Authentication> authenticationClassToTest = authentication.getClass();
+ Authentication result = null;
+ for (AuthenticationProvider provider : this.providers) {
+ if (!provider.supports(authenticationClassToTest)) {
+ continue;
+ }
+ result = provider.authenticate(authentication);
+ if (result != null) { // ์ธ์ฆ๋ ๊ฐ์ ๊ฐ ์๋ค๋ฉด
+ copyDetails(authentication, result);
+ result.setAuthenticated(true); // todo ์ฑ
์ ํ์ธ ํ๋ฒ ํ์
+ break;
+ }
+ }
+ if (result == null) {
+ throw new ProviderNotFoundException("์ง์ํ๋ provider๊ฐ ์์ต๋๋ค!");
+ }
+ return result;
+ }
+
+ // ์ธ์ฆ๋ ํ ํฐ์ detail ๊ฐ์ด ์๋ค๋ฉด detail ๋ฃ์ด์ฃผ๊ธฐ
+ private void copyDetails(Authentication source, Authentication dest) {
+ if ((dest instanceof AbstractAuthenticationToken token) && (dest.getDetails() == null)) {
+ token.setDetails(source.getDetails());
+ }
+ }
+
+}
+ | Java | > ์ง์ํ๋ provider๋ฅผ ์ฐพ์๋ authenticate ์ null์ด ์๋ต๋๋ค๋ฉด ํด๋น ์์ธ ๋ฉ์์ง๊ฐ ์ถ๋ ฅ๋๊ฒ ๋ค์. ์๋ํ ๋ด์ฉ์ด ๋ง์๊น์?
๋ค ๋ง์ต๋๋ค!
`AuthenticationManager`์์ ์ธ์ฆ์ supportํ๋ `AuthenticationProvider`๊ฐ ์๋ค๋ฉด ํด๋น ์์ธ๋ฅผ ๋์ง๊ฒ ๋ง๋ค์ด ๋์์ต๋๋ค!
`ProviderManager` ์ฝ๋๋ฅผ ์ฐธ๊ณ ํ๋๋ฐ์, `ProviderManager`์์๋ `parent` `AuthenticationManager`๊ฐ ์กด์ฌํ๋ค๋ฉด ๋ถ๋ชจ `AuthenticationManager`๊ฐ `authenticate()` ๋ฅผ ํธ์ถํ๋๋ฐ, ๊ฒฐ๊ตญ์ ๊ทธ ๋ถ๋ชจ๋ supportํ๋ `AuthenticationProvider`๊ฐ ์๋ค๋ฉด `ProviderNotFoundException`์ ๋์ง๊ธธ๋ ์ฐธ๊ณ ํ์ต๋๋ค.!
`ProviderManager`์ `authenticate() ` ์ผ๋ถ
``` java
if (result == null && this.parent != null) {
// Allow the parent to try.
try {
parentResult = this.parent.authenticate(authentication);
result = parentResult;
}
catch (ProviderNotFoundException ex) {
// ignore as we will throw below if no other exception occurred prior to
// calling parent and the parent
// may throw ProviderNotFound even though a provider in the child already
// handled the request
}
catch (AuthenticationException ex) {
parentException = ex;
lastException = ex;
}
....
// Parent was null, or didn't authenticate (or throw an exception).
if (lastException == null) {
lastException = new ProviderNotFoundException(this.messages.getMessage("ProviderManager.providerNotFound",
new Object[] { toTest.getName() }, "No AuthenticationProvider found for {0}"));
}
....
}
``` |
@@ -0,0 +1,45 @@
+package nextstep.security.config;
+
+import nextstep.security.ProviderNotFoundException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderManager implements AuthenticationManager {
+
+ private List<AuthenticationProvider> providers = Collections.emptyList();
+
+ public ProviderManager(List<AuthenticationProvider> providers) {
+ this.providers = providers;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) {
+ Class<? extends Authentication> authenticationClassToTest = authentication.getClass();
+ Authentication result = null;
+ for (AuthenticationProvider provider : this.providers) {
+ if (!provider.supports(authenticationClassToTest)) {
+ continue;
+ }
+ result = provider.authenticate(authentication);
+ if (result != null) { // ์ธ์ฆ๋ ๊ฐ์ ๊ฐ ์๋ค๋ฉด
+ copyDetails(authentication, result);
+ result.setAuthenticated(true); // todo ์ฑ
์ ํ์ธ ํ๋ฒ ํ์
+ break;
+ }
+ }
+ if (result == null) {
+ throw new ProviderNotFoundException("์ง์ํ๋ provider๊ฐ ์์ต๋๋ค!");
+ }
+ return result;
+ }
+
+ // ์ธ์ฆ๋ ํ ํฐ์ detail ๊ฐ์ด ์๋ค๋ฉด detail ๋ฃ์ด์ฃผ๊ธฐ
+ private void copyDetails(Authentication source, Authentication dest) {
+ if ((dest instanceof AbstractAuthenticationToken token) && (dest.getDetails() == null)) {
+ token.setDetails(source.getDetails());
+ }
+ }
+
+}
+ | Java | ๊ทธ๋ฐ๋ฐ ๊ถ๊ธํ์ ์ `ProviderManager` ๋ ๋ด๋ถ์ `parent` ํ๋กํผํฐ๋ก `AuthenticationManager` ๊ฐ์ ธ์ `AuthenticationManager` ๋ฅผ ๊ณ์ํด์ ์ด์์ ์๋ค๋๊ฒ์ ํ์ธํ๋๋ฐ์,
์ ์ด๋ ๊ฒ ๋ง๋ค์์์ง ์ฌ์ฐ๋์ ์ด๋ป๊ฒ ์๊ฐํ์๋์?
์ parent๋ฅผ ํ๋กํผํฐ๋ก ๋์์๊น์?
์ฌ๋ฌ AuthenticationManager ๊ฐ์ ์ธ์ฆ ์ ์ฐจ๋ฅผ ์ ์ฐํ๊ฒ ์ค์ ํ๊ธฐ ์ํด ๊ด๊ณ ์ค์ ์ ํ๋๊ฒ์ผ๊ฒ ๊ฐ๊ธดํ๋ฐ ๊ถ๊ธํฉ๋๋ค :) |
@@ -0,0 +1,45 @@
+package nextstep.security.config;
+
+import nextstep.security.ProviderNotFoundException;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ProviderManager implements AuthenticationManager {
+
+ private List<AuthenticationProvider> providers = Collections.emptyList();
+
+ public ProviderManager(List<AuthenticationProvider> providers) {
+ this.providers = providers;
+ }
+
+ @Override
+ public Authentication authenticate(Authentication authentication) {
+ Class<? extends Authentication> authenticationClassToTest = authentication.getClass();
+ Authentication result = null;
+ for (AuthenticationProvider provider : this.providers) {
+ if (!provider.supports(authenticationClassToTest)) {
+ continue;
+ }
+ result = provider.authenticate(authentication);
+ if (result != null) { // ์ธ์ฆ๋ ๊ฐ์ ๊ฐ ์๋ค๋ฉด
+ copyDetails(authentication, result);
+ result.setAuthenticated(true); // todo ์ฑ
์ ํ์ธ ํ๋ฒ ํ์
+ break;
+ }
+ }
+ if (result == null) {
+ throw new ProviderNotFoundException("์ง์ํ๋ provider๊ฐ ์์ต๋๋ค!");
+ }
+ return result;
+ }
+
+ // ์ธ์ฆ๋ ํ ํฐ์ detail ๊ฐ์ด ์๋ค๋ฉด detail ๋ฃ์ด์ฃผ๊ธฐ
+ private void copyDetails(Authentication source, Authentication dest) {
+ if ((dest instanceof AbstractAuthenticationToken token) && (dest.getDetails() == null)) {
+ token.setDetails(source.getDetails());
+ }
+ }
+
+}
+ | Java | ์ฌ๊ธฐ์ `ProviderManager` ๋ ์ง์ํ๋ `AuthenticationProvider`๋ฅผ ์ํํ๋ ์ญํ ์ ํ๋ค๊ณ ์๊ฐํ์ต๋๋ค.
์ธ์ฆ ๋ก์ง ์์ฒด๋ ๊ฐ `AuthenticationProvider`์์ ์งํ์ ํ๋ค๊ณ ์๊ฐํ์ด์. (๋ง์น FilerChainProxy์ SecurityFilterChain ๊ณผ ๋น์ทํ ๊ด๊ณ๊ฐ๋ค๊ณ ๋ ์๊ฐํ์ต๋๋ค.)
`AuthenticationProvider` ๋ ์ธ์ฆ๋๋ค๋ฉด `Authentication` ์ด๋ผ๋ ํ ํฐ๊ฐ์ฒด์ ์ฌ์ฉ์ ์ ๋ณด๋ฅผ ๋ด์ ๋๊ฒจ์ฃผ๋ ์ญํ ์ ํ๊ณ ์.
๊ทธ๋ฐ๋ฐ ์ฌ๊ธฐ์๋ result๋ผ๋ `Authentication` ๋ณ์๋ฅผ `ProviderManager`์์ ์ ์ธํ๊ณ , null์ธ์ง ์๋์ง์ ๋ฐ๋ผ ๋ก์ง์ ๋ค๋ฅด๊ฒ ํ์ฐ๊ธฐ ๋๋ฌธ์ `ProviderManager`์ ์๋๊ฒ ๋ ์ ์ ํด ๋ณด์ธ๋ค๊ณ ํ๋จํ์ต๋๋ค.
ํน์ ์ฌ์ฐ๋์ ๋ค๋ฅด๊ฒ ์๊ฐํ์ ๋ค๋ฉด ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค! |
@@ -0,0 +1,84 @@
+package nextstep.security.filter;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.security.AuthenticationException;
+import nextstep.security.config.Authentication;
+import nextstep.security.config.AuthenticationManager;
+import nextstep.security.config.BasicAuthenticationToken;
+import nextstep.security.config.SecurityContextHolder;
+
+import java.util.List;
+
+import static org.springframework.http.HttpHeaders.AUTHORIZATION;
+
+public class BasicAuthFilter implements Filter {
+
+ private static final List<String> TARGET_URL = List.of("/members");
+
+ private final AuthenticationManager authenticationManager;
+
+ public BasicAuthFilter(AuthenticationManager authenticationManager) {
+ this.authenticationManager = authenticationManager;
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws ServletException {
+ boolean isHttpServlet = servletRequest instanceof HttpServletRequest && servletResponse instanceof HttpServletResponse;
+ if (isHttpServlet) {
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+ try {
+ boolean notTarget = isNotTarget(request);
+ if (notTarget) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+ // ํ๊ฒ์ผ ๊ฒฝ์ฐ
+ checkAuthentication(request);
+ filterChain.doFilter(request, response);
+ } catch (Exception e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ }
+ return;
+ }
+ throw new ServletException("BasicAuthFilter only supports HTTP requests");
+ }
+
+ private boolean isNotTarget(HttpServletRequest request) {
+ String requestURI = request.getRequestURI();
+ return TARGET_URL.stream()
+ .filter(requestURI::startsWith)
+ .findAny()
+ .isEmpty();
+ }
+
+ private void checkAuthentication(HttpServletRequest request) {
+ try {
+ String authorizationHeader = getAuthorizationHeader(request);
+ if (authorizationHeader == null) throw new AuthenticationException("Missing authorization header");
+
+ Authentication authentication = authenticationManager.authenticate(new BasicAuthenticationToken(authorizationHeader));
+ if (!authentication.isAuthenticated()) {
+ throw new AuthenticationException();
+ }
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+ } catch (AuthenticationException e) {
+ SecurityContextHolder.clearContext();
+ throw e;
+ }
+
+ }
+
+ private static String getAuthorizationHeader(HttpServletRequest request) {
+ return request.getHeader(AUTHORIZATION);
+ }
+
+
+} | Java | ํผ๋๋ฐฑ ๋ฐ์ํ๊ฒ ์ต๋๋ค! ๊ฐ์ฌํฉ๋๋ค :)
์ด๋ฒ ๋ฏธ์
์์๋ ๊ธฐ๋ณธ์ ์ผ๋ก security์ ๋์ ์๋ฆฌ ์ค์ฌ์ผ๋ก ๋ณด๊ณ ์์ด ์ ๊ฒฝ์ ์ฐ์ง ๋ชปํ์ง๋ง ๊ฐ๋
์ฑ๋ ๊ณ ๋ คํด์ ์์ฑํด๋ณด๊ฒ ์ต๋๋ค! ๐ |
@@ -0,0 +1,49 @@
+package nextstep.security.interceptor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.security.AuthenticationException;
+import nextstep.security.UserDetailService;
+import nextstep.security.UserDetails;
+import nextstep.security.util.Base64Convertor;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+public class BasicAuthInterceptor implements HandlerInterceptor {
+
+ private final UserDetailService userDetailService;
+
+ public BasicAuthInterceptor(UserDetailService userDetailService) {
+ this.userDetailService = userDetailService;
+ }
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+ try {
+ String authorizationHeader = request.getHeader("Authorization");
+ String authType = authorizationHeader.split(" ")[0];
+ String credentials = authorizationHeader.split(" ")[1];
+ String decodedString = Base64Convertor.decode(credentials);
+ checkAuthType(authType);
+
+ String[] usernameAndPassword = decodedString.split(":");
+ String username = usernameAndPassword[0];
+ String password = usernameAndPassword[1];
+
+ UserDetails userDetail = userDetailService.getUserByUsername(username);
+ if (!userDetail.getPassword().equals(password)) {
+ throw new AuthenticationException();
+ }
+ return true;
+ } catch (Exception e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ return false;
+ }
+ }
+
+ private void checkAuthType(String authType) {
+ if (!authType.equalsIgnoreCase(HttpServletRequest.BASIC_AUTH)) {
+ throw new AuthenticationException();
+ }
+ }
+
+} | Java | ์ด๊ฑด ๋ฏธ์
์งํํ๋ค ๋จ๊ธด ์ ๋ฌผ๋ค์ธ๋ฐ ์ง์ฐ์ง์๊ณ ํ์ต์ฉ์ผ๋ก ๋จ๊ฒจ๋์์ต๋๋ค!
์ฒ์์ interceptor์ ๋ก์ง > filter๋ก ๋ณํ ๊ณผ์ ์์ ์๊ฒผ๋ ๊ฒ๋ค์
๋๋ค:) |
@@ -0,0 +1,32 @@
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+function LargeHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={true}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={false}
+ disabled={false}
+ />
+ <S.SearchIcon src="./search_button.png" />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default LargeHeader; | Unknown | ๋ผ์ฐํ
์ด ๋ฐ๋ก ํ์ํ์ง ์์์ a ํ๊ทธ๋ก ๋์ฒดํฉ๋๋ค! |
@@ -0,0 +1,20 @@
+import { DISPLAY_SIZE } from '../../../constants/displaySize';
+import LargeHeader from './LargeHeader';
+import MobileHeader from './MobileHeader';
+
+interface HeaderProps {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+function Header({ searchKeyword, onSearch }: HeaderProps) {
+ const isMobile = document.documentElement.clientWidth <= DISPLAY_SIZE.mobile;
+
+ return isMobile ? (
+ <MobileHeader searchKeyword={searchKeyword} onSearch={onSearch} />
+ ) : (
+ <LargeHeader searchKeyword={searchKeyword} onSearch={onSearch} />
+ );
+}
+
+export default Header; | Unknown | HTMLInputElement๋ฅผ ์์๋ฐ์ผ๋ฉด์ rest props๋ฅผ ๋๊ฒจ์ฃผ๊ณ ์์ง๋ง ํ์ฌ๋ก์๋ ์ด ๊ธฐ๋ฅ๋ค์ ํ์ฉํ๊ณ ์๋ ๊ฒ ๊ฐ์ง ์์์. ๊ทธ๋ฆฌ๊ณ ๋ณดํต ์ด๋ฐ ํจํด์ ๊ณตํต ์ปดํฌ๋ํธ์์ ๋ง์ด ์ฌ์ฉํ๋๋ฐ, ์ ํค๋๋ common์ ๋ค์ด์๊ธฐ๋ ํ์ง๋ง ํน์ ๋์์ธ๊ณผ ๊ตฌํ์ ํนํ๋ ๊ฒ ๊ฐ์์ ์ด๋ ๊ฒ ํ์ฅ์ฑ์ ์ด์ด๋ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค!
+ common ํด๋์๋ง _๊ฐ ๋ถ์ด์๋๋ฐ ์ฒ์ ๋ณด๋ ์ปจ๋ฒค์
์ด๋ผ ์ด๋ค ์๋ฏธ์ธ์ง๋ ๊ถ๊ธํด์ ใ
ใ
|
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | ์ค input์ด ์ด์ฐจํผ ๋๋ณด๊ธฐ ํด๋ฆญ ์ ์๋ ์ด๋ฆฌ์ง ์์์ ๋์น๊ธฐ ์ฌ์ ์ํ
๋ฐ ๊ผผ๊ผผํ๊ฒ disabled๊น์ง ์ฑ๊ฒจ์ฃผ์
จ๋ค์! ๐
์ด๋ ๊ฒ UI์์ input์ด ์ฌ์ฉ ๋ถ๊ฐ๋ฅํ ๋ disabled๋ฅผ ๋ช
์ํด์ค ์ด์ ๊ฐ ๊ถ๊ธํด์. ์ ๋ UI์ ์ฝ๋์ ์ผ์น + ๋ถํ์ํ DOM ์กฐ์ ๋ฐฉ์ง ์ ๋๋ก ์๊ฐํ๋๋ฐ ๋ง๋์ฉ? |
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | Action์ ๊ฐ์ฒด๋ก ๋ง๋ ์ด์ ๋ ํ์ฅ์ฑ ๋๋ฌธ์ผ๊น์? ์ ๋ผ๋ฉด ๊ฐ๋จํ ํ๋ก๊ทธ๋จ์์๋ ๋จ์ ๋ฌธ์์ด union ํ์
์ผ๋ก ๋ง๋ค์์ ๊ฒ ๊ฐ๋ค์ ใ
ใ
ใ
|
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | useReducer๋ฅผ ์ค์ ๋ก ์ฐ๋ ์ฝ๋๋ ์ฒ์ ๋ณด๋ค์! ๋งค์ผ useState๋ง ์๊ฐํ๋๋ฐ ๋ฆฌํ๋ ์๊ฐ ๋๋๊ตฐ์ใ
ใ
ใ
๋ค๋ง ์ง๊ธ action ์ค์์ ์ค์ง์ ์ผ๋ก ์ฌ์ฉํ๋ ๋์์ TOGGLE๋ฟ์ธ ๊ฒ ๊ฐ์๋ฐ OPEN๊ณผ CLOSE๊ฐ ๋ช
์๋ ์ด์ , ๋ฆฌ๋์๋ฅผ ์ฌ์ฉํ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค~~ |
@@ -0,0 +1,81 @@
+import styled from 'styled-components';
+import media from '../../../styles/mediaQueries';
+
+export const Layout = styled.header`
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 1rem;
+
+ position: relative;
+
+ width: 100%;
+ height: 6rem;
+ padding: 0.8rem 3.2rem;
+
+ border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+ box-shadow: 0px 4px 8px 0px rgba(255, 255, 255, 0.2);
+
+ color: ${({ theme }) => theme.colors.white};
+ background-color: rgba(17, 17, 17, 1);
+`;
+
+export const LogoImage = styled.img`
+ width: 12.3rem;
+ height: 2rem;
+`;
+
+export const LogoButton = styled.button`
+ cursor: pointer;
+`;
+
+export const InputBox = styled.div<{ $isExpanded: boolean }>`
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.8rem;
+
+ right: 3.2rem;
+
+ width: 100%;
+ max-width: 32rem;
+ height: 4.4rem;
+ padding: 1rem 1.4rem;
+
+ border: 1px solid rgba(208, 213, 221, 1);
+ border-radius: 0.8rem;
+
+ overflow: hidden;
+ background-color: ${({ theme }) => theme.colors.white};
+ transition: width 0.2s ease;
+
+ ${({ $isExpanded }) => media.mobile`
+ position: absolute;
+ width: ${$isExpanded ? 'calc(100% - 6.4rem)' : '4.8rem'};
+ max-width: 100%;
+ height: 4.4rem;
+ `};
+`;
+
+export const Input = styled.input<{ $isDisabled: boolean }>`
+ width: 100%;
+ height: 100%;
+
+ pointer-events: ${({ $isDisabled }) => ($isDisabled ? 'none' : 'auto')};
+ transition: width 0.2s ease;
+
+ ${({ $isDisabled }) => media.mobile`
+ display: ${$isDisabled ? 'none' : 'block'};
+
+ width: ${$isDisabled ? 0 : '100%'};
+ height: ${$isDisabled ? 0 : '100%'};
+ `}
+`;
+
+export const SearchIcon = styled.img`
+ width: 1.8rem;
+ height: 1.8rem;
+
+ cursor: pointer;
+`; | TypeScript | ํ๊ทธ๊ฐ header๋ฉด ๋ ์ข์ ๊ฒ ๊ฐ์์~! |
@@ -0,0 +1,52 @@
+import React, { Suspense, useEffect, useState } from 'react';
+import { createPortal } from 'react-dom';
+import * as S from './Modal.styled';
+import useEscapeKey from '../../../hooks/useEscapeKey';
+import ModalBackdrop from './ModalBackdrop';
+import SkeletonModal from '../Skeleton/SkeletonModal';
+
+interface ModalProps {
+ isOpen: boolean;
+ onClose: () => void;
+ children: React.ReactNode;
+}
+
+const ANIMATION_DURATION_TIME = 200;
+
+const Modal = ({ children, isOpen, onClose }: ModalProps) => {
+ const portalElement = document.getElementById('modal') as HTMLElement;
+ const [isRender, setIsRender] = useState(isOpen);
+
+ useEscapeKey(isOpen, onClose);
+
+ useEffect(() => {
+ if (isOpen) {
+ setIsRender(true);
+ } else {
+ const timer = setTimeout(() => {
+ setIsRender(false);
+ }, ANIMATION_DURATION_TIME);
+ return () => clearTimeout(timer);
+ }
+ }, [isOpen]);
+
+ if (!portalElement || !isRender) {
+ return null;
+ }
+
+ const modalLayout = (
+ <S.Layout>
+ <ModalBackdrop onClick={onClose} />
+ <S.ContentLayout
+ $isRender={isRender && isOpen}
+ $animationTime={ANIMATION_DURATION_TIME}
+ >
+ <Suspense fallback={<SkeletonModal />}>{children}</Suspense>
+ </S.ContentLayout>
+ </S.Layout>
+ );
+
+ return isRender && createPortal(modalLayout, portalElement);
+};
+
+export default Modal; | Unknown | ์ด๋ค ํจ๊ณผ์์๊น์?! |
@@ -0,0 +1,23 @@
+import Title from '../../_common/Title/Title';
+import MovieList from '../MovieList/MovieList';
+import * as S from '../Movie.styled';
+
+interface ContentProps {
+ searchKeyword: string;
+}
+
+function Content({ searchKeyword }: ContentProps) {
+ const titleContent =
+ searchKeyword.length > 0
+ ? `${searchKeyword} ๊ฒ์ ๊ฒฐ๊ณผ`
+ : '์ง๊ธ ์ธ๊ธฐ์๋ ์ํ';
+
+ return (
+ <S.ContentLayout>
+ <Title content={titleContent} />
+ <MovieList keyword={searchKeyword} />
+ </S.ContentLayout>
+ );
+}
+
+export default Content; | Unknown | ์ค ์์์ searchKeyword ๊ฐ์ ๋ฐ์์ค๋ ๋๋ฐ์ด์ค๋ฅผ ๊ฑธ์ด์ ์ ๊ฐ์ ๋ฐ์์ค๋๊ตฐ์ฉ
๊ทธ๋ฐ๋ฐ ๋๋ฐ์ด์ค ์ฒ๋ฆฌ๋ฅผ searchKeyword๋ฅผ ์์ ํ ๋ถ๋ชจ ์ปดํฌ๋ํธ๊ฐ ์๋๋ผ Content์์ ํด ์ฃผ๋ ์ด์ ๊ฐ ์๋์?
๋๋ฐ์ด์ค ๋ก์ง์ด Content๋ฅผ ๊ฑฐ์ณ์ผ ๋์ค๋ ์ํฉ์ด ์๋๋ผ์ ๋ถ๋ชจ ์ปดํฌ๋ํธ๊ฐ ๋ด๋นํ๋ ๊ฒ ์กฐ๊ธ ๋ ๋ซ๋ค๋ ์๊ฐ์
๋๋ค. (Single Source of Truth ๋ฉด์์)
๋ ์ญํ ์ ์ง๊ด์ ์ผ๋ก ๋๋ ๋ณผ ๋๋ debounce ์ฑ
์์ ๊ฒ์์ฐฝ ์ชฝ์์ ๋ด๋นํ๊ณ Content๋ ๊ทธ ๊ฐ์ ๋ฐ์์ ์ฐ๊ธฐ๋ง ํ๋ ๊ฒ ์์ฐ์ค๋ฌ์ ๋ณด์ธ๋ค๊ณ ์๊ฐํด์~! |
@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import { useModalContext } from '../../../contexts/ModalContext';
+import Modal from '../../_common/Modal/Modal';
+import * as S from '../Movie.styled';
+import MovieDetail from '../MovieDetail/MovieDetail';
+import MovieItem from '../MovieItem/MovieItem';
+import FetchTargetBox from '../../_common/FetchTargetBox/FetchTargetBox';
+import SkeletonColumn from '../../_common/Skeleton/SkeletonColumn';
+import useInfiniteScroll from '../../../hooks/useInfiniteScroll';
+import useMovieQuery from '../../../hooks/useMovieQuery';
+
+interface MovieListProps {
+ keyword: string;
+}
+
+function MovieList({ keyword }: MovieListProps) {
+ const [selectedMovie, setSelectedMovie] = useState<number>(0);
+
+ const { isOpenModal, openModal, closeModal } = useModalContext();
+
+ const handleModalOpen = (movieId: number) => {
+ setSelectedMovie(movieId);
+ openModal('movie');
+ };
+
+ const {
+ movieList,
+ fetchNextPage,
+ isFetchingNextPage,
+ hasNextPage,
+ isLoading,
+ } = useMovieQuery({ keyword });
+
+ const { nextFetchTargetRef } = useInfiniteScroll({
+ fetchNextPage,
+ hasNextPage,
+ movieList,
+ });
+
+ return (
+ <S.MovieListLayout>
+ <S.ItemList>
+ {isLoading && <SkeletonColumn count={20} />}
+ {movieList.map(movie => (
+ <MovieItem movie={movie} key={movie.id} onClick={handleModalOpen} />
+ ))}
+ </S.ItemList>
+ {!isFetchingNextPage && hasNextPage && (
+ <FetchTargetBox ref={nextFetchTargetRef} />
+ )}
+
+ <Modal onClose={() => closeModal('movie')} isOpen={isOpenModal}>
+ <MovieDetail movieId={selectedMovie} />
+ </Modal>
+ </S.MovieListLayout>
+ );
+}
+
+export default MovieList; | Unknown | id ๊ฐ์ ๊ด๋ฆฌํ๋๊น ๋ณ์๋ช
์์๋ ๋ช
ํํ๊ฒ Id์์ด ๋๋ฌ๋๋ฉด ์ข๊ฒ ์ด์! |
@@ -0,0 +1,131 @@
+import axios from 'axios';
+import { API_URL, TMDB_URL } from './constant';
+import { Movie, MovieDetail } from '../types/movie.type';
+
+interface GetPopularMoviesResponse {
+ page: number;
+ results: Movie[];
+ total_pages: number;
+ total_results: number;
+}
+
+export const getPopularMovies = async ({
+ page,
+}: {
+ page: number;
+}): Promise<GetPopularMoviesResponse> => {
+ try {
+ const response = await axios.get(
+ `${TMDB_URL}/movie/popular?${new URLSearchParams({
+ api_key: import.meta.env.VITE_API_KEY,
+ language: 'ko-KR',
+ page: `${page}`,
+ })}`,
+ );
+
+ return response.data;
+ } catch (error) {
+ throw new Error('Failed to fetch popular movies');
+ }
+};
+
+interface GetSearchedMoviesResponse {
+ page: number;
+ results: Movie[];
+ total_pages: number;
+ total_results: number;
+}
+
+export const getSearchedMovies = async ({
+ page,
+ keyword,
+}: {
+ page: number;
+ keyword: string;
+}): Promise<GetSearchedMoviesResponse> => {
+ try {
+ const response = await axios({
+ method: 'GET',
+ url: `${TMDB_URL}/search/movie`,
+ params: {
+ api_key: import.meta.env.VITE_API_KEY,
+ include_adult: 'false',
+ language: 'ko-KR',
+ page,
+ query: keyword,
+ },
+ headers: {
+ accept: 'application/json',
+ Authorization: `Bearer ${import.meta.env.VITE_API_KEY}`,
+ },
+ });
+
+ return response.data;
+ } catch (error) {
+ throw new Error('Failed to fetch popular movies');
+ }
+};
+
+export const getMovie = async ({
+ movieId,
+}: {
+ movieId: number;
+}): Promise<MovieDetail> => {
+ try {
+ const response = await axios({
+ method: 'GET',
+ url: `${TMDB_URL}/movie/${movieId}`,
+ params: {
+ api_key: import.meta.env.VITE_API_KEY,
+ language: 'ko-KR',
+ },
+ headers: {
+ accept: 'application/json',
+ Authorization: `Bearer ${import.meta.env.VITE_API_KEY}`,
+ },
+ });
+
+ return response.data;
+ } catch (error) {
+ throw new Error('Failed to fetch popular movies');
+ }
+};
+
+export const getRating = async ({
+ movieId,
+}: {
+ movieId: number;
+}): Promise<number> => {
+ try {
+ const response = await axios({
+ method: 'GET',
+ url: `${API_URL}/rating/${movieId}`,
+ });
+
+ return response.data;
+ } catch (error) {
+ throw new Error('Failed to fetch popular movies');
+ }
+};
+
+export const updateRating = async ({
+ movieId,
+ rating,
+}: {
+ movieId: number;
+ rating: number;
+}): Promise<{ rating: number }> => {
+ try {
+ const response = await axios({
+ method: 'POST',
+ url: `${API_URL}/rating/${movieId}`,
+ data: {
+ rating,
+ },
+ });
+
+ return { rating: response.data };
+ } catch (error) {
+ throw new Error('Failed to fetch popular movies');
+ }
+}; | TypeScript | axios๋ ๊ฑฐ์ ๋ฐ๋
๋ง์ ๋ณด๋ค์...ใ
ใ
ใ
ใ
ใ
ใ
ํ์คํ fetch ์ฝ๋๊ฐ ๋ ๊ฐ๊ฒฐํด์ง๋๊ตฐ์
page๋ฅผ ๋ณด๋ผ ๋ String()์ด ์๋๋ผ ํ
ํ๋ฆฟ ๋ฆฌํฐ๋ด์ ์ฌ์ฉํ ๊ฒ ๋์ ๋๋ค์! |
@@ -0,0 +1,136 @@
+import styled from 'styled-components';
+import media from '../../../styles/mediaQueries';
+
+export const Layout = styled.div`
+ width: 100%;
+ height: 100%;
+`;
+
+// Text
+
+export const TitleText = styled.p`
+ ${({ theme }) => theme.font.body};
+ text-align: center;
+`;
+
+export const CaptionText = styled.p`
+ ${({ theme }) => theme.font.caption};
+`;
+
+export const CaptionBoldText = styled.p`
+ ${({ theme }) => theme.font.caption};
+ font-weight: 700;
+ white-space: nowrap;
+`;
+
+export const OverviewText = styled.p`
+ ${({ theme }) => theme.font.caption};
+ text-align: start;
+`;
+
+export const RatingDescriptionText = styled.p`
+ ${({ theme }) => theme.font.caption};
+
+ ${media.tablet`
+ display: none;
+ `}
+`;
+
+// Box Layout
+
+export const TitleBox = styled.div`
+ position: relative;
+ width: 100%;
+
+ padding: 1.8rem 0;
+ border-bottom: 1px solid rgba(241, 241, 241, 0.25);
+`;
+
+export const ContentBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ gap: 3.2rem;
+
+ width: 100%;
+ height: calc(100% - 6.4rem);
+
+ padding: 3.6rem 3.2rem 4.8rem;
+`;
+
+export const DetailBox = styled.div`
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+`;
+
+export const DetailHeaderBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ gap: 1.6rem;
+`;
+
+export const DetailContentBox = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: 1.6rem;
+
+ -webkit-line-clamp: 10;
+ -webkit-box-orient: vertical;
+
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: normal;
+`;
+
+export const DetailVoteBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 1.2rem;
+
+ width: 100%;
+ padding: 1.6rem;
+ border-radius: 1.6rem;
+
+ background: ${({ theme }) => theme.colors.greyScale2};
+
+ ${media.tablet`
+ justify-content: center;
+ `}
+`;
+
+export const StarImageVoteBox = styled.div`
+ display: flex;
+ flex-direction: row;
+`;
+
+export const ThumbnailImageBox = styled.div`
+ width: 29.2rem;
+ height: 43.3rem;
+`;
+
+// Image
+
+export const ThumbnailImage = styled.img`
+ ${media.desktop`
+ width: 26rem;
+ height: 40rem;
+ `}
+
+ ${media.tablet`
+ display: none;
+ `}
+`;
+
+export const StarImage = styled.img`
+ width: 2.6rem;
+ height: 2.6rem;
+
+ cursor: pointer;
+
+ ${media.tablet`
+ width: 3.2rem;
+ height: 3.2rem;
+ `}
+`; | TypeScript | ์ ๋ ํญ์ ์คํ์ผ๋ง ๋์์ด ๋๋ ์์์ ๊ธฐ๋ฅ๋ง ์๊ฐํด์ styled component์ ์ด๋ฆ์ ์ง์๋๋ฐ ์ ์ฉํ ์คํ์ผ๋ก ์ด๋ฆ์ ๋ถ์ด๋๊น ๋ ์ง๊ด์ ์ด๊ณ ํธํ๋ค์ ๐ ์ ์ด ์๊ฐ์ ๋ชป ํ์ง?! |
@@ -0,0 +1,136 @@
+import styled from 'styled-components';
+import media from '../../../styles/mediaQueries';
+
+export const Layout = styled.div`
+ width: 100%;
+ height: 100%;
+`;
+
+// Text
+
+export const TitleText = styled.p`
+ ${({ theme }) => theme.font.body};
+ text-align: center;
+`;
+
+export const CaptionText = styled.p`
+ ${({ theme }) => theme.font.caption};
+`;
+
+export const CaptionBoldText = styled.p`
+ ${({ theme }) => theme.font.caption};
+ font-weight: 700;
+ white-space: nowrap;
+`;
+
+export const OverviewText = styled.p`
+ ${({ theme }) => theme.font.caption};
+ text-align: start;
+`;
+
+export const RatingDescriptionText = styled.p`
+ ${({ theme }) => theme.font.caption};
+
+ ${media.tablet`
+ display: none;
+ `}
+`;
+
+// Box Layout
+
+export const TitleBox = styled.div`
+ position: relative;
+ width: 100%;
+
+ padding: 1.8rem 0;
+ border-bottom: 1px solid rgba(241, 241, 241, 0.25);
+`;
+
+export const ContentBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ gap: 3.2rem;
+
+ width: 100%;
+ height: calc(100% - 6.4rem);
+
+ padding: 3.6rem 3.2rem 4.8rem;
+`;
+
+export const DetailBox = styled.div`
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+`;
+
+export const DetailHeaderBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ gap: 1.6rem;
+`;
+
+export const DetailContentBox = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: 1.6rem;
+
+ -webkit-line-clamp: 10;
+ -webkit-box-orient: vertical;
+
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: normal;
+`;
+
+export const DetailVoteBox = styled.div`
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 1.2rem;
+
+ width: 100%;
+ padding: 1.6rem;
+ border-radius: 1.6rem;
+
+ background: ${({ theme }) => theme.colors.greyScale2};
+
+ ${media.tablet`
+ justify-content: center;
+ `}
+`;
+
+export const StarImageVoteBox = styled.div`
+ display: flex;
+ flex-direction: row;
+`;
+
+export const ThumbnailImageBox = styled.div`
+ width: 29.2rem;
+ height: 43.3rem;
+`;
+
+// Image
+
+export const ThumbnailImage = styled.img`
+ ${media.desktop`
+ width: 26rem;
+ height: 40rem;
+ `}
+
+ ${media.tablet`
+ display: none;
+ `}
+`;
+
+export const StarImage = styled.img`
+ width: 2.6rem;
+ height: 2.6rem;
+
+ cursor: pointer;
+
+ ${media.tablet`
+ width: 3.2rem;
+ height: 3.2rem;
+ `}
+`; | TypeScript | ์๊ธฐ overflow-y ์์ฑ์ด ์์ด์ผ ํ ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import { useModalContext } from '../../../contexts/ModalContext';
+import Modal from '../../_common/Modal/Modal';
+import * as S from '../Movie.styled';
+import MovieDetail from '../MovieDetail/MovieDetail';
+import MovieItem from '../MovieItem/MovieItem';
+import FetchTargetBox from '../../_common/FetchTargetBox/FetchTargetBox';
+import SkeletonColumn from '../../_common/Skeleton/SkeletonColumn';
+import useInfiniteScroll from '../../../hooks/useInfiniteScroll';
+import useMovieQuery from '../../../hooks/useMovieQuery';
+
+interface MovieListProps {
+ keyword: string;
+}
+
+function MovieList({ keyword }: MovieListProps) {
+ const [selectedMovie, setSelectedMovie] = useState<number>(0);
+
+ const { isOpenModal, openModal, closeModal } = useModalContext();
+
+ const handleModalOpen = (movieId: number) => {
+ setSelectedMovie(movieId);
+ openModal('movie');
+ };
+
+ const {
+ movieList,
+ fetchNextPage,
+ isFetchingNextPage,
+ hasNextPage,
+ isLoading,
+ } = useMovieQuery({ keyword });
+
+ const { nextFetchTargetRef } = useInfiniteScroll({
+ fetchNextPage,
+ hasNextPage,
+ movieList,
+ });
+
+ return (
+ <S.MovieListLayout>
+ <S.ItemList>
+ {isLoading && <SkeletonColumn count={20} />}
+ {movieList.map(movie => (
+ <MovieItem movie={movie} key={movie.id} onClick={handleModalOpen} />
+ ))}
+ </S.ItemList>
+ {!isFetchingNextPage && hasNextPage && (
+ <FetchTargetBox ref={nextFetchTargetRef} />
+ )}
+
+ <Modal onClose={() => closeModal('movie')} isOpen={isOpenModal}>
+ <MovieDetail movieId={selectedMovie} />
+ </Modal>
+ </S.MovieListLayout>
+ );
+}
+
+export default MovieList; | Unknown | queries๋ฅผ ๊ฐ์ฒด๋ก ๋ง๋ค๊ณ key๋ฅผ name์ผ๋ก ํ๋ฉด ์ด๋ค ๋ฆฌ์์ค๋ฅผ ์ํ ์ฟผ๋ฆฌ์ธ์ง ๋ ์ ๋๋ฌ๋ ๊ฒ ๊ฐ์์~ ๊ทผ๋ฐ ๊ฐ์ฒด๋ผ์ ์ฝ๋๊ฐ ์ข ๋ ๋ณต์กํด์ง๊ฒ ๋ค์ ๐ |
@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import { useModalContext } from '../../../contexts/ModalContext';
+import Modal from '../../_common/Modal/Modal';
+import * as S from '../Movie.styled';
+import MovieDetail from '../MovieDetail/MovieDetail';
+import MovieItem from '../MovieItem/MovieItem';
+import FetchTargetBox from '../../_common/FetchTargetBox/FetchTargetBox';
+import SkeletonColumn from '../../_common/Skeleton/SkeletonColumn';
+import useInfiniteScroll from '../../../hooks/useInfiniteScroll';
+import useMovieQuery from '../../../hooks/useMovieQuery';
+
+interface MovieListProps {
+ keyword: string;
+}
+
+function MovieList({ keyword }: MovieListProps) {
+ const [selectedMovie, setSelectedMovie] = useState<number>(0);
+
+ const { isOpenModal, openModal, closeModal } = useModalContext();
+
+ const handleModalOpen = (movieId: number) => {
+ setSelectedMovie(movieId);
+ openModal('movie');
+ };
+
+ const {
+ movieList,
+ fetchNextPage,
+ isFetchingNextPage,
+ hasNextPage,
+ isLoading,
+ } = useMovieQuery({ keyword });
+
+ const { nextFetchTargetRef } = useInfiniteScroll({
+ fetchNextPage,
+ hasNextPage,
+ movieList,
+ });
+
+ return (
+ <S.MovieListLayout>
+ <S.ItemList>
+ {isLoading && <SkeletonColumn count={20} />}
+ {movieList.map(movie => (
+ <MovieItem movie={movie} key={movie.id} onClick={handleModalOpen} />
+ ))}
+ </S.ItemList>
+ {!isFetchingNextPage && hasNextPage && (
+ <FetchTargetBox ref={nextFetchTargetRef} />
+ )}
+
+ <Modal onClose={() => closeModal('movie')} isOpen={isOpenModal}>
+ <MovieDetail movieId={selectedMovie} />
+ </Modal>
+ </S.MovieListLayout>
+ );
+}
+
+export default MovieList; | Unknown | ์ต์ ๋ฒ ๊ด๋ จ ๋์์ ๋ณ๋์ ํ
์ผ๋ก ๋ถ๋ฆฌํ๋ฉด ์ฝ๋๊ฐ ๋ ๊ฐ๊ฒฐํด์ง ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,59 @@
+import { useState } from 'react';
+import { useModalContext } from '../../../contexts/ModalContext';
+import Modal from '../../_common/Modal/Modal';
+import * as S from '../Movie.styled';
+import MovieDetail from '../MovieDetail/MovieDetail';
+import MovieItem from '../MovieItem/MovieItem';
+import FetchTargetBox from '../../_common/FetchTargetBox/FetchTargetBox';
+import SkeletonColumn from '../../_common/Skeleton/SkeletonColumn';
+import useInfiniteScroll from '../../../hooks/useInfiniteScroll';
+import useMovieQuery from '../../../hooks/useMovieQuery';
+
+interface MovieListProps {
+ keyword: string;
+}
+
+function MovieList({ keyword }: MovieListProps) {
+ const [selectedMovie, setSelectedMovie] = useState<number>(0);
+
+ const { isOpenModal, openModal, closeModal } = useModalContext();
+
+ const handleModalOpen = (movieId: number) => {
+ setSelectedMovie(movieId);
+ openModal('movie');
+ };
+
+ const {
+ movieList,
+ fetchNextPage,
+ isFetchingNextPage,
+ hasNextPage,
+ isLoading,
+ } = useMovieQuery({ keyword });
+
+ const { nextFetchTargetRef } = useInfiniteScroll({
+ fetchNextPage,
+ hasNextPage,
+ movieList,
+ });
+
+ return (
+ <S.MovieListLayout>
+ <S.ItemList>
+ {isLoading && <SkeletonColumn count={20} />}
+ {movieList.map(movie => (
+ <MovieItem movie={movie} key={movie.id} onClick={handleModalOpen} />
+ ))}
+ </S.ItemList>
+ {!isFetchingNextPage && hasNextPage && (
+ <FetchTargetBox ref={nextFetchTargetRef} />
+ )}
+
+ <Modal onClose={() => closeModal('movie')} isOpen={isOpenModal}>
+ <MovieDetail movieId={selectedMovie} />
+ </Modal>
+ </S.MovieListLayout>
+ );
+}
+
+export default MovieList; | Unknown | ์ค์น ์ด ๋ฐฉ์ ๊น๋ํ๊ณ ์ข๋ค์ ๐๐ ๋ฆฌํฉํ ๋งํ๋ฌ ๊ฐ์ผ๊ฒ ... ๐ |
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+
+export const Layout = styled.div`
+ width: 100%;
+ height: 10vh;
+`; | TypeScript | ํฌ๊ธฐ ์ ์ ๊ธฐ์ค์ด ๊ถ๊ธํด์! |
@@ -0,0 +1,29 @@
+import { Movie } from '../../../types/movie.type';
+import * as S from '../Movie.styled';
+
+interface MovieItemProps {
+ movie: Movie;
+ onClick: (movieId: number) => void;
+}
+
+function MovieItem({ movie, onClick }: MovieItemProps) {
+ return (
+ <li key={movie.id} onClick={() => onClick(movie.id)}>
+ <S.ItemCard>
+ <S.ItemThumbnail
+ src={`https://image.tmdb.org/t/p/w220_and_h330_face${movie.poster_path}`}
+ loading="lazy"
+ alt={movie.title}
+ />
+
+ <S.ItemTitle>{movie.title}</S.ItemTitle>
+ <S.ItemScoreBox>
+ <S.ItemScore>{movie.vote_average.toFixed(1)} </S.ItemScore>
+ <S.StarImage src="./star_filled.png" alt="๋ณ์ " />
+ </S.ItemScoreBox>
+ </S.ItemCard>
+ </li>
+ );
+}
+
+export default MovieItem; | Unknown | ์ฌ๊ธฐ์๋ ์์์ ๋ณด์ ์ ํด์ผ ํ ๊ฒ ๊ฐ์์ |
@@ -0,0 +1,112 @@
+import { TMDB } from '../../../constants/url';
+import useMovie from '../../../queries/useMovie';
+import useRating from '../../../queries/useRating';
+import useUpdateStars from '../../../queries/useUpdateStars';
+import * as S from './MovieDetail.styled';
+
+interface MovieDetailProps {
+ movieId: number;
+}
+
+const RATING_TEXT = (rating: number) => {
+ if (rating === 10) {
+ return '์ต๊ณ ์์';
+ } else if (rating >= 8) {
+ return '์ข์์';
+ } else if (rating >= 6) {
+ return '๋์์ง ์์์';
+ } else if (rating >= 4) {
+ return '๊ทธ๋ฅ ๊ทธ๋์';
+ } else if (rating >= 2) {
+ return '๋ณ๋ก์์';
+ }
+ return '์์ง ์ ์๋ฅผ ๋งค๊ธฐ์ง ์์์ด์.';
+};
+
+function MovieDetail({ movieId }: MovieDetailProps) {
+ const { movieDetail } = useMovie(movieId);
+ const { rating } = useRating(movieId);
+ const { updateRating } = useUpdateStars(movieId);
+ const { updateRating: errorUpdateRating } = useUpdateStars(1);
+
+ const filledStars = Math.floor(rating / 2);
+ return (
+ <S.Layout>
+ <S.TitleBox>
+ <S.TitleText>{movieDetail.title}</S.TitleText>
+ </S.TitleBox>
+
+ <S.ContentBox>
+ <S.ThumbnailImageBox>
+ <S.ThumbnailImage
+ src={`${TMDB.POSTER_PATH}${movieDetail.poster_path}`}
+ />
+ </S.ThumbnailImageBox>
+
+ <S.DetailBox>
+ <S.DetailContentBox>
+ <S.DetailHeaderBox>
+ <S.CaptionText>
+ {movieDetail.genres.flatMap(genre => genre.name).join(', ')}
+ </S.CaptionText>
+ <S.StarImage src="./star_filled.png" alt="๋ณ์ " />
+ <S.CaptionText>
+ {movieDetail.vote_average.toFixed(1)}
+ </S.CaptionText>
+ </S.DetailHeaderBox>
+ <S.OverviewText>{movieDetail.overview}</S.OverviewText>
+ </S.DetailContentBox>
+
+ <S.DetailVoteBox>
+ <S.CaptionBoldText>ํ ์คํธ ํ์ธ์ ์ํ ๋ณ์ </S.CaptionBoldText>
+ <S.StarImageVoteBox>
+ {[...Array(5)].map((_, index) => (
+ <button
+ onClick={() => errorUpdateRating({ rating: (index + 1) * 2 })}
+ >
+ <S.StarImage
+ key={index}
+ src={
+ index < filledStars
+ ? './star_filled.png'
+ : './star_empty.png'
+ }
+ alt={index < filledStars ? 'filled star' : 'empty star'}
+ />
+ </button>
+ ))}
+ </S.StarImageVoteBox>
+ <S.CaptionText>{rating !== 0 && rating}</S.CaptionText>
+ </S.DetailVoteBox>
+
+ <S.DetailVoteBox>
+ <S.CaptionBoldText>๋ด ๋ณ์ </S.CaptionBoldText>
+ <S.StarImageVoteBox>
+ {[...Array(5)].map((_, index) => (
+ <button
+ onClick={() => updateRating({ rating: (index + 1) * 2 })}
+ >
+ <S.StarImage
+ key={index}
+ src={
+ index < filledStars
+ ? './star_filled.png'
+ : './star_empty.png'
+ }
+ alt={index < filledStars ? 'filled star' : 'empty star'}
+ />
+ </button>
+ ))}
+ </S.StarImageVoteBox>
+ <S.CaptionText>{rating !== 0 && rating}</S.CaptionText>
+ <S.RatingDescriptionText>
+ {RATING_TEXT(rating)}
+ </S.RatingDescriptionText>
+ </S.DetailVoteBox>
+ </S.DetailBox>
+ </S.ContentBox>
+ </S.Layout>
+ );
+}
+
+export default MovieDetail; | Unknown | ์ ๊ทผ์ฑ์ ์ํด button ํ๊ทธ๋ก ๊ฐ์ธ๋ ๊ฒ ์ข์ ๊ฒ ๊ฐ์๋ฐ ์๊ฐ์์ ์ด์ ๋ก img์ ๋ฐ๋ก onClick์ด ๋ถ์ ๊ฑธ๊น์?
๊ทธ๋ฆฌ๊ณ StarImageVoteBox ์ดํ ์ปดํฌ๋ํธ๋ค์ ๋ณ๋๋ก ๋ถ๋ฆฌํ์ง ์์ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค(Content์์ ๋ ๊ฐ๋จํ ์ปดํฌ๋ํธ์ธ Title์ ๋ถ๋ฆฌ๋์ด ์๊ธธ๋์~!) |
@@ -0,0 +1,20 @@
+import { DISPLAY_SIZE } from '../../../constants/displaySize';
+import LargeHeader from './LargeHeader';
+import MobileHeader from './MobileHeader';
+
+interface HeaderProps {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+function Header({ searchKeyword, onSearch }: HeaderProps) {
+ const isMobile = document.documentElement.clientWidth <= DISPLAY_SIZE.mobile;
+
+ return isMobile ? (
+ <MobileHeader searchKeyword={searchKeyword} onSearch={onSearch} />
+ ) : (
+ <LargeHeader searchKeyword={searchKeyword} onSearch={onSearch} />
+ );
+}
+
+export default Header; | Unknown | ์ค Header์์๋ ์ฌ์ฉ๋์ง ์๋๋ฐ ๋ค์ด๊ฐ์๊ตฐ์! Header๋ ๋จ์ํ ๋ ์ด์์ ๊ธฐ๋ฅ๋ง ํ๊ณ ์์ด์ ํ์
์ ํ์ฅํ์ง ์์๋ ๋ ๊ฒ ๊ฐ์์ ์ง์ด์ฃผ์
์ ๊ฐ์ฌํด์~!
> common ํด๋์๋ง _๊ฐ ๋ถ์ด์๋๋ฐ ์ฒ์ ๋ณด๋ ์ปจ๋ฒค์
์ด๋ผ ์ด๋ค ์๋ฏธ์ธ์ง๋ ๊ถ๊ธํด์ ใ
ใ
_๋ ํด๋ ์ต์๋จ์ ๋์์ง๋๋ก ํ๊ธฐ ์ํด ๋ฃ์ ์ปจ๋ฒค์
์ด๋๋๋ค!๐ค |
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | ๋ง์์! ๊ทธ๋ฆฌ๊ณ input์ด ๋ซํ ์๋ ๊ฒฝ์ฐ input์ ํด๋ฆญํ์ ๋ ๊ฐ์ด ์
๋ ฅ๋๋ฉด์ ๋๋ณด๊ธฐ ๋ฒํผ ์๋ก ๋ณด์ฌ์ง๋ ๋ฌธ์ ๊ฐ ๋ฐ์ํด์ disabled ์์ฑ์ ์ถ๊ฐํ์ต๋๋น |
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | ์ฒ์์๋ ํ์ฅ์ฑ์ ์ผ๋ํ๊ณ ๊ฐ์ฒด๋ก ๋ง๋ค์๋๋ฐ ์ด ๊ฒฝ์ฐ์๋ `isExpanded`์ boolean ์ํ ๋ณ๊ฒฝ๋ง์ ๋ชฉ์ ์ผ๋ก ํ๋ ๊ฐ์ฒด๋ก ๋ง๋ค์ง ์๊ณ ์ฌ๋ฆฌ๊ฐ ์ ์ํ ๋ฐฉ์๋ ๊ด์ฐฎ์ ๊ฒ ๊ฐ๋ค๋ ์๊ฐ์ด ๋๋ค์~! |
@@ -0,0 +1,58 @@
+import React, { useReducer } from 'react';
+import * as S from './Header.styled';
+
+interface HeaderProps extends React.InputHTMLAttributes<HTMLInputElement> {
+ searchKeyword: string;
+ onSearch: (keyword: string) => void;
+}
+
+type State = boolean;
+type Action = { type: 'TOGGLE' } | { type: 'OPEN' } | { type: 'CLOSE' };
+
+function reducer(state: State, action: Action): State {
+ switch (action.type) {
+ case 'TOGGLE':
+ return !state;
+ case 'OPEN':
+ return true;
+ case 'CLOSE':
+ return false;
+ default:
+ return state;
+ }
+}
+
+function MobileHeader({ searchKeyword, onSearch, ...rest }: HeaderProps) {
+ const [isExpanded, updateState] = useReducer(reducer, false);
+
+ const handleSearchIconClick = () => {
+ updateState({ type: 'TOGGLE' });
+ };
+
+ return (
+ <S.Layout>
+ <a href="https://chosim-dvlpr.github.io/react-movie-review/">
+ <S.LogoButton>
+ <S.LogoImage src="./logo.png" />
+ </S.LogoButton>
+ </a>
+ <S.InputBox $isExpanded={isExpanded}>
+ <S.Input
+ {...rest}
+ value={searchKeyword}
+ onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onSearch(event.target.value)
+ }
+ $isDisabled={!isExpanded}
+ disabled={!isExpanded}
+ />
+ <S.SearchIcon
+ src="./search_button.png"
+ onClick={handleSearchIconClick}
+ />
+ </S.InputBox>
+ </S.Layout>
+ );
+}
+
+export default MobileHeader; | Unknown | ์ค ์ ๋ง ํ ๊ธ๋ง ์ฌ์ฉ ์ค์ด๊ตฐ์,,, open๊ณผ close๋ ์ต๊ด์ ์ผ๋ก ์์ฑํ๋ ๊ฒ ๊ฐ๋ค์ ใ
ใ
ใ
์ฃผ์ํด์ผ๊ฒ ์ด์๐ `useReducer`๋ฅผ ์ฌ์ฉํ ์ด์ ๋ `isExpanded` state๋ฅผ ์
๋ฐ์ดํธ ํ๋ ๋ฐฉ์์ ๋ช
์์ ์ผ๋ก ๋ํ๋ด๊ธฐ ์ํจ์ด์์ด์! `useState`๋ ์ํ๋ฅผ ์ด๋ค ๊ฐ์ผ๋ก ๋ณ๊ฒฝํ๋์ง ๋ํ๋ธ๋ค๋ฉด, `useReducer`๋ ์ด๋ค ๋ฐฉ์์ผ๋ก ๋ณ๊ฒฝํ ์ง๋ฅผ ๋ณด์ฌ์ค ์ ์๋ค๊ณ ์๊ฐํด์ `useReducer`๋ฅผ ์ฌ์ฉํ์ต๋๋ท |
@@ -0,0 +1,49 @@
+package christmas.domain;
+
+import christmas.error.ErrorCode;
+import java.util.Arrays;
+
+public enum MenuItem {
+
+ ์์ก์ด์คํ(6_000, "์์ก์ด์คํ", MenuCategory.Appetizers),
+ ํํ์ค(5_500, "ํํ์ค", MenuCategory.Appetizers),
+ ์์ ์๋ฌ๋(8_000, "์์ ์๋ฌ๋", MenuCategory.Appetizers),
+ ํฐ๋ณธ์คํ
์ดํฌ(55_000, "ํฐ๋ณธ์คํ
์ดํฌ", MenuCategory.MainDishes),
+ ๋ฐ๋นํ๋ฆฝ(54_000, "๋ฐ๋นํ๋ฆฝ", MenuCategory.MainDishes),
+ ํด์ฐ๋ฌผํ์คํ(35_000, "ํด์ฐ๋ฌผํ์คํ", MenuCategory.MainDishes),
+ ํฌ๋ฆฌ์ค๋ง์คํ์คํ(25_000, "ํฌ๋ฆฌ์ค๋ง์คํ์คํ", MenuCategory.MainDishes),
+ ์ด์ฝ์ผ์ดํฌ(15_000, "์ด์ฝ์ผ์ดํฌ", MenuCategory.Desserts),
+ ์์ด์คํฌ๋ฆผ(5_000, "์์ด์คํฌ๋ฆผ", MenuCategory.Desserts),
+ ์ ๋ก์ฝ๋ผ(3_000, "์ ๋ก์ฝ๋ผ", MenuCategory.Drinks),
+ ๋ ๋์์ธ(60_000, "๋ ๋์์ธ", MenuCategory.Drinks),
+ ์ดํ์ธ(25_000, "์ดํ์ธ", MenuCategory.Drinks);
+
+ private final int price;
+ private final String name;
+ private final MenuCategory category;
+
+ MenuItem(int price, String name, MenuCategory category) {
+ this.price = price;
+ this.name = name;
+ this.category = category;
+ }
+
+ public static MenuItem getMenuList(String menuName) {
+ return Arrays.stream(MenuItem.values())
+ .filter(menuItem -> menuItem.name.equals(menuName))
+ .findFirst()
+ .orElseThrow(() -> new IllegalArgumentException(ErrorCode.INVALID_MENU_FORMAT.getMessage()));
+ }
+
+ public int getPrice() {
+ return price;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public MenuCategory getCategory() {
+ return category;
+ }
+} | Java | MenuItem์ enum์ผ๋ก ๋ง๋๋ ๋ฐฉ์์ด ์ข์๋ณด์ฌ์! |
@@ -0,0 +1,69 @@
+package christmas.domain.benefit;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+public enum BenefitCategory {
+
+ ํ์ผํ ์ธ("ํ์ผํ ์ธ", 2_023, input -> {
+
+ LocalDate date = (LocalDate) input;
+ if (date.getDayOfWeek().getValue() == 7) {
+ return true;
+ }
+ return date.getDayOfWeek().getValue() <= 4 && date.getDayOfWeek().getValue() >= 1;
+ }),
+ ์ฃผ๋งํ ์ธ("์ฃผ๋งํ ์ธ", 2_023, input -> {
+
+ LocalDate date = (LocalDate) input;
+ return date.getDayOfWeek().getValue() <= 6 && date.getDayOfWeek().getValue() >= 5;
+ }),
+ ํน๋ณํ ์ธ("ํน๋ณํ ์ธ", 1_000, input -> {
+
+ LocalDate date = (LocalDate) input;
+ return date.getDayOfWeek().getValue() == 7 || date.getDayOfMonth() == 25;
+ }),
+ ์ฆ์ ์ด๋ฒคํธ("์ฆ์ ์ด๋ฒคํธ", 25_000, input -> false),
+ ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ("ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ", 100, input -> {
+ LocalDate date = (LocalDate) input;
+ if (date.getDayOfMonth() <= 25) {
+ return true;
+ }
+ return false;
+ }),
+ ;
+
+ private final String name;
+ private final int price;
+ private final Function<Object, Boolean> dateValidator;
+
+ BenefitCategory(String name, int price, Function<Object, Boolean> dateValidator) {
+ this.name = name;
+ this.price = price;
+ this.dateValidator = dateValidator;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getPrice() {
+ return price;
+ }
+
+ public static List<BenefitCategory> getAvailableBenefitItems(Calender calender, Order order) {
+ List<BenefitCategory> benefitItems = new java.util.ArrayList<>(Arrays.stream(BenefitCategory.values())
+ .filter(benefitItem -> benefitItem.dateValidator.apply(calender.getDate()))
+ .toList());
+
+ if (order.calculateTotalPrice() >= 120_000) {
+ benefitItems.add(์ฆ์ ์ด๋ฒคํธ);
+ }
+
+ return benefitItems;
+ }
+} | Java | enum ํด๋์ค ๋ด๋ถ์ ๋ก์ง์ด ๋ง์ผ๋ฉด ๋๋ฌด ๋ณต์กํ์ง๋ ์์๊น์? |
@@ -0,0 +1,69 @@
+package christmas.domain.benefit;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+public enum BenefitCategory {
+
+ ํ์ผํ ์ธ("ํ์ผํ ์ธ", 2_023, input -> {
+
+ LocalDate date = (LocalDate) input;
+ if (date.getDayOfWeek().getValue() == 7) {
+ return true;
+ }
+ return date.getDayOfWeek().getValue() <= 4 && date.getDayOfWeek().getValue() >= 1;
+ }),
+ ์ฃผ๋งํ ์ธ("์ฃผ๋งํ ์ธ", 2_023, input -> {
+
+ LocalDate date = (LocalDate) input;
+ return date.getDayOfWeek().getValue() <= 6 && date.getDayOfWeek().getValue() >= 5;
+ }),
+ ํน๋ณํ ์ธ("ํน๋ณํ ์ธ", 1_000, input -> {
+
+ LocalDate date = (LocalDate) input;
+ return date.getDayOfWeek().getValue() == 7 || date.getDayOfMonth() == 25;
+ }),
+ ์ฆ์ ์ด๋ฒคํธ("์ฆ์ ์ด๋ฒคํธ", 25_000, input -> false),
+ ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ("ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ", 100, input -> {
+ LocalDate date = (LocalDate) input;
+ if (date.getDayOfMonth() <= 25) {
+ return true;
+ }
+ return false;
+ }),
+ ;
+
+ private final String name;
+ private final int price;
+ private final Function<Object, Boolean> dateValidator;
+
+ BenefitCategory(String name, int price, Function<Object, Boolean> dateValidator) {
+ this.name = name;
+ this.price = price;
+ this.dateValidator = dateValidator;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getPrice() {
+ return price;
+ }
+
+ public static List<BenefitCategory> getAvailableBenefitItems(Calender calender, Order order) {
+ List<BenefitCategory> benefitItems = new java.util.ArrayList<>(Arrays.stream(BenefitCategory.values())
+ .filter(benefitItem -> benefitItem.dateValidator.apply(calender.getDate()))
+ .toList());
+
+ if (order.calculateTotalPrice() >= 120_000) {
+ benefitItems.add(์ฆ์ ์ด๋ฒคํธ);
+ }
+
+ return benefitItems;
+ }
+} | Java | ์ฆ์ ์ด๋ฒคํธ๋ ๋ ์ง์๋ ๊ด๋ จ์ด ์๋ ์ด๋ฒคํธ๋ผ function์ด ๋ฐ๋ก ์ฌ์ฉ๋์ง ์๋ค์.
์ฆ์ ์ด๋ฒคํธ๋ ์ด ํด๋์ค์์ ์ฒ๋ฆฌํ๋๊ฒ ์ข์๊ฐ์? |
@@ -0,0 +1,40 @@
+package christmas.domain.benefit;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.benefit.benefitItems.BenefitItem;
+import christmas.domain.benefit.benefitItems.ChristmasBenefit;
+import christmas.domain.benefit.benefitItems.GiftBenefit;
+import christmas.domain.benefit.benefitItems.SpecialBenefit;
+import christmas.domain.benefit.benefitItems.WeekdaysBenefit;
+import christmas.domain.benefit.benefitItems.WeekendBenefit;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BenefitItemFactory {
+
+ public static List<BenefitItem> createBenefitItems(List<BenefitCategory> benefitCategory, Calender calender, Order order) {
+ List<BenefitItem> benefitItems = new ArrayList<>();
+ for(BenefitCategory category : benefitCategory) {
+ benefitItems.add(createBenefitItem(category, calender, order));
+ }
+ return benefitItems;
+ }
+
+ private static BenefitItem createBenefitItem(BenefitCategory category, Calender calender, Order order) {
+ switch(category) {
+ case ํ์ผํ ์ธ:
+ return WeekdaysBenefit.of(category, calender, order);
+ case ์ฃผ๋งํ ์ธ:
+ return WeekendBenefit.of(category, calender, order);
+ case ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ:
+ return ChristmasBenefit.of(category, calender, order);
+ case ํน๋ณํ ์ธ:
+ return SpecialBenefit.of(category, calender, order);
+ case ์ฆ์ ์ด๋ฒคํธ:
+ return GiftBenefit.of(category, calender, order);
+ default:
+ throw new IllegalArgumentException("์๋ชป๋ ํํ ์นดํ
๊ณ ๋ฆฌ์
๋๋ค.");
+ }
+ }
+} | Java | ํฉํ ๋ฆฌ ํจํด์ ์ฌ์ฉํ์ ๊ฒ ๊ฐ์๋ฐ ์ฌ๊ธฐ์ ํฉํ ๋ฆฌ ํจํด์ ์ฌ์ฉํ๋ฉด ์ด๋ค ์ด์ ์ ์ป์ ์ ์๋์ง ๊ถ๊ธํฉ๋๋ค! |
@@ -0,0 +1,40 @@
+package christmas.domain.benefit;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.benefit.benefitItems.BenefitItem;
+import christmas.domain.benefit.benefitItems.ChristmasBenefit;
+import christmas.domain.benefit.benefitItems.GiftBenefit;
+import christmas.domain.benefit.benefitItems.SpecialBenefit;
+import christmas.domain.benefit.benefitItems.WeekdaysBenefit;
+import christmas.domain.benefit.benefitItems.WeekendBenefit;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BenefitItemFactory {
+
+ public static List<BenefitItem> createBenefitItems(List<BenefitCategory> benefitCategory, Calender calender, Order order) {
+ List<BenefitItem> benefitItems = new ArrayList<>();
+ for(BenefitCategory category : benefitCategory) {
+ benefitItems.add(createBenefitItem(category, calender, order));
+ }
+ return benefitItems;
+ }
+
+ private static BenefitItem createBenefitItem(BenefitCategory category, Calender calender, Order order) {
+ switch(category) {
+ case ํ์ผํ ์ธ:
+ return WeekdaysBenefit.of(category, calender, order);
+ case ์ฃผ๋งํ ์ธ:
+ return WeekendBenefit.of(category, calender, order);
+ case ํฌ๋ฆฌ์ค๋ง์ค_๋๋ฐ์ดํ ์ธ:
+ return ChristmasBenefit.of(category, calender, order);
+ case ํน๋ณํ ์ธ:
+ return SpecialBenefit.of(category, calender, order);
+ case ์ฆ์ ์ด๋ฒคํธ:
+ return GiftBenefit.of(category, calender, order);
+ default:
+ throw new IllegalArgumentException("์๋ชป๋ ํํ ์นดํ
๊ณ ๋ฆฌ์
๋๋ค.");
+ }
+ }
+} | Java | ๊ตฌํ ์กฐ๊ฑด์ switch ๋ฌธ์ ์ฌ์ฉ ๊ธ์ง๋ผ๊ณ ๋์ด ์์ด์...
if๋ฌธ์ผ๋ก ์ถฉ๋ถํ ๋ฐ๊ฟ ์ ์์ด ๋ณด์ฌ์ ํฌ๊ฒ ์ค์ํ์ง ์์ ๊ฒ ๊ฐ์์ |
@@ -0,0 +1,54 @@
+package christmas.domain.benefit;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.benefit.benefitItems.BenefitItem;
+import java.util.List;
+
+public class Benefits {
+
+ public static final int GIFT_PRICE = 25_000;
+ private List<BenefitItem> benefitItems;
+
+ public Benefits(Calender calender, Order order) {
+ List<BenefitCategory> benefitCategory = BenefitCategory.getAvailableBenefitItems(calender, order);
+ this.benefitItems = BenefitItemFactory.createBenefitItems(benefitCategory, calender, order);
+ }
+
+ public List<BenefitItem> getBenefitItems() {
+ return benefitItems;
+ }
+
+ public int getBenefitPrice() {
+ return benefitItems.stream()
+ .mapToInt(BenefitItem::getDiscountPrice)
+ .sum();
+ }
+
+ public int getDiscountPrice(){
+ int sum = benefitItems.stream()
+ .mapToInt(BenefitItem::getDiscountPrice)
+ .sum();
+
+ if(isGiftBenefit())
+ sum -= GIFT_PRICE;
+
+ return sum;
+ }
+
+ public String getGiftBenefit() {
+ if(isGiftBenefit()) {
+ return "์ดํ์ธ 1๊ฐ";
+ }
+ return "์์";
+ }
+
+ private boolean isGiftBenefit() {
+ return benefitItems.stream()
+ .anyMatch(benefitItem -> benefitItem.getBenefitCategory() == BenefitCategory.์ฆ์ ์ด๋ฒคํธ);
+ }
+
+ public Badges getBadges() {
+ return Badges.getBadge(getBenefitPrice());
+ }
+} | Java | ์ฆ์ ์ด๋ฒคํธ์ ํ ์ธ ๊ธ์ก์ ์ฌ์ฉ์์๊ฒ ๋ณด์ฌ์ฃผ๊ธฐ๋ง ํ๊ณ ์์ ๊ฒฐ์ ๊ธ์ก์๋ ์ ์ฉ๋์ง ์๊ธฐ ๋๋ฌธ์ ์ฌ๊ธฐ์ ์ฒ๋ฆฌํด ์ฃผ๋๊ฒ ์ข์ ๋ฐฉ๋ฒ ๊ฐ์์! |
@@ -0,0 +1,21 @@
+package christmas.domain.benefit.benefitItems;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.benefit.BenefitCategory;
+
+public class ChristmasBenefit extends BenefitItem {
+
+ public ChristmasBenefit(BenefitCategory benefitCategory, int discountPrice) {
+ super(benefitCategory, discountPrice);
+ }
+
+ public static ChristmasBenefit of(BenefitCategory benefitCategory, Calender calender, Order order) {
+ return new ChristmasBenefit(benefitCategory, calculateDiscountPrice(benefitCategory, calender, order));
+ }
+
+ private static int calculateDiscountPrice(BenefitCategory benefitCategory, Calender calender, Order order) {
+
+ return 1000 + (calender.getDate().getDayOfMonth() - 1) * benefitCategory.getPrice();
+ }
+} | Java | 1000์ ๋งค์ง ๋๋ฒ๋ก ์ฌ์ฉํด์ค๋ ์ข์ ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,65 @@
+package christmas.io;
+
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.error.ErrorCode;
+import java.util.function.Supplier;
+
+public class InputView implements AutoCloseable {
+
+ private final Reader DEFAULT_READER = new ConsoleReader();
+ private final Reader reader;
+
+ public InputView(Reader reader) {
+ this.reader = reader;
+ }
+
+ public InputView() {
+ this.reader = DEFAULT_READER;
+ }
+
+ private String readLine() {
+ String input = reader.readLine();
+ validate(input);
+ return input;
+ }
+
+ private static void printReInput(IllegalArgumentException ex) {
+ System.out.flush();
+ System.out.println(ex.getMessage());
+ }
+
+ private static void validate(String input) {
+ if (input.isBlank()) {
+ throw new IllegalArgumentException(ErrorCode.BLANK_INPUT_MESSAGE.getMessage());
+ }
+ }
+
+ public Calender inputDate() {
+ return retryInput("12์ ์ค ์๋น ์์ ๋ฐฉ๋ฌธ ๋ ์ง๋ ์ธ์ ์ธ๊ฐ์? (์ซ์๋ง ์
๋ ฅํด ์ฃผ์ธ์!)",
+ () -> new Calender(readLine()));
+ }
+
+ public Order inputMenu() {
+ return retryInput("์ฃผ๋ฌธํ์ค ๋ฉ๋ด์ ๊ฐ์๋ฅผ ์๋ ค ์ฃผ์ธ์. (e.g. ํด์ฐ๋ฌผํ์คํ-2,๋ ๋์์ธ-1,์ด์ฝ์ผ์ดํฌ-1)",
+ () -> new Order(readLine()));
+ }
+
+
+ private static <T> T retryInput(String prompt, Supplier<T> inputSupplier) {
+ System.out.println(prompt);
+ while (true) {
+ try {
+ T result = inputSupplier.get();
+ return result;
+ } catch (IllegalArgumentException ex) {
+ printReInput(ex);
+ }
+ }
+ }
+
+ @Override
+ public void close() {
+ reader.close();
+ }
+} | Java | ๋ค์ ์
๋ ฅ ๋ฐ๋ ๋ฉ์๋๋ฅผ ์ ๋ค๋ฆญ๊ณผ ์ํ๋ผ์ด์ด๋ฅผ ์ฌ์ฉํ์ฌ ๊ตฌํํ๋ ๋ฐฉ์์ด ์ข์๋ณด์ฌ์! |
@@ -0,0 +1,80 @@
+package christmas.io;
+
+import christmas.domain.benefit.Benefits;
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.OrderItem;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.List;
+
+public class OutputView {
+
+ public static void printWelcomeMessage() {
+ System.out.println("์๋
ํ์ธ์! ์ฐํ
์ฝ ์๋น 12์ ์ด๋ฒคํธ ํ๋๋์
๋๋ค.");
+ }
+
+ public static void printEventMessage(Calender calender) {
+ LocalDate date = calender.getDate();
+ System.out.println(date.getMonth().getValue() + "์ " + date.getDayOfMonth() + "์ผ์ ์ฐํ
์ฝ ์๋น์์ ๋ฐ์ ์ด๋ฒคํธ ํํ ๋ฏธ๋ฆฌ ๋ณด๊ธฐ! \n");
+ }
+
+ public static void printOrderMenu(Order order) {
+ System.out.println("<์ฃผ๋ฌธ ๋ฉ๋ด>");
+ List<OrderItem> orderItems = order.getOrderItems();
+ orderItems.forEach(
+ orderItem -> System.out.println(orderItem.getName() + " " + orderItem.getOrderCount() + "๊ฐ")
+ );
+ System.out.println();
+ }
+
+ public static void printTotalPrice(Order order) {
+ int totalPrice = order.calculateTotalPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("<ํ ์ธ ์ ์ด์ฃผ๋ฌธ ๊ธ์ก>");
+ System.out.println(df.format(totalPrice) + "์\n");
+ }
+
+ public static void printBenefit(Order order, Benefits benefits){
+ printGiftBenefit(benefits);
+ printBenefits(benefits);
+ printTotalDiscountPrice(benefits);
+ printAfterDiscountPrice(order, benefits);
+ printBadge(benefits);
+ }
+
+ public static void printGiftBenefit(Benefits benefits) {
+ System.out.println("<์ฆ์ ๋ฉ๋ด>");
+ System.out.println(benefits.getGiftBenefit() + "\n");
+ }
+
+ public static void printBenefits(Benefits benefits) {
+ System.out.println("<ํํ ๋ด์ญ>");
+ benefits.getBenefitItems().forEach(
+ benefitItem -> {
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println(benefitItem.getName() + ": -" + df.format(benefitItem.getDiscountPrice()) + "์");
+ }
+ );
+ System.out.println();
+ }
+
+ public static void printTotalDiscountPrice(Benefits benefits) {
+ System.out.println("<์ดํํ ๊ธ์ก>");
+ int totalDiscountPrice = benefits.getBenefitPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("-" + df.format(totalDiscountPrice) + "์\n");
+ }
+
+ public static void printAfterDiscountPrice(Order order, Benefits benefits) {
+ int afterDiscountPrice = order.calculateTotalPrice() - benefits.getDiscountPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("<ํ ์ธ ํ ์์ ๊ฒฐ์ ๊ธ์ก>");
+ System.out.println(df.format(afterDiscountPrice) + "์\n");
+ }
+
+ public static void printBadge(Benefits benefits) {
+ System.out.println("<12์ ์ด๋ฒคํธ ๋ฐฐ์ง>");
+ System.out.println(benefits.getBadges().getName());
+ }
+} | Java | DecimalFormat ์ด๋ผ๋ ๊ฒ๋ ์๊ตฐ์...
๋ ์ฐพ์๋ด์ผ๊ฒ ์ด์ |
@@ -0,0 +1,80 @@
+package christmas.io;
+
+import christmas.domain.benefit.Benefits;
+import christmas.domain.Calender;
+import christmas.domain.Order;
+import christmas.domain.OrderItem;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.List;
+
+public class OutputView {
+
+ public static void printWelcomeMessage() {
+ System.out.println("์๋
ํ์ธ์! ์ฐํ
์ฝ ์๋น 12์ ์ด๋ฒคํธ ํ๋๋์
๋๋ค.");
+ }
+
+ public static void printEventMessage(Calender calender) {
+ LocalDate date = calender.getDate();
+ System.out.println(date.getMonth().getValue() + "์ " + date.getDayOfMonth() + "์ผ์ ์ฐํ
์ฝ ์๋น์์ ๋ฐ์ ์ด๋ฒคํธ ํํ ๋ฏธ๋ฆฌ ๋ณด๊ธฐ! \n");
+ }
+
+ public static void printOrderMenu(Order order) {
+ System.out.println("<์ฃผ๋ฌธ ๋ฉ๋ด>");
+ List<OrderItem> orderItems = order.getOrderItems();
+ orderItems.forEach(
+ orderItem -> System.out.println(orderItem.getName() + " " + orderItem.getOrderCount() + "๊ฐ")
+ );
+ System.out.println();
+ }
+
+ public static void printTotalPrice(Order order) {
+ int totalPrice = order.calculateTotalPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("<ํ ์ธ ์ ์ด์ฃผ๋ฌธ ๊ธ์ก>");
+ System.out.println(df.format(totalPrice) + "์\n");
+ }
+
+ public static void printBenefit(Order order, Benefits benefits){
+ printGiftBenefit(benefits);
+ printBenefits(benefits);
+ printTotalDiscountPrice(benefits);
+ printAfterDiscountPrice(order, benefits);
+ printBadge(benefits);
+ }
+
+ public static void printGiftBenefit(Benefits benefits) {
+ System.out.println("<์ฆ์ ๋ฉ๋ด>");
+ System.out.println(benefits.getGiftBenefit() + "\n");
+ }
+
+ public static void printBenefits(Benefits benefits) {
+ System.out.println("<ํํ ๋ด์ญ>");
+ benefits.getBenefitItems().forEach(
+ benefitItem -> {
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println(benefitItem.getName() + ": -" + df.format(benefitItem.getDiscountPrice()) + "์");
+ }
+ );
+ System.out.println();
+ }
+
+ public static void printTotalDiscountPrice(Benefits benefits) {
+ System.out.println("<์ดํํ ๊ธ์ก>");
+ int totalDiscountPrice = benefits.getBenefitPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("-" + df.format(totalDiscountPrice) + "์\n");
+ }
+
+ public static void printAfterDiscountPrice(Order order, Benefits benefits) {
+ int afterDiscountPrice = order.calculateTotalPrice() - benefits.getDiscountPrice();
+ DecimalFormat df = new DecimalFormat("###,###");
+ System.out.println("<ํ ์ธ ํ ์์ ๊ฒฐ์ ๊ธ์ก>");
+ System.out.println(df.format(afterDiscountPrice) + "์\n");
+ }
+
+ public static void printBadge(Benefits benefits) {
+ System.out.println("<12์ ์ด๋ฒคํธ ๋ฐฐ์ง>");
+ System.out.println(benefits.getBadges().getName());
+ }
+} | Java | ์ดํํ ๊ธ์ก์ด 0์ผ ๊ฒฝ์ฐ -0์ผ๋ก ์ถ๋ ฅ๋ ์๋ ์์ง ์์๊น์? |
@@ -0,0 +1,44 @@
+package christmas.domain;
+
+import christmas.error.ErrorCode;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class Order {
+
+ private final String DELIMITER = ",";
+ private final List<OrderItem> orderItems;
+
+ public Order(String orderInputs) {
+ this.orderItems = createOrderItems(orderInputs);
+ }
+
+ public List<OrderItem> getOrderItems() {
+ return orderItems;
+ }
+
+ public int calculateTotalPrice() {
+ return orderItems.stream()
+ .mapToInt(OrderItem::getPrice)
+ .sum();
+ }
+
+ private List<OrderItem> createOrderItems(String orderInputs) {
+ List<OrderItem> orderItems = Arrays.stream(orderInputs.split(DELIMITER))
+ .map(OrderItem::new)
+ .toList();
+ validateDuplication(orderItems);
+ return orderItems;
+ }
+
+ private static void validateDuplication(List<OrderItem> orderItems) {
+ Set<String> duplicateChecker = orderItems.stream()
+ .map(OrderItem::getName)
+ .collect(Collectors.toSet());
+ if (duplicateChecker.size() != orderItems.size()) {
+ throw new IllegalArgumentException(ErrorCode.INVALID_MENU_FORMAT.getMessage());
+ }
+ }
+} | Java | ๋ฉ๋ด๋ ํ ๋ฒ ์ต๋ 20๊ฐ๊น์ง๋ง ์ฃผ๋ฌธํ ์ ์๋๋ฐ ์ด ๋ถ๋ถ์ ๊ฒ์ฆํ๋ ๊ณณ์ด ์์๊น์?
์ด์ฃผ๋ฌธ ๊ธ์ก 10000์ ์ด์๋ถํฐ ์ด๋ฒคํธ๊ฐ ์ ์ฉ๋๋ ๋ถ๋ถ, ์๋ฃ๋ง ์ฃผ๋ฌธ ์ ์ฃผ๋ฌธ์ด ๋ถ๊ฐ๋ฅํ ๊ฒ์ ์ฒดํฌํด์ฃผ๋ ๋ถ๋ถ์ด ์๋์? |
@@ -0,0 +1,43 @@
+package com.ll.backend.domain.admin.controller;
+
+import com.ll.backend.domain.admin.dto.AdminRequestDto;
+import com.ll.backend.domain.admin.entity.Admin;
+import com.ll.backend.domain.admin.service.AdminService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin")
+public class AdminController {
+ private final AdminService adminService;
+
+ //ํ์๊ฐ์
+ @PostMapping("/register")
+ public ResponseEntity<String> registerAdmin(@RequestBody AdminRequestDto request) {
+ try {
+ adminService.registerAdmin(request.getUsername(), request.getPassword());
+ return ResponseEntity.ok("Admin registered successfully.");
+ } catch (Exception e) {
+ return ResponseEntity.badRequest().body("Error: " + e.getMessage());
+ }
+ }
+
+ //๋ก๊ทธ์ธ
+ @PostMapping("/login")
+ public ResponseEntity<String> loginAdmin(@RequestBody AdminRequestDto request) {
+ try {
+ Admin admin = adminService.validateAdmin(request.getUsername(), request.getPassword());
+ return ResponseEntity.ok("Welcome, " + admin.getUsername());
+ } catch (IllegalArgumentException e) {
+ return ResponseEntity.badRequest().body("Error: " + e.getMessage());
+ }
+ }
+
+
+
+}
+
+
+ | Java | ์ธ๋ถ์๋ ์๋ฌ๊ฐ ์ต๋ํ๊ฒ ๋
ธ์ถ๋์ง ์๋๋ก ํด์ผ ํฉ๋๋ค. (ํนํ๋, ์๋ฌ๊ฐ ๊ตฌ์ฒดํ๊ฐ ๋๋ฉด ์ ๋ฉ๋๋ค.) -> ์ธ๋ถ ๊ณต๊ฒฉ์ ์
์ฅ์์, ์ด ์๋ฒ์ ์ทจ์ฝ์ ์ด ๋ฌด์์ธ์ง ํ๋จํ๊ธฐ ์ฌ์์ ธ์. |
@@ -0,0 +1,43 @@
+package com.ll.backend.domain.admin.controller;
+
+import com.ll.backend.domain.admin.dto.AdminRequestDto;
+import com.ll.backend.domain.admin.entity.Admin;
+import com.ll.backend.domain.admin.service.AdminService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/admin")
+public class AdminController {
+ private final AdminService adminService;
+
+ //ํ์๊ฐ์
+ @PostMapping("/register")
+ public ResponseEntity<String> registerAdmin(@RequestBody AdminRequestDto request) {
+ try {
+ adminService.registerAdmin(request.getUsername(), request.getPassword());
+ return ResponseEntity.ok("Admin registered successfully.");
+ } catch (Exception e) {
+ return ResponseEntity.badRequest().body("Error: " + e.getMessage());
+ }
+ }
+
+ //๋ก๊ทธ์ธ
+ @PostMapping("/login")
+ public ResponseEntity<String> loginAdmin(@RequestBody AdminRequestDto request) {
+ try {
+ Admin admin = adminService.validateAdmin(request.getUsername(), request.getPassword());
+ return ResponseEntity.ok("Welcome, " + admin.getUsername());
+ } catch (IllegalArgumentException e) {
+ return ResponseEntity.badRequest().body("Error: " + e.getMessage());
+ }
+ }
+
+
+
+}
+
+
+ | Java | ๋ง์ฝ์ ์ด๊ฒ ์๋ฒ ์๋ฌ๊ฐ ์๋๋ผ, ์ฌ๋ฐ๋ฅด์ง ์์ ๊ฐ์ ํํฐ๋งํ๊ธฐ ์ํ ์์ธ๋ผ๋ฉด,
`catch (Exception e)` ๊ฐ ์๋๋ผ `catch (ServiceException e)` ์ ๊ฐ์ด, ์ฌ๋ฌ๋ถ๋ค์ด ๋ง๋ ์์ธ๋ง catch ํ๋๋ก ๋ง๋ค์ด์ค์ผ ํฉ๋๋ค. |
@@ -0,0 +1,11 @@
+package com.ll.backend.domain.admin.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AdminRequestDto {
+ private String username;
+ private String password;
+} | Java | record๋ก ์์ ํด ์ฃผ์ธ์. |
@@ -0,0 +1,27 @@
+package com.ll.backend.domain.admin.service;
+
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.order.repository.OrderRepository;
+import com.ll.backend.domain.orderdetail.repository.OrderDetailRepository;
+import com.ll.backend.domain.product.repository.ProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AdminNotificationService {
+ private final OrderRepository orderRepository;
+ private final ProductRepository productRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // ๊ฒฐ์ ์๋ฃ ์ ๊ด๋ฆฌ์์๊ฒ ๋ฐฐ์ก ์์ฒญ ๋ก์ง
+ public void notifyAdminForShipping(int orderId) {
+ // ์ฃผ๋ฌธ ์กฐํ
+ Order order = orderRepository.findById(orderId)
+ .orElseThrow(() -> new IllegalArgumentException("Order not found for ID: " + orderId));
+
+ // ๊ด๋ฆฌ์์๊ฒ ์๋ฆผ
+ System.out.println("Admin notified for shipping. Order ID: " + orderId);
+ }
+
+} | Java | ๊ฐ๋ฅํ๋ฉด, ์ด๋ฐ ์์ "์๋น์ค ์ ์ธ ์์ธ"๋ ์๋ฐ์์ ์ ์ํ ๊ธฐ๋ณธ ์์ธ๋ฅผ ์ฌ์ฉํ์ง ์๋ ๊ฒ์ ๊ถ์ฅ๋๋ ค์. |
@@ -0,0 +1,27 @@
+package com.ll.backend.domain.admin.service;
+
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.order.repository.OrderRepository;
+import com.ll.backend.domain.orderdetail.repository.OrderDetailRepository;
+import com.ll.backend.domain.product.repository.ProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AdminNotificationService {
+ private final OrderRepository orderRepository;
+ private final ProductRepository productRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // ๊ฒฐ์ ์๋ฃ ์ ๊ด๋ฆฌ์์๊ฒ ๋ฐฐ์ก ์์ฒญ ๋ก์ง
+ public void notifyAdminForShipping(int orderId) {
+ // ์ฃผ๋ฌธ ์กฐํ
+ Order order = orderRepository.findById(orderId)
+ .orElseThrow(() -> new IllegalArgumentException("Order not found for ID: " + orderId));
+
+ // ๊ด๋ฆฌ์์๊ฒ ์๋ฆผ
+ System.out.println("Admin notified for shipping. Order ID: " + orderId);
+ }
+
+} | Java | log๋ก ๋์ฒดํด ์ฃผ์ธ์. |
@@ -0,0 +1,56 @@
+package com.ll.backend.domain.admin.service;
+
+import com.ll.backend.domain.admin.entity.Admin;
+import com.ll.backend.domain.admin.repository.AdminRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class AdminService {
+ private final AdminRepository adminRepository;
+ private final PasswordEncoder passwordEncoder;
+
+ //๊ด๋ฆฌ์ ํ์๊ฐ์
+ public Admin registerAdmin(String username, String password){
+ if (adminRepository.findByUsername(username).isPresent()) {
+ throw new IllegalArgumentException("์ด๋ฏธ ์กด์ฌํ๋ ์ฌ์ฉ์ ์ด๋ฆ์
๋๋ค.");
+ }
+
+ Admin admin = new Admin();
+ admin.setUsername(username);
+ admin.setPassword(passwordEncoder.encode(password));
+ return adminRepository.save(admin);
+ }
+
+ //๊ด๋ฆฌ์ ๋ก๊ทธ์ธ ๊ฒ์ฆ
+ public Admin validateAdmin(String username, String password){
+ Optional<Admin> oa=adminRepository.findByUsername(username);
+ if(oa.isEmpty()){
+ throw new IllegalArgumentException("์ฌ์ฉ์๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค.");
+ }
+
+ Admin admin=oa.get();
+ if(!passwordEncoder.matches(password,admin.getPassword())){
+ throw new IllegalArgumentException("๋น๋ฐ๋ฒํธ๊ฐ ์ผ์นํ์ง ์์ต๋๋ค.");
+ }
+
+ return admin;
+ }
+
+ //๊ด๋ฆฌ์ ์กฐํ
+ public Optional<Admin> getAdmin(String username){
+ return adminRepository.findByUsername(username);
+ }
+
+ public Optional<Admin> findByUsername(String user1) {
+ return adminRepository.findByUsername(user1);
+ }
+
+ public long count() {
+ return adminRepository.count();
+ }
+} | Java | ๊ฐ๋ฅํ๋ฉด, ์ต๋ํ ๋ง์ ๊ฐ์ฒด๋ค์์ setter ์ง์ ํธ์ถ์ ๋ฐฐ์ ํด ์ฃผ์ธ์. |
@@ -0,0 +1,56 @@
+package com.ll.backend.domain.admin.service;
+
+import com.ll.backend.domain.admin.entity.Admin;
+import com.ll.backend.domain.admin.repository.AdminRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class AdminService {
+ private final AdminRepository adminRepository;
+ private final PasswordEncoder passwordEncoder;
+
+ //๊ด๋ฆฌ์ ํ์๊ฐ์
+ public Admin registerAdmin(String username, String password){
+ if (adminRepository.findByUsername(username).isPresent()) {
+ throw new IllegalArgumentException("์ด๋ฏธ ์กด์ฌํ๋ ์ฌ์ฉ์ ์ด๋ฆ์
๋๋ค.");
+ }
+
+ Admin admin = new Admin();
+ admin.setUsername(username);
+ admin.setPassword(passwordEncoder.encode(password));
+ return adminRepository.save(admin);
+ }
+
+ //๊ด๋ฆฌ์ ๋ก๊ทธ์ธ ๊ฒ์ฆ
+ public Admin validateAdmin(String username, String password){
+ Optional<Admin> oa=adminRepository.findByUsername(username);
+ if(oa.isEmpty()){
+ throw new IllegalArgumentException("์ฌ์ฉ์๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค.");
+ }
+
+ Admin admin=oa.get();
+ if(!passwordEncoder.matches(password,admin.getPassword())){
+ throw new IllegalArgumentException("๋น๋ฐ๋ฒํธ๊ฐ ์ผ์นํ์ง ์์ต๋๋ค.");
+ }
+
+ return admin;
+ }
+
+ //๊ด๋ฆฌ์ ์กฐํ
+ public Optional<Admin> getAdmin(String username){
+ return adminRepository.findByUsername(username);
+ }
+
+ public Optional<Admin> findByUsername(String user1) {
+ return adminRepository.findByUsername(user1);
+ }
+
+ public long count() {
+ return adminRepository.count();
+ }
+} | Java | ```java
Admin admin = adminRepository.findByUsername(username)
.orElseThrow(() -> new IllegalArgumentException("์ฌ์ฉ์๋ฅผ ์ฐพ์ ์ ์์ต๋๋ค."));
``` |
@@ -0,0 +1,42 @@
+package com.ll.backend.domain.order.controller;
+
+import com.ll.backend.domain.order.dto.OrderRequestDto;
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.order.service.OrderService;
+import com.ll.backend.domain.orderdetail.service.OrderDetailService;
+import com.ll.backend.domain.order.dto.OrderResponseDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class OrderController {
+ private final OrderService orderService;
+ private final OrderDetailService orderDetailService;
+
+ record OrderCreated(Integer id,String message) {}
+
+ //์ฃผ๋ฌธ์์ฑ
+ @PostMapping("/api/main/order")
+ public ResponseEntity<OrderCreated> createOrder(@RequestBody OrderRequestDto orderRequestDto){
+ Order order = orderService.createOrder(orderRequestDto);
+ orderDetailService.createOrderDetails(order, orderRequestDto.getProducts());
+ return ResponseEntity.ok(new OrderCreated(order.getId(),"Order successfully created."));
+ }
+
+ @GetMapping("/admin/orderList")
+ public ResponseEntity<List<OrderResponseDto>> getOrderList() {
+ List<OrderResponseDto> orderList = orderService.getOrderList();
+ if (orderList.isEmpty()) {
+ return ResponseEntity.noContent().build();
+ }
+ return ResponseEntity.ok(orderList);
+ }
+
+} | Java | ์๊ฑฐ๋ ๊ฐ์ด ์๋ค๊ณ ํด์ status๋ฅผ ๋ค๋ฅด๊ฒ ์ฃผ๋ ๊ฑด ์๋ ๊ฒ ๊ฐ์์.
(204 -> no content ๊ฐ ๋ง๊ธด ํ๋ฐ, ์ ๊ฑด ์๋ต์ด ํ์ ์๋ ์์ฒญ์ ๋ํ ์๋ต ์ฝ๋์์.) |
@@ -0,0 +1,15 @@
+package com.ll.backend.domain.order.dto;
+
+import com.ll.backend.domain.orderdetail.dto.OrderDetailRequestDto;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class OrderRequestDto {
+ private String email;
+ private String address;
+ private String postalCode;
+ private Integer totalPrice;
+ private List<OrderDetailRequestDto> products;
+} | Java | Jakarta Validation ์ ์ฉ |
@@ -0,0 +1,81 @@
+package com.ll.backend.domain.order.service;
+
+import com.ll.backend.domain.order.OrderStatus;
+import com.ll.backend.domain.order.dto.OrderRequestDto;
+import com.ll.backend.domain.order.dto.OrderResponseDto;
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.order.repository.OrderRepository;
+import com.ll.backend.domain.orderdetail.service.OrderDetailService;
+import com.ll.backend.domain.product.repository.ProductRepository;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class OrderService {
+ private final OrderRepository orderRepository;
+ private final ProductRepository productRepository;
+ private final OrderDetailService orderDetailService;
+
+
+ // ์ฃผ๋ฌธ ์์ฑ
+ @Transactional
+ public Order createOrder(OrderRequestDto orderRequestDto) {
+
+ // ์ฃผ๋ฌธ ์ ๋ณด ์์ฑ
+ Order order = new Order(
+ orderRequestDto.getEmail(),
+ orderRequestDto.getAddress(),
+ orderRequestDto.getPostalCode(),
+ setOrderStateBasedOnTime(),
+ orderRequestDto.getTotalPrice()
+ );
+
+ // ์ฃผ๋ฌธ ์ ์ฅ
+ return orderRepository.save(order);
+ }
+
+ private OrderStatus setOrderStateBasedOnTime() {
+ LocalDateTime now = LocalDateTime.now();
+ LocalTime cutoffTime = LocalTime.of(14, 0); // ์คํ 2์ ๊ธฐ์ค
+
+ if (now.toLocalTime().isBefore(cutoffTime)) {
+ return OrderStatus.SHIPPED;
+ } else {
+ return OrderStatus.PENDING;
+ }
+ }
+
+ public long count() {
+ return orderRepository.count();
+ }
+
+ public Order initDataOrder(Order order) {
+ return orderRepository.save(order);
+ }
+
+ @Transactional()
+ public List<OrderResponseDto> getOrderList() {
+ List<Order> orders = orderRepository.findAll();
+
+ return orders.stream()
+ .map(order -> new OrderResponseDto(
+ order.getId(),
+ order.getEmail(),
+ order.getAddress(),
+ order.getPostalCode(),
+ order.getState().toString(),
+ order.getTotalPrice(),
+ order.getOrderDate()
+ ))
+ .collect(Collectors.toList());
+ }
+}
+
+ | Java | ๊ฐ์ฒด ์ธํ
์ ๊ฐ๋ฅํ๋ฉด Service ์ด์ธ์ ๊ณณ์ผ๋ก ์ ๋ฐฐ ๋ณด๋ด์์ฃ .
```java
return orderRepository.findAll().stream()
.map(OrderConverter::toOrderResponse)
.toList();
``` |
@@ -0,0 +1,81 @@
+package com.ll.backend.domain.order.service;
+
+import com.ll.backend.domain.order.OrderStatus;
+import com.ll.backend.domain.order.dto.OrderRequestDto;
+import com.ll.backend.domain.order.dto.OrderResponseDto;
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.order.repository.OrderRepository;
+import com.ll.backend.domain.orderdetail.service.OrderDetailService;
+import com.ll.backend.domain.product.repository.ProductRepository;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class OrderService {
+ private final OrderRepository orderRepository;
+ private final ProductRepository productRepository;
+ private final OrderDetailService orderDetailService;
+
+
+ // ์ฃผ๋ฌธ ์์ฑ
+ @Transactional
+ public Order createOrder(OrderRequestDto orderRequestDto) {
+
+ // ์ฃผ๋ฌธ ์ ๋ณด ์์ฑ
+ Order order = new Order(
+ orderRequestDto.getEmail(),
+ orderRequestDto.getAddress(),
+ orderRequestDto.getPostalCode(),
+ setOrderStateBasedOnTime(),
+ orderRequestDto.getTotalPrice()
+ );
+
+ // ์ฃผ๋ฌธ ์ ์ฅ
+ return orderRepository.save(order);
+ }
+
+ private OrderStatus setOrderStateBasedOnTime() {
+ LocalDateTime now = LocalDateTime.now();
+ LocalTime cutoffTime = LocalTime.of(14, 0); // ์คํ 2์ ๊ธฐ์ค
+
+ if (now.toLocalTime().isBefore(cutoffTime)) {
+ return OrderStatus.SHIPPED;
+ } else {
+ return OrderStatus.PENDING;
+ }
+ }
+
+ public long count() {
+ return orderRepository.count();
+ }
+
+ public Order initDataOrder(Order order) {
+ return orderRepository.save(order);
+ }
+
+ @Transactional()
+ public List<OrderResponseDto> getOrderList() {
+ List<Order> orders = orderRepository.findAll();
+
+ return orders.stream()
+ .map(order -> new OrderResponseDto(
+ order.getId(),
+ order.getEmail(),
+ order.getAddress(),
+ order.getPostalCode(),
+ order.getState().toString(),
+ order.getTotalPrice(),
+ order.getOrderDate()
+ ))
+ .collect(Collectors.toList());
+ }
+}
+
+ | Java | ```java
//๋ฐฐ์ก ์ํ ๋ณ๊ฒฝ
@Transactional
public void updateDeliveryStatus(OrderDeliveryRequestDto orderDeliveryRequestDto) {
List<Integer> orderIds = orderDeliveryRequestDto.getId();
if (CollectionUtils.isEmpty(orderIds)) {
throw new IllegalArgumentException("ID list cannot be null or empty.");
}
for (Integer orderId : orderIds) {
Order order = orderRepository.findById(orderId)
.orElseThrow(() -> new IllegalArgumentException("Order not found for ID: " + orderId));
// ๋ฐฐ์ก ์ํ๋ฅผ SHIPPED๋ก ๋ณ๊ฒฝ
order.updateToShipped();
}
}
``` |
@@ -0,0 +1,29 @@
+package com.ll.backend.domain.orderdetail.controller;
+
+import com.ll.backend.domain.orderdetail.dto.OrderDetailResponseDto;
+import com.ll.backend.domain.orderdetail.service.OrderDetailService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class OrderDetailController {
+
+ private final OrderDetailService orderDetailService;
+
+ @GetMapping("/admin/order/{id}")
+ public ResponseEntity<List<OrderDetailResponseDto>> getOrderDetail(@PathVariable String id){
+ List<OrderDetailResponseDto> orderDetail = orderDetailService.getOrderDetail(Integer.parseInt(id));
+ if(orderDetail.isEmpty()){
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
+ return new ResponseEntity<>(orderDetail, HttpStatus.OK);
+ }
+
+} | Java | Integer๋ก ๋ฐ์์๋ค. |
@@ -0,0 +1,29 @@
+package com.ll.backend.domain.orderdetail.controller;
+
+import com.ll.backend.domain.orderdetail.dto.OrderDetailResponseDto;
+import com.ll.backend.domain.orderdetail.service.OrderDetailService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class OrderDetailController {
+
+ private final OrderDetailService orderDetailService;
+
+ @GetMapping("/admin/order/{id}")
+ public ResponseEntity<List<OrderDetailResponseDto>> getOrderDetail(@PathVariable String id){
+ List<OrderDetailResponseDto> orderDetail = orderDetailService.getOrderDetail(Integer.parseInt(id));
+ if(orderDetail.isEmpty()){
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
+ return new ResponseEntity<>(orderDetail, HttpStatus.OK);
+ }
+
+} | Java | (๋์ค์ ์๊ฐ ๋๋ฉด ํ์ธํด ๋ณด์ธ์~~~~~)
- `@ControllerAdvice`, `@ExceptionHandler` ๋ฅผ ๊ฐ์ด ์ฌ์ฉํ๋ฉด, ์ ํฌ๊ฐ ๊ตณ์ด ์ ๋ ๊ฒ ์๋ต ์ฝ๋๋ฅผ ๋ถ๊ธฐํ์ง ์์๋ ์์ธ์ ์ข
๋ฅ๋ง ๋ณด๊ณ HttpStatusCode๋ฅผ ์ง์ ํ ์ ์์ต๋๋ค. |
@@ -0,0 +1,15 @@
+package com.ll.backend.domain.orderdetail.repository;
+
+import com.ll.backend.domain.order.entity.Order;
+import com.ll.backend.domain.orderdetail.entity.OrderDetail;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface OrderDetailRepository extends JpaRepository<OrderDetail,Long> {
+ List<OrderDetail> findByOrder(Order order);
+
+ Long id(Integer id);
+
+ List<OrderDetail> findByOrder_Id(Integer orderId);
+} | Java | Google Java Convention/Naver Java Convention ๋ชจ๋์์, ๋ฉ์๋ ์ด๋ฆ์ ์ธ๋์ค์ฝ์ด๋ฅผ ์ฐ์ง ๋ง๋ผ๊ณ ์ ํ์์๊ฑฐ์์. (์ผ๋ฐ์ ์ผ๋ก ํ
์คํธ๊ฐ ์๋๋ผ๋ฉด ๋ฉ์๋ ์ด๋ฆ์ ์ธ๋์ค์ฝ์ด๋ฅผ ์ฐ์ง ์์ต๋๋ค.) |
@@ -0,0 +1,104 @@
+import React from "react";
+import { useState } from "react";
+
+const dummies = [
+ { reviewId: 1, isAwarded: true, applicationYear: 2023, semester: "1ํ๊ธฐ", content: "์ฅํ๊ธ ์ ์ฒญ ๊ณผ์ ์ด ๊ฐ๋จํ์ด์!" },
+ { reviewId: 2, isAwarded: false, applicationYear: 2024, semester: "2ํ๊ธฐ", content: "์ ๋ฐ ๊ธฐ์ค์ด ๋ช
ํํ์ง ์์์ ์์ฌ์ ์ด์." },
+ { reviewId: 3, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "๋ฐ์์ ํ๋น ๋ถ๋ด์ด ์ค์์ด์!" },
+ { reviewId: 4, isAwarded: false, applicationYear: 2021, semester: "2ํ๊ธฐ", content: "์ง์ํ์ง๋ง ํ๋ฝํด์ ์์ฌ์ ์ด์." },
+ { reviewId: 5, isAwarded: true, applicationYear: 2020, semester: "1ํ๊ธฐ", content: "๊ธ์ก์ด ์๊ฐ๋ณด๋ค ๋ง์์ ๋ง์กฑํ์ด์!" },
+ { reviewId: 6, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "์ฑ์ ์ด ์กฐ๊ธ ๋ถ์กฑํ๊ฐ ์ถ์๋๋ฐ ๊ด์ฐฎ์์ด์." },
+ { reviewId: 7, isAwarded: false, applicationYear: 2024, semester: "1ํ๊ธฐ", content: "๋ค์์ ๋ค์ ์ ์ฒญํ๋ ค๊ณ ์.." },
+ { reviewId: 8, isAwarded: true, applicationYear: 2020, semester: "2ํ๊ธฐ", content: "ํ์ ๋ณด๋จ ๋ฉด์ ์ด ๋ ์ค์ํ ๊ฒ ๊ฐ์์!" },
+ { reviewId: 9, isAwarded: false, applicationYear: 2021, semester: "1ํ๊ธฐ", content: "์ ๋จ์ด์ก๋์ง ์ ๋ชจ๋ฅด๊ฒ ์ด์ใ
ใ
" },
+ { reviewId: 10, isAwarded: true, applicationYear: 2018, semester: "2ํ๊ธฐ", content: "์ง์ ๋น์ ํ์ ์ X.XX์์ด์." },
+];
+
+function ReviewList() {
+
+ const reviewsInOnePage = 5;
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const [filterIsAwarded, setFilterIsAwarded] = useState("");
+ const [filterApplicationYear, setFilterApplicationYear] = useState("");
+ const [filterSemester, setFilterSemester] = useState("");
+
+ const filteredReviews = dummies.filter((review) => {
+ const findIsAwarded = filterIsAwarded === "" || (filterIsAwarded === "์ํํจ" && review.isAwarded) || (filterIsAwarded === "์ํ ์ํจ" && !review.isAwarded);
+ const findApplicationYear = filterApplicationYear === "" || review.applicationYear.toString() === filterApplicationYear;
+ const findSemester = filterSemester === "" || `${review.applicationYear}-${review.semester}` === filterSemester;
+
+ return findIsAwarded && findApplicationYear && findSemester;
+ });
+
+ const indexOfLastReview = currentPage * reviewsInOnePage;
+ const indexOfFirstReview = indexOfLastReview - reviewsInOnePage;
+ const currentReviews = filteredReviews.slice(indexOfFirstReview, indexOfLastReview);
+
+ function previousPage() {
+ if (currentPage > 1) {
+ setCurrentPage(currentPage - 1);
+ }
+ }
+
+ function nextPage() {
+ if (indexOfLastReview < filteredReviews.length) {
+ setCurrentPage(currentPage + 1);
+ }
+ }
+
+ return (
+ <div>
+ <h2>ํ์๋ค์ ๋ฆฌ๋ทฐ</h2>
+
+ <div>
+ <label>
+ ์ํ ์ฌ๋ถ
+ <select value={filterIsAwarded} onChange={(e) => setFilterIsAwarded(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="์ํํจ">์ํํจ</option>
+ <option value="์ํ ์ํจ">์ํ ์ํจ</option>
+ </select>
+ </label>
+
+ <label>
+ ์ ์ฒญ ์ฐ๋
+ <input
+ type="number"
+ placeholder="์ ์ฒญ ์ฐ๋๋ฅผ ์
๋ ฅํ์ธ์"
+ value={filterApplicationYear}
+ onChange={(e) => setFilterApplicationYear(e.target.value)}
+ />
+ </label>
+
+ <label>
+ ํ๊ธฐ
+ <select value={filterSemester} onChange={(e) => setFilterSemester(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="1ํ๊ธฐ">1ํ๊ธฐ</option>
+ <option value="2ํ๊ธฐ">2ํ๊ธฐ</option>
+ </select>
+ </label>
+ </div>
+
+ <div>
+ {currentReviews.length > 0 && currentReviews.map((review) => (
+ <div key={review.reviewId}>
+ <p><strong>์ต๋ช
</strong></p>
+ <p>{review.isAwarded ? "์ํํจ" : "์ํ ์ํจ"}</p>
+ <p>{review.applicationYear}-{review.semester}</p>
+ <p>{review.content}</p>
+ </div>
+ ))}
+ </div>
+
+ <div>
+ <button onClick={previousPage} disabled={currentPage === 1}>์ด์ </button>
+ <span> {currentPage} </span>
+ <button onClick={nextPage} disabled={indexOfLastReview >= filteredReviews.length}>๋ค์</button>
+ </div>
+ </div>
+ );
+}
+
+export default ReviewList;
\ No newline at end of file | Unknown | ์ฌ์ฉํ์ง ์๋ ๋ถํ์ํ import React๋ ์ ๊ฑฐํด์ฃผ์ธ์~ |
@@ -0,0 +1,104 @@
+import React from "react";
+import { useState } from "react";
+
+const dummies = [
+ { reviewId: 1, isAwarded: true, applicationYear: 2023, semester: "1ํ๊ธฐ", content: "์ฅํ๊ธ ์ ์ฒญ ๊ณผ์ ์ด ๊ฐ๋จํ์ด์!" },
+ { reviewId: 2, isAwarded: false, applicationYear: 2024, semester: "2ํ๊ธฐ", content: "์ ๋ฐ ๊ธฐ์ค์ด ๋ช
ํํ์ง ์์์ ์์ฌ์ ์ด์." },
+ { reviewId: 3, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "๋ฐ์์ ํ๋น ๋ถ๋ด์ด ์ค์์ด์!" },
+ { reviewId: 4, isAwarded: false, applicationYear: 2021, semester: "2ํ๊ธฐ", content: "์ง์ํ์ง๋ง ํ๋ฝํด์ ์์ฌ์ ์ด์." },
+ { reviewId: 5, isAwarded: true, applicationYear: 2020, semester: "1ํ๊ธฐ", content: "๊ธ์ก์ด ์๊ฐ๋ณด๋ค ๋ง์์ ๋ง์กฑํ์ด์!" },
+ { reviewId: 6, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "์ฑ์ ์ด ์กฐ๊ธ ๋ถ์กฑํ๊ฐ ์ถ์๋๋ฐ ๊ด์ฐฎ์์ด์." },
+ { reviewId: 7, isAwarded: false, applicationYear: 2024, semester: "1ํ๊ธฐ", content: "๋ค์์ ๋ค์ ์ ์ฒญํ๋ ค๊ณ ์.." },
+ { reviewId: 8, isAwarded: true, applicationYear: 2020, semester: "2ํ๊ธฐ", content: "ํ์ ๋ณด๋จ ๋ฉด์ ์ด ๋ ์ค์ํ ๊ฒ ๊ฐ์์!" },
+ { reviewId: 9, isAwarded: false, applicationYear: 2021, semester: "1ํ๊ธฐ", content: "์ ๋จ์ด์ก๋์ง ์ ๋ชจ๋ฅด๊ฒ ์ด์ใ
ใ
" },
+ { reviewId: 10, isAwarded: true, applicationYear: 2018, semester: "2ํ๊ธฐ", content: "์ง์ ๋น์ ํ์ ์ X.XX์์ด์." },
+];
+
+function ReviewList() {
+
+ const reviewsInOnePage = 5;
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const [filterIsAwarded, setFilterIsAwarded] = useState("");
+ const [filterApplicationYear, setFilterApplicationYear] = useState("");
+ const [filterSemester, setFilterSemester] = useState("");
+
+ const filteredReviews = dummies.filter((review) => {
+ const findIsAwarded = filterIsAwarded === "" || (filterIsAwarded === "์ํํจ" && review.isAwarded) || (filterIsAwarded === "์ํ ์ํจ" && !review.isAwarded);
+ const findApplicationYear = filterApplicationYear === "" || review.applicationYear.toString() === filterApplicationYear;
+ const findSemester = filterSemester === "" || `${review.applicationYear}-${review.semester}` === filterSemester;
+
+ return findIsAwarded && findApplicationYear && findSemester;
+ });
+
+ const indexOfLastReview = currentPage * reviewsInOnePage;
+ const indexOfFirstReview = indexOfLastReview - reviewsInOnePage;
+ const currentReviews = filteredReviews.slice(indexOfFirstReview, indexOfLastReview);
+
+ function previousPage() {
+ if (currentPage > 1) {
+ setCurrentPage(currentPage - 1);
+ }
+ }
+
+ function nextPage() {
+ if (indexOfLastReview < filteredReviews.length) {
+ setCurrentPage(currentPage + 1);
+ }
+ }
+
+ return (
+ <div>
+ <h2>ํ์๋ค์ ๋ฆฌ๋ทฐ</h2>
+
+ <div>
+ <label>
+ ์ํ ์ฌ๋ถ
+ <select value={filterIsAwarded} onChange={(e) => setFilterIsAwarded(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="์ํํจ">์ํํจ</option>
+ <option value="์ํ ์ํจ">์ํ ์ํจ</option>
+ </select>
+ </label>
+
+ <label>
+ ์ ์ฒญ ์ฐ๋
+ <input
+ type="number"
+ placeholder="์ ์ฒญ ์ฐ๋๋ฅผ ์
๋ ฅํ์ธ์"
+ value={filterApplicationYear}
+ onChange={(e) => setFilterApplicationYear(e.target.value)}
+ />
+ </label>
+
+ <label>
+ ํ๊ธฐ
+ <select value={filterSemester} onChange={(e) => setFilterSemester(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="1ํ๊ธฐ">1ํ๊ธฐ</option>
+ <option value="2ํ๊ธฐ">2ํ๊ธฐ</option>
+ </select>
+ </label>
+ </div>
+
+ <div>
+ {currentReviews.length > 0 && currentReviews.map((review) => (
+ <div key={review.reviewId}>
+ <p><strong>์ต๋ช
</strong></p>
+ <p>{review.isAwarded ? "์ํํจ" : "์ํ ์ํจ"}</p>
+ <p>{review.applicationYear}-{review.semester}</p>
+ <p>{review.content}</p>
+ </div>
+ ))}
+ </div>
+
+ <div>
+ <button onClick={previousPage} disabled={currentPage === 1}>์ด์ </button>
+ <span> {currentPage} </span>
+ <button onClick={nextPage} disabled={indexOfLastReview >= filteredReviews.length}>๋ค์</button>
+ </div>
+ </div>
+ );
+}
+
+export default ReviewList;
\ No newline at end of file | Unknown | ์คํธ~ dummies๋ก ๋ง๋ค์ด ์์ ๊ตฌํ ๊ตฟ๐๐๐ |
@@ -0,0 +1,104 @@
+import React from "react";
+import { useState } from "react";
+
+const dummies = [
+ { reviewId: 1, isAwarded: true, applicationYear: 2023, semester: "1ํ๊ธฐ", content: "์ฅํ๊ธ ์ ์ฒญ ๊ณผ์ ์ด ๊ฐ๋จํ์ด์!" },
+ { reviewId: 2, isAwarded: false, applicationYear: 2024, semester: "2ํ๊ธฐ", content: "์ ๋ฐ ๊ธฐ์ค์ด ๋ช
ํํ์ง ์์์ ์์ฌ์ ์ด์." },
+ { reviewId: 3, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "๋ฐ์์ ํ๋น ๋ถ๋ด์ด ์ค์์ด์!" },
+ { reviewId: 4, isAwarded: false, applicationYear: 2021, semester: "2ํ๊ธฐ", content: "์ง์ํ์ง๋ง ํ๋ฝํด์ ์์ฌ์ ์ด์." },
+ { reviewId: 5, isAwarded: true, applicationYear: 2020, semester: "1ํ๊ธฐ", content: "๊ธ์ก์ด ์๊ฐ๋ณด๋ค ๋ง์์ ๋ง์กฑํ์ด์!" },
+ { reviewId: 6, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "์ฑ์ ์ด ์กฐ๊ธ ๋ถ์กฑํ๊ฐ ์ถ์๋๋ฐ ๊ด์ฐฎ์์ด์." },
+ { reviewId: 7, isAwarded: false, applicationYear: 2024, semester: "1ํ๊ธฐ", content: "๋ค์์ ๋ค์ ์ ์ฒญํ๋ ค๊ณ ์.." },
+ { reviewId: 8, isAwarded: true, applicationYear: 2020, semester: "2ํ๊ธฐ", content: "ํ์ ๋ณด๋จ ๋ฉด์ ์ด ๋ ์ค์ํ ๊ฒ ๊ฐ์์!" },
+ { reviewId: 9, isAwarded: false, applicationYear: 2021, semester: "1ํ๊ธฐ", content: "์ ๋จ์ด์ก๋์ง ์ ๋ชจ๋ฅด๊ฒ ์ด์ใ
ใ
" },
+ { reviewId: 10, isAwarded: true, applicationYear: 2018, semester: "2ํ๊ธฐ", content: "์ง์ ๋น์ ํ์ ์ X.XX์์ด์." },
+];
+
+function ReviewList() {
+
+ const reviewsInOnePage = 5;
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const [filterIsAwarded, setFilterIsAwarded] = useState("");
+ const [filterApplicationYear, setFilterApplicationYear] = useState("");
+ const [filterSemester, setFilterSemester] = useState("");
+
+ const filteredReviews = dummies.filter((review) => {
+ const findIsAwarded = filterIsAwarded === "" || (filterIsAwarded === "์ํํจ" && review.isAwarded) || (filterIsAwarded === "์ํ ์ํจ" && !review.isAwarded);
+ const findApplicationYear = filterApplicationYear === "" || review.applicationYear.toString() === filterApplicationYear;
+ const findSemester = filterSemester === "" || `${review.applicationYear}-${review.semester}` === filterSemester;
+
+ return findIsAwarded && findApplicationYear && findSemester;
+ });
+
+ const indexOfLastReview = currentPage * reviewsInOnePage;
+ const indexOfFirstReview = indexOfLastReview - reviewsInOnePage;
+ const currentReviews = filteredReviews.slice(indexOfFirstReview, indexOfLastReview);
+
+ function previousPage() {
+ if (currentPage > 1) {
+ setCurrentPage(currentPage - 1);
+ }
+ }
+
+ function nextPage() {
+ if (indexOfLastReview < filteredReviews.length) {
+ setCurrentPage(currentPage + 1);
+ }
+ }
+
+ return (
+ <div>
+ <h2>ํ์๋ค์ ๋ฆฌ๋ทฐ</h2>
+
+ <div>
+ <label>
+ ์ํ ์ฌ๋ถ
+ <select value={filterIsAwarded} onChange={(e) => setFilterIsAwarded(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="์ํํจ">์ํํจ</option>
+ <option value="์ํ ์ํจ">์ํ ์ํจ</option>
+ </select>
+ </label>
+
+ <label>
+ ์ ์ฒญ ์ฐ๋
+ <input
+ type="number"
+ placeholder="์ ์ฒญ ์ฐ๋๋ฅผ ์
๋ ฅํ์ธ์"
+ value={filterApplicationYear}
+ onChange={(e) => setFilterApplicationYear(e.target.value)}
+ />
+ </label>
+
+ <label>
+ ํ๊ธฐ
+ <select value={filterSemester} onChange={(e) => setFilterSemester(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="1ํ๊ธฐ">1ํ๊ธฐ</option>
+ <option value="2ํ๊ธฐ">2ํ๊ธฐ</option>
+ </select>
+ </label>
+ </div>
+
+ <div>
+ {currentReviews.length > 0 && currentReviews.map((review) => (
+ <div key={review.reviewId}>
+ <p><strong>์ต๋ช
</strong></p>
+ <p>{review.isAwarded ? "์ํํจ" : "์ํ ์ํจ"}</p>
+ <p>{review.applicationYear}-{review.semester}</p>
+ <p>{review.content}</p>
+ </div>
+ ))}
+ </div>
+
+ <div>
+ <button onClick={previousPage} disabled={currentPage === 1}>์ด์ </button>
+ <span> {currentPage} </span>
+ <button onClick={nextPage} disabled={indexOfLastReview >= filteredReviews.length}>๋ค์</button>
+ </div>
+ </div>
+ );
+}
+
+export default ReviewList;
\ No newline at end of file | Unknown | ๋ณดํต ๋ณํ์ง ์๋ ์์๋ `REVIEWS_IN_ONE_PAGE`์ ๊ฐ์ด ๋๋ฌธ์๋ก ๋ค์ด๋ฐํ๋ ๊ฒ์ด ๋ณดํธ์ ์
๋๋ค~ ์ฐธ๊ณ ํด์ ์ ์ฉํด๋ณผ๊น์~?
- cf. https://ko.javascript.info/variables#ref-337
<img width="777" alt="image" src="https://github.com/user-attachments/assets/038d8339-e35a-4608-a4a3-5e847fe7ad1e" /> |
@@ -0,0 +1,104 @@
+import React from "react";
+import { useState } from "react";
+
+const dummies = [
+ { reviewId: 1, isAwarded: true, applicationYear: 2023, semester: "1ํ๊ธฐ", content: "์ฅํ๊ธ ์ ์ฒญ ๊ณผ์ ์ด ๊ฐ๋จํ์ด์!" },
+ { reviewId: 2, isAwarded: false, applicationYear: 2024, semester: "2ํ๊ธฐ", content: "์ ๋ฐ ๊ธฐ์ค์ด ๋ช
ํํ์ง ์์์ ์์ฌ์ ์ด์." },
+ { reviewId: 3, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "๋ฐ์์ ํ๋น ๋ถ๋ด์ด ์ค์์ด์!" },
+ { reviewId: 4, isAwarded: false, applicationYear: 2021, semester: "2ํ๊ธฐ", content: "์ง์ํ์ง๋ง ํ๋ฝํด์ ์์ฌ์ ์ด์." },
+ { reviewId: 5, isAwarded: true, applicationYear: 2020, semester: "1ํ๊ธฐ", content: "๊ธ์ก์ด ์๊ฐ๋ณด๋ค ๋ง์์ ๋ง์กฑํ์ด์!" },
+ { reviewId: 6, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "์ฑ์ ์ด ์กฐ๊ธ ๋ถ์กฑํ๊ฐ ์ถ์๋๋ฐ ๊ด์ฐฎ์์ด์." },
+ { reviewId: 7, isAwarded: false, applicationYear: 2024, semester: "1ํ๊ธฐ", content: "๋ค์์ ๋ค์ ์ ์ฒญํ๋ ค๊ณ ์.." },
+ { reviewId: 8, isAwarded: true, applicationYear: 2020, semester: "2ํ๊ธฐ", content: "ํ์ ๋ณด๋จ ๋ฉด์ ์ด ๋ ์ค์ํ ๊ฒ ๊ฐ์์!" },
+ { reviewId: 9, isAwarded: false, applicationYear: 2021, semester: "1ํ๊ธฐ", content: "์ ๋จ์ด์ก๋์ง ์ ๋ชจ๋ฅด๊ฒ ์ด์ใ
ใ
" },
+ { reviewId: 10, isAwarded: true, applicationYear: 2018, semester: "2ํ๊ธฐ", content: "์ง์ ๋น์ ํ์ ์ X.XX์์ด์." },
+];
+
+function ReviewList() {
+
+ const reviewsInOnePage = 5;
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const [filterIsAwarded, setFilterIsAwarded] = useState("");
+ const [filterApplicationYear, setFilterApplicationYear] = useState("");
+ const [filterSemester, setFilterSemester] = useState("");
+
+ const filteredReviews = dummies.filter((review) => {
+ const findIsAwarded = filterIsAwarded === "" || (filterIsAwarded === "์ํํจ" && review.isAwarded) || (filterIsAwarded === "์ํ ์ํจ" && !review.isAwarded);
+ const findApplicationYear = filterApplicationYear === "" || review.applicationYear.toString() === filterApplicationYear;
+ const findSemester = filterSemester === "" || `${review.applicationYear}-${review.semester}` === filterSemester;
+
+ return findIsAwarded && findApplicationYear && findSemester;
+ });
+
+ const indexOfLastReview = currentPage * reviewsInOnePage;
+ const indexOfFirstReview = indexOfLastReview - reviewsInOnePage;
+ const currentReviews = filteredReviews.slice(indexOfFirstReview, indexOfLastReview);
+
+ function previousPage() {
+ if (currentPage > 1) {
+ setCurrentPage(currentPage - 1);
+ }
+ }
+
+ function nextPage() {
+ if (indexOfLastReview < filteredReviews.length) {
+ setCurrentPage(currentPage + 1);
+ }
+ }
+
+ return (
+ <div>
+ <h2>ํ์๋ค์ ๋ฆฌ๋ทฐ</h2>
+
+ <div>
+ <label>
+ ์ํ ์ฌ๋ถ
+ <select value={filterIsAwarded} onChange={(e) => setFilterIsAwarded(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="์ํํจ">์ํํจ</option>
+ <option value="์ํ ์ํจ">์ํ ์ํจ</option>
+ </select>
+ </label>
+
+ <label>
+ ์ ์ฒญ ์ฐ๋
+ <input
+ type="number"
+ placeholder="์ ์ฒญ ์ฐ๋๋ฅผ ์
๋ ฅํ์ธ์"
+ value={filterApplicationYear}
+ onChange={(e) => setFilterApplicationYear(e.target.value)}
+ />
+ </label>
+
+ <label>
+ ํ๊ธฐ
+ <select value={filterSemester} onChange={(e) => setFilterSemester(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="1ํ๊ธฐ">1ํ๊ธฐ</option>
+ <option value="2ํ๊ธฐ">2ํ๊ธฐ</option>
+ </select>
+ </label>
+ </div>
+
+ <div>
+ {currentReviews.length > 0 && currentReviews.map((review) => (
+ <div key={review.reviewId}>
+ <p><strong>์ต๋ช
</strong></p>
+ <p>{review.isAwarded ? "์ํํจ" : "์ํ ์ํจ"}</p>
+ <p>{review.applicationYear}-{review.semester}</p>
+ <p>{review.content}</p>
+ </div>
+ ))}
+ </div>
+
+ <div>
+ <button onClick={previousPage} disabled={currentPage === 1}>์ด์ </button>
+ <span> {currentPage} </span>
+ <button onClick={nextPage} disabled={indexOfLastReview >= filteredReviews.length}>๋ค์</button>
+ </div>
+ </div>
+ );
+}
+
+export default ReviewList;
\ No newline at end of file | Unknown | ๋ฐ๋ณต๋ฌธ์ผ๋ก ์ฌ์ฉํ ๋ ๋์คํธ๋ญ์ณ๋ง์ ์ฌ์ฉํ๋ฉด ๋ ๊น๋ํ๊ฒ ํํ์ด ๊ฐ๋ฅํฉ๋๋ค~
์ง๊ธ๋ map ๋ด๋ถ์์ `review.reviewId`, `reveiw.isAwarded` ์ฒ๋ผ `review.`์ด ๊ณ์ ์ค๋ณตํด์ ์ฌ์ฉํ๊ณ ์์ฃ ~
๋์คํธ๋ญ์ณ๋ง์ผ๋ก ์ข ๋ ๊น๋ํ๊ฒ ํํํด ๋ณผ๊น์~?
- cf. https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment |
@@ -0,0 +1,104 @@
+import React from "react";
+import { useState } from "react";
+
+const dummies = [
+ { reviewId: 1, isAwarded: true, applicationYear: 2023, semester: "1ํ๊ธฐ", content: "์ฅํ๊ธ ์ ์ฒญ ๊ณผ์ ์ด ๊ฐ๋จํ์ด์!" },
+ { reviewId: 2, isAwarded: false, applicationYear: 2024, semester: "2ํ๊ธฐ", content: "์ ๋ฐ ๊ธฐ์ค์ด ๋ช
ํํ์ง ์์์ ์์ฌ์ ์ด์." },
+ { reviewId: 3, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "๋ฐ์์ ํ๋น ๋ถ๋ด์ด ์ค์์ด์!" },
+ { reviewId: 4, isAwarded: false, applicationYear: 2021, semester: "2ํ๊ธฐ", content: "์ง์ํ์ง๋ง ํ๋ฝํด์ ์์ฌ์ ์ด์." },
+ { reviewId: 5, isAwarded: true, applicationYear: 2020, semester: "1ํ๊ธฐ", content: "๊ธ์ก์ด ์๊ฐ๋ณด๋ค ๋ง์์ ๋ง์กฑํ์ด์!" },
+ { reviewId: 6, isAwarded: true, applicationYear: 2022, semester: "1ํ๊ธฐ", content: "์ฑ์ ์ด ์กฐ๊ธ ๋ถ์กฑํ๊ฐ ์ถ์๋๋ฐ ๊ด์ฐฎ์์ด์." },
+ { reviewId: 7, isAwarded: false, applicationYear: 2024, semester: "1ํ๊ธฐ", content: "๋ค์์ ๋ค์ ์ ์ฒญํ๋ ค๊ณ ์.." },
+ { reviewId: 8, isAwarded: true, applicationYear: 2020, semester: "2ํ๊ธฐ", content: "ํ์ ๋ณด๋จ ๋ฉด์ ์ด ๋ ์ค์ํ ๊ฒ ๊ฐ์์!" },
+ { reviewId: 9, isAwarded: false, applicationYear: 2021, semester: "1ํ๊ธฐ", content: "์ ๋จ์ด์ก๋์ง ์ ๋ชจ๋ฅด๊ฒ ์ด์ใ
ใ
" },
+ { reviewId: 10, isAwarded: true, applicationYear: 2018, semester: "2ํ๊ธฐ", content: "์ง์ ๋น์ ํ์ ์ X.XX์์ด์." },
+];
+
+function ReviewList() {
+
+ const reviewsInOnePage = 5;
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const [filterIsAwarded, setFilterIsAwarded] = useState("");
+ const [filterApplicationYear, setFilterApplicationYear] = useState("");
+ const [filterSemester, setFilterSemester] = useState("");
+
+ const filteredReviews = dummies.filter((review) => {
+ const findIsAwarded = filterIsAwarded === "" || (filterIsAwarded === "์ํํจ" && review.isAwarded) || (filterIsAwarded === "์ํ ์ํจ" && !review.isAwarded);
+ const findApplicationYear = filterApplicationYear === "" || review.applicationYear.toString() === filterApplicationYear;
+ const findSemester = filterSemester === "" || `${review.applicationYear}-${review.semester}` === filterSemester;
+
+ return findIsAwarded && findApplicationYear && findSemester;
+ });
+
+ const indexOfLastReview = currentPage * reviewsInOnePage;
+ const indexOfFirstReview = indexOfLastReview - reviewsInOnePage;
+ const currentReviews = filteredReviews.slice(indexOfFirstReview, indexOfLastReview);
+
+ function previousPage() {
+ if (currentPage > 1) {
+ setCurrentPage(currentPage - 1);
+ }
+ }
+
+ function nextPage() {
+ if (indexOfLastReview < filteredReviews.length) {
+ setCurrentPage(currentPage + 1);
+ }
+ }
+
+ return (
+ <div>
+ <h2>ํ์๋ค์ ๋ฆฌ๋ทฐ</h2>
+
+ <div>
+ <label>
+ ์ํ ์ฌ๋ถ
+ <select value={filterIsAwarded} onChange={(e) => setFilterIsAwarded(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="์ํํจ">์ํํจ</option>
+ <option value="์ํ ์ํจ">์ํ ์ํจ</option>
+ </select>
+ </label>
+
+ <label>
+ ์ ์ฒญ ์ฐ๋
+ <input
+ type="number"
+ placeholder="์ ์ฒญ ์ฐ๋๋ฅผ ์
๋ ฅํ์ธ์"
+ value={filterApplicationYear}
+ onChange={(e) => setFilterApplicationYear(e.target.value)}
+ />
+ </label>
+
+ <label>
+ ํ๊ธฐ
+ <select value={filterSemester} onChange={(e) => setFilterSemester(e.target.value)}>
+ <option value="">์ ์ฒด</option>
+ <option value="1ํ๊ธฐ">1ํ๊ธฐ</option>
+ <option value="2ํ๊ธฐ">2ํ๊ธฐ</option>
+ </select>
+ </label>
+ </div>
+
+ <div>
+ {currentReviews.length > 0 && currentReviews.map((review) => (
+ <div key={review.reviewId}>
+ <p><strong>์ต๋ช
</strong></p>
+ <p>{review.isAwarded ? "์ํํจ" : "์ํ ์ํจ"}</p>
+ <p>{review.applicationYear}-{review.semester}</p>
+ <p>{review.content}</p>
+ </div>
+ ))}
+ </div>
+
+ <div>
+ <button onClick={previousPage} disabled={currentPage === 1}>์ด์ </button>
+ <span> {currentPage} </span>
+ <button onClick={nextPage} disabled={indexOfLastReview >= filteredReviews.length}>๋ค์</button>
+ </div>
+ </div>
+ );
+}
+
+export default ReviewList;
\ No newline at end of file | Unknown | ์คํธ~ ์ธ์ฌํ๊ฒ disabled๊น์ง ์ฑ๊ธฐ๋ค๋~๐ |
@@ -9,6 +9,7 @@
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-scripts": "5.0.1",
+ "styled-components": "^6.1.15",
"web-vitals": "^2.1.0"
},
"scripts": { | Unknown | ์ด๋ฏธ main์ ์ถ๊ฐ๋ ์ฝ๋๋ rebase๋ฅผ ํตํด ํด๊ฒฐํ๊ณ ๋ฐ์ํด๋ด
์๋ค~ |
@@ -25,6 +25,7 @@ public class Board {
@Column(updatable = false)
private LocalDateTime createdAt = LocalDateTime.now();
+
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "userId")
private User user; | Java | N+1 ๋ฌธ์ ๋ฅผ ๊ณ ๋ คํด์ผํด์ ์์ ํด์ผํจ |
@@ -22,18 +22,19 @@
public class BoardService {
private final BoardRepository boardRepository;
private final UserRepository userRepository;
- LocalDateTime now = LocalDateTime.now();
- @Transactional
+
+ @Transactional(readOnly = true)
public Page<Board> getBoards(int page, int size) {
Pageable pageable = PageRequest.of(page, size);
return boardRepository.findAll(pageable);
}
@Transactional
- public void create(BoardDto boardDto) {
- final User user = userRepository.findByUsername(boardDto.getUsername())
+ public void create(BoardDto boardDto, String identity) {
+ LocalDateTime now = LocalDateTime.now();
+ final User user = userRepository.findByIdentity(identity)
.orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
Board board = Board.builder()
@@ -49,12 +50,14 @@ public void create(BoardDto boardDto) {
@Transactional
public void update(BoardUpdateDto dto) {
- final User user = userRepository.findByUsername(dto.getUsername())
- .orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
-
final Board board = boardRepository.findById(dto.getId())
.orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ๊ฒ์๋ฌผ์ด ์์ต๋๋ค."));
+ final String username = board.getUser().getUsername();
+
+ final User user = userRepository.findByUsername(username)
+ .orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
+
if(user.getUsername().equals(dto.getUsername())) {
board.update(dto.getTitle(), dto.getContent());
boardRepository.save(board);
@@ -66,12 +69,16 @@ public void update(BoardUpdateDto dto) {
@Transactional
public void delete(BoardDeleteDto dto) {
- final User user = userRepository.findByUsername(dto.getUsername())
- .orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
-
final Board board = boardRepository.findById(dto.getId())
.orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ๊ฒ์๋ฌผ์ด ์์ต๋๋ค."));
+ final String username = board.getUser().getUsername();
+
+// final String userid = board.getUser().getIdentity();
+
+ final User user = userRepository.findByUsername(username)
+ .orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
+
if(user.getUsername().equals(dto.getUsername())) {
boardRepository.delete(board);
}else { | Java | ์๋์ฒ๋ผ ๋ก์ง์ด ๋ฐ๋์ด์ผํจ
```java
@Transactional
public void delete(BoardDeleteDto dto) {
// ๋น์ฆ๋์ค ๋ก์ง์ ๋ฌธ์ -> ์ด๋ฐ๊ฑฐ๋ฅผ ๊ณ ๋ฏผํ๋๊ฒ ๋ฐฑ์๋ ๊ฐ๋ฐ์์ ์ญํ
// ๊ฒ์ํ์ ์ฐพ๋๋ค.
final Board board = boardRepository.findById(dto.getId())
.orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ๊ฒ์๋ฌผ์ด ์์ต๋๋ค."));
// ๊ฒ์ํ์ ์์ฑ์๋ฅผ ์ฐพ๋๋ค.
final String username = board.getUser().getUsername();
// ๊ฒ์ํ์ ์์ฑ์์ DB ์กฐํ
final User user = userRepository.findByUsername(username)
.orElseThrow(() -> new RuntimeException("์ผ์นํ๋ ์ฌ์ฉ์๊ฐ ์์ต๋๋ค."));
// ๊ฒ์ํ ์์ฑ์์ DB ์ ํ์ฌ ์์ฒญํ ์ฌ๋์ username ์ด ๊ฐ์์ง ๋น๊ต
if (user.getUsername().equals(dto.getUsername())) {
boardRepository.delete(board);
} else {
throw new IllegalArgumentException("์์ฑ์๋ง ์์ ํ ์ ์์ต๋๋ค.");
}
}
``` |
@@ -1,5 +1,22 @@
+import MovieListContainer from './components/MovieListContainer';
+import Header from './components/Header';
+import QueryErrorBoundary from './components/common/QueryResetErrorboundary';
+
function App() {
- return <div>hi</div>;
+ return (
+ <div style={AppStyle}>
+ <QueryErrorBoundary>
+ <Header />
+ <main>
+ <MovieListContainer />
+ </main>
+ </QueryErrorBoundary>
+ </div>
+ );
}
+const AppStyle = {
+ paddingBottom: '48px',
+};
+
export default App; | Unknown | ์์ฐ ์๋ฌ๋ฐ์ด๋๋ฆฌ๊น์ง...!๐๐ป |
@@ -0,0 +1,56 @@
+import * as S from './styles';
+import Portal from '../common/Portal';
+import ModalBackground from '../common/ModalBackground';
+import useGetMovieDetail from '../../hooks/useGetMovieDetail';
+import {IMAGE_BASE_URL} from '../../constants/movie';
+import {toOneDecimalPlace} from '../../utils/number';
+import filledStar from '../../assets/star_filled.png';
+import MyRating from '../MyRating';
+
+interface DetailModalProps {
+ selectedMovieId: number;
+ closeModal: () => void;
+}
+
+const DetailModal = ({selectedMovieId, closeModal}: DetailModalProps) => {
+ const {data} = useGetMovieDetail(selectedMovieId);
+
+ const {poster_path, vote_average, title, overview, genres} = data;
+
+ return (
+ <Portal>
+ <ModalBackground closeModal={closeModal}>
+ <S.ModalContainer>
+ <S.Header>
+ <h2>{title}</h2>
+ <button type="button" onClick={closeModal}>
+ ๋ซ๊ธฐ
+ </button>
+ </S.Header>
+
+ <S.Content>
+ <S.Poster src={`${IMAGE_BASE_URL}${poster_path}`} alt={`${title} ํฌ์คํฐ`} />
+
+ <S.RightContent>
+ <S.ShortInfo>
+ <S.Genres>{genres.map(genre => genre.name).join(', ')}</S.Genres>
+ <S.Rate>
+ <span>{toOneDecimalPlace(vote_average)}</span>
+ <img src={filledStar} alt="" />
+ </S.Rate>
+ </S.ShortInfo>
+
+ <S.Overview>{overview}</S.Overview>
+
+ <S.MyRatingWrapper>
+ <MyRating movieId={selectedMovieId} />
+ </S.MyRatingWrapper>
+ </S.RightContent>
+ </S.Content>
+ </S.ModalContainer>
+ </ModalBackground>
+ </Portal>
+ );
+};
+
+export default DetailModal; | Unknown | ๋ชจ๋ฌ ๋ฐ์ดํฐ๋ฅผ ๋ถ๋ฌ์ค๊ณ ์๋ ์ค์๋ ๋ชจ๋ฌ์ด ์๋์์ง๋๋ผ๊ตฌ์. ๊ทธ๋์ Movie๋ฅผ ํด๋ฆญํ์ ๋ ์ฝ๊ฐ์ ์ง์ฐ์๊ฐ ํ์ ๋ชจ๋ฌ์ด ๋์์ง๊ณ ์๊ตฌ์! ์ด ๋ถ๋ถ์์ ์ฌ์ฉ์ฑ์ ์ํด ์ค์ผ๋ ํค์ด๋ Suspense๊ฐ์ UI๋ฅผ ๋ฃ๋ ๊ฒ์ ์ด๋จ๊น์? |
@@ -0,0 +1,81 @@
+import {BASE_URL, POPULAR_MOVIE_URL, SEARCH_URL} from '../constants/movie';
+import {MovieDetail, MovieList} from '../types/movie';
+import {createApiErrorMessage} from '../utils/error';
+
+export const getMovieList = async ({pageParam = 1}: {pageParam?: number}) => {
+ const params = {
+ api_key: import.meta.env.VITE_TMDB_TOKEN,
+ language: 'ko-KR',
+ page: String(pageParam),
+ };
+ const endpoint = `${POPULAR_MOVIE_URL}?${new URLSearchParams(params).toString()}`;
+
+ const response = await fetch(endpoint, {
+ method: 'GET',
+ headers: {
+ Authorization: `Bearer ${import.meta.env.VITE_TMDB_TOKEN}`,
+ accept: 'application/json',
+ },
+ });
+
+ if (!response.ok) {
+ throw new Error(createApiErrorMessage(response.status));
+ }
+
+ const data = await response.json();
+ return data as MovieList;
+};
+
+interface GetSearchedMovieListParam {
+ pageParam?: number;
+ title: string;
+}
+
+export const getSearchedMovieList = async ({pageParam = 1, title}: GetSearchedMovieListParam) => {
+ const params = {
+ api_key: import.meta.env.VITE_TMDB_TOKEN,
+ query: title, // ๊ฒ์์ด
+ language: 'ko-KR',
+ page: String(pageParam),
+ };
+
+ const endpoint = `${SEARCH_URL}?${new URLSearchParams(params).toString()}`;
+
+ const response = await fetch(endpoint, {
+ method: 'GET',
+ headers: {
+ Authorization: `Bearer ${import.meta.env.VITE_TMDB_TOKEN}`,
+ accept: 'application/json',
+ },
+ });
+
+ if (!response.ok) {
+ throw new Error(createApiErrorMessage(response.status));
+ }
+
+ const data = await response.json();
+ return data as MovieList;
+};
+
+export const getMovieDetail = async (movieId: number) => {
+ const params = {
+ api_key: import.meta.env.VITE_TMDB_TOKEN,
+ language: 'ko-KR',
+ };
+ const endpoint = `${BASE_URL}/movie/${movieId}?${new URLSearchParams(params).toString()}`;
+
+ const response = await fetch(endpoint, {
+ method: 'GET',
+ headers: {
+ Authorization: `Bearer ${import.meta.env.VITE_TMDB_TOKEN}`,
+ accept: 'application/json',
+ },
+ });
+
+ if (!response.ok) {
+ throw new Error(createApiErrorMessage(response.status));
+ }
+
+ const data = await response.json();
+ return data as MovieDetail;
+}; | TypeScript | ์ฌ๊ธฐ์๋ as๋ก ๋ฆฌํดํ๊ณ ์๊ตฐ์! ํน์ ํ์
๋จ์ธ์ ํ๋ ๊ฒฝ์ฐ๋ `getMovieDetail` ํจ์์ ๋ฆฌํด๊ฐ ํ์
์ถ๋ก ์ด ๋๋์??(์ ๋ชฐ๋ผ์...) ์ฌ์ค ์๋ฒ๋ก๋ถํฐ ์ค๋ ๋ฐ์ดํฐ ํ์
์ Typescript๊ฐ ์ถ๋ก ํ ์๋ ์์ด์ `as`๋ ์๊ด์์ ๊ฒ ๊ฐ์ง๋ง ๊ถ์ฅ๋๋ ํ์์ ๋ช
์์ ์ธ ๋ฐํ ํ์
์ ์ธ์ ํ๋ ๋ฐฉ๋ฒ ๊ฐ์์์! ์ฌ๋ฆฌ๋ as์ ๋ฐํ ํ์
์ ์ธ ์ค ์ด๋ค ๋ฐฉ๋ฒ์ด ๋ ๋ซ๋ค๊ณ ์๊ฐํ๋์ง ๊ถ๊ธํด์! |
@@ -0,0 +1,56 @@
+import * as S from './styles';
+import Portal from '../common/Portal';
+import ModalBackground from '../common/ModalBackground';
+import useGetMovieDetail from '../../hooks/useGetMovieDetail';
+import {IMAGE_BASE_URL} from '../../constants/movie';
+import {toOneDecimalPlace} from '../../utils/number';
+import filledStar from '../../assets/star_filled.png';
+import MyRating from '../MyRating';
+
+interface DetailModalProps {
+ selectedMovieId: number;
+ closeModal: () => void;
+}
+
+const DetailModal = ({selectedMovieId, closeModal}: DetailModalProps) => {
+ const {data} = useGetMovieDetail(selectedMovieId);
+
+ const {poster_path, vote_average, title, overview, genres} = data;
+
+ return (
+ <Portal>
+ <ModalBackground closeModal={closeModal}>
+ <S.ModalContainer>
+ <S.Header>
+ <h2>{title}</h2>
+ <button type="button" onClick={closeModal}>
+ ๋ซ๊ธฐ
+ </button>
+ </S.Header>
+
+ <S.Content>
+ <S.Poster src={`${IMAGE_BASE_URL}${poster_path}`} alt={`${title} ํฌ์คํฐ`} />
+
+ <S.RightContent>
+ <S.ShortInfo>
+ <S.Genres>{genres.map(genre => genre.name).join(', ')}</S.Genres>
+ <S.Rate>
+ <span>{toOneDecimalPlace(vote_average)}</span>
+ <img src={filledStar} alt="" />
+ </S.Rate>
+ </S.ShortInfo>
+
+ <S.Overview>{overview}</S.Overview>
+
+ <S.MyRatingWrapper>
+ <MyRating movieId={selectedMovieId} />
+ </S.MyRatingWrapper>
+ </S.RightContent>
+ </S.Content>
+ </S.ModalContainer>
+ </ModalBackground>
+ </Portal>
+ );
+};
+
+export default DetailModal; | Unknown | selectedMovieId๋ props๊ฐ ๊ฝค ๊น์ด ์์ด์ ์ ์ญ์ผ๋ก ๊ด๋ฆฌํด๋ ์ข์ ๊ฒ ๊ฐ์๋ฐ ์ด๋จ๊น์?? |
@@ -0,0 +1,66 @@
+import {useAtomValue} from 'jotai';
+import useGetList from '../../hooks/useGetList';
+import useInfiniteScroll from '../../hooks/useInfiniteScroll';
+import * as S from './styles';
+import MovieItem from '../MovieItem';
+import SkeletonMovieList from '../skeleton/MovieList';
+import {searchTextAtom} from '../../jotai/atoms';
+
+interface MovieListProps {
+ openModal: (movieId: number) => void;
+}
+
+const MovieList = ({openModal}: MovieListProps) => {
+ const {movies, hasNextPage, fetchNextPage, isLoading, isFetchingNextPage} = useGetList();
+ const searchText = useAtomValue(searchTextAtom);
+
+ const lastElementRef = useInfiniteScroll({
+ fetchNextPage,
+ isLoading,
+ isLastPage: !hasNextPage,
+ });
+
+ const handleItemClick = (event: React.MouseEvent<HTMLUListElement>) => {
+ event.preventDefault();
+
+ const listItem = (event.target as HTMLElement).closest('li');
+ if (!listItem) return;
+
+ const id = Number(listItem.id);
+ const selectedItem = movies.find(item => item.id === id);
+
+ if (selectedItem) openModal(id);
+ };
+
+ return (
+ <S.MovieList onClick={handleItemClick}>
+ {isLoading ? (
+ <SkeletonMovieList />
+ ) : (
+ movies.map((movie, index) => {
+ const isLastMovie = index === movies.length - 1;
+
+ return (
+ <div
+ key={movie.id}
+ ref={isLastMovie ? lastElementRef : null} // ๋ง์ง๋ง ์์์ ref ์ฐ๊ฒฐ
+ >
+ <MovieItem
+ key={movie.id}
+ id={movie.id}
+ title={movie.title}
+ poster_path={movie.poster_path}
+ vote_average={movie.vote_average}
+ />
+ </div>
+ );
+ })
+ )}
+ {isFetchingNextPage && <SkeletonMovieList />}
+
+ {searchText && movies.length === 0 && <S.Message>๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค.</S.Message>}
+ </S.MovieList>
+ );
+};
+
+export default MovieList; | Unknown | ๋ฐ์ดํฐ ํ์ ์ฒ๋ฆฌ๋ฅผ MovieList์์ ํ๊ณ ์๊ตฐ์! ์ ์๊ฐ์๋ ์ญํ ์ ๋ฐ๋ผ useGetList์์ ๋ด๋นํ ์๋ ์์ ๊ฒ ๊ฐ์์! |
@@ -0,0 +1,66 @@
+import {useAtomValue} from 'jotai';
+import useGetList from '../../hooks/useGetList';
+import useInfiniteScroll from '../../hooks/useInfiniteScroll';
+import * as S from './styles';
+import MovieItem from '../MovieItem';
+import SkeletonMovieList from '../skeleton/MovieList';
+import {searchTextAtom} from '../../jotai/atoms';
+
+interface MovieListProps {
+ openModal: (movieId: number) => void;
+}
+
+const MovieList = ({openModal}: MovieListProps) => {
+ const {movies, hasNextPage, fetchNextPage, isLoading, isFetchingNextPage} = useGetList();
+ const searchText = useAtomValue(searchTextAtom);
+
+ const lastElementRef = useInfiniteScroll({
+ fetchNextPage,
+ isLoading,
+ isLastPage: !hasNextPage,
+ });
+
+ const handleItemClick = (event: React.MouseEvent<HTMLUListElement>) => {
+ event.preventDefault();
+
+ const listItem = (event.target as HTMLElement).closest('li');
+ if (!listItem) return;
+
+ const id = Number(listItem.id);
+ const selectedItem = movies.find(item => item.id === id);
+
+ if (selectedItem) openModal(id);
+ };
+
+ return (
+ <S.MovieList onClick={handleItemClick}>
+ {isLoading ? (
+ <SkeletonMovieList />
+ ) : (
+ movies.map((movie, index) => {
+ const isLastMovie = index === movies.length - 1;
+
+ return (
+ <div
+ key={movie.id}
+ ref={isLastMovie ? lastElementRef : null} // ๋ง์ง๋ง ์์์ ref ์ฐ๊ฒฐ
+ >
+ <MovieItem
+ key={movie.id}
+ id={movie.id}
+ title={movie.title}
+ poster_path={movie.poster_path}
+ vote_average={movie.vote_average}
+ />
+ </div>
+ );
+ })
+ )}
+ {isFetchingNextPage && <SkeletonMovieList />}
+
+ {searchText && movies.length === 0 && <S.Message>๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค.</S.Message>}
+ </S.MovieList>
+ );
+};
+
+export default MovieList; | Unknown | ์ค ์ด๋ ๊ฒ ๋ฌดํ ์คํฌ๋กค ๋ก์ง์ ๋ถ๋ฆฌํ๋ ์ ๋ง ๊น๋ํ๋ค์๐๐ป |
@@ -0,0 +1,66 @@
+import {useAtomValue} from 'jotai';
+import useGetList from '../../hooks/useGetList';
+import useInfiniteScroll from '../../hooks/useInfiniteScroll';
+import * as S from './styles';
+import MovieItem from '../MovieItem';
+import SkeletonMovieList from '../skeleton/MovieList';
+import {searchTextAtom} from '../../jotai/atoms';
+
+interface MovieListProps {
+ openModal: (movieId: number) => void;
+}
+
+const MovieList = ({openModal}: MovieListProps) => {
+ const {movies, hasNextPage, fetchNextPage, isLoading, isFetchingNextPage} = useGetList();
+ const searchText = useAtomValue(searchTextAtom);
+
+ const lastElementRef = useInfiniteScroll({
+ fetchNextPage,
+ isLoading,
+ isLastPage: !hasNextPage,
+ });
+
+ const handleItemClick = (event: React.MouseEvent<HTMLUListElement>) => {
+ event.preventDefault();
+
+ const listItem = (event.target as HTMLElement).closest('li');
+ if (!listItem) return;
+
+ const id = Number(listItem.id);
+ const selectedItem = movies.find(item => item.id === id);
+
+ if (selectedItem) openModal(id);
+ };
+
+ return (
+ <S.MovieList onClick={handleItemClick}>
+ {isLoading ? (
+ <SkeletonMovieList />
+ ) : (
+ movies.map((movie, index) => {
+ const isLastMovie = index === movies.length - 1;
+
+ return (
+ <div
+ key={movie.id}
+ ref={isLastMovie ? lastElementRef : null} // ๋ง์ง๋ง ์์์ ref ์ฐ๊ฒฐ
+ >
+ <MovieItem
+ key={movie.id}
+ id={movie.id}
+ title={movie.title}
+ poster_path={movie.poster_path}
+ vote_average={movie.vote_average}
+ />
+ </div>
+ );
+ })
+ )}
+ {isFetchingNextPage && <SkeletonMovieList />}
+
+ {searchText && movies.length === 0 && <S.Message>๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค.</S.Message>}
+ </S.MovieList>
+ );
+};
+
+export default MovieList; | Unknown | closest๋ฅผ ์ฌ์ฉํ ์ด์ ๊ฐ ์์๊น์?! |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.