From 61a9cc016e414be50b169f95146a4f1561db9efa Mon Sep 17 00:00:00 2001 From: LeeJongWon <106072775+LJW22222@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:19:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20User=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=ED=83=88=ED=87=B4=20=EB=B2=84=EA=B7=B8=20fix=20=EB=B0=8F=20imp?= =?UTF-8?q?ort=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../petmatz/api/chatting/ChatController.java | 2 +- ...ontroller.java => ChatRoomController.java} | 2 +- .../com/petmatz/api/global/ImageErrorApi.java | 1 - .../exception/GlobalExceptionHandler.java | 1 - .../com/petmatz/api/pet/PetController.java | 3 +- .../sosboard/dto/LegercySosBoardResponse.java | 3 +- .../sosboard/dto/SosBoardCreateRequest.java | 3 - .../api/sosboard/dto/SosBoardPetResponse.java | 1 - .../api/sosboard/dto/SosBoardResponse.java | 4 -- .../dto/SpecificSosBoardResponse.java | 1 - .../api/user/controller/AuthController.java | 7 +-- .../api/user/controller/EmailController.java | 2 - .../api/user/controller/JwtController.java | 1 - .../user/controller/LocationController.java | 1 - .../api/user/controller/PageController.java | 2 +- .../user/controller/PasswordController.java | 3 - .../user/controller/RecommendController.java | 2 - .../FailedAuthenticationEntryPoint.java | 2 - .../common/config/WebSecurityConfig.java | 7 --- .../filter/JwtAuthenticationFilter.java | 1 - .../handler/NotFoundExceptionHandler.java | 16 ------ .../security/handler/OAuthSuccessHandler.java | 1 - .../security/jwt/JwtExtractProviderImpl.java | 1 - .../common/security/jwt/JwtManager.java | 1 - .../domain/chatting/ChatMessageService.java | 2 - .../domain/chatting/ChatRoomService.java | 45 +++++---------- .../chatting/component/ChatDocsAppend.java | 1 - .../component/ChatRoomMetaDataReader.java | 5 +- .../chatting/component/ChatRoomReader.java | 10 ++-- .../chatting/docs/ChatReadStatusDocs.java | 10 ++-- .../domain/chatting/docs/ChatRoomDocs.java | 10 ++-- .../chatting/docs/ChatRoomMetadataDocs.java | 15 +++-- .../chatting/entity/UserToChatRoomEntity.java | 8 +++ .../repository/ChatRoomRepository.java | 1 + .../repository/UserToChatRoomRepository.java | 8 ++- .../match/component/MatchScoreCalculator.java | 1 - .../match/component/MatchSizeCalculator.java | 1 - .../com/petmatz/domain/pet/PetService.java | 4 +- .../domain/pet/component/PetUpdater.java | 1 - .../petmatz/domain/pet/dto/PetUpdateInfo.java | 1 - .../domain/petmission/PetMissionService.java | 30 +++++----- .../component/UserToPetMissionReader.java | 1 - .../petmission/entity/PetMissionEntity.java | 6 +- .../UserToPetMissionRepository.java | 1 - .../domain/sosboard/SosBoardRepository.java | 2 - .../domain/sosboard/SosBoardService.java | 1 - .../sosboard/dto/LegercySosBoardInfo.java | 1 - .../domain/sosboard/dto/SosBoardInfoList.java | 1 - .../domain/sosboard/entity/PetSosBoard.java | 4 +- .../domain/sosboard/entity/SosBoard.java | 1 - .../user/component/CookieComponent.java | 2 +- .../user/component/GeocodingComponent.java | 1 - .../domain/user/component/HeartComponent.java | 2 +- .../CheckCertificationResponseDto.java | 26 --------- .../user/response/DeleteIdResponseDto.java | 26 --------- .../response/EditMyProfileResponseDto.java | 13 ----- .../EmailCertificationResponseDto.java | 27 --------- .../response/GetHeartingListResponseDto.java | 24 -------- .../response/GetMyProfileResponseDto.java | 5 -- .../response/GetOtherProfileResponseDto.java | 5 -- .../GetRecommendationResponseDto.java | 8 --- .../user/response/RepasswordResponseDto.java | 20 ------- .../response/SendRepasswordResponseDto.java | 20 ------- .../domain/user/response/SignUpResponse.java | 3 - .../user/response/SignUpResponseDto.java | 57 ------------------- .../response/UpdateLocationResponseDto.java | 5 -- .../UpdateRecommendationResponseDto.java | 19 ------- .../domain/user/service/AuthService.java | 4 +- .../domain/user/service/EmailService.java | 2 - .../domain/user/service/KakaoUserService.java | 2 +- .../domain/user/service/LocationService.java | 2 +- .../domain/user/service/PasswordService.java | 1 - .../domain/user/service/UserService.java | 3 - .../petmatz/user/common/LogInResponseDto.java | 39 ------------- .../com/petmatz/user/common/ResponseCode.java | 37 ------------ .../petmatz/user/common/ResponseMessage.java | 37 ------------ 76 files changed, 97 insertions(+), 532 deletions(-) rename src/main/java/com/petmatz/api/chatting/{MatchingController.java => ChatRoomController.java} (98%) delete mode 100644 src/main/java/com/petmatz/common/security/handler/NotFoundExceptionHandler.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/CheckCertificationResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/DeleteIdResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/EmailCertificationResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/GetHeartingListResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/RepasswordResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/SignUpResponseDto.java delete mode 100644 src/main/java/com/petmatz/domain/user/response/UpdateRecommendationResponseDto.java delete mode 100644 src/main/java/com/petmatz/user/common/LogInResponseDto.java delete mode 100644 src/main/java/com/petmatz/user/common/ResponseCode.java delete mode 100644 src/main/java/com/petmatz/user/common/ResponseMessage.java diff --git a/src/main/java/com/petmatz/api/chatting/ChatController.java b/src/main/java/com/petmatz/api/chatting/ChatController.java index 8bc569a..e49eaa6 100644 --- a/src/main/java/com/petmatz/api/chatting/ChatController.java +++ b/src/main/java/com/petmatz/api/chatting/ChatController.java @@ -7,8 +7,8 @@ import com.petmatz.domain.chatting.ChatMessageService; import com.petmatz.domain.chatting.ChatRoomService; import com.petmatz.domain.chatting.dto.ChatMessageInfo; -import com.petmatz.domain.user.service.UserService; import com.petmatz.domain.user.info.UserInfo; +import com.petmatz.domain.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/src/main/java/com/petmatz/api/chatting/MatchingController.java b/src/main/java/com/petmatz/api/chatting/ChatRoomController.java similarity index 98% rename from src/main/java/com/petmatz/api/chatting/MatchingController.java rename to src/main/java/com/petmatz/api/chatting/ChatRoomController.java index ec1316a..2bd5706 100644 --- a/src/main/java/com/petmatz/api/chatting/MatchingController.java +++ b/src/main/java/com/petmatz/api/chatting/ChatRoomController.java @@ -17,7 +17,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/api/v1/match") -public class MatchingController { +public class ChatRoomController { private final ChatRoomService chatRoomService; private final JwtExtractProvider jwtExtractProvider; diff --git a/src/main/java/com/petmatz/api/global/ImageErrorApi.java b/src/main/java/com/petmatz/api/global/ImageErrorApi.java index 8819ac9..e133a67 100644 --- a/src/main/java/com/petmatz/api/global/ImageErrorApi.java +++ b/src/main/java/com/petmatz/api/global/ImageErrorApi.java @@ -3,7 +3,6 @@ import com.petmatz.api.global.dto.ImageErrorRequest; import com.petmatz.api.global.dto.ImgType; import com.petmatz.domain.pet.PetService; -//import com.petmatz.domain.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/petmatz/api/global/exception/GlobalExceptionHandler.java b/src/main/java/com/petmatz/api/global/exception/GlobalExceptionHandler.java index 4419aa1..d229cdd 100644 --- a/src/main/java/com/petmatz/api/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/petmatz/api/global/exception/GlobalExceptionHandler.java @@ -3,7 +3,6 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.common.exception.BaseErrorCode; import com.petmatz.common.exception.ErrorReason; -import com.petmatz.domain.user.exception.UserErrorCode; import com.petmatz.domain.user.exception.UserException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/petmatz/api/pet/PetController.java b/src/main/java/com/petmatz/api/pet/PetController.java index ca916f3..56bdd20 100644 --- a/src/main/java/com/petmatz/api/pet/PetController.java +++ b/src/main/java/com/petmatz/api/pet/PetController.java @@ -2,8 +2,8 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.global.dto.S3ImgDataResponse; -import com.petmatz.api.pet.dto.PetRegisterNoRequest; import com.petmatz.api.pet.dto.PetInfoResponse; +import com.petmatz.api.pet.dto.PetRegisterNoRequest; import com.petmatz.api.pet.dto.PetRequest; import com.petmatz.api.pet.dto.PetUpdateRequest; import com.petmatz.common.security.jwt.JwtExtractProvider; @@ -11,7 +11,6 @@ import com.petmatz.domain.pet.PetService; import com.petmatz.domain.pet.dto.OpenApiPetInfo; import com.petmatz.domain.user.component.UserUtils; -import com.petmatz.domain.user.service.UserService; import com.petmatz.domain.user.entity.User; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/petmatz/api/sosboard/dto/LegercySosBoardResponse.java b/src/main/java/com/petmatz/api/sosboard/dto/LegercySosBoardResponse.java index 3ae6f62..946d95d 100644 --- a/src/main/java/com/petmatz/api/sosboard/dto/LegercySosBoardResponse.java +++ b/src/main/java/com/petmatz/api/sosboard/dto/LegercySosBoardResponse.java @@ -1,10 +1,11 @@ package com.petmatz.api.sosboard.dto; + import com.fasterxml.jackson.annotation.JsonFormat; import com.petmatz.api.pet.dto.PetResponse; import com.petmatz.domain.sosboard.PaymentType; +import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo; import com.petmatz.domain.sosboard.entity.PetSosBoard; import com.petmatz.domain.sosboard.entity.SosBoard; -import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardCreateRequest.java b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardCreateRequest.java index 6730708..04f973e 100644 --- a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardCreateRequest.java +++ b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardCreateRequest.java @@ -2,10 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.petmatz.api.pet.dto.PetResponse; -import com.petmatz.domain.sosboard.PaymentType; -import com.petmatz.domain.sosboard.dto.LegercySosBoardInfo; import com.petmatz.domain.sosboard.dto.SosBoardCreateInfo; -import com.petmatz.domain.user.entity.User; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardPetResponse.java b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardPetResponse.java index c6fbfb3..c081d70 100644 --- a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardPetResponse.java +++ b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardPetResponse.java @@ -1,6 +1,5 @@ package com.petmatz.api.sosboard.dto; -import com.petmatz.domain.sosboard.dto.SosBoardInfoList; import com.petmatz.domain.sosboard.dto.SosBoardPetInfo; import lombok.Builder; diff --git a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardResponse.java b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardResponse.java index 3990e92..547faaf 100644 --- a/src/main/java/com/petmatz/api/sosboard/dto/SosBoardResponse.java +++ b/src/main/java/com/petmatz/api/sosboard/dto/SosBoardResponse.java @@ -1,12 +1,8 @@ package com.petmatz.api.sosboard.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.petmatz.domain.pet.entity.Pet; import com.petmatz.domain.sosboard.PaymentType; import com.petmatz.domain.sosboard.dto.SosBoardInfo; -import com.petmatz.domain.sosboard.dto.SosBoardPet; -import com.petmatz.domain.sosboard.entity.SosBoard; -import com.petmatz.domain.user.entity.User; import lombok.Builder; import java.time.LocalDateTime; diff --git a/src/main/java/com/petmatz/api/sosboard/dto/SpecificSosBoardResponse.java b/src/main/java/com/petmatz/api/sosboard/dto/SpecificSosBoardResponse.java index dca44d8..2c0b382 100644 --- a/src/main/java/com/petmatz/api/sosboard/dto/SpecificSosBoardResponse.java +++ b/src/main/java/com/petmatz/api/sosboard/dto/SpecificSosBoardResponse.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.petmatz.domain.sosboard.PaymentType; -import com.petmatz.domain.sosboard.dto.SosBoardPetInfo; import com.petmatz.domain.sosboard.dto.SpecificSosBoardInfo; import lombok.Builder; diff --git a/src/main/java/com/petmatz/api/user/controller/AuthController.java b/src/main/java/com/petmatz/api/user/controller/AuthController.java index 02d906e..048acd9 100644 --- a/src/main/java/com/petmatz/api/user/controller/AuthController.java +++ b/src/main/java/com/petmatz/api/user/controller/AuthController.java @@ -2,17 +2,14 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.user.request.CheckCertificationRequestDto; -import com.petmatz.api.user.request.DeleteIdRequestDto; import com.petmatz.api.user.request.SignInRequestDto; import com.petmatz.api.user.request.SignUpRequestDto; -import com.petmatz.domain.user.entity.User; -import com.petmatz.domain.user.response.*; +import com.petmatz.domain.user.response.SignInResponseDto; +import com.petmatz.domain.user.response.SignUpResponse; import com.petmatz.domain.user.service.AuthService; -import com.petmatz.user.common.LogInResponseDto; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/petmatz/api/user/controller/EmailController.java b/src/main/java/com/petmatz/api/user/controller/EmailController.java index eec20c7..9c3d712 100644 --- a/src/main/java/com/petmatz/api/user/controller/EmailController.java +++ b/src/main/java/com/petmatz/api/user/controller/EmailController.java @@ -2,11 +2,9 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.user.request.EmailCertificationRequestDto; -import com.petmatz.domain.user.response.EmailCertificationResponseDto; import com.petmatz.domain.user.service.EmailService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/petmatz/api/user/controller/JwtController.java b/src/main/java/com/petmatz/api/user/controller/JwtController.java index ee36ce6..4666865 100644 --- a/src/main/java/com/petmatz/api/user/controller/JwtController.java +++ b/src/main/java/com/petmatz/api/user/controller/JwtController.java @@ -4,7 +4,6 @@ import com.petmatz.common.security.jwt.JwtManager; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseCookie; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/petmatz/api/user/controller/LocationController.java b/src/main/java/com/petmatz/api/user/controller/LocationController.java index 4b63313..112ab58 100644 --- a/src/main/java/com/petmatz/api/user/controller/LocationController.java +++ b/src/main/java/com/petmatz/api/user/controller/LocationController.java @@ -6,7 +6,6 @@ import com.petmatz.domain.user.service.LocationService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/petmatz/api/user/controller/PageController.java b/src/main/java/com/petmatz/api/user/controller/PageController.java index 8f7255b..3683886 100644 --- a/src/main/java/com/petmatz/api/user/controller/PageController.java +++ b/src/main/java/com/petmatz/api/user/controller/PageController.java @@ -2,10 +2,10 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.user.request.EditMyProfileRequestDto; -import com.petmatz.domain.user.service.PageService; import com.petmatz.domain.user.response.EditMyProfileResponseDto; import com.petmatz.domain.user.response.GetMyProfileResponseDto; import com.petmatz.domain.user.response.GetOtherProfileResponseDto; +import com.petmatz.domain.user.service.PageService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/petmatz/api/user/controller/PasswordController.java b/src/main/java/com/petmatz/api/user/controller/PasswordController.java index 2e80b7e..200661b 100644 --- a/src/main/java/com/petmatz/api/user/controller/PasswordController.java +++ b/src/main/java/com/petmatz/api/user/controller/PasswordController.java @@ -3,12 +3,9 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.user.request.RepasswordRequestDto; import com.petmatz.api.user.request.SendRepasswordRequestDto; -import com.petmatz.domain.user.response.RepasswordResponseDto; -import com.petmatz.domain.user.response.SendRepasswordResponseDto; import com.petmatz.domain.user.service.PasswordService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/petmatz/api/user/controller/RecommendController.java b/src/main/java/com/petmatz/api/user/controller/RecommendController.java index 613661a..1604415 100644 --- a/src/main/java/com/petmatz/api/user/controller/RecommendController.java +++ b/src/main/java/com/petmatz/api/user/controller/RecommendController.java @@ -3,11 +3,9 @@ import com.petmatz.api.global.dto.Response; import com.petmatz.api.user.request.UpdateRecommendationRequestDto; import com.petmatz.domain.user.response.GetRecommendationResponseDto; -import com.petmatz.domain.user.response.UpdateRecommendationResponseDto; import com.petmatz.domain.user.service.RecommendService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @RestController diff --git a/src/main/java/com/petmatz/common/config/FailedAuthenticationEntryPoint.java b/src/main/java/com/petmatz/common/config/FailedAuthenticationEntryPoint.java index 7e4b484..61d5541 100644 --- a/src/main/java/com/petmatz/common/config/FailedAuthenticationEntryPoint.java +++ b/src/main/java/com/petmatz/common/config/FailedAuthenticationEntryPoint.java @@ -14,8 +14,6 @@ public class FailedAuthenticationEntryPoint implements AuthenticationEntryPoint @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - System.out.println("request.getRequestURI() :: " + request.getRequestURI()); - System.out.println("request.getQueryString() :: " + request.getQueryString()); response.setContentType("application/json"); response.setStatus(HttpServletResponse.SC_FORBIDDEN); // 403 상태 반환 response.getWriter().write("{\"code\":\"NP\",\"message\":\"No Permission.\"}"); // 인증 실패 메시지 diff --git a/src/main/java/com/petmatz/common/config/WebSecurityConfig.java b/src/main/java/com/petmatz/common/config/WebSecurityConfig.java index 7e3bc7c..f2ead33 100644 --- a/src/main/java/com/petmatz/common/config/WebSecurityConfig.java +++ b/src/main/java/com/petmatz/common/config/WebSecurityConfig.java @@ -2,9 +2,6 @@ import com.petmatz.common.security.filter.JwtAuthenticationFilter; import com.petmatz.common.security.handler.OAuthSuccessHandler; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,17 +11,13 @@ import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.core.AuthenticationException; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; -import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import java.io.IOException; - @Configuration @EnableWebSecurity @RequiredArgsConstructor diff --git a/src/main/java/com/petmatz/common/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/petmatz/common/security/filter/JwtAuthenticationFilter.java index df183b2..36eba19 100644 --- a/src/main/java/com/petmatz/common/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/petmatz/common/security/filter/JwtAuthenticationFilter.java @@ -1,7 +1,6 @@ package com.petmatz.common.security.filter; import com.petmatz.common.security.jwt.JwtManager; -import com.petmatz.common.security.jwt.JwtProvider; import com.petmatz.domain.user.constant.LoginRole; import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.repository.UserRepository; diff --git a/src/main/java/com/petmatz/common/security/handler/NotFoundExceptionHandler.java b/src/main/java/com/petmatz/common/security/handler/NotFoundExceptionHandler.java deleted file mode 100644 index 9f1ce86..0000000 --- a/src/main/java/com/petmatz/common/security/handler/NotFoundExceptionHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.petmatz.common.security.handler; - -import com.petmatz.user.common.LogInResponseDto; -import org.springframework.http.ResponseEntity; -import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -@RestControllerAdvice -public class NotFoundExceptionHandler { - @ExceptionHandler({MethodArgumentNotValidException.class, HttpMessageNotReadableException.class}) - public ResponseEntity notFoundExceptionHandler(Exception e) { - return LogInResponseDto.userNotFound(); - } -} diff --git a/src/main/java/com/petmatz/common/security/handler/OAuthSuccessHandler.java b/src/main/java/com/petmatz/common/security/handler/OAuthSuccessHandler.java index d185261..78d1835 100644 --- a/src/main/java/com/petmatz/common/security/handler/OAuthSuccessHandler.java +++ b/src/main/java/com/petmatz/common/security/handler/OAuthSuccessHandler.java @@ -1,7 +1,6 @@ package com.petmatz.common.security.handler; import com.petmatz.common.security.jwt.JwtManager; -import com.petmatz.common.security.jwt.JwtProvider; import com.petmatz.domain.user.entity.CustomOAuthUser; import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.repository.UserRepository; diff --git a/src/main/java/com/petmatz/common/security/jwt/JwtExtractProviderImpl.java b/src/main/java/com/petmatz/common/security/jwt/JwtExtractProviderImpl.java index 12795bc..4b04e9f 100644 --- a/src/main/java/com/petmatz/common/security/jwt/JwtExtractProviderImpl.java +++ b/src/main/java/com/petmatz/common/security/jwt/JwtExtractProviderImpl.java @@ -1,7 +1,6 @@ package com.petmatz.common.security.jwt; import com.petmatz.domain.user.repository.UserRepository; -import com.petmatz.infra.redis.component.RedisTokenComponent; import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java index ba9d50b..d7df9e8 100644 --- a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java +++ b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java @@ -11,7 +11,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; import javax.crypto.SecretKey; diff --git a/src/main/java/com/petmatz/domain/chatting/ChatMessageService.java b/src/main/java/com/petmatz/domain/chatting/ChatMessageService.java index 78eb83a..bf3e206 100644 --- a/src/main/java/com/petmatz/domain/chatting/ChatMessageService.java +++ b/src/main/java/com/petmatz/domain/chatting/ChatMessageService.java @@ -1,6 +1,5 @@ package com.petmatz.domain.chatting; -import com.petmatz.api.chatting.dto.ChatReadStatusDirect; import com.petmatz.domain.chatting.component.ChatMessageReader; import com.petmatz.domain.chatting.component.ChatMessageUpdater; import com.petmatz.domain.chatting.docs.ChatReadStatusDocs; @@ -11,7 +10,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; -import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.stereotype.Service; import java.time.LocalDateTime; diff --git a/src/main/java/com/petmatz/domain/chatting/ChatRoomService.java b/src/main/java/com/petmatz/domain/chatting/ChatRoomService.java index 541c3e9..71bca35 100644 --- a/src/main/java/com/petmatz/domain/chatting/ChatRoomService.java +++ b/src/main/java/com/petmatz/domain/chatting/ChatRoomService.java @@ -11,10 +11,8 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -48,41 +46,28 @@ public long createdChatRoom(ChatRoomInfo chatRoomInfo) { return chatRoomId; } - public List selectChatRoomList(int pageSize, int startPage, String userEmail) { + public List selectChatRoomList(int pageSize, int startPage, String accountId) { - List chatRoomNumber = chatRoomReader.findChatRoomNumber(userEmail); - List roomNumberList = chatRoomNumber.stream() - .map(chatRoomEntity -> String.valueOf(chatRoomEntity.getChatRoom().getId())) - .distinct() - .toList(); + List chatRoomNumber = chatRoomReader.findChatRoomNumber(accountId); + List userToChatRoomEntities = chatRoomReader.selectChatRoomUserList(chatRoomNumber, accountId); - Map unreadCountList = updateMessageStatus(roomNumberList, userEmail, pageSize, startPage); - Map userList = getUserList(chatRoomNumber, userEmail); + Map unreadCountList = updateMessageStatus(chatRoomNumber, accountId, pageSize, startPage); + Map userList = getUserList(userToChatRoomEntities, accountId); - return chatRoomMetaDataReader.findChatRoomMetaDataInfo(roomNumberList, unreadCountList, userList); + return chatRoomMetaDataReader.findChatRoomMetaDataInfo(chatRoomNumber, unreadCountList, userList); } private Map getUserList(List chatRoomNumber, String userEmail) { - Map userList = new HashMap<>(); - - for (UserToChatRoomEntity userToChatRoomEntity : chatRoomNumber) { - String chatRoomId = userToChatRoomEntity.getChatRoom().getId().toString(); - - // 현재 사용자가 아닌 다른 사용자를 찾기 위한 스트림 사용 - userToChatRoomEntity.getChatRoom().getParticipants().stream() - .filter(participant -> !participant.getUser().getAccountId().equals(userEmail)) - .findFirst() // 첫 번째로 조건을 만족하는 사용자 찾기 - .ifPresent(participant -> { - IChatUserInfo userInfo = IChatUserInfo.of(participant.getUser()); - userList.put(chatRoomId, userInfo); - }); - } - return userList; + return chatRoomNumber.stream() + .collect(Collectors.toMap( + userToChatRoomEntity -> userToChatRoomEntity.getChatRoom().getId().toString(), // key: chatRoomId + userToChatRoomEntity -> IChatUserInfo.of(userToChatRoomEntity.getUser()) // value: IChatUserInfo + )); } - private Map updateMessageStatus(List chatRoomNumber,String userEmail, int pageSize, int startPage) { + private Map updateMessageStatus(List chatRoomNumber,String userEmail, int pageSize, int startPage) { Map unreadCountList = new HashMap<>(); - for (String roomId : chatRoomNumber) { + for (Long roomId : chatRoomNumber) { String chatRoomId = String.valueOf(roomId); ChatReadStatusDocs chatReadStatusDocs = chatReadStatusReader.selectChatMessageLastStatus(chatRoomId, userEmail); LocalDateTime lastReadTimestamp = chatReadStatusDocs.checkLastReadTimestamp(); diff --git a/src/main/java/com/petmatz/domain/chatting/component/ChatDocsAppend.java b/src/main/java/com/petmatz/domain/chatting/component/ChatDocsAppend.java index 0cf1c4f..76c1055 100644 --- a/src/main/java/com/petmatz/domain/chatting/component/ChatDocsAppend.java +++ b/src/main/java/com/petmatz/domain/chatting/component/ChatDocsAppend.java @@ -24,7 +24,6 @@ public void init(ChatRoomInfo chatRoomInfo,long chatRoomID) { ChatReadStatusDocs caregiverChatReadStatusDocs = createdChatReadStatusDocs(chatRoomInfo.caregiverInfo(),chatRoomID); ChatReadStatusDocs entrustedChatReadStatusDocs = createdChatReadStatusDocs(chatRoomInfo.entrustedInfo(),chatRoomID); - mongoTemplate.save(caregiverChatReadStatusDocs); mongoTemplate.save(entrustedChatReadStatusDocs); mongoTemplate.save(chatRoomDocs); diff --git a/src/main/java/com/petmatz/domain/chatting/component/ChatRoomMetaDataReader.java b/src/main/java/com/petmatz/domain/chatting/component/ChatRoomMetaDataReader.java index 28f4993..a7c3648 100644 --- a/src/main/java/com/petmatz/domain/chatting/component/ChatRoomMetaDataReader.java +++ b/src/main/java/com/petmatz/domain/chatting/component/ChatRoomMetaDataReader.java @@ -21,8 +21,9 @@ public class ChatRoomMetaDataReader { private final MongoTemplate mongoTemplate; //자기자신이 속한 채팅방의 메타데이터를 전부 조회 및 해당 채팅방의 안읽은 메세지 갯수를 업데이트해서 반환 - public List findChatRoomMetaDataInfo(List chatRoomNumbers, Map unreadCountList, Map userList) { - Criteria criteria = Criteria.where("_id").in(chatRoomNumbers); + public List findChatRoomMetaDataInfo(List chatRoomNumbers, Map unreadCountList, Map userList) { + List chatNumberList = chatRoomNumbers.stream().map(Object::toString).toList(); + Criteria criteria = Criteria.where("_id").in(chatNumberList); Query query = new Query(criteria); return mongoTemplate.find(query, ChatRoomMetadataDocs.class).stream() diff --git a/src/main/java/com/petmatz/domain/chatting/component/ChatRoomReader.java b/src/main/java/com/petmatz/domain/chatting/component/ChatRoomReader.java index 5370909..8accb48 100644 --- a/src/main/java/com/petmatz/domain/chatting/component/ChatRoomReader.java +++ b/src/main/java/com/petmatz/domain/chatting/component/ChatRoomReader.java @@ -20,10 +20,12 @@ public class ChatRoomReader { //TODO 예외처리 해야 함. //자기자신이 속한 채팅방을 전부 조회 - public List findChatRoomNumber(String userEmail) { - Optional> chatRoomEntities = userToChatRoomRepository.findByUser_AccountId(userEmail); - System.out.println(chatRoomEntities.get()); - return chatRoomEntities.get(); + public List findChatRoomNumber(String userEmail) { + return userToChatRoomRepository.findDistinctByUserAccountId(userEmail); + } + + public List selectChatRoomUserList(List chatRoomIdList, String accountId) { + return userToChatRoomRepository.selectChatRoomUserList(chatRoomIdList, accountId); } public Optional selectChatRoom(ChatRoomInfo chatRoomInfo) { diff --git a/src/main/java/com/petmatz/domain/chatting/docs/ChatReadStatusDocs.java b/src/main/java/com/petmatz/domain/chatting/docs/ChatReadStatusDocs.java index 580a952..127871d 100644 --- a/src/main/java/com/petmatz/domain/chatting/docs/ChatReadStatusDocs.java +++ b/src/main/java/com/petmatz/domain/chatting/docs/ChatReadStatusDocs.java @@ -4,6 +4,7 @@ import lombok.Builder; import lombok.Getter; import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.mongodb.core.mapping.Document; import java.time.LocalDateTime; @@ -13,12 +14,13 @@ public class ChatReadStatusDocs { @Id - private String chatRoomId; - private String userEmail; - private String lastReadMessageId; - private LocalDateTime lastReadTimestamp; + private final String chatRoomId; + private final String userEmail; + private final String lastReadMessageId; + private final LocalDateTime lastReadTimestamp; @Builder + @PersistenceCreator public ChatReadStatusDocs(String chatRoomId, String userEmail, String lastReadMessageId, LocalDateTime lastReadTimestamp) { this.chatRoomId = chatRoomId; this.userEmail = userEmail; diff --git a/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomDocs.java b/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomDocs.java index 1dd136b..69115b6 100644 --- a/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomDocs.java +++ b/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomDocs.java @@ -7,30 +7,30 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.mongodb.core.mapping.Document; import java.util.ArrayList; import java.util.List; @Document(collection = "chat_rooms") -@NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter public class ChatRoomDocs { @Id // 채팅방 ID - private String id; - + private final String id; //보내는이 User Id //보내는 이의 Info 추가 - private String caregiverInfo; + private final String caregiverInfo; //받는이 User Id //받는 이의 Info 추가 - private String entrustedInfo; + private final String entrustedInfo; private List messages = new ArrayList<>(); @Builder + @PersistenceCreator public ChatRoomDocs(String id, String caregiverInfo, String entrustedInfo, List messages) { this.id = id; this.caregiverInfo = caregiverInfo; diff --git a/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomMetadataDocs.java b/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomMetadataDocs.java index e998866..adbcdf6 100644 --- a/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomMetadataDocs.java +++ b/src/main/java/com/petmatz/domain/chatting/docs/ChatRoomMetadataDocs.java @@ -2,9 +2,11 @@ import com.petmatz.domain.chatting.dto.ChatMessageInfo; import com.petmatz.domain.chatting.dto.ChatRoomInfo; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.mongodb.core.mapping.Document; import java.time.LocalDateTime; @@ -13,14 +15,15 @@ @Getter public class ChatRoomMetadataDocs { @Id - private String room_id; - private String lastMessage; - private LocalDateTime lastMessageTimestamp; - private String msg_type; - private int messageCount; - private int unreadCount; + private final String room_id; + private final String lastMessage; + private final LocalDateTime lastMessageTimestamp; + private final String msg_type; + private final int messageCount; + private final int unreadCount; @Builder + @PersistenceCreator public ChatRoomMetadataDocs(String room_id, String lastMessage, LocalDateTime lastMessageTimestamp, String msg_type, int messageCount, int unreadCount) { this.room_id = room_id; this.lastMessage = lastMessage; diff --git a/src/main/java/com/petmatz/domain/chatting/entity/UserToChatRoomEntity.java b/src/main/java/com/petmatz/domain/chatting/entity/UserToChatRoomEntity.java index 7385d5a..68e3578 100644 --- a/src/main/java/com/petmatz/domain/chatting/entity/UserToChatRoomEntity.java +++ b/src/main/java/com/petmatz/domain/chatting/entity/UserToChatRoomEntity.java @@ -36,4 +36,12 @@ public void addChatRoom(ChatRoomEntity chatRoom) { chatRoom.getParticipants().add(this); // 양방향 관계 설정 } } + + @Override + public String toString() { + return "UserToChatRoomEntity{" + + "id=" + id + + ", user.getNickname=" + user.getNickname() + + '}'; + } } diff --git a/src/main/java/com/petmatz/domain/chatting/repository/ChatRoomRepository.java b/src/main/java/com/petmatz/domain/chatting/repository/ChatRoomRepository.java index 5ffccc2..6cf9009 100644 --- a/src/main/java/com/petmatz/domain/chatting/repository/ChatRoomRepository.java +++ b/src/main/java/com/petmatz/domain/chatting/repository/ChatRoomRepository.java @@ -16,4 +16,5 @@ public interface ChatRoomRepository extends JpaRepository Optional findChatRoomByUsers(@Param("user1") String user1, @Param("user2") String user2); + } diff --git a/src/main/java/com/petmatz/domain/chatting/repository/UserToChatRoomRepository.java b/src/main/java/com/petmatz/domain/chatting/repository/UserToChatRoomRepository.java index 19982f8..eb657c4 100644 --- a/src/main/java/com/petmatz/domain/chatting/repository/UserToChatRoomRepository.java +++ b/src/main/java/com/petmatz/domain/chatting/repository/UserToChatRoomRepository.java @@ -4,13 +4,19 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.security.core.parameters.P; import java.util.List; import java.util.Optional; public interface UserToChatRoomRepository extends JpaRepository { - Optional> findByUser_AccountId(String userEmail); + @Query("SELECT DISTINCT cr.chatRoom.id FROM UserToChatRoomEntity cr WHERE cr.user.accountId = :accountId") + List findDistinctByUserAccountId(@Param("accountId") String accountId); + + @Query("SELECT cr FROM UserToChatRoomEntity cr WHERE cr.chatRoom.id IN :chatRoomIdList AND cr.user.accountId != :accountId") + List selectChatRoomUserList(@Param("chatRoomIdList") List chatRoomIdList, + @Param("accountId") String accountId); void deleteByChatRoom_Id(Long chatRoomId); diff --git a/src/main/java/com/petmatz/domain/match/component/MatchScoreCalculator.java b/src/main/java/com/petmatz/domain/match/component/MatchScoreCalculator.java index 5c40a3f..80a02ad 100644 --- a/src/main/java/com/petmatz/domain/match/component/MatchScoreCalculator.java +++ b/src/main/java/com/petmatz/domain/match/component/MatchScoreCalculator.java @@ -2,7 +2,6 @@ import com.petmatz.domain.match.dto.response.MatchScoreResponse; import com.petmatz.domain.match.dto.response.UserResponse; -import com.petmatz.domain.pet.PetService; import com.petmatz.domain.pet.component.PetReader; import com.petmatz.domain.user.entity.User; import com.petmatz.infra.redis.component.RedisMatchComponent; diff --git a/src/main/java/com/petmatz/domain/match/component/MatchSizeCalculator.java b/src/main/java/com/petmatz/domain/match/component/MatchSizeCalculator.java index 4fbb9f6..fe7cbd1 100644 --- a/src/main/java/com/petmatz/domain/match/component/MatchSizeCalculator.java +++ b/src/main/java/com/petmatz/domain/match/component/MatchSizeCalculator.java @@ -1,7 +1,6 @@ package com.petmatz.domain.match.component; import com.petmatz.domain.match.exception.MatchException; -import com.petmatz.domain.pet.PetService; import com.petmatz.domain.pet.component.PetReader; import com.petmatz.domain.pet.entity.Pet; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/petmatz/domain/pet/PetService.java b/src/main/java/com/petmatz/domain/pet/PetService.java index fd21e90..1434f8b 100644 --- a/src/main/java/com/petmatz/domain/pet/PetService.java +++ b/src/main/java/com/petmatz/domain/pet/PetService.java @@ -5,7 +5,9 @@ import com.petmatz.domain.pet.component.PetAppend; import com.petmatz.domain.pet.component.PetDelete; import com.petmatz.domain.pet.component.PetUpdater; -import com.petmatz.domain.pet.dto.*; +import com.petmatz.domain.pet.dto.OpenApiPetInfo; +import com.petmatz.domain.pet.dto.PetSaveInfo; +import com.petmatz.domain.pet.dto.PetUpdateInfo; import com.petmatz.domain.user.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/petmatz/domain/pet/component/PetUpdater.java b/src/main/java/com/petmatz/domain/pet/component/PetUpdater.java index 49640dd..c793198 100644 --- a/src/main/java/com/petmatz/domain/pet/component/PetUpdater.java +++ b/src/main/java/com/petmatz/domain/pet/component/PetUpdater.java @@ -11,7 +11,6 @@ import com.petmatz.domain.user.entity.User; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.net.MalformedURLException; diff --git a/src/main/java/com/petmatz/domain/pet/dto/PetUpdateInfo.java b/src/main/java/com/petmatz/domain/pet/dto/PetUpdateInfo.java index e8c7d40..cf4a5e9 100644 --- a/src/main/java/com/petmatz/domain/pet/dto/PetUpdateInfo.java +++ b/src/main/java/com/petmatz/domain/pet/dto/PetUpdateInfo.java @@ -1,6 +1,5 @@ package com.petmatz.domain.pet.dto; -import com.petmatz.api.pet.dto.PetUpdateRequest; import com.petmatz.domain.pet.Gender; import com.petmatz.domain.pet.Size; import lombok.Builder; diff --git a/src/main/java/com/petmatz/domain/petmission/PetMissionService.java b/src/main/java/com/petmatz/domain/petmission/PetMissionService.java index 908d05e..dafee39 100644 --- a/src/main/java/com/petmatz/domain/petmission/PetMissionService.java +++ b/src/main/java/com/petmatz/domain/petmission/PetMissionService.java @@ -9,6 +9,8 @@ import com.petmatz.domain.petmission.dto.*; import com.petmatz.domain.petmission.entity.*; import com.petmatz.domain.petmission.exception.ExistPetMissionAnswerException; +import com.petmatz.domain.petmission.utils.PetMissionMapper; +import com.petmatz.domain.user.component.UserUtils; import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; @@ -19,6 +21,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; @Service @RequiredArgsConstructor @@ -34,17 +37,20 @@ public class PetMissionService { private final PetMissionAppend petMissionAppend; private final PetMissionAskReader petMissionAskReader; private final AwsClient awsClient; + private final UserUtils userUtils; + //TODO 이건 chatRoom으로 옮겨져야 하는데 왜 여기? public String selectChatRoomId(String careEmail, String receiverEmail) { return userToChatRoomReader.selectChatRoomId(careEmail, receiverEmail); } @Transactional public PetMissionData insertPetMission(PetMissionInfo petMissionInfo, Long careId) { - List users = makeUserEntityList(careId, petMissionInfo.receiverId()); + User careUser = userUtils.findIdUser(careId); + User receiverUser = userUtils.findIdUser(petMissionInfo.receiverId()); - String chatRoomId = userToChatRoomReader.selectChatRoomId(users.get(0).getAccountId(), users.get(1).getAccountId()); + String chatRoomId = userToChatRoomReader.selectChatRoomId(careUser.getAccountId(), receiverUser.getAccountId()); List pets = petRepository.findPetListByPetId(petMissionInfo.petId()); if (pets.isEmpty()) { @@ -59,18 +65,20 @@ public PetMissionData insertPetMission(PetMissionInfo petMissionInfo, Long careI PetMissionEntity petMissionEntity = PetMissionEntity.of(petMissionInfo); petMissionEntity.addPetMissionAsk(petMissionAskEntityList); - List petToPetMissionEntities = pets.stream() - .map(pet -> PetToPetMissionEntity.of(pet, petMissionEntity)) - .toList(); + List petToPetMissionEntities = PetMissionMapper.of(pets, petMissionEntity); + +// List petToPetMissionEntities = pets.stream() +// .map(pet -> PetToPetMissionEntity.of(pet, petMissionEntity)) +// .toList(); petToPetMissionEntities.forEach(petMissionEntity::addPetToPetMission); - List userToPetMissionEntities = users.stream() - .map(user -> UserToPetMissionEntity.of(user, petMissionEntity, careId)) + List userToPetMissionEntities = Stream.of(careUser, receiverUser).map(user -> UserToPetMissionEntity.of(user, petMissionEntity, careId)) .toList(); petMissionAppend.insertPetMission(petMissionEntity); userToPetMissionAppend.insertUserToPetMission(userToPetMissionEntities); + return PetMissionData.of(chatRoomId, petMissionEntity); } @@ -103,14 +111,6 @@ public PetMissionDetails selectPetMissionInfo(String petMissionId) { return PetMissionDetails.of(petMissionEntity, userToPetMissionEntities); } - private List makeUserEntityList(Long careId, Long receiverId) { - ArrayList userList = new ArrayList<>(); - userList.add(userRepository.findById(careId).get()); - userList.add(userRepository.findById(receiverId).get()); - return userList; - } - - @Transactional public String updatePetMissionComment(PetMissionCommentInfo petMissionCommentInfo, String userEmail) throws MalformedURLException { PetMissionAskEntity petMissionAskEntity = petMissionReader.selectById(Long.valueOf(petMissionCommentInfo.askId())); diff --git a/src/main/java/com/petmatz/domain/petmission/component/UserToPetMissionReader.java b/src/main/java/com/petmatz/domain/petmission/component/UserToPetMissionReader.java index db8dd32..3509177 100644 --- a/src/main/java/com/petmatz/domain/petmission/component/UserToPetMissionReader.java +++ b/src/main/java/com/petmatz/domain/petmission/component/UserToPetMissionReader.java @@ -8,7 +8,6 @@ import java.time.LocalDate; import java.util.List; -import java.util.Optional; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/petmatz/domain/petmission/entity/PetMissionEntity.java b/src/main/java/com/petmatz/domain/petmission/entity/PetMissionEntity.java index dd2c59a..b9ec9cc 100644 --- a/src/main/java/com/petmatz/domain/petmission/entity/PetMissionEntity.java +++ b/src/main/java/com/petmatz/domain/petmission/entity/PetMissionEntity.java @@ -59,13 +59,13 @@ public void addPetMissionAsk(List ask) { ask.forEach(petMissionAskEntity -> petMissionAskEntity.addPetMission(this)); } + public void addPetToPetMission(PetToPetMissionEntity pet) { + this.petToPetMissions.add(pet); + } public void updatePetMissionStatusZip(PetMissionStatusZip updateStatus) { status = updateStatus; } - public void addPetToPetMission(PetToPetMissionEntity pet) { - this.petToPetMissions.add(pet); - } } diff --git a/src/main/java/com/petmatz/domain/petmission/repository/UserToPetMissionRepository.java b/src/main/java/com/petmatz/domain/petmission/repository/UserToPetMissionRepository.java index 4b4edcb..d0ee976 100644 --- a/src/main/java/com/petmatz/domain/petmission/repository/UserToPetMissionRepository.java +++ b/src/main/java/com/petmatz/domain/petmission/repository/UserToPetMissionRepository.java @@ -7,7 +7,6 @@ import java.time.LocalDate; import java.util.List; -import java.util.Optional; public interface UserToPetMissionRepository extends JpaRepository { diff --git a/src/main/java/com/petmatz/domain/sosboard/SosBoardRepository.java b/src/main/java/com/petmatz/domain/sosboard/SosBoardRepository.java index e8d23ca..b57e185 100644 --- a/src/main/java/com/petmatz/domain/sosboard/SosBoardRepository.java +++ b/src/main/java/com/petmatz/domain/sosboard/SosBoardRepository.java @@ -7,8 +7,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; - public interface SosBoardRepository extends JpaRepository { // 지역 필터링 (User의 region 기준) diff --git a/src/main/java/com/petmatz/domain/sosboard/SosBoardService.java b/src/main/java/com/petmatz/domain/sosboard/SosBoardService.java index 424b6e1..b3e48b8 100644 --- a/src/main/java/com/petmatz/domain/sosboard/SosBoardService.java +++ b/src/main/java/com/petmatz/domain/sosboard/SosBoardService.java @@ -15,7 +15,6 @@ import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.*; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/petmatz/domain/sosboard/dto/LegercySosBoardInfo.java b/src/main/java/com/petmatz/domain/sosboard/dto/LegercySosBoardInfo.java index ed04fa1..868fa1a 100644 --- a/src/main/java/com/petmatz/domain/sosboard/dto/LegercySosBoardInfo.java +++ b/src/main/java/com/petmatz/domain/sosboard/dto/LegercySosBoardInfo.java @@ -4,7 +4,6 @@ import com.petmatz.api.pet.dto.PetResponse; import com.petmatz.domain.sosboard.PaymentType; import com.petmatz.domain.sosboard.entity.SosBoard; -import com.petmatz.domain.user.entity.User; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/petmatz/domain/sosboard/dto/SosBoardInfoList.java b/src/main/java/com/petmatz/domain/sosboard/dto/SosBoardInfoList.java index f7d099c..02d4b14 100644 --- a/src/main/java/com/petmatz/domain/sosboard/dto/SosBoardInfoList.java +++ b/src/main/java/com/petmatz/domain/sosboard/dto/SosBoardInfoList.java @@ -1,7 +1,6 @@ package com.petmatz.domain.sosboard.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.petmatz.domain.pet.entity.Pet; import com.petmatz.domain.sosboard.PaymentType; import com.petmatz.domain.sosboard.entity.SosBoard; import lombok.Builder; diff --git a/src/main/java/com/petmatz/domain/sosboard/entity/PetSosBoard.java b/src/main/java/com/petmatz/domain/sosboard/entity/PetSosBoard.java index ca3ec51..ab479bf 100644 --- a/src/main/java/com/petmatz/domain/sosboard/entity/PetSosBoard.java +++ b/src/main/java/com/petmatz/domain/sosboard/entity/PetSosBoard.java @@ -3,7 +3,9 @@ import com.petmatz.domain.global.BaseEntity; import com.petmatz.domain.pet.entity.Pet; import jakarta.persistence.*; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/petmatz/domain/sosboard/entity/SosBoard.java b/src/main/java/com/petmatz/domain/sosboard/entity/SosBoard.java index 508348b..ae085b9 100644 --- a/src/main/java/com/petmatz/domain/sosboard/entity/SosBoard.java +++ b/src/main/java/com/petmatz/domain/sosboard/entity/SosBoard.java @@ -10,7 +10,6 @@ import com.petmatz.domain.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/petmatz/domain/user/component/CookieComponent.java b/src/main/java/com/petmatz/domain/user/component/CookieComponent.java index be37572..9f93158 100644 --- a/src/main/java/com/petmatz/domain/user/component/CookieComponent.java +++ b/src/main/java/com/petmatz/domain/user/component/CookieComponent.java @@ -1,8 +1,8 @@ package com.petmatz.domain.user.component; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.stereotype.Component; import org.springframework.http.ResponseCookie; +import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java b/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java index a6f6b38..c5eda25 100644 --- a/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java +++ b/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java @@ -9,7 +9,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; - import java.util.List; import static com.petmatz.domain.user.exception.UserErrorCode.INSUFFICIENT_LOCATION_DATA; diff --git a/src/main/java/com/petmatz/domain/user/component/HeartComponent.java b/src/main/java/com/petmatz/domain/user/component/HeartComponent.java index 61e727d..5ffd685 100644 --- a/src/main/java/com/petmatz/domain/user/component/HeartComponent.java +++ b/src/main/java/com/petmatz/domain/user/component/HeartComponent.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Optional; -import static com.petmatz.domain.user.exception.UserErrorCode.*; +import static com.petmatz.domain.user.exception.UserErrorCode.HEART_USER_NOT_FOUND; @RequiredArgsConstructor @Component diff --git a/src/main/java/com/petmatz/domain/user/response/CheckCertificationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/CheckCertificationResponseDto.java deleted file mode 100644 index 8e701d8..0000000 --- a/src/main/java/com/petmatz/domain/user/response/CheckCertificationResponseDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class CheckCertificationResponseDto extends LogInResponseDto { - private CheckCertificationResponseDto() { - super(); - } - - - public static ResponseEntity certificationFail() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.CERTIFICATION_FAIL, ResponseMessage.CERTIFICATION_FAIL); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(responseBody); - } - - public static ResponseEntity certificationExpired() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.CERTIFICATION_EXPIRED, ResponseMessage.CERTIFICATION_EXPIRED); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/response/DeleteIdResponseDto.java b/src/main/java/com/petmatz/domain/user/response/DeleteIdResponseDto.java deleted file mode 100644 index d86e979..0000000 --- a/src/main/java/com/petmatz/domain/user/response/DeleteIdResponseDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class DeleteIdResponseDto extends LogInResponseDto { - - private DeleteIdResponseDto(){ - super(); - } - - public static ResponseEntity idNotFound(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } - - public static ResponseEntity wrongPassword(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.WRONG_PASSWORD, ResponseMessage.WRONG_PASSWORD); - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java index be131bb..9e1a2b9 100644 --- a/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java @@ -1,8 +1,5 @@ package com.petmatz.domain.user.response; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -15,16 +12,6 @@ public EditMyProfileResponseDto(String resultImgURL){ this.resultImgURL=resultImgURL; } - public static ResponseEntity idNotFound(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } - - public static ResponseEntity editFailed(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.EDIT_FAIL, ResponseMessage.EDIT_FAIL); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } - public static ResponseEntity success(String resultImgURL) { // 반환 타입 수정 EditMyProfileResponseDto responseBody = new EditMyProfileResponseDto(resultImgURL); return ResponseEntity.status(HttpStatus.OK).body(responseBody); diff --git a/src/main/java/com/petmatz/domain/user/response/EmailCertificationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/EmailCertificationResponseDto.java deleted file mode 100644 index b75196b..0000000 --- a/src/main/java/com/petmatz/domain/user/response/EmailCertificationResponseDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.petmatz.domain.user.response; - - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class EmailCertificationResponseDto extends LogInResponseDto { - - public EmailCertificationResponseDto(){ - } - - - public static ResponseEntity duplicateId(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.DUPLICATE_ID, ResponseMessage.DUPLICATE_ID); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } - - public static ResponseEntity mailSendFail(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.MAIL_FAIL, ResponseMessage.MAIL_FAIL); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/response/GetHeartingListResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetHeartingListResponseDto.java deleted file mode 100644 index 28e2989..0000000 --- a/src/main/java/com/petmatz/domain/user/response/GetHeartingListResponseDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.api.user.request.HeartedUserDto; -import com.petmatz.user.common.LogInResponseDto; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -import java.util.List; - -@Getter -public class GetHeartingListResponseDto extends LogInResponseDto { - private List heartedUsers; - - public GetHeartingListResponseDto(List heartedUsers) { - super(); - this.heartedUsers = heartedUsers; - } - - public static ResponseEntity success(List heartedUsers) { - GetHeartingListResponseDto responseBody = new GetHeartingListResponseDto(heartedUsers); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } -} \ No newline at end of file diff --git a/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java index 871a116..86e7998 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java @@ -3,12 +3,7 @@ import com.petmatz.domain.user.constant.Gender; import com.petmatz.domain.user.constant.PreferredSize; import com.petmatz.domain.user.entity.User; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import java.util.List; diff --git a/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java index 3dc95c9..bc35ec9 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java @@ -3,12 +3,7 @@ import com.petmatz.domain.user.constant.Gender; import com.petmatz.domain.user.constant.PreferredSize; import com.petmatz.domain.user.entity.User; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import java.util.List; diff --git a/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java index b9f494d..18e1cd0 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java @@ -1,8 +1,5 @@ package com.petmatz.domain.user.response; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -15,11 +12,6 @@ public GetRecommendationResponseDto(boolean isRecommended) { this.isRecommended=isRecommended; } - public static ResponseEntity userNotFound() { - LogInResponseDto responseBody=new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } - public static ResponseEntity success(boolean isRecommended) { GetRecommendationResponseDto responseBody = new GetRecommendationResponseDto(isRecommended); return ResponseEntity.status(HttpStatus.OK).body(responseBody); diff --git a/src/main/java/com/petmatz/domain/user/response/RepasswordResponseDto.java b/src/main/java/com/petmatz/domain/user/response/RepasswordResponseDto.java deleted file mode 100644 index 1063d24..0000000 --- a/src/main/java/com/petmatz/domain/user/response/RepasswordResponseDto.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class RepasswordResponseDto extends LogInResponseDto{ - private RepasswordResponseDto(){ - super(); - } - - public static ResponseEntity wrongPassword(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.WRONG_PASSWORD, ResponseMessage.WRONG_PASSWORD); - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java b/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java deleted file mode 100644 index e7244f3..0000000 --- a/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class SendRepasswordResponseDto{ - - public SendRepasswordResponseDto(){ - } - - public static ResponseEntity mailSendFail(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.MAIL_FAIL, ResponseMessage.MAIL_FAIL); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java b/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java index c99d7ae..08139b3 100644 --- a/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java +++ b/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java @@ -1,8 +1,5 @@ package com.petmatz.domain.user.response; -import lombok.Getter; - - public record SignUpResponse( Long id, String imgURL) { diff --git a/src/main/java/com/petmatz/domain/user/response/SignUpResponseDto.java b/src/main/java/com/petmatz/domain/user/response/SignUpResponseDto.java deleted file mode 100644 index 66ea037..0000000 --- a/src/main/java/com/petmatz/domain/user/response/SignUpResponseDto.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -public class SignUpResponseDto extends LogInResponseDto { - private Long id; - - private String imgURL; - - public SignUpResponseDto(Long id, String imgURL) { - super(); - this.id=id; - this.imgURL = imgURL; - } - - // 1. 중복된 ID 응답 - public static ResponseEntity duplicateId() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.DUPLICATE_ID, ResponseMessage.DUPLICATE_ID); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } - - // 2. 인증 실패 응답 - public static ResponseEntity certificationFail() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.CERTIFICATION_FAIL, ResponseMessage.CERTIFICATION_FAIL); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(responseBody); - } - - // 4. 회원가입 성공 응답 - public static ResponseEntity success(Long id, String imgURL) { - SignUpResponseDto responseBody = new SignUpResponseDto(id,imgURL); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } - - // 5. 위치 정보 확인 실패 응답 - public static ResponseEntity locationFail() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.LOCATION_FAIL, ResponseMessage.LOCATION_FAIL); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } - - // 7. 필수 정보 누락 응답 - public static ResponseEntity missingRequiredFields() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.MISSING_FIELDS, ResponseMessage.MISSING_FIELDS); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(responseBody); - } - - // 8. 알 수 없는 오류 발생 - public static ResponseEntity unknownError() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.UNKNOWN_ERROR, ResponseMessage.UNKNOWN_ERROR); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseBody); - } -} \ No newline at end of file diff --git a/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java index 0b33849..a8cc782 100644 --- a/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java @@ -1,11 +1,6 @@ package com.petmatz.domain.user.response; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; @Getter public class UpdateLocationResponseDto { diff --git a/src/main/java/com/petmatz/domain/user/response/UpdateRecommendationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/UpdateRecommendationResponseDto.java deleted file mode 100644 index 943ccef..0000000 --- a/src/main/java/com/petmatz/domain/user/response/UpdateRecommendationResponseDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.petmatz.domain.user.response; - -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -public class UpdateRecommendationResponseDto extends LogInResponseDto { - - private UpdateRecommendationResponseDto(){ - super(); - } - - public static ResponseEntity userNotFound() { - LogInResponseDto responseBody=new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } -} diff --git a/src/main/java/com/petmatz/domain/user/service/AuthService.java b/src/main/java/com/petmatz/domain/user/service/AuthService.java index 518d1cb..7ef7154 100644 --- a/src/main/java/com/petmatz/domain/user/service/AuthService.java +++ b/src/main/java/com/petmatz/domain/user/service/AuthService.java @@ -2,11 +2,11 @@ import com.petmatz.common.security.jwt.JwtManager; - import com.petmatz.domain.aws.AwsClient; import com.petmatz.domain.aws.vo.S3Imge; import com.petmatz.domain.user.component.AuthenticationComponent; import com.petmatz.domain.user.component.CookieComponent; +import com.petmatz.domain.user.component.GeocodingComponent; import com.petmatz.domain.user.entity.Certification; import com.petmatz.domain.user.entity.KakaoRegion; import com.petmatz.domain.user.entity.User; @@ -18,8 +18,6 @@ import com.petmatz.domain.user.repository.UserRepository; import com.petmatz.domain.user.response.SignInResponseDto; import com.petmatz.domain.user.response.SignUpResponse; -import com.petmatz.domain.user.response.SignUpResponseDto; -import com.petmatz.domain.user.component.GeocodingComponent; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/petmatz/domain/user/service/EmailService.java b/src/main/java/com/petmatz/domain/user/service/EmailService.java index e751dac..672d388 100644 --- a/src/main/java/com/petmatz/domain/user/service/EmailService.java +++ b/src/main/java/com/petmatz/domain/user/service/EmailService.java @@ -5,9 +5,7 @@ import com.petmatz.domain.user.component.UserUtils; import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.provider.CertificationNumberProvider; -import com.petmatz.domain.user.repository.UserRepository; import com.petmatz.domain.user.response.GetMyUserDto; -import com.petmatz.domain.user.service.EmailProvider; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java b/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java index 86b2a97..4d35e91 100644 --- a/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java +++ b/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import static com.petmatz.domain.user.exception.UserErrorCode.*; +import static com.petmatz.domain.user.exception.UserErrorCode.MISS_KAKAO_LOACTION; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/petmatz/domain/user/service/LocationService.java b/src/main/java/com/petmatz/domain/user/service/LocationService.java index e8d91eb..5f0c382 100644 --- a/src/main/java/com/petmatz/domain/user/service/LocationService.java +++ b/src/main/java/com/petmatz/domain/user/service/LocationService.java @@ -1,12 +1,12 @@ package com.petmatz.domain.user.service; import com.petmatz.common.security.jwt.JwtExtractProvider; +import com.petmatz.domain.user.component.GeocodingComponent; import com.petmatz.domain.user.component.UserUtils; import com.petmatz.domain.user.entity.KakaoRegion; import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.info.UpdateLocationInfo; import com.petmatz.domain.user.response.UpdateLocationResponseDto; -import com.petmatz.domain.user.component.GeocodingComponent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/petmatz/domain/user/service/PasswordService.java b/src/main/java/com/petmatz/domain/user/service/PasswordService.java index ceb118c..32cf5f3 100644 --- a/src/main/java/com/petmatz/domain/user/service/PasswordService.java +++ b/src/main/java/com/petmatz/domain/user/service/PasswordService.java @@ -7,7 +7,6 @@ import com.petmatz.domain.user.entity.User; import com.petmatz.domain.user.info.RepasswordInfo; import com.petmatz.domain.user.provider.RePasswordProvider; -import com.petmatz.domain.user.response.SendRepasswordResponseDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/petmatz/domain/user/service/UserService.java b/src/main/java/com/petmatz/domain/user/service/UserService.java index 632fe63..41aa8de 100644 --- a/src/main/java/com/petmatz/domain/user/service/UserService.java +++ b/src/main/java/com/petmatz/domain/user/service/UserService.java @@ -2,7 +2,6 @@ import com.petmatz.api.user.request.DeleteIdRequestDto; import com.petmatz.common.security.jwt.JwtExtractProvider; -import com.petmatz.domain.pet.entity.Pet; import com.petmatz.domain.pet.repository.PetRepository; import com.petmatz.domain.sosboard.component.SosBoardDelete; import com.petmatz.domain.user.component.PasswordComponent; @@ -16,8 +15,6 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Component @RequiredArgsConstructor @Slf4j diff --git a/src/main/java/com/petmatz/user/common/LogInResponseDto.java b/src/main/java/com/petmatz/user/common/LogInResponseDto.java deleted file mode 100644 index 1f31946..0000000 --- a/src/main/java/com/petmatz/user/common/LogInResponseDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.petmatz.user.common; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; - -@Getter -@AllArgsConstructor -public class LogInResponseDto { - private String responseCode; - private String message; - - public LogInResponseDto() { - this.responseCode = ResponseCode.SUCCESS; - this.message = ResponseMessage.SUCCESS; - } - - public static ResponseEntity success() { - LogInResponseDto responseBody = new LogInResponseDto(); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } - - public static ResponseEntity databaseError(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.DATABASE_ERROR, ResponseMessage.DATABASE_ERROR); - return ResponseEntity.status(500).body(responseBody); //500 Error == Internal Server Error - } - - public static ResponseEntity userNotFound() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.USER_NOT_FOUND, ResponseMessage.USER_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); // 404 Error == Not Found - } - - public static ResponseEntity validationFail(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.VALIDATION_FAIL, ResponseMessage.VALIDATION_FAIL); - return ResponseEntity.status(400).body(responseBody); //400 Error == Bad Request - } - -} diff --git a/src/main/java/com/petmatz/user/common/ResponseCode.java b/src/main/java/com/petmatz/user/common/ResponseCode.java deleted file mode 100644 index 60aad0b..0000000 --- a/src/main/java/com/petmatz/user/common/ResponseCode.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.petmatz.user.common; - -public interface ResponseCode { - String SUCCESS = "SU"; - - String VALIDATION_FAIL = "VF"; - - String DUPLICATE_ID = "DI"; - - String SIGN_IN_FAIL = "SF"; - - String CERTIFICATION_FAIL = "CF"; - - String MAIL_FAIL = "MF"; - - String DATABASE_ERROR = "DBE"; - - String ID_NOT_FOUND = "IDNF"; - - String WRONG_PASSWORD = "WP"; - - String EDIT_FAIL = "EF"; - - String HEARTED_ID_NOT_FOUND = "HINF"; - - String WRONG_LOCATION = "WL"; - - String USER_NOT_FOUND = "UNF"; - - String LOCATION_FAIL = "LF"; - - String MISSING_FIELDS = "MF"; - - String UNKNOWN_ERROR = "UE"; - - String CERTIFICATION_EXPIRED = "CE"; -} diff --git a/src/main/java/com/petmatz/user/common/ResponseMessage.java b/src/main/java/com/petmatz/user/common/ResponseMessage.java deleted file mode 100644 index fcd9be3..0000000 --- a/src/main/java/com/petmatz/user/common/ResponseMessage.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.petmatz.user.common; - -public interface ResponseMessage { - String SUCCESS = "Success"; - - String VALIDATION_FAIL = "Validation failed"; - - String DUPLICATE_ID = "Duplicate ID"; - - String SIGN_IN_FAIL = "Login information mismatch"; - - String CERTIFICATION_FAIL = "Certification failed"; - - String MAIL_FAIL = "Failed to send email"; - - String DATABASE_ERROR = "Database error"; - - String ID_NOT_FOUND = "ID Not found"; - - String WRONG_PASSWORD="Wrong password."; - - String EDIT_FAIL = "Edit profile failed"; - - String HEARTED_ID_NOT_FOUND = "Hearted Id Not Found"; - - String WRONG_LOCATION= "Wrong location"; - - String USER_NOT_FOUND = "User Not Found"; - - String LOCATION_FAIL = "Location Fail"; // LF - - String MISSING_FIELDS = "Missing Fields"; // MF - - String UNKNOWN_ERROR = "Unknown Error"; // UE - - String CERTIFICATION_EXPIRED = "Certificate Expired"; -} From 8eb7756a1e35afb3b7be73a2ace1e1552b9ba143 Mon Sep 17 00:00:00 2001 From: LeeJongWon <106072775+LJW22222@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:20:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20User=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=ED=83=88=ED=87=B4=20=EB=B2=84=EA=B7=B8=20fix=20=EB=B0=8F=20imp?= =?UTF-8?q?ort=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../petmission/utils/PetMissionMapper.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/com/petmatz/domain/petmission/utils/PetMissionMapper.java diff --git a/src/main/java/com/petmatz/domain/petmission/utils/PetMissionMapper.java b/src/main/java/com/petmatz/domain/petmission/utils/PetMissionMapper.java new file mode 100644 index 0000000..476d935 --- /dev/null +++ b/src/main/java/com/petmatz/domain/petmission/utils/PetMissionMapper.java @@ -0,0 +1,18 @@ +package com.petmatz.domain.petmission.utils; + + +import com.petmatz.domain.pet.entity.Pet; +import com.petmatz.domain.petmission.entity.PetMissionEntity; +import com.petmatz.domain.petmission.entity.PetToPetMissionEntity; + +import java.util.List; + +public class PetMissionMapper { + + public static List of(List pets, PetMissionEntity petMissionEntity) { + return pets.stream() + .map(pet -> PetToPetMissionEntity.of(pet, petMissionEntity)) + .toList(); + } + +}