Merge pull request #155 from PROTOTYNE/develop

[240929] - 03

src/main/java/com/prototyne/Enterprise/service/EventService/EventServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.converter.EventConverter;
 import com.prototyne.Enterprise.web.dto.EventDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.domain.Event;

src/main/java/com/prototyne/Enterprise/service/LoginService/LoginServiceImpl.java

@@ -1,7 +1,7 @@
 package com.prototyne.Enterprise.service.LoginService;
 
 import com.prototyne.Enterprise.web.dto.LoginDto;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.domain.Enterprise;

src/main/java/com/prototyne/Enterprise/service/MyInfoService/MyInfoServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.converter.MyInfoConverter;
 import com.prototyne.Enterprise.web.dto.MyInfoDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.domain.Enterprise;
 import com.prototyne.repository.EnterpriseRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/com/prototyne/Enterprise/service/ProductService/ProductServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.converter.ProductConverter;
 import com.prototyne.Enterprise.web.dto.ProductDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.aws.s3.AmazonS3Manager;

src/main/java/com/prototyne/Enterprise/service/ReviewService/EntReviewServiceImpl.java

@@ -3,7 +3,7 @@
 import com.prototyne.Enterprise.converter.EntReviewConverter;
 import com.prototyne.Enterprise.web.dto.EntAllReviewResponseDTO;
 import com.prototyne.Enterprise.web.dto.EntReviewDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.converter.ReviewConverter;
 import com.prototyne.Users.web.dto.ReviewDTO;
 import com.prototyne.apiPayload.code.status.ErrorStatus;

src/main/java/com/prototyne/Enterprise/service/UserlistService/UserlistServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.converter.UserlistConverter;
 import com.prototyne.Enterprise.web.dto.UserlistDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.domain.Enterprise;

src/main/java/com/prototyne/Enterprise/web/controller/EntReviewController.java

@@ -5,7 +5,7 @@
 import com.prototyne.Enterprise.web.dto.EntReviewDTO;
 import com.prototyne.Users.web.dto.ReviewDTO;
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/prototyne/Enterprise/web/controller/EventController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.service.EventService.EventService;
 import com.prototyne.Enterprise.web.dto.EventDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Enterprise/web/controller/LoginController.java

@@ -4,7 +4,7 @@
 import com.prototyne.Enterprise.service.TokenService.EnterpriseTokenService;
 import com.prototyne.Enterprise.web.dto.LoginDto;
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,7 +42,7 @@ public ApiResponse<LoginDto.EnterpriseLoginResponse> enterpriseLogin(@RequestBod
     }
 
     @PostMapping("/logout")
-    @Operation(summary = "기업 로그아웃 API",
+    @Operation(summary = "기업 로그아웃 API - 인증 필요",
             description = "Delete되는 Refresh Token 과 해당하는 enterpriseId 응답",
             security = {@SecurityRequirement(name = "session-token")})
     public ApiResponse<LoginDto.EnterpriseLogoutResponse> enterpriseLogout(HttpServletRequest req){

src/main/java/com/prototyne/Enterprise/web/controller/MyInfoController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.service.MyInfoService.MyInfoService;
 import com.prototyne.Enterprise.web.dto.MyInfoDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Enterprise/web/controller/ProductController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Enterprise.service.ProductService.ProductService;
 import com.prototyne.Enterprise.web.dto.ProductDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Enterprise/web/controller/UserlistController.java

@@ -4,7 +4,7 @@
 
 import com.prototyne.Enterprise.service.UserlistService.UserlistService;
 import com.prototyne.Enterprise.web.dto.UserlistDTO;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Users/service/AlarmService/AlarmServiceImpl.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.service.AlarmService;
 
 import com.prototyne.repository.AlarmRespository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.AlarmDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/prototyne/Users/service/ApplicationService/ApplicationServiceImpl.java

@@ -5,7 +5,7 @@
 import com.prototyne.Users.converter.InvestmentConverter;
 import com.prototyne.domain.*;
 import com.prototyne.repository.*;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.ProductService.EventService;
 import com.prototyne.Users.service.TicketService.TicketService;
 import com.prototyne.Users.web.dto.InvestmentDTO;

src/main/java/com/prototyne/Users/service/DeliveryService/DeliveryServiceImpl.java

@@ -4,7 +4,7 @@
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.domain.User;
 import com.prototyne.repository.UserRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.DeliveryDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/prototyne/Users/service/FeedbackService/FeedbackServiceImpl.java

@@ -12,7 +12,7 @@
 import com.prototyne.repository.FeedbackRepository;
 import com.prototyne.repository.InvestmentRepository;
 import com.prototyne.repository.UserRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.FeedbackDTO;
 import com.prototyne.Users.web.dto.FeedbackImageDTO;
 import lombok.RequiredArgsConstructor;

src/main/java/com/prototyne/Users/service/HeartService/HeartServiceImpl.java

@@ -9,7 +9,7 @@
 import com.prototyne.repository.EventRepository;
 import com.prototyne.repository.HeartRepository;
 import com.prototyne.repository.UserRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.HeartDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/prototyne/Users/service/LoginService/KakaoServiceImpl.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.Users.service.TokenService.TokenService;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.Users.converter.UserConverter;
 import com.prototyne.domain.User;

src/main/java/com/prototyne/Users/service/MyProductService/MyProductServiceImpl.java

@@ -4,7 +4,7 @@
 import com.prototyne.domain.enums.InvestmentStatus;
 import com.prototyne.repository.FeedbackRepository;
 import com.prototyne.repository.MyProductRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.MyProductDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/prototyne/Users/service/PaymentService/KakaopayServiceImpl.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.service.PaymentService;
 
 import com.prototyne.Users.converter.PaymentConverter;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.TicketService.TicketService;
 import com.prototyne.Users.web.dto.KakaoPayDto;
 import com.prototyne.apiPayload.code.status.ErrorStatus;

src/main/java/com/prototyne/Users/service/ProductService/EventServiceImpl.java

@@ -12,7 +12,7 @@
 import com.prototyne.repository.HeartRepository;
 import com.prototyne.repository.InvestmentRepository;
 import com.prototyne.repository.UserRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.ProductDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/prototyne/Users/service/SignupService/UserSignupServiceImpl.java

@@ -4,7 +4,7 @@
 import com.prototyne.Users.web.dto.JwtTokenDto;
 import com.prototyne.Users.web.dto.UserDto;
 import com.prototyne.apiPayload.code.status.ErrorStatus;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.apiPayload.exception.handler.TempHandler;
 import com.prototyne.domain.ADD_set;
 import com.prototyne.domain.User;

src/main/java/com/prototyne/Users/service/TicketService/TicketServiceImpl.java

@@ -8,7 +8,7 @@
 import com.prototyne.domain.User;
 import com.prototyne.domain.enums.InvestmentStatus;
 import com.prototyne.repository.*;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.TicketDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/prototyne/Users/service/UserService/UserDetailServiceImpl.java

@@ -9,7 +9,7 @@
 import com.prototyne.repository.ADD_setRepository;
 import com.prototyne.repository.AdditionalRepository;
 import com.prototyne.repository.UserRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.UserDto;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;

src/main/java/com/prototyne/Users/web/controller/AlarmController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.service.AlarmService.AlarmService;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.AlarmDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Users/web/controller/ApplicationController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.service.ApplicationService.ApplicationService;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.InvestmentDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Users/web/controller/DeliveryController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.service.DeliveryService.DeliveryService;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.DeliveryDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Users/web/controller/HeartController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.service.HeartService.HeartServiceImpl;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.web.dto.HeartDto;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

src/main/java/com/prototyne/Users/web/controller/KakaopayController.java

@@ -1,6 +1,6 @@
 package com.prototyne.Users.web.controller;
 
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.PaymentService.KakaopayService;
 import com.prototyne.Users.web.dto.KakaoPayDto;
 import com.prototyne.apiPayload.ApiResponse;

src/main/java/com/prototyne/Users/web/controller/MyController.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.web.controller;
 
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.UserService.UserDetailServiceImpl;
 import com.prototyne.Users.web.dto.UserDto;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/Users/web/controller/MyProductController.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.web.controller;
 
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.MyProductService.MyProductServiceImpl;
 import com.prototyne.Users.web.dto.MyProductDto;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/Users/web/controller/OauthController.java

@@ -5,7 +5,7 @@
 import com.prototyne.Users.service.TokenService.TokenService;
 import com.prototyne.Users.web.dto.UserDto;
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -36,7 +36,7 @@ public ApiResponse<UserDto.KakaoTokenResponse> callback(@RequestParam("code") St
     }
 
     @PostMapping("/logout")
-    @Operation(summary = "로그아웃 API",
+    @Operation(summary = "로그아웃 API - 인증 필요",
             description = "Delete되는 Refresh Token 과 해당하는 userId 응답",
             security = {@SecurityRequirement(name = "session-token")})
     public ApiResponse<UserDto.KakaoLogoutTokenResponse> logout(HttpServletRequest req){

src/main/java/com/prototyne/Users/web/controller/ProductController.java

@@ -3,7 +3,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.repository.HeartRepository;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.ProductService.EventService;
 import com.prototyne.Users.web.dto.ProductDTO;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/Users/web/controller/ReviewController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.service.FeedbackService.FeedbackService;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.ReviewService.ReviewService;
 import com.prototyne.Users.web.dto.FeedbackDTO;
 import com.prototyne.Users.web.dto.FeedbackImageDTO;

src/main/java/com/prototyne/Users/web/controller/SearchController.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.web.controller;
 
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.ProductService.EventService;
 import com.prototyne.Users.web.dto.ProductDTO;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/Users/web/controller/TempRestController.java

@@ -2,7 +2,7 @@
 
 import com.prototyne.apiPayload.ApiResponse;
 import com.prototyne.Users.converter.TempConverter;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.TempService.TempCommandService;
 import com.prototyne.Users.web.dto.TempResponse;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/Users/web/controller/TicketController.java

@@ -1,7 +1,7 @@
 package com.prototyne.Users.web.controller;
 
 import com.prototyne.apiPayload.ApiResponse;
-import com.prototyne.apiPayload.config.JwtManager;
+import com.prototyne.config.JwtManager;
 import com.prototyne.Users.service.TicketService.TicketService;
 import com.prototyne.Users.web.dto.TicketDto;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/prototyne/aws/s3/AmazonS3Manager.java

@@ -4,8 +4,7 @@
 import com.amazonaws.services.s3.model.DeleteObjectRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.prototyne.apiPayload.config.AmazonConfig;
-import com.prototyne.apiPayload.exception.handler.TempHandler;
+import com.prototyne.config.AmazonConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/com/prototyne/apiPayload/config/AmazonConfig.java → src/main/java/com/prototyne/config/AmazonConfig.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSCredentialsProvider;

src/main/java/com/prototyne/apiPayload/config/JwtManager.java → src/main/java/com/prototyne/config/JwtManager.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import com.prototyne.Users.service.TokenService.TokenService;
 import com.prototyne.Users.web.dto.JwtTokenDto;

src/main/java/com/prototyne/apiPayload/config/RedisConfig.java → src/main/java/com/prototyne/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/prototyne/apiPayload/config/SecurityConfig.java → src/main/java/com/prototyne/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/prototyne/apiPayload/config/SwaggerBeanConfig.java → src/main/java/com/prototyne/config/SwaggerBeanConfig.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;

src/main/java/com/prototyne/apiPayload/config/SwaggerConfig.java → src/main/java/com/prototyne/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.prototyne.apiPayload.config;
+package com.prototyne.config;
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.servers.Server;