제버릇 개 못주고 깔끔하게 구현하지 못한 누누

README.md

@@ -1 +1,50 @@
 # jwp-shopping-cart
+
+## 기능 목록 Step2
+
+- [x] settings 페이지 연동
+    - [x] settings.html 변경
+- [x] 장바구니 페이지 연동
+    - [x] cart.html 변경
+
+- [x] DB 설계
+
+- [x] 필터 작성
+
+- [x] User 도메인 추가
+    - [x] User 도메인에 Cart 도메인 추가
+- [x] Cart 도메인 추가
+
+## 기능목록
+
+- [x] 상품 목록 페이지 연동
+    - [x] index.html 변경
+- [x] 상품 관리 CRUD API 작성
+    - [x] create product
+    - [x] read product
+    - [x] update product
+    - [x] delete product
+- [x] 관리자 도구 페이지 연동
+    - [x] admin.html 변경
+    - [x] admin.js 변경
+
+- [x] DB 설계
+
+# 도메인 구조
+
+```mermaid
+graph TD
+
+cart --> user
+cart --many--> product
+```
+
+# DB 설계
+
+```mermaid
+graph TD
+
+cart --> user
+cart --many--> cart_product
+product --many--> cart_product
+```

build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'

src/main/java/cart/JwpCartApplication.java

@@ -6,8 +6,7 @@
 @SpringBootApplication
 public class JwpCartApplication {
 
-    public static void main(String[] args) {
+    public static void main(final String[] args) {
         SpringApplication.run(JwpCartApplication.class, args);
     }
-
 }

src/main/java/cart/config/SecurityConfig.java

@@ -0,0 +1,34 @@
+package cart.config;
+
+import cart.filter.AuthenticationFilter;
+import cart.repository.user.UserRepository;
+import cart.resolver.AuthenticationResolver;
+import java.util.List;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class SecurityConfig implements WebMvcConfigurer {
+
+    private final UserRepository userRepository;
+
+    public SecurityConfig(final UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @Bean
+    public FilterRegistrationBean<AuthenticationFilter> filterRegistrationBean() {
+        final FilterRegistrationBean<AuthenticationFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new AuthenticationFilter(userRepository));
+        registrationBean.addUrlPatterns("/carts/*, /products/*");
+        return registrationBean;
+    }
+
+    @Override
+    public void addArgumentResolvers(final List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(new AuthenticationResolver());
+    }
+}

src/main/java/cart/controller/GlobalExceptionHandler.java

@@ -0,0 +1,68 @@
+package cart.controller;
+
+import cart.dto.ErrorResponse;
+import cart.exception.AlreadyAddedProductException;
+import cart.exception.CartNotFoundException;
+import cart.exception.ProductInCartDeleteException;
+import cart.exception.ProductNotFoundException;
+import cart.exception.UserNotFoundException;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    @ExceptionHandler
+    private ResponseEntity<ErrorResponse> handleException(final Exception exception) {
+        log.error("예상치 못한 예외가 발생했습니다.", exception);
+        return ResponseEntity.internalServerError().body(new ErrorResponse("예상치 못한 예외가 발생했습니다."));
+    }
+
+    @ExceptionHandler
+    private ResponseEntity<ErrorResponse> handleIllegalArgumentException(final IllegalArgumentException exception) {
+        log.warn("잘못된 인자가 들어왔습니다", exception);
+        return ResponseEntity.badRequest().body(new ErrorResponse(exception.getMessage()));
+    }
+
+    @ExceptionHandler({CartNotFoundException.class, ProductNotFoundException.class, UserNotFoundException.class})
+    private ResponseEntity<ErrorResponse> handleNotFoundException(final Exception exception) {
+        log.warn("존재하지 않는 리소스에 접근했습니다.", exception);
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(exception.getMessage()));
+    }
+
+    @ExceptionHandler
+    private ResponseEntity<ErrorResponse> handleAlreadyAddedProduct(final AlreadyAddedProductException e) {
+        log.warn("이미 장바구니에 담긴 상품입니다.", e);
+        return ResponseEntity.badRequest().body(new ErrorResponse(e.getMessage()));
+    }
+
+    @ExceptionHandler
+    private ResponseEntity<ErrorResponse> handleProductInCartDelete(final ProductInCartDeleteException e) {
+        log.warn("장바구니에 담긴 상품을 삭제할 수 없습니다.", e);
+        return ResponseEntity.badRequest().body(new ErrorResponse(e.getMessage()));
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(
+            final MethodArgumentNotValidException exception, final HttpHeaders headers, final HttpStatus status,
+            final WebRequest request) {
+        log.warn("유효성 검사에 실패했습니다.", exception);
+        final Map<String, String> body = exception.getFieldErrors()
+                .stream()
+                .collect(Collectors.toMap(FieldError::getField, FieldError::getDefaultMessage));
+        return handleExceptionInternal(exception, body, headers, status, request);
+    }
+}

src/main/java/cart/controller/cart/CartApiController.java

@@ -0,0 +1,62 @@
+package cart.controller.cart;
+
+import cart.domain.cart.Cart;
+import cart.domain.product.Product;
+import cart.dto.cart.AddCartResponse;
+import cart.dto.cart.AddProductRequest;
+import cart.dto.cart.FindCartResponse;
+import cart.resolver.AuthInfo;
+import cart.resolver.Authentication;
+import cart.service.cart.CartCommandService;
+import cart.service.cart.CartQueryService;
+import cart.service.product.ProductQueryService;
+import java.util.List;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/carts/cartproduct")
+public class CartApiController {
+
+    private final CartCommandService cartCommandService;
+    private final ProductQueryService productQueryService;
+    private final CartQueryService cartQueryService;
+
+    public CartApiController(final CartCommandService cartCommandService,
+            final ProductQueryService productQueryService,
+            final CartQueryService cartQueryService) {
+        this.cartCommandService = cartCommandService;
+        this.productQueryService = productQueryService;
+        this.cartQueryService = cartQueryService;
+    }
+
+    @PostMapping
+    public ResponseEntity<AddCartResponse> addProduct(@RequestBody final AddProductRequest addProductRequest,
+            @Authentication final AuthInfo authInfo) {
+        final Long productId = addProductRequest.getProductId();
+        final String email = authInfo.getEmail();
+        final Cart cart = cartCommandService.addProduct(productId, email);
+        return ResponseEntity.ok(AddCartResponse.from(cart));
+    }
+
+    @GetMapping
+    public ResponseEntity<FindCartResponse> findCart(@Authentication final AuthInfo authInfo) {
+        final Cart cart = cartQueryService.findByEmail(authInfo.getEmail());
+        final List<Product> products = productQueryService.findAllByIds(cart.getCartProducts().getProductIds());
+        return ResponseEntity.ok(FindCartResponse.of(cart, products));
+    }
+
+    @DeleteMapping("/{cartProductId}")
+    public ResponseEntity<Void> deleteProduct(@Authentication final AuthInfo authInfo,
+            @PathVariable final Long cartProductId) {
+        final String email = authInfo.getEmail();
+        cartCommandService.deleteProduct(cartProductId, email);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/cart/controller/cart/CartViewController.java

@@ -0,0 +1,13 @@
+package cart.controller.cart;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class CartViewController {
+
+    @GetMapping("/cart")
+    public String getCartPage() {
+        return "cart";
+    }
+}

src/main/java/cart/controller/product/ProductApiController.java

@@ -0,0 +1,73 @@
+package cart.controller.product;
+
+import cart.domain.product.Product;
+import cart.dto.product.ProductRequest;
+import cart.dto.product.ProductResponse;
+import cart.service.product.ProductCommandService;
+import cart.service.product.ProductQueryService;
+import java.net.URI;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ProductApiController {
+
+    private final ProductCommandService productCommandService;
+    private final ProductQueryService productQueryService;
+
+    public ProductApiController(final ProductCommandService productCommandService,
+            final ProductQueryService productQueryService) {
+        this.productCommandService = productCommandService;
+        this.productQueryService = productQueryService;
+    }
+
+    @PostMapping("/products")
+    public ResponseEntity<ProductResponse> createProduct(@RequestBody @Valid final ProductRequest productRequest) {
+        final Product product = productCommandService.create(
+                productRequest.getName(),
+                productRequest.getImage(),
+                productRequest.getPrice());
+
+        final ProductResponse productResponse = ProductResponse.from(product);
+        return ResponseEntity.created(URI.create("/products/" + product.getProductId()))
+                .body(productResponse);
+    }
+
+    @GetMapping("/products")
+    public ResponseEntity<List<ProductResponse>> getAllProducts() {
+        final List<ProductResponse> productResponses = productQueryService.findAll()
+                .stream()
+                .map(ProductResponse::from)
+                .collect(Collectors.toList());
+
+        return ResponseEntity.ok(productResponses);
+    }
+
+    @PutMapping("/products/{id}")
+    public ResponseEntity<ProductResponse> updateProduct(@PathVariable final long id,
+            @RequestBody @Valid final ProductRequest productRequest) {
+        final Product product = productCommandService.update(
+                id,
+                productRequest.getName(),
+                productRequest.getImage(),
+                productRequest.getPrice());
+
+        final ProductResponse productResponse = ProductResponse.from(product);
+        return ResponseEntity.ok(productResponse);
+    }
+
+    @DeleteMapping("/products/{id}")
+    public ResponseEntity<Void> deleteProduct(@PathVariable final long id) {
+        productCommandService.delete(id);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/cart/controller/product/ProductViewController.java

@@ -0,0 +1,42 @@
+package cart.controller.product;
+
+import cart.dto.product.ProductResponse;
+import cart.service.product.ProductQueryService;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class ProductViewController {
+
+    private final ProductQueryService productSearchService;
+
+    public ProductViewController(final ProductQueryService productSearchService) {
+        this.productSearchService = productSearchService;
+    }
+
+    @GetMapping("/")
+    public String getIndexPage(final Model model) {
+        final List<ProductResponse> productResponses = productSearchService.findAll()
+                .stream()
+                .map(ProductResponse::from)
+                .collect(Collectors.toList());
+
+        model.addAttribute("products", productResponses);
+        return "index";
+    }
+
+    @GetMapping("/admin")
+    public String getAdminPage(final Model model) {
+        final List<ProductResponse> productResponses = productSearchService.findAll()
+                .stream()
+                .map(ProductResponse::from)
+                .collect(Collectors.toList());
+
+        model.addAttribute("products", productResponses);
+        return "admin";
+    }
+
+}

src/main/java/cart/controller/setting/SettingViewController.java

@@ -0,0 +1,30 @@
+package cart.controller.setting;
+
+import cart.dto.user.UserResponse;
+import cart.service.user.UserQueryService;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class SettingViewController {
+
+    private final UserQueryService userQueryService;
+
+    public SettingViewController(final UserQueryService userQueryService) {
+        this.userQueryService = userQueryService;
+    }
+
+    @GetMapping("/settings")
+    public String getSettingsPage(final Model model) {
+        final List<UserResponse> userResponses = userQueryService.findAll()
+                .stream()
+                .map(UserResponse::from)
+                .collect(Collectors.toList());
+
+        model.addAttribute("members", userResponses);
+        return "settings";
+    }
+}