Merge pull request #74 from keke125/development

refactor: Reorganize code into modules and remove unused code.

src/main/java/ntou/auction/spring/NtouAuctionJavaApplication.java

@@ -1,6 +1,6 @@
 package ntou.auction.spring;
 
-import ntou.auction.spring.data.service.UserRepository;
+import ntou.auction.spring.account.repository.UserRepository;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.sql.init.SqlDataSourceScriptDatabaseInitializer;

src/main/java/ntou/auction/spring/security/JWTRequestFilter.java → src/main/java/ntou/auction/spring/account/config/JWTRequestFilter.java

@@ -1,9 +1,11 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.config;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import ntou.auction.spring.account.service.JWTService;
+import ntou.auction.spring.account.service.UserDetailsServiceImpl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;

src/main/java/ntou/auction/spring/security/SecurityConfiguration.java → src/main/java/ntou/auction/spring/account/config/SecurityConfiguration.java

@@ -1,7 +1,6 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.config;
 
-import ntou.auction.spring.core.AppConfig;
-import ntou.auction.spring.data.Role;
+import ntou.auction.spring.util.AppConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;

src/main/java/ntou/auction/spring/controller/AuthController.java → src/main/java/ntou/auction/spring/account/controller/AuthController.java

@@ -1,12 +1,12 @@
-package ntou.auction.spring.controller;
+package ntou.auction.spring.account.controller;
 
 import jakarta.validation.Valid;
-import ntou.auction.spring.data.Role;
-import ntou.auction.spring.data.entity.User;
-import ntou.auction.spring.data.service.UserService;
-import ntou.auction.spring.security.AuthRequest;
-import ntou.auction.spring.security.JWTService;
-import ntou.auction.spring.security.SignupRequest;
+import ntou.auction.spring.account.entity.Role;
+import ntou.auction.spring.account.entity.User;
+import ntou.auction.spring.account.service.UserService;
+import ntou.auction.spring.account.request.AuthRequest;
+import ntou.auction.spring.account.service.JWTService;
+import ntou.auction.spring.account.request.SignupRequest;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/ntou/auction/spring/controller/UserController.java → src/main/java/ntou/auction/spring/account/controller/UserController.java

@@ -1,13 +1,13 @@
-package ntou.auction.spring.controller;
+package ntou.auction.spring.account.controller;
 
 import jakarta.validation.Valid;
-import ntou.auction.spring.data.entity.FavoriteRequest;
-import ntou.auction.spring.data.entity.Product;
-import ntou.auction.spring.data.entity.User;
-import ntou.auction.spring.data.service.ProductService;
-import ntou.auction.spring.data.service.UserIdentity;
-import ntou.auction.spring.data.service.UserService;
-import ntou.auction.spring.security.SignupRequest;
+import ntou.auction.spring.account.request.FavoriteRequest;
+import ntou.auction.spring.product.entity.Product;
+import ntou.auction.spring.account.entity.User;
+import ntou.auction.spring.product.service.ProductService;
+import ntou.auction.spring.account.response.UserIdentity;
+import ntou.auction.spring.account.service.UserService;
+import ntou.auction.spring.account.request.SignupRequest;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

src/main/java/ntou/auction/spring/account/entity/Role.java

@@ -0,0 +1,5 @@
+package ntou.auction.spring.account.entity;
+
+public enum Role {
+    USER, ADMIN
+}

src/main/java/ntou/auction/spring/data/entity/User.java → src/main/java/ntou/auction/spring/account/entity/User.java

@@ -1,14 +1,14 @@
-package ntou.auction.spring.data.entity;
+package ntou.auction.spring.account.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
-import ntou.auction.spring.data.Role;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import ntou.auction.spring.util.AbstractEntity;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/ntou/auction/spring/data/service/UserRepository.java → src/main/java/ntou/auction/spring/account/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package ntou.auction.spring.data.service;
+package ntou.auction.spring.account.repository;
 
-import ntou.auction.spring.data.entity.User;
+import ntou.auction.spring.account.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

src/main/java/ntou/auction/spring/security/AuthRequest.java → src/main/java/ntou/auction/spring/account/request/AuthRequest.java

@@ -1,4 +1,4 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.request;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

src/main/java/ntou/auction/spring/data/entity/FavoriteRequest.java → src/main/java/ntou/auction/spring/account/request/FavoriteRequest.java

@@ -1,4 +1,4 @@
-package ntou.auction.spring.data.entity;
+package ntou.auction.spring.account.request;
 
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

src/main/java/ntou/auction/spring/security/SignupRequest.java → src/main/java/ntou/auction/spring/account/request/SignupRequest.java

@@ -1,4 +1,4 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.request;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Email;

src/main/java/ntou/auction/spring/security/AuthResponse.java → src/main/java/ntou/auction/spring/account/response/AuthResponse.java

@@ -1,4 +1,4 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.response;
 
 import lombok.Data;
 

src/main/java/ntou/auction/spring/data/service/UserIdentity.java → src/main/java/ntou/auction/spring/account/response/UserIdentity.java

@@ -1,7 +1,8 @@
-package ntou.auction.spring.data.service;
+package ntou.auction.spring.account.response;
 
-import ntou.auction.spring.data.Role;
-import ntou.auction.spring.data.entity.User;
+import ntou.auction.spring.account.service.UserService;
+import ntou.auction.spring.account.entity.Role;
+import ntou.auction.spring.account.entity.User;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/ntou/auction/spring/security/JWTService.java → src/main/java/ntou/auction/spring/account/service/JWTService.java

@@ -1,8 +1,9 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.service;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import ntou.auction.spring.account.request.AuthRequest;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

src/main/java/ntou/auction/spring/security/UserDetailsServiceImpl.java → src/main/java/ntou/auction/spring/account/service/UserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
-package ntou.auction.spring.security;
+package ntou.auction.spring.account.service;
 
-import ntou.auction.spring.data.entity.User;
-import ntou.auction.spring.data.service.UserRepository;
+import ntou.auction.spring.account.entity.User;
+import ntou.auction.spring.account.repository.UserRepository;
 
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/ntou/auction/spring/data/service/UserService.java → src/main/java/ntou/auction/spring/account/service/UserService.java

@@ -1,10 +1,11 @@
-package ntou.auction.spring.data.service;
+package ntou.auction.spring.account.service;
 
-import ntou.auction.spring.data.entity.User;
+import ntou.auction.spring.account.entity.User;
 
 import java.util.Optional;
 import java.util.Set;
 
+import ntou.auction.spring.account.repository.UserRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/ntou/auction/spring/chat/config/AuthChannelInterceptor.java

@@ -1,8 +1,8 @@
 package ntou.auction.spring.chat.config;
 
 import io.micrometer.common.util.StringUtils;
-import ntou.auction.spring.security.JWTService;
-import ntou.auction.spring.security.UserDetailsServiceImpl;
+import ntou.auction.spring.account.service.JWTService;
+import ntou.auction.spring.account.service.UserDetailsServiceImpl;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.messaging.Message;
@@ -39,7 +39,7 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
             List<String> header = accessor.getNativeHeader("Authorization");
             // header裡面有沒有token
             if (header != null && !header.isEmpty()) {
-                String token = header.get(0);
+                String token = header.getFirst();
                 if (StringUtils.isNotBlank(token)) {
                     String username = JWTService.validateTokenAndGetUsername(token);
                     System.out.println("username:" + username);

src/main/java/ntou/auction/spring/chat/config/WebSocketMessageConfig.java

@@ -12,7 +12,6 @@
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 
-import java.net.http.WebSocketHandshakeException;
 import java.util.List;
 
 @Configuration

src/main/java/ntou/auction/spring/chat/controller/ChatController.java

@@ -1,12 +1,12 @@
 package ntou.auction.spring.chat.controller;
 
 
-import ntou.auction.spring.chat.data.entity.ChatMessage;
-import ntou.auction.spring.chat.data.entity.ChatNotification;
-import ntou.auction.spring.chat.data.service.ChatMessageService;
-import ntou.auction.spring.chat.data.service.ChatRoomService;
-import ntou.auction.spring.data.service.UserIdentity;
-import ntou.auction.spring.data.service.UserService;
+import ntou.auction.spring.chat.entity.ChatMessage;
+import ntou.auction.spring.chat.entity.ChatNotification;
+import ntou.auction.spring.chat.service.ChatMessageService;
+import ntou.auction.spring.chat.service.ChatRoomService;
+import ntou.auction.spring.account.response.UserIdentity;
+import ntou.auction.spring.account.service.UserService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -45,13 +45,6 @@ public ChatController(UserService userService, UserIdentity userIdentity, SimpMe
 
     @MessageMapping("/send")
     public void sendMessage(@Payload ChatMessage chatMessage, Principal principal) {
-        /*
-        User sender = userService.findByUsername(userIdentity.getUsername());
-        ChatMessage message = new ChatMessage();
-        message.setSenderId(sender.getId());
-        message.setReceiverId(chatMessageRequest.getReceiverId());
-        message.setContent(chatMessageRequest.getContent());
-        */
 
         // token無效
         if (principal.getName() == null) {

src/main/java/ntou/auction/spring/chat/data/entity/ChatMessage.java → src/main/java/ntou/auction/spring/chat/entity/ChatMessage.java

@@ -1,11 +1,11 @@
-package ntou.auction.spring.chat.data.entity;
+package ntou.auction.spring.chat.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.persistence.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ntou.auction.spring.data.entity.AbstractEntity;
+import ntou.auction.spring.util.AbstractEntity;
 import java.time.LocalDateTime;
 
 @Entity

src/main/java/ntou/auction/spring/chat/data/entity/ChatMessageStatus.java → src/main/java/ntou/auction/spring/chat/entity/ChatMessageStatus.java

@@ -1,4 +1,4 @@
-package ntou.auction.spring.chat.data.entity;
+package ntou.auction.spring.chat.entity;
 
 public enum ChatMessageStatus {
     RECEIVED, DELIVERED

src/main/java/ntou/auction/spring/chat/data/entity/ChatNotification.java → src/main/java/ntou/auction/spring/chat/entity/ChatNotification.java

@@ -1,9 +1,9 @@
-package ntou.auction.spring.chat.data.entity;
+package ntou.auction.spring.chat.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ntou.auction.spring.data.entity.AbstractEntity;
+import ntou.auction.spring.util.AbstractEntity;
 
 @Data
 @AllArgsConstructor

src/main/java/ntou/auction/spring/chat/data/entity/ChatRoom.java → src/main/java/ntou/auction/spring/chat/entity/ChatRoom.java

@@ -1,10 +1,10 @@
-package ntou.auction.spring.chat.data.entity;
+package ntou.auction.spring.chat.entity;
 
 import jakarta.persistence.Entity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ntou.auction.spring.data.entity.AbstractEntity;
+import ntou.auction.spring.util.AbstractEntity;
 @Entity
 @Data
 @NoArgsConstructor

src/main/java/ntou/auction/spring/chat/repository/ChatMessageRepository.java

@@ -2,11 +2,10 @@
 
 
 import jakarta.validation.constraints.NotNull;
-import ntou.auction.spring.chat.data.entity.ChatMessageStatus;
-import ntou.auction.spring.chat.data.entity.ChatMessage;
+import ntou.auction.spring.chat.entity.ChatMessageStatus;
+import ntou.auction.spring.chat.entity.ChatMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/ntou/auction/spring/chat/repository/ChatRoomRepository.java

@@ -1,6 +1,6 @@
 package ntou.auction.spring.chat.repository;
 
-import ntou.auction.spring.chat.data.entity.ChatRoom;
+import ntou.auction.spring.chat.entity.ChatRoom;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

src/main/java/ntou/auction/spring/chat/data/service/ChatMessageService.java → src/main/java/ntou/auction/spring/chat/service/ChatMessageService.java

@@ -1,7 +1,7 @@
-package ntou.auction.spring.chat.data.service;
+package ntou.auction.spring.chat.service;
 
-import ntou.auction.spring.chat.data.entity.ChatMessage;
-import ntou.auction.spring.chat.data.entity.ChatMessageStatus;
+import ntou.auction.spring.chat.entity.ChatMessage;
+import ntou.auction.spring.chat.entity.ChatMessageStatus;
 import ntou.auction.spring.chat.exception.MessageNotFound;
 import ntou.auction.spring.chat.repository.ChatMessageRepository;
 import org.springframework.stereotype.Service;

src/main/java/ntou/auction/spring/chat/data/service/ChatRoomService.java → src/main/java/ntou/auction/spring/chat/service/ChatRoomService.java

@@ -1,6 +1,6 @@
-package ntou.auction.spring.chat.data.service;
+package ntou.auction.spring.chat.service;
 
-import ntou.auction.spring.chat.data.entity.ChatRoom;
+import ntou.auction.spring.chat.entity.ChatRoom;
 import ntou.auction.spring.chat.repository.ChatRoomRepository;
 import org.springframework.stereotype.Service;
 

src/main/java/ntou/auction/spring/mail/EmailService.java

@@ -2,10 +2,10 @@
 
 import jakarta.mail.Message;
 import jakarta.mail.internet.InternetAddress;
-import ntou.auction.spring.core.AppConfig;
-import ntou.auction.spring.data.entity.Product;
-import ntou.auction.spring.data.entity.User;
-import ntou.auction.spring.data.service.UserService;
+import ntou.auction.spring.util.AppConfig;
+import ntou.auction.spring.product.entity.Product;
+import ntou.auction.spring.account.entity.User;
+import ntou.auction.spring.account.service.UserService;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessagePreparator;

src/main/java/ntou/auction/spring/controller/OrderController.java → src/main/java/ntou/auction/spring/order/controller/OrderController.java

@@ -1,8 +1,16 @@
-package ntou.auction.spring.controller;
+package ntou.auction.spring.order.controller;
 
 import jakarta.validation.Valid;
-import ntou.auction.spring.data.entity.*;
-import ntou.auction.spring.data.service.*;
+import ntou.auction.spring.account.response.UserIdentity;
+import ntou.auction.spring.account.service.UserService;
+import ntou.auction.spring.order.entity.Order;
+import ntou.auction.spring.order.request.AddOrderRequest;
+import ntou.auction.spring.order.request.OperateOrderRequest;
+import ntou.auction.spring.order.response.OrderWithProductDetail;
+import ntou.auction.spring.order.service.OrderService;
+import ntou.auction.spring.product.entity.Product;
+import ntou.auction.spring.product.service.ProductService;
+import ntou.auction.spring.shoppingcart.service.ShoppingcartService;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -118,7 +126,7 @@ ResponseEntity<Map<String, String>> addOrder(@Valid @RequestBody AddOrderRequest
         List<List<Long>> getrequest = request.getProductList();
 
         for (List<Long> eachProductAddAmount : getrequest) {
-            Long productId = eachProductAddAmount.get(0);
+            Long productId = eachProductAddAmount.getFirst();
             Product getProduct = productService.getID(productId);
             // Id error
             if (getProduct == null) {

src/main/java/ntou/auction/spring/data/entity/Order.java → src/main/java/ntou/auction/spring/order/entity/Order.java

@@ -1,12 +1,12 @@
-package ntou.auction.spring.data.entity;
+package ntou.auction.spring.order.entity;
 
-import ch.qos.logback.core.joran.sanity.Pair;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import ntou.auction.spring.util.AbstractEntity;
 
 import java.time.LocalDateTime;
 import java.util.*;