From 2fd95504d2290471862fa63cb692d90dc1c65bb3 Mon Sep 17 00:00:00 2001 From: TaetaetaE01 Date: Thu, 3 Oct 2024 23:25:04 +0900 Subject: [PATCH] =?UTF-8?q?[refactor]=20:=20=ED=8C=A8=ED=82=A4=EC=A7=95=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20global=20=EB=B6=80?= =?UTF-8?q?=ED=99=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/AffiliationManager.java | 4 +- .../CampusNoticeAdminController.java | 8 ++-- .../controller/CampusNoticeController.java | 12 +++--- .../dto/CampusNoticeRegisterRequest.java | 8 ++-- .../dto/CampusNoticeResponse.java | 2 +- .../campusNotice/entity/CampusNotice.java | 2 +- .../service/CampusNoticeServiceImpl.java | 8 ++-- .../domain/campusNotice/util/LambdaUtil.java | 2 +- .../controller/EventAdminController.java | 8 ++-- .../event/controller/EventController.java | 8 ++-- .../dto/request/EventRegisterRequest.java | 2 +- .../event/dto/response/EventResponse.java | 2 +- .../domain/event/entity/Event.java | 2 +- .../event/service/EventServiceImpl.java | 22 +++++----- .../faq/controller/FAQAdminController.java | 6 +-- .../domain/faq/controller/FAQController.java | 6 +-- .../faq/dto/request/FAQRegisterRequest.java | 2 +- .../domain/faq/dto/response/FAQResponse.java | 2 +- .../bigbrotherbe/domain/faq/entity/FAQ.java | 2 +- .../domain/faq/service/FAQServiceImpl.java | 19 ++++----- .../controller/MeetingsAdminController.java | 8 ++-- .../controller/MeetingsController.java | 8 ++-- .../dto/request/MeetingsRegisterRequest.java | 2 +- .../dto/response/MeetingsResponse.java | 2 +- .../domain/meetings/entity/Meetings.java | 2 +- .../meetings/service/MeetingsServiceImpl.java | 22 +++++----- .../member/component/MemberChecker.java | 4 +- .../domain/member/component/MemberLoader.java | 4 +- .../member/component/MemberManager.java | 4 +- .../member/controller/MemberController.java | 40 +++++++++---------- .../controller/MemberControllerImpl.java | 16 ++++---- .../domain/member/dto/request/SignUpDto.java | 4 +- .../member/entity/enums/AffiliationCode.java | 6 +-- .../domain/member/service/MemberService.java | 2 +- .../member/service/MemberServiceImpl.java | 2 +- .../controller/NoticeAdminController.java | 6 +-- .../notice/controller/NoticeController.java | 6 +-- .../dto/request/NoticeRegisterRequest.java | 2 +- .../notice/dto/response/NoticeResponse.java | 2 +- .../domain/notice/entity/Notice.java | 2 +- .../notice/service/NoticeServiceImpl.java | 21 +++++----- .../rule/controller/RuleAdminController.java | 8 ++-- .../rule/controller/RuleController.java | 8 ++-- .../rule/dto/request/RuleRegisterRequest.java | 2 +- .../rule/dto/response/RuleResponse.java | 2 +- .../bigbrotherbe/domain/rule/entity/Rule.java | 2 +- .../domain/rule/service/RuleServiceImpl.java | 22 +++++----- .../TransactionsAdminController.java | 4 +- .../controller/TransactionsController.java | 4 +- .../transactions/entity/Transactions.java | 2 +- .../service/TransactionsServiceImpl.java | 18 ++++----- .../auth/custom/CustomUserDetailsService.java | 6 +-- .../auth/custom/CustomerDetails.java | 2 +- .../{ => global}/auth/jwt/dto/TokenDto.java | 2 +- .../auth/jwt/dto/response/JwtToken.java | 2 +- .../auth/jwt/entity/RefreshToken.java | 2 +- .../jwt/filter/JwtAuthenticationFilter.java | 8 ++-- .../auth/jwt/service/JwtTokenService.java | 24 +++++------ .../{ => global}/auth/util/AuthUtil.java | 10 ++--- .../common/config/CustomerCorsFilter.java | 4 +- .../{ => global}/common/config/S3Config.java | 2 +- .../common/config/SecurityConfig.java | 6 +-- .../common/config/SwaggerConfig.java | 4 +- .../common/constant/Constant.java | 2 +- .../common/database/InitialDataLoader.java | 2 +- .../common/exception/BusinessException.java | 4 +- .../common/exception/enums/ErrorCode.java | 2 +- .../common/exception/enums/SuccessCode.java | 2 +- .../handler/GlobalExceptionHandler.java | 6 +-- .../exception/response/ApiResponse.java | 6 +-- .../common/ssh/SshDataSourceConfig.java | 0 .../common/ssh/SshTunnelingInitializer.java | 0 .../{ => global}/email/EmailConfig.java | 2 +- .../email/component/MailChecker.java | 8 ++-- .../email/component/MailMaker.java | 8 ++-- .../email/component/MailService.java | 10 ++--- .../{ => global}/email/entity/Email.java | 2 +- .../email/entity/EmailRequest.java | 2 +- .../email/entity/EmailVerificationResult.java | 2 +- .../{ => global}/file/dto/FileDeleteDTO.java | 4 +- .../{ => global}/file/dto/FileResponse.java | 2 +- .../{ => global}/file/dto/FileSaveDTO.java | 4 +- .../{ => global}/file/dto/FileUpdateDTO.java | 4 +- .../{ => global}/file/entity/File.java | 2 +- .../{ => global}/file/enums/FileType.java | 2 +- .../file/repository/FileRepository.java | 4 +- .../file/service/FileService.java | 10 ++--- .../file/service/FileServiceImpl.java | 16 ++++---- .../{ => global}/file/util/FileUtil.java | 8 ++-- .../{ => global}/file/util/S3Util.java | 8 ++-- .../{ => global}/ocr/dto/OcrDTO.java | 2 +- .../{ => global}/ocr/service/OcrService.java | 4 +- .../ocr/service/OcrServiceImpl.java | 6 +-- .../{ => global}/ocr/util/OcrUtil.java | 2 +- 94 files changed, 278 insertions(+), 294 deletions(-) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/custom/CustomUserDetailsService.java (81%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/custom/CustomerDetails.java (96%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/jwt/dto/TokenDto.java (86%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/jwt/dto/response/JwtToken.java (78%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/jwt/entity/RefreshToken.java (93%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/jwt/filter/JwtAuthenticationFilter.java (90%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/jwt/service/JwtTokenService.java (89%) rename src/main/java/com/example/bigbrotherbe/{ => global}/auth/util/AuthUtil.java (92%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/config/CustomerCorsFilter.java (93%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/config/S3Config.java (94%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/config/SecurityConfig.java (93%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/config/SwaggerConfig.java (94%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/constant/Constant.java (91%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/database/InitialDataLoader.java (97%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/exception/BusinessException.java (67%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/exception/enums/ErrorCode.java (98%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/exception/enums/SuccessCode.java (84%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/exception/handler/GlobalExceptionHandler.java (74%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/exception/response/ApiResponse.java (88%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/ssh/SshDataSourceConfig.java (100%) rename src/main/java/com/example/bigbrotherbe/{ => global}/common/ssh/SshTunnelingInitializer.java (100%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/EmailConfig.java (97%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/component/MailChecker.java (66%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/component/MailMaker.java (83%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/component/MailService.java (90%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/entity/Email.java (67%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/entity/EmailRequest.java (61%) rename src/main/java/com/example/bigbrotherbe/{ => global}/email/entity/EmailVerificationResult.java (88%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/dto/FileDeleteDTO.java (62%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/dto/FileResponse.java (88%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/dto/FileSaveDTO.java (82%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/dto/FileUpdateDTO.java (80%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/entity/File.java (97%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/enums/FileType.java (88%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/repository/FileRepository.java (54%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/service/FileService.java (56%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/service/FileServiceImpl.java (87%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/util/FileUtil.java (81%) rename src/main/java/com/example/bigbrotherbe/{ => global}/file/util/S3Util.java (84%) rename src/main/java/com/example/bigbrotherbe/{ => global}/ocr/dto/OcrDTO.java (91%) rename src/main/java/com/example/bigbrotherbe/{ => global}/ocr/service/OcrService.java (56%) rename src/main/java/com/example/bigbrotherbe/{ => global}/ocr/service/OcrServiceImpl.java (82%) rename src/main/java/com/example/bigbrotherbe/{ => global}/ocr/util/OcrUtil.java (97%) diff --git a/src/main/java/com/example/bigbrotherbe/domain/affiliation/component/AffiliationManager.java b/src/main/java/com/example/bigbrotherbe/domain/affiliation/component/AffiliationManager.java index 7e61a7c..bd78546 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/affiliation/component/AffiliationManager.java +++ b/src/main/java/com/example/bigbrotherbe/domain/affiliation/component/AffiliationManager.java @@ -7,8 +7,8 @@ import com.example.bigbrotherbe.domain.member.entity.AffiliationMember; import com.example.bigbrotherbe.domain.member.repository.AffiliationMemberRepository; import com.example.bigbrotherbe.domain.member.repository.AffiliationRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeAdminController.java index 019d280..587a533 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeAdminController.java @@ -5,7 +5,7 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; import com.example.bigbrotherbe.domain.campusNotice.service.CampusNoticeService; import com.example.bigbrotherbe.domain.campusNotice.util.LambdaUtil; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -14,9 +14,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequestMapping("/api/v1/admin/campusnotice") diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeController.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeController.java index 2cf818a..3368802 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/controller/CampusNoticeController.java @@ -4,8 +4,8 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; import com.example.bigbrotherbe.domain.campusNotice.service.CampusNoticeService; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -14,10 +14,10 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.NO_EXIST_CAMPUS_NOTICE_TYPE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.NO_EXIST_CAMPUS_NOTICE_TYPE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequestMapping("/api/v1/campusnotice") diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeRegisterRequest.java index b96037d..4e78bda 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeRegisterRequest.java @@ -3,10 +3,10 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; import com.example.bigbrotherbe.domain.campusNotice.util.CampusNoticeMultipartFile; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; import lombok.*; import org.springframework.http.MediaType; import org.springframework.web.client.RestTemplate; diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeResponse.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeResponse.java index e7544c9..d8de3af 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/dto/CampusNoticeResponse.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/entity/CampusNotice.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/entity/CampusNotice.java index a03590e..14b9258 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/entity/CampusNotice.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/entity/CampusNotice.java @@ -1,6 +1,6 @@ package com.example.bigbrotherbe.domain.campusNotice.entity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/service/CampusNoticeServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/service/CampusNoticeServiceImpl.java index afa1377..acdad87 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/service/CampusNoticeServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/service/CampusNoticeServiceImpl.java @@ -8,9 +8,9 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; import com.example.bigbrotherbe.domain.campusNotice.repository.CampusNoticeRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.service.FileService; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.service.FileService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class CampusNoticeServiceImpl implements CampusNoticeService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/util/LambdaUtil.java b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/util/LambdaUtil.java index 23a6896..fa4ca5b 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/campusNotice/util/LambdaUtil.java +++ b/src/main/java/com/example/bigbrotherbe/domain/campusNotice/util/LambdaUtil.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNoticeType; import com.example.bigbrotherbe.domain.campusNotice.service.CampusNoticeService; -import com.example.bigbrotherbe.common.constant.Constant; +import com.example.bigbrotherbe.global.common.constant.Constant; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java index 1a1f2b7..c2b57b4 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventAdminController.java @@ -5,7 +5,7 @@ import com.example.bigbrotherbe.domain.event.dto.response.EventResponse; import com.example.bigbrotherbe.domain.event.entity.Event; import com.example.bigbrotherbe.domain.event.service.EventService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -17,9 +17,9 @@ import java.util.List; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventController.java b/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventController.java index f3caff6..9627b2a 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/controller/EventController.java @@ -4,7 +4,7 @@ import com.example.bigbrotherbe.domain.event.dto.response.EventResponse; import com.example.bigbrotherbe.domain.event.entity.Event; import com.example.bigbrotherbe.domain.event.service.EventService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/dto/request/EventRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/event/dto/request/EventRegisterRequest.java index df61f23..6b46ac6 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/dto/request/EventRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/dto/request/EventRegisterRequest.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.event.dto.request; import com.example.bigbrotherbe.domain.event.entity.Event; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java b/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java index da4985c..092277b 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/dto/response/EventResponse.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.event.dto.response; import com.example.bigbrotherbe.domain.event.entity.Event; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/entity/Event.java b/src/main/java/com/example/bigbrotherbe/domain/event/entity/Event.java index b8f862e..01ea984 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/entity/Event.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/entity/Event.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.event.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java index 5ac3a99..716f590 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/event/service/EventServiceImpl.java @@ -7,16 +7,16 @@ import com.example.bigbrotherbe.domain.event.entity.Event; import com.example.bigbrotherbe.domain.event.repository.EventRepository; import com.example.bigbrotherbe.domain.member.entity.Member; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.file.util.FileUtil; -import com.example.bigbrotherbe.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.file.util.FileUtil; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,8 +26,6 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class EventServiceImpl implements EventService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java index a7a6f62..87f80d1 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQAdminController.java @@ -5,8 +5,8 @@ import com.example.bigbrotherbe.domain.faq.dto.response.FAQResponse; import com.example.bigbrotherbe.domain.faq.entity.FAQ; import com.example.bigbrotherbe.domain.faq.service.FAQService; -import com.example.bigbrotherbe.common.constant.Constant; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.constant.Constant; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -19,7 +19,7 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @Slf4j @RestController diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQController.java b/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQController.java index 45e4dcf..13afa81 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/controller/FAQController.java @@ -4,8 +4,8 @@ import com.example.bigbrotherbe.domain.faq.dto.response.FAQResponse; import com.example.bigbrotherbe.domain.faq.entity.FAQ; import com.example.bigbrotherbe.domain.faq.service.FAQService; -import com.example.bigbrotherbe.common.constant.Constant; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.constant.Constant; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @Slf4j @RestController diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/dto/request/FAQRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/faq/dto/request/FAQRegisterRequest.java index 8449c6f..92158fd 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/dto/request/FAQRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/dto/request/FAQRegisterRequest.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.faq.dto.request; import com.example.bigbrotherbe.domain.faq.entity.FAQ; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.*; import java.util.List; diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/dto/response/FAQResponse.java b/src/main/java/com/example/bigbrotherbe/domain/faq/dto/response/FAQResponse.java index 8ac1893..c6e8d5c 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/dto/response/FAQResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/dto/response/FAQResponse.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.faq.dto.response; import com.example.bigbrotherbe.domain.faq.entity.FAQ; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/entity/FAQ.java b/src/main/java/com/example/bigbrotherbe/domain/faq/entity/FAQ.java index cf84819..71b9521 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/entity/FAQ.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/entity/FAQ.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.faq.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java index 24268f8..fc4dce7 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/faq/service/FAQServiceImpl.java @@ -7,15 +7,14 @@ import com.example.bigbrotherbe.domain.faq.entity.FAQ; import com.example.bigbrotherbe.domain.faq.repository.FAQRepository; import com.example.bigbrotherbe.domain.member.entity.Member; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -25,8 +24,6 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class FAQServiceImpl implements FAQService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsAdminController.java index 47c9d95..5b5f340 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsAdminController.java @@ -5,7 +5,7 @@ import com.example.bigbrotherbe.domain.meetings.dto.response.MeetingsResponse; import com.example.bigbrotherbe.domain.meetings.entity.Meetings; import com.example.bigbrotherbe.domain.meetings.service.MeetingsService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -17,9 +17,9 @@ import java.util.List; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsController.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsController.java index ed3761d..2a293fc 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/controller/MeetingsController.java @@ -4,7 +4,7 @@ import com.example.bigbrotherbe.domain.meetings.entity.Meetings; import com.example.bigbrotherbe.domain.meetings.service.MeetingsService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/request/MeetingsRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/request/MeetingsRegisterRequest.java index f80c92c..dcda16c 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/request/MeetingsRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/request/MeetingsRegisterRequest.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.meetings.entity.Meetings; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/response/MeetingsResponse.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/response/MeetingsResponse.java index 634c42b..6ca4890 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/response/MeetingsResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/dto/response/MeetingsResponse.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.meetings.dto.response; import com.example.bigbrotherbe.domain.meetings.entity.Meetings; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/entity/Meetings.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/entity/Meetings.java index 0ff870c..c073472 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/entity/Meetings.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/entity/Meetings.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.meetings.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/meetings/service/MeetingsServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/meetings/service/MeetingsServiceImpl.java index a933000..b890db2 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/meetings/service/MeetingsServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/meetings/service/MeetingsServiceImpl.java @@ -7,16 +7,16 @@ import com.example.bigbrotherbe.domain.meetings.entity.Meetings; import com.example.bigbrotherbe.domain.meetings.repository.MeetingsRepository; import com.example.bigbrotherbe.domain.member.entity.Member; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.file.util.FileUtil; -import com.example.bigbrotherbe.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.file.util.FileUtil; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,8 +26,6 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class MeetingsServiceImpl implements MeetingsService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberChecker.java b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberChecker.java index 9fbaa50..85235a3 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberChecker.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberChecker.java @@ -1,8 +1,8 @@ package com.example.bigbrotherbe.domain.member.component; import com.example.bigbrotherbe.domain.member.repository.MemberRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberLoader.java b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberLoader.java index 2ec04ec..75796b6 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberLoader.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberLoader.java @@ -2,8 +2,8 @@ import com.example.bigbrotherbe.domain.member.entity.Member; import com.example.bigbrotherbe.domain.member.repository.MemberRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberManager.java b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberManager.java index b05b362..2ab84e8 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberManager.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/component/MemberManager.java @@ -9,8 +9,8 @@ import com.example.bigbrotherbe.domain.member.entity.role.Affiliation; import com.example.bigbrotherbe.domain.member.dto.AffiliationListDto; import com.example.bigbrotherbe.domain.member.entity.AffiliationMember; -import com.example.bigbrotherbe.auth.util.AuthUtil; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberController.java b/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberController.java index 7555e5a..d89b171 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberController.java @@ -8,11 +8,11 @@ import com.example.bigbrotherbe.domain.member.dto.response.MemberInfoResponse; import com.example.bigbrotherbe.domain.member.dto.response.MemberResponse; import com.example.bigbrotherbe.domain.member.dto.AffiliationListDto; -import com.example.bigbrotherbe.email.entity.EmailRequest; -import com.example.bigbrotherbe.email.entity.EmailVerificationResult; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; -import com.example.bigbrotherbe.auth.jwt.dto.TokenDto; -import com.example.bigbrotherbe.common.config.SecurityConfig; +import com.example.bigbrotherbe.global.email.entity.EmailRequest; +import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.jwt.dto.TokenDto; +import com.example.bigbrotherbe.global.common.config.SecurityConfig; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -43,62 +43,62 @@ public interface MemberController { @ApiResponse(responseCode = "200", description = "Success", content = {@Content(schema = @Schema(implementation = MemberResponse.class))}) }) - ResponseEntity> signUp(@RequestBody SignUpDto signUpDto); + ResponseEntity> signUp(@RequestBody SignUpDto signUpDto); @Operation(summary = "로그인") @PostMapping("/sign-in") - ResponseEntity> signIn(@RequestBody MemberRequest memberRequest); + ResponseEntity> signIn(@RequestBody MemberRequest memberRequest); @PostMapping("/test") @Operation(summary = "test용", description = "현재는 로그인 멤버의 AffiliationRoleList 가져오는 값") - ResponseEntity> test(); + ResponseEntity> test(); @GetMapping("/information") @Operation(summary = "유저 상세 정보 조회") - ResponseEntity> inquireMemberInfo(); + ResponseEntity> inquireMemberInfo(); @GetMapping("/sign-up/emails/verification") @Operation(summary = "이메일 중복확인") - ResponseEntity> verificateEmail(@RequestParam(name = "member-email") String email); + ResponseEntity> verificateEmail(@RequestParam(name = "member-email") String email); @PostMapping("/sign-up/emails/request-code") @Operation(summary = "이메일 인증 코드 요청") - ResponseEntity> sendMessage(@RequestBody EmailRequest emailRequest); + ResponseEntity> sendMessage(@RequestBody EmailRequest emailRequest); @GetMapping("/sign-up/emails/verifications") @Operation(summary = "이메일 인증 코드 검증") - ResponseEntity> verificationEmail(@RequestParam(name = "email") String email, @RequestParam(name = "code") String code); + ResponseEntity> verificationEmail(@RequestParam(name = "email") String email, @RequestParam(name = "code") String code); @PatchMapping("/password") @Operation(summary = "비밀번호 변경") - ResponseEntity> changePassword(@RequestBody ChangePasswordRequest changePasswordRequest); + ResponseEntity> changePassword(@RequestBody ChangePasswordRequest changePasswordRequest); @GetMapping("/colleges") @Operation(summary = "단과대학 리스트 조회") - ResponseEntity>> getCollegesList(); + ResponseEntity>> getCollegesList(); @GetMapping("/departments") @Operation(summary = "해당 학과 리스트 조회") - ResponseEntity>> getDepartmentList(@RequestParam(name = "councilName") String councilName); + ResponseEntity>> getDepartmentList(@RequestParam(name = "councilName") String councilName); @GetMapping("/refresh") @Operation(summary = "refresh 토큰으로 토큰 재 생성 요청") - ResponseEntity> refreshToken(@RequestHeader(value = "Authorization",required = false) String refreshToken); + ResponseEntity> refreshToken(@RequestHeader(value = "Authorization",required = false) String refreshToken); @DeleteMapping @Operation(summary = "유저 탈퇴") - ResponseEntity> memberDeleteSelf(); + ResponseEntity> memberDeleteSelf(); @PatchMapping("/information") @Operation(summary = "유저 상세 정보 변경") - ResponseEntity> changeMemberInfo(@RequestBody MemberInfoChangeRequest memberInfoChangeRequest); + ResponseEntity> changeMemberInfo(@RequestBody MemberInfoChangeRequest memberInfoChangeRequest); @GetMapping() @Operation(summary = "유저 전체 조회") - ResponseEntity>> inquireAllUserInfo(); + ResponseEntity>> inquireAllUserInfo(); @GetMapping("/{email}") @Operation(summary = "유저 이메일을 통한 조회") - ResponseEntity> findUserByEmail(@PathVariable(name = "email") String email); + ResponseEntity> findUserByEmail(@PathVariable(name = "email") String email); } diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberControllerImpl.java b/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberControllerImpl.java index 36c81e8..466b9ae 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberControllerImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/controller/MemberControllerImpl.java @@ -9,15 +9,15 @@ import com.example.bigbrotherbe.domain.member.dto.response.MemberInfoResponse; import com.example.bigbrotherbe.domain.member.dto.response.MemberResponse; import com.example.bigbrotherbe.domain.member.dto.AffiliationListDto; -import com.example.bigbrotherbe.email.entity.EmailRequest; -import com.example.bigbrotherbe.email.entity.EmailVerificationResult; -import com.example.bigbrotherbe.email.component.MailService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.email.entity.EmailRequest; +import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.email.component.MailService; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; import com.example.bigbrotherbe.domain.member.service.MemberService; -import com.example.bigbrotherbe.auth.jwt.service.JwtTokenService; -import com.example.bigbrotherbe.auth.jwt.dto.TokenDto; +import com.example.bigbrotherbe.global.auth.jwt.service.JwtTokenService; +import com.example.bigbrotherbe.global.auth.jwt.dto.TokenDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -25,7 +25,7 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/dto/request/SignUpDto.java b/src/main/java/com/example/bigbrotherbe/domain/member/dto/request/SignUpDto.java index d9e7e60..46df7f5 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/dto/request/SignUpDto.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/dto/request/SignUpDto.java @@ -3,8 +3,8 @@ import com.example.bigbrotherbe.domain.member.entity.Member; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/entity/enums/AffiliationCode.java b/src/main/java/com/example/bigbrotherbe/domain/member/entity/enums/AffiliationCode.java index 85cc018..763d409 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/entity/enums/AffiliationCode.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/entity/enums/AffiliationCode.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.member.entity.enums; import com.example.bigbrotherbe.domain.member.dto.response.AffiliationResponse; -import com.example.bigbrotherbe.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.BusinessException; import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; import lombok.Getter; @@ -10,8 +10,8 @@ import java.util.List; import java.util.stream.Collectors; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.INVALID_AFFILIATION; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.NO_EXIST_AFFILIATION; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.INVALID_AFFILIATION; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.NO_EXIST_AFFILIATION; @Getter @AllArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberService.java b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberService.java index def7fe3..52da99c 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberService.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberService.java @@ -4,7 +4,7 @@ import com.example.bigbrotherbe.domain.member.dto.response.MemberInfoResponse; import com.example.bigbrotherbe.domain.member.dto.response.MemberResponse; import com.example.bigbrotherbe.domain.member.dto.AffiliationListDto; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; import java.util.List; diff --git a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java index ce825d9..ad4e07e 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/member/service/MemberServiceImpl.java @@ -6,7 +6,7 @@ import com.example.bigbrotherbe.domain.member.dto.response.MemberInfoResponse; import com.example.bigbrotherbe.domain.member.dto.response.MemberResponse; import com.example.bigbrotherbe.domain.member.dto.AffiliationListDto; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; import com.example.bigbrotherbe.domain.member.entity.Member; diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java index 3eed99d..7ebdada 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeAdminController.java @@ -5,8 +5,8 @@ import com.example.bigbrotherbe.domain.notice.dto.response.NoticeResponse; import com.example.bigbrotherbe.domain.notice.entity.Notice; import com.example.bigbrotherbe.domain.notice.service.NoticeService; -import com.example.bigbrotherbe.common.constant.Constant; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.constant.Constant; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -19,7 +19,7 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @Slf4j @RestController diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeController.java b/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeController.java index bcf3aba..20adac7 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/controller/NoticeController.java @@ -3,8 +3,8 @@ import com.example.bigbrotherbe.domain.notice.dto.response.NoticeResponse; import com.example.bigbrotherbe.domain.notice.entity.Notice; import com.example.bigbrotherbe.domain.notice.service.NoticeService; -import com.example.bigbrotherbe.common.constant.Constant; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.constant.Constant; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -14,7 +14,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @Slf4j // 로깅 기능 추가 @RestController // RESTful 웹서비스 컨트롤러 diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java index ba1b2d3..2cba660 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/dto/request/NoticeRegisterRequest.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.notice.dto.request; import com.example.bigbrotherbe.domain.notice.entity.Notice; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.*; import java.util.List; diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/dto/response/NoticeResponse.java b/src/main/java/com/example/bigbrotherbe/domain/notice/dto/response/NoticeResponse.java index 120d53a..a9e9d05 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/dto/response/NoticeResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/dto/response/NoticeResponse.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.notice.dto.response; import com.example.bigbrotherbe.domain.notice.entity.Notice; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/entity/Notice.java b/src/main/java/com/example/bigbrotherbe/domain/notice/entity/Notice.java index ca2425f..ecb524d 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/entity/Notice.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/entity/Notice.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.notice.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java index dd11918..0ce0c73 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/notice/service/NoticeServiceImpl.java @@ -7,16 +7,15 @@ import com.example.bigbrotherbe.domain.notice.dto.request.NoticeModifyRequest; import com.example.bigbrotherbe.domain.notice.dto.request.NoticeRegisterRequest; import com.example.bigbrotherbe.domain.notice.repository.NoticeRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,8 +25,6 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class NoticeServiceImpl implements NoticeService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleAdminController.java index 14ae141..166ef30 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleAdminController.java @@ -6,7 +6,7 @@ import com.example.bigbrotherbe.domain.rule.dto.response.RuleResponse; import com.example.bigbrotherbe.domain.rule.entity.Rule; import com.example.bigbrotherbe.domain.rule.service.RuleService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -18,9 +18,9 @@ import java.util.List; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleController.java b/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleController.java index 45fd0b1..03c2737 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/controller/RuleController.java @@ -3,7 +3,7 @@ import com.example.bigbrotherbe.domain.rule.dto.response.RuleResponse; import com.example.bigbrotherbe.domain.rule.entity.Rule; import com.example.bigbrotherbe.domain.rule.service.RuleService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.*; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.PAGE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.constant.Constant.GetContent.SIZE_DEFAULT_VALUE; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/dto/request/RuleRegisterRequest.java b/src/main/java/com/example/bigbrotherbe/domain/rule/dto/request/RuleRegisterRequest.java index f325975..a5ead34 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/dto/request/RuleRegisterRequest.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/dto/request/RuleRegisterRequest.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.rule.dto.request; import com.example.bigbrotherbe.domain.rule.entity.Rule; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/dto/response/RuleResponse.java b/src/main/java/com/example/bigbrotherbe/domain/rule/dto/response/RuleResponse.java index ec9b5ef..27ba77c 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/dto/response/RuleResponse.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/dto/response/RuleResponse.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.rule.dto.response; import com.example.bigbrotherbe.domain.rule.entity.Rule; -import com.example.bigbrotherbe.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/entity/Rule.java b/src/main/java/com/example/bigbrotherbe/domain/rule/entity/Rule.java index fc8850e..38c392c 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/entity/Rule.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/entity/Rule.java @@ -1,7 +1,7 @@ package com.example.bigbrotherbe.domain.rule.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/rule/service/RuleServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/rule/service/RuleServiceImpl.java index 98ab31a..9ee38eb 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/rule/service/RuleServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/rule/service/RuleServiceImpl.java @@ -7,16 +7,16 @@ import com.example.bigbrotherbe.domain.rule.dto.response.RuleResponse; import com.example.bigbrotherbe.domain.rule.entity.Rule; import com.example.bigbrotherbe.domain.rule.repository.RuleRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileResponse; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.file.util.FileUtil; -import com.example.bigbrotherbe.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileResponse; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.file.util.FileUtil; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,8 +26,6 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor public class RuleServiceImpl implements RuleService { diff --git a/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsAdminController.java b/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsAdminController.java index 1ed1ed7..c20d4b6 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsAdminController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsAdminController.java @@ -4,7 +4,7 @@ import com.example.bigbrotherbe.domain.transactions.dto.request.TransactionsUpdateRequest; import com.example.bigbrotherbe.domain.transactions.dto.response.TransactionsResponse; import com.example.bigbrotherbe.domain.transactions.service.TransactionsService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -12,7 +12,7 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsController.java b/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsController.java index d671e6d..44167c9 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsController.java +++ b/src/main/java/com/example/bigbrotherbe/domain/transactions/controller/TransactionsController.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.transactions.dto.response.TransactionsResponse; import com.example.bigbrotherbe.domain.transactions.service.TransactionsService; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -10,7 +10,7 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.SuccessCode.SUCCESS; +import static com.example.bigbrotherbe.global.common.exception.enums.SuccessCode.SUCCESS; @RestController @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/domain/transactions/entity/Transactions.java b/src/main/java/com/example/bigbrotherbe/domain/transactions/entity/Transactions.java index 1956146..c3083c9 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/transactions/entity/Transactions.java +++ b/src/main/java/com/example/bigbrotherbe/domain/transactions/entity/Transactions.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.BaseTimeEntity; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/bigbrotherbe/domain/transactions/service/TransactionsServiceImpl.java b/src/main/java/com/example/bigbrotherbe/domain/transactions/service/TransactionsServiceImpl.java index e7504e8..2f2a070 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/transactions/service/TransactionsServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/domain/transactions/service/TransactionsServiceImpl.java @@ -6,14 +6,14 @@ import com.example.bigbrotherbe.domain.transactions.dto.response.TransactionsResponse; import com.example.bigbrotherbe.domain.transactions.entity.Transactions; import com.example.bigbrotherbe.domain.transactions.repository.TransactionsRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.enums.FileType; -import com.example.bigbrotherbe.file.service.FileService; -import com.example.bigbrotherbe.auth.util.AuthUtil; -import com.example.bigbrotherbe.ocr.dto.OcrDTO; -import com.example.bigbrotherbe.ocr.service.OcrService; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.enums.FileType; +import com.example.bigbrotherbe.global.file.service.FileService; +import com.example.bigbrotherbe.global.auth.util.AuthUtil; +import com.example.bigbrotherbe.global.ocr.dto.OcrDTO; +import com.example.bigbrotherbe.global.ocr.service.OcrService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,8 +26,6 @@ import java.util.List; import java.util.stream.Collectors; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; - @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/auth/custom/CustomUserDetailsService.java b/src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomUserDetailsService.java similarity index 81% rename from src/main/java/com/example/bigbrotherbe/auth/custom/CustomUserDetailsService.java rename to src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomUserDetailsService.java index f9c9e75..169fecc 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/custom/CustomUserDetailsService.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomUserDetailsService.java @@ -1,9 +1,9 @@ -package com.example.bigbrotherbe.auth.custom; +package com.example.bigbrotherbe.global.auth.custom; import com.example.bigbrotherbe.domain.member.entity.Member; import com.example.bigbrotherbe.domain.member.repository.MemberRepository; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/example/bigbrotherbe/auth/custom/CustomerDetails.java b/src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomerDetails.java similarity index 96% rename from src/main/java/com/example/bigbrotherbe/auth/custom/CustomerDetails.java rename to src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomerDetails.java index 4991886..0416cf2 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/custom/CustomerDetails.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/custom/CustomerDetails.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.auth.custom; +package com.example.bigbrotherbe.global.auth.custom; import java.util.Collection; import java.util.stream.Collectors; diff --git a/src/main/java/com/example/bigbrotherbe/auth/jwt/dto/TokenDto.java b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/TokenDto.java similarity index 86% rename from src/main/java/com/example/bigbrotherbe/auth/jwt/dto/TokenDto.java rename to src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/TokenDto.java index 11da753..65afc7d 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/jwt/dto/TokenDto.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/TokenDto.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.auth.jwt.dto; +package com.example.bigbrotherbe.global.auth.jwt.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/auth/jwt/dto/response/JwtToken.java b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/response/JwtToken.java similarity index 78% rename from src/main/java/com/example/bigbrotherbe/auth/jwt/dto/response/JwtToken.java rename to src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/response/JwtToken.java index 226a284..04faecd 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/jwt/dto/response/JwtToken.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/dto/response/JwtToken.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.auth.jwt.dto.response; +package com.example.bigbrotherbe.global.auth.jwt.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/bigbrotherbe/auth/jwt/entity/RefreshToken.java b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/entity/RefreshToken.java similarity index 93% rename from src/main/java/com/example/bigbrotherbe/auth/jwt/entity/RefreshToken.java rename to src/main/java/com/example/bigbrotherbe/global/auth/jwt/entity/RefreshToken.java index 13073f2..cf04bc7 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/jwt/entity/RefreshToken.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/entity/RefreshToken.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.auth.jwt.entity; +package com.example.bigbrotherbe.global.auth.jwt.entity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/bigbrotherbe/auth/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/filter/JwtAuthenticationFilter.java similarity index 90% rename from src/main/java/com/example/bigbrotherbe/auth/jwt/filter/JwtAuthenticationFilter.java rename to src/main/java/com/example/bigbrotherbe/global/auth/jwt/filter/JwtAuthenticationFilter.java index 2acbfb1..6898213 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/jwt/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/filter/JwtAuthenticationFilter.java @@ -1,8 +1,8 @@ -package com.example.bigbrotherbe.auth.jwt.filter; +package com.example.bigbrotherbe.global.auth.jwt.filter; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; -import com.example.bigbrotherbe.auth.jwt.service.JwtTokenService; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.auth.jwt.service.JwtTokenService; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/src/main/java/com/example/bigbrotherbe/auth/jwt/service/JwtTokenService.java b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/service/JwtTokenService.java similarity index 89% rename from src/main/java/com/example/bigbrotherbe/auth/jwt/service/JwtTokenService.java rename to src/main/java/com/example/bigbrotherbe/global/auth/jwt/service/JwtTokenService.java index 96c5001..b686cdd 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/jwt/service/JwtTokenService.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/jwt/service/JwtTokenService.java @@ -1,15 +1,15 @@ -package com.example.bigbrotherbe.auth.jwt.service; - -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.ACCESS_TOKEN_EXPIRED; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.REFRESH_TOKEN_EXPIRED; -import static com.example.bigbrotherbe.auth.jwt.dto.TokenDto.ACCESS_TOKEN; -import static com.example.bigbrotherbe.auth.jwt.dto.TokenDto.REFRESH_TOKEN; - -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; -import com.example.bigbrotherbe.auth.jwt.dto.TokenDto; -import com.example.bigbrotherbe.auth.custom.CustomUserDetailsService; +package com.example.bigbrotherbe.global.auth.jwt.service; + +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.ACCESS_TOKEN_EXPIRED; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.REFRESH_TOKEN_EXPIRED; +import static com.example.bigbrotherbe.global.auth.jwt.dto.TokenDto.ACCESS_TOKEN; +import static com.example.bigbrotherbe.global.auth.jwt.dto.TokenDto.REFRESH_TOKEN; + +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.jwt.dto.TokenDto; +import com.example.bigbrotherbe.global.auth.custom.CustomUserDetailsService; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/example/bigbrotherbe/auth/util/AuthUtil.java b/src/main/java/com/example/bigbrotherbe/global/auth/util/AuthUtil.java similarity index 92% rename from src/main/java/com/example/bigbrotherbe/auth/util/AuthUtil.java rename to src/main/java/com/example/bigbrotherbe/global/auth/util/AuthUtil.java index a0ea986..f6fef9c 100644 --- a/src/main/java/com/example/bigbrotherbe/auth/util/AuthUtil.java +++ b/src/main/java/com/example/bigbrotherbe/global/auth/util/AuthUtil.java @@ -1,16 +1,16 @@ -package com.example.bigbrotherbe.auth.util; +package com.example.bigbrotherbe.global.auth.util; import com.example.bigbrotherbe.domain.member.entity.Member; import com.example.bigbrotherbe.domain.member.entity.AffiliationMember; import com.example.bigbrotherbe.domain.member.repository.AffiliationMemberRepository; import com.example.bigbrotherbe.domain.member.repository.AffiliationRepository; import com.example.bigbrotherbe.domain.member.repository.MemberRepository; -import com.example.bigbrotherbe.auth.jwt.dto.response.JwtToken; +import com.example.bigbrotherbe.global.auth.jwt.dto.response.JwtToken; import java.util.List; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.auth.jwt.service.JwtTokenService; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.auth.jwt.service.JwtTokenService; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; @@ -18,7 +18,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.*; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.*; import static com.example.bigbrotherbe.domain.member.entity.enums.AffiliationCode.STUDENT_COUNCIL; import static com.example.bigbrotherbe.domain.member.entity.role.Role.*; diff --git a/src/main/java/com/example/bigbrotherbe/common/config/CustomerCorsFilter.java b/src/main/java/com/example/bigbrotherbe/global/common/config/CustomerCorsFilter.java similarity index 93% rename from src/main/java/com/example/bigbrotherbe/common/config/CustomerCorsFilter.java rename to src/main/java/com/example/bigbrotherbe/global/common/config/CustomerCorsFilter.java index a6a4324..903f1d1 100644 --- a/src/main/java/com/example/bigbrotherbe/common/config/CustomerCorsFilter.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/config/CustomerCorsFilter.java @@ -1,7 +1,7 @@ -package com.example.bigbrotherbe.common.config; +package com.example.bigbrotherbe.global.common.config; -import static com.example.bigbrotherbe.common.constant.Constant.Url.DOMAIN_URL; +import static com.example.bigbrotherbe.global.common.constant.Constant.Url.DOMAIN_URL; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; diff --git a/src/main/java/com/example/bigbrotherbe/common/config/S3Config.java b/src/main/java/com/example/bigbrotherbe/global/common/config/S3Config.java similarity index 94% rename from src/main/java/com/example/bigbrotherbe/common/config/S3Config.java rename to src/main/java/com/example/bigbrotherbe/global/common/config/S3Config.java index 3a41042..4708ec3 100644 --- a/src/main/java/com/example/bigbrotherbe/common/config/S3Config.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/config/S3Config.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.common.config; +package com.example.bigbrotherbe.global.common.config; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; diff --git a/src/main/java/com/example/bigbrotherbe/common/config/SecurityConfig.java b/src/main/java/com/example/bigbrotherbe/global/common/config/SecurityConfig.java similarity index 93% rename from src/main/java/com/example/bigbrotherbe/common/config/SecurityConfig.java rename to src/main/java/com/example/bigbrotherbe/global/common/config/SecurityConfig.java index 08d98f4..0c2f3bd 100644 --- a/src/main/java/com/example/bigbrotherbe/common/config/SecurityConfig.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/config/SecurityConfig.java @@ -1,7 +1,7 @@ -package com.example.bigbrotherbe.common.config; +package com.example.bigbrotherbe.global.common.config; -import com.example.bigbrotherbe.auth.jwt.filter.JwtAuthenticationFilter; -import com.example.bigbrotherbe.auth.jwt.service.JwtTokenService; +import com.example.bigbrotherbe.global.auth.jwt.filter.JwtAuthenticationFilter; +import com.example.bigbrotherbe.global.auth.jwt.service.JwtTokenService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/example/bigbrotherbe/common/config/SwaggerConfig.java b/src/main/java/com/example/bigbrotherbe/global/common/config/SwaggerConfig.java similarity index 94% rename from src/main/java/com/example/bigbrotherbe/common/config/SwaggerConfig.java rename to src/main/java/com/example/bigbrotherbe/global/common/config/SwaggerConfig.java index f01098b..f4f8e1b 100644 --- a/src/main/java/com/example/bigbrotherbe/common/config/SwaggerConfig.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/config/SwaggerConfig.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.common.config; +package com.example.bigbrotherbe.global.common.config; -import static com.example.bigbrotherbe.common.constant.Constant.Url.DOMAIN_URL; +import static com.example.bigbrotherbe.global.common.constant.Constant.Url.DOMAIN_URL; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/example/bigbrotherbe/common/constant/Constant.java b/src/main/java/com/example/bigbrotherbe/global/common/constant/Constant.java similarity index 91% rename from src/main/java/com/example/bigbrotherbe/common/constant/Constant.java rename to src/main/java/com/example/bigbrotherbe/global/common/constant/Constant.java index dbd04ba..b374b24 100644 --- a/src/main/java/com/example/bigbrotherbe/common/constant/Constant.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/constant/Constant.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.common.constant; +package com.example.bigbrotherbe.global.common.constant; public class Constant { public static class GetContent { diff --git a/src/main/java/com/example/bigbrotherbe/common/database/InitialDataLoader.java b/src/main/java/com/example/bigbrotherbe/global/common/database/InitialDataLoader.java similarity index 97% rename from src/main/java/com/example/bigbrotherbe/common/database/InitialDataLoader.java rename to src/main/java/com/example/bigbrotherbe/global/common/database/InitialDataLoader.java index bdffaa0..08f7c7f 100644 --- a/src/main/java/com/example/bigbrotherbe/common/database/InitialDataLoader.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/database/InitialDataLoader.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.common.database; +package com.example.bigbrotherbe.global.common.database; import com.example.bigbrotherbe.domain.member.entity.Member; import com.example.bigbrotherbe.domain.member.entity.enums.AffiliationCode; diff --git a/src/main/java/com/example/bigbrotherbe/common/exception/BusinessException.java b/src/main/java/com/example/bigbrotherbe/global/common/exception/BusinessException.java similarity index 67% rename from src/main/java/com/example/bigbrotherbe/common/exception/BusinessException.java rename to src/main/java/com/example/bigbrotherbe/global/common/exception/BusinessException.java index 14f2653..eed0e0e 100644 --- a/src/main/java/com/example/bigbrotherbe/common/exception/BusinessException.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/exception/BusinessException.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.common.exception; +package com.example.bigbrotherbe.global.common.exception; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import lombok.Getter; @Getter diff --git a/src/main/java/com/example/bigbrotherbe/common/exception/enums/ErrorCode.java b/src/main/java/com/example/bigbrotherbe/global/common/exception/enums/ErrorCode.java similarity index 98% rename from src/main/java/com/example/bigbrotherbe/common/exception/enums/ErrorCode.java rename to src/main/java/com/example/bigbrotherbe/global/common/exception/enums/ErrorCode.java index ff181fd..cce5567 100644 --- a/src/main/java/com/example/bigbrotherbe/common/exception/enums/ErrorCode.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/exception/enums/ErrorCode.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.common.exception.enums; +package com.example.bigbrotherbe.global.common.exception.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/common/exception/enums/SuccessCode.java b/src/main/java/com/example/bigbrotherbe/global/common/exception/enums/SuccessCode.java similarity index 84% rename from src/main/java/com/example/bigbrotherbe/common/exception/enums/SuccessCode.java rename to src/main/java/com/example/bigbrotherbe/global/common/exception/enums/SuccessCode.java index 72365f5..8e4808f 100644 --- a/src/main/java/com/example/bigbrotherbe/common/exception/enums/SuccessCode.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/exception/enums/SuccessCode.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.common.exception.enums; +package com.example.bigbrotherbe.global.common.exception.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/common/exception/handler/GlobalExceptionHandler.java b/src/main/java/com/example/bigbrotherbe/global/common/exception/handler/GlobalExceptionHandler.java similarity index 74% rename from src/main/java/com/example/bigbrotherbe/common/exception/handler/GlobalExceptionHandler.java rename to src/main/java/com/example/bigbrotherbe/global/common/exception/handler/GlobalExceptionHandler.java index 187c4ae..b9507e9 100644 --- a/src/main/java/com/example/bigbrotherbe/common/exception/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/exception/handler/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.example.bigbrotherbe.common.exception.handler; +package com.example.bigbrotherbe.global.common.exception.handler; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.response.ApiResponse; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.response.ApiResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/src/main/java/com/example/bigbrotherbe/common/exception/response/ApiResponse.java b/src/main/java/com/example/bigbrotherbe/global/common/exception/response/ApiResponse.java similarity index 88% rename from src/main/java/com/example/bigbrotherbe/common/exception/response/ApiResponse.java rename to src/main/java/com/example/bigbrotherbe/global/common/exception/response/ApiResponse.java index f101dda..a21b148 100644 --- a/src/main/java/com/example/bigbrotherbe/common/exception/response/ApiResponse.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/exception/response/ApiResponse.java @@ -1,7 +1,7 @@ -package com.example.bigbrotherbe.common.exception.response; +package com.example.bigbrotherbe.global.common.exception.response; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; -import com.example.bigbrotherbe.common.exception.enums.SuccessCode; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.common.exception.enums.SuccessCode; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.*; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/example/bigbrotherbe/common/ssh/SshDataSourceConfig.java b/src/main/java/com/example/bigbrotherbe/global/common/ssh/SshDataSourceConfig.java similarity index 100% rename from src/main/java/com/example/bigbrotherbe/common/ssh/SshDataSourceConfig.java rename to src/main/java/com/example/bigbrotherbe/global/common/ssh/SshDataSourceConfig.java diff --git a/src/main/java/com/example/bigbrotherbe/common/ssh/SshTunnelingInitializer.java b/src/main/java/com/example/bigbrotherbe/global/common/ssh/SshTunnelingInitializer.java similarity index 100% rename from src/main/java/com/example/bigbrotherbe/common/ssh/SshTunnelingInitializer.java rename to src/main/java/com/example/bigbrotherbe/global/common/ssh/SshTunnelingInitializer.java diff --git a/src/main/java/com/example/bigbrotherbe/email/EmailConfig.java b/src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java similarity index 97% rename from src/main/java/com/example/bigbrotherbe/email/EmailConfig.java rename to src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java index a61727a..39db927 100644 --- a/src/main/java/com/example/bigbrotherbe/email/EmailConfig.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.email; +package com.example.bigbrotherbe.global.email; import java.util.Properties; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/bigbrotherbe/email/component/MailChecker.java b/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java similarity index 66% rename from src/main/java/com/example/bigbrotherbe/email/component/MailChecker.java rename to src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java index de3c12d..cdac1fb 100644 --- a/src/main/java/com/example/bigbrotherbe/email/component/MailChecker.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java @@ -1,10 +1,10 @@ -package com.example.bigbrotherbe.email.component; +package com.example.bigbrotherbe.global.email.component; import com.example.bigbrotherbe.domain.member.component.MemberLoader; -import com.example.bigbrotherbe.email.entity.EmailVerificationResult; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/bigbrotherbe/email/component/MailMaker.java b/src/main/java/com/example/bigbrotherbe/global/email/component/MailMaker.java similarity index 83% rename from src/main/java/com/example/bigbrotherbe/email/component/MailMaker.java rename to src/main/java/com/example/bigbrotherbe/global/email/component/MailMaker.java index 044128e..2c5e88e 100644 --- a/src/main/java/com/example/bigbrotherbe/email/component/MailMaker.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/component/MailMaker.java @@ -1,8 +1,8 @@ -package com.example.bigbrotherbe.email.component; +package com.example.bigbrotherbe.global.email.component; -import com.example.bigbrotherbe.email.entity.Email; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.email.entity.Email; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; diff --git a/src/main/java/com/example/bigbrotherbe/email/component/MailService.java b/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java similarity index 90% rename from src/main/java/com/example/bigbrotherbe/email/component/MailService.java rename to src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java index bab6a8f..290ab3d 100644 --- a/src/main/java/com/example/bigbrotherbe/email/component/MailService.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java @@ -1,11 +1,11 @@ -package com.example.bigbrotherbe.email.component; +package com.example.bigbrotherbe.global.email.component; import com.example.bigbrotherbe.domain.member.entity.EMailVerification; import com.example.bigbrotherbe.domain.member.repository.MailRepository; -import com.example.bigbrotherbe.email.entity.Email; -import com.example.bigbrotherbe.email.entity.EmailVerificationResult; -import com.example.bigbrotherbe.common.exception.BusinessException; -import com.example.bigbrotherbe.common.exception.enums.ErrorCode; +import com.example.bigbrotherbe.global.email.entity.Email; +import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import java.time.Duration; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/bigbrotherbe/email/entity/Email.java b/src/main/java/com/example/bigbrotherbe/global/email/entity/Email.java similarity index 67% rename from src/main/java/com/example/bigbrotherbe/email/entity/Email.java rename to src/main/java/com/example/bigbrotherbe/global/email/entity/Email.java index 0f789cf..22c8e46 100644 --- a/src/main/java/com/example/bigbrotherbe/email/entity/Email.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/entity/Email.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.email.entity; +package com.example.bigbrotherbe.global.email.entity; import lombok.Builder; diff --git a/src/main/java/com/example/bigbrotherbe/email/entity/EmailRequest.java b/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java similarity index 61% rename from src/main/java/com/example/bigbrotherbe/email/entity/EmailRequest.java rename to src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java index 0198519..7c481fc 100644 --- a/src/main/java/com/example/bigbrotherbe/email/entity/EmailRequest.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.email.entity; +package com.example.bigbrotherbe.global.email.entity; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/email/entity/EmailVerificationResult.java b/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java similarity index 88% rename from src/main/java/com/example/bigbrotherbe/email/entity/EmailVerificationResult.java rename to src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java index 536718a..1d3d9e7 100644 --- a/src/main/java/com/example/bigbrotherbe/email/entity/EmailVerificationResult.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.email.entity; +package com.example.bigbrotherbe.global.email.entity; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/file/dto/FileDeleteDTO.java b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileDeleteDTO.java similarity index 62% rename from src/main/java/com/example/bigbrotherbe/file/dto/FileDeleteDTO.java rename to src/main/java/com/example/bigbrotherbe/global/file/dto/FileDeleteDTO.java index 1f0501d..774449d 100644 --- a/src/main/java/com/example/bigbrotherbe/file/dto/FileDeleteDTO.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileDeleteDTO.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.file.dto; +package com.example.bigbrotherbe.global.file.dto; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/file/dto/FileResponse.java b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileResponse.java similarity index 88% rename from src/main/java/com/example/bigbrotherbe/file/dto/FileResponse.java rename to src/main/java/com/example/bigbrotherbe/global/file/dto/FileResponse.java index cf59d9e..7c90464 100644 --- a/src/main/java/com/example/bigbrotherbe/file/dto/FileResponse.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileResponse.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.file.dto; +package com.example.bigbrotherbe.global.file.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/bigbrotherbe/file/dto/FileSaveDTO.java b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileSaveDTO.java similarity index 82% rename from src/main/java/com/example/bigbrotherbe/file/dto/FileSaveDTO.java rename to src/main/java/com/example/bigbrotherbe/global/file/dto/FileSaveDTO.java index 7bee7a6..fda2db1 100644 --- a/src/main/java/com/example/bigbrotherbe/file/dto/FileSaveDTO.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileSaveDTO.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.file.dto; +package com.example.bigbrotherbe.global.file.dto; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/example/bigbrotherbe/file/dto/FileUpdateDTO.java b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileUpdateDTO.java similarity index 80% rename from src/main/java/com/example/bigbrotherbe/file/dto/FileUpdateDTO.java rename to src/main/java/com/example/bigbrotherbe/global/file/dto/FileUpdateDTO.java index d8fa4df..32f761b 100644 --- a/src/main/java/com/example/bigbrotherbe/file/dto/FileUpdateDTO.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/dto/FileUpdateDTO.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.file.dto; +package com.example.bigbrotherbe.global.file.dto; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import lombok.Builder; import lombok.Getter; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/example/bigbrotherbe/file/entity/File.java b/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java similarity index 97% rename from src/main/java/com/example/bigbrotherbe/file/entity/File.java rename to src/main/java/com/example/bigbrotherbe/global/file/entity/File.java index 16b5867..43117ef 100644 --- a/src/main/java/com/example/bigbrotherbe/file/entity/File.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.file.entity; +package com.example.bigbrotherbe.global.file.entity; import com.example.bigbrotherbe.domain.BaseTimeEntity; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; diff --git a/src/main/java/com/example/bigbrotherbe/file/enums/FileType.java b/src/main/java/com/example/bigbrotherbe/global/file/enums/FileType.java similarity index 88% rename from src/main/java/com/example/bigbrotherbe/file/enums/FileType.java rename to src/main/java/com/example/bigbrotherbe/global/file/enums/FileType.java index 6b1f32d..14df40b 100644 --- a/src/main/java/com/example/bigbrotherbe/file/enums/FileType.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/enums/FileType.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.file.enums; +package com.example.bigbrotherbe.global.file.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/file/repository/FileRepository.java b/src/main/java/com/example/bigbrotherbe/global/file/repository/FileRepository.java similarity index 54% rename from src/main/java/com/example/bigbrotherbe/file/repository/FileRepository.java rename to src/main/java/com/example/bigbrotherbe/global/file/repository/FileRepository.java index cbbf833..8d05cb5 100644 --- a/src/main/java/com/example/bigbrotherbe/file/repository/FileRepository.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/repository/FileRepository.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.file.repository; +package com.example.bigbrotherbe.global.file.repository; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.entity.File; import org.springframework.data.jpa.repository.JpaRepository; public interface FileRepository extends JpaRepository { diff --git a/src/main/java/com/example/bigbrotherbe/file/service/FileService.java b/src/main/java/com/example/bigbrotherbe/global/file/service/FileService.java similarity index 56% rename from src/main/java/com/example/bigbrotherbe/file/service/FileService.java rename to src/main/java/com/example/bigbrotherbe/global/file/service/FileService.java index 5a6b4bb..42614f2 100644 --- a/src/main/java/com/example/bigbrotherbe/file/service/FileService.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/service/FileService.java @@ -1,9 +1,9 @@ -package com.example.bigbrotherbe.file.service; +package com.example.bigbrotherbe.global.file.service; -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/example/bigbrotherbe/file/service/FileServiceImpl.java b/src/main/java/com/example/bigbrotherbe/global/file/service/FileServiceImpl.java similarity index 87% rename from src/main/java/com/example/bigbrotherbe/file/service/FileServiceImpl.java rename to src/main/java/com/example/bigbrotherbe/global/file/service/FileServiceImpl.java index e5a1308..fa9438f 100644 --- a/src/main/java/com/example/bigbrotherbe/file/service/FileServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/service/FileServiceImpl.java @@ -1,11 +1,11 @@ -package com.example.bigbrotherbe.file.service; - -import com.example.bigbrotherbe.file.dto.FileDeleteDTO; -import com.example.bigbrotherbe.file.dto.FileSaveDTO; -import com.example.bigbrotherbe.file.dto.FileUpdateDTO; -import com.example.bigbrotherbe.file.entity.File; -import com.example.bigbrotherbe.file.repository.FileRepository; -import com.example.bigbrotherbe.file.util.S3Util; +package com.example.bigbrotherbe.global.file.service; + +import com.example.bigbrotherbe.global.file.dto.FileDeleteDTO; +import com.example.bigbrotherbe.global.file.dto.FileSaveDTO; +import com.example.bigbrotherbe.global.file.dto.FileUpdateDTO; +import com.example.bigbrotherbe.global.file.entity.File; +import com.example.bigbrotherbe.global.file.repository.FileRepository; +import com.example.bigbrotherbe.global.file.util.S3Util; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/bigbrotherbe/file/util/FileUtil.java b/src/main/java/com/example/bigbrotherbe/global/file/util/FileUtil.java similarity index 81% rename from src/main/java/com/example/bigbrotherbe/file/util/FileUtil.java rename to src/main/java/com/example/bigbrotherbe/global/file/util/FileUtil.java index af7c290..dd65104 100644 --- a/src/main/java/com/example/bigbrotherbe/file/util/FileUtil.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/util/FileUtil.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.file.util; +package com.example.bigbrotherbe.global.file.util; -import com.example.bigbrotherbe.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; @@ -8,8 +8,8 @@ import java.util.List; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.INVALID_IMAGE_TYPE; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.INVALID_PDF_TYPE; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.INVALID_IMAGE_TYPE; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.INVALID_PDF_TYPE; @Component @RequiredArgsConstructor diff --git a/src/main/java/com/example/bigbrotherbe/file/util/S3Util.java b/src/main/java/com/example/bigbrotherbe/global/file/util/S3Util.java similarity index 84% rename from src/main/java/com/example/bigbrotherbe/file/util/S3Util.java rename to src/main/java/com/example/bigbrotherbe/global/file/util/S3Util.java index 0b5505c..6a32590 100644 --- a/src/main/java/com/example/bigbrotherbe/file/util/S3Util.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/util/S3Util.java @@ -1,10 +1,10 @@ -package com.example.bigbrotherbe.file.util; +package com.example.bigbrotherbe.global.file.util; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import com.example.bigbrotherbe.common.exception.BusinessException; +import com.example.bigbrotherbe.global.common.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -13,8 +13,8 @@ import java.io.IOException; import java.net.URL; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.FAIL_TO_DELETE; -import static com.example.bigbrotherbe.common.exception.enums.ErrorCode.FAIL_TO_UPLOAD; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.FAIL_TO_DELETE; +import static com.example.bigbrotherbe.global.common.exception.enums.ErrorCode.FAIL_TO_UPLOAD; @Component diff --git a/src/main/java/com/example/bigbrotherbe/ocr/dto/OcrDTO.java b/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java similarity index 91% rename from src/main/java/com/example/bigbrotherbe/ocr/dto/OcrDTO.java rename to src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java index dbd9dc0..125d26e 100644 --- a/src/main/java/com/example/bigbrotherbe/ocr/dto/OcrDTO.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.ocr.dto; +package com.example.bigbrotherbe.global.ocr.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/bigbrotherbe/ocr/service/OcrService.java b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java similarity index 56% rename from src/main/java/com/example/bigbrotherbe/ocr/service/OcrService.java rename to src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java index dfdfb00..6b3ac8c 100644 --- a/src/main/java/com/example/bigbrotherbe/ocr/service/OcrService.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java @@ -1,6 +1,6 @@ -package com.example.bigbrotherbe.ocr.service; +package com.example.bigbrotherbe.global.ocr.service; -import com.example.bigbrotherbe.ocr.dto.OcrDTO; +import com.example.bigbrotherbe.global.ocr.dto.OcrDTO; import org.springframework.web.multipart.MultipartFile; public interface OcrService { diff --git a/src/main/java/com/example/bigbrotherbe/ocr/service/OcrServiceImpl.java b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java similarity index 82% rename from src/main/java/com/example/bigbrotherbe/ocr/service/OcrServiceImpl.java rename to src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java index 3115175..399a9ad 100644 --- a/src/main/java/com/example/bigbrotherbe/ocr/service/OcrServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java @@ -1,7 +1,7 @@ -package com.example.bigbrotherbe.ocr.service; +package com.example.bigbrotherbe.global.ocr.service; -import com.example.bigbrotherbe.ocr.dto.OcrDTO; -import com.example.bigbrotherbe.ocr.util.OcrUtil; +import com.example.bigbrotherbe.global.ocr.dto.OcrDTO; +import com.example.bigbrotherbe.global.ocr.util.OcrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/example/bigbrotherbe/ocr/util/OcrUtil.java b/src/main/java/com/example/bigbrotherbe/global/ocr/util/OcrUtil.java similarity index 97% rename from src/main/java/com/example/bigbrotherbe/ocr/util/OcrUtil.java rename to src/main/java/com/example/bigbrotherbe/global/ocr/util/OcrUtil.java index 3d872ba..0fc8203 100644 --- a/src/main/java/com/example/bigbrotherbe/ocr/util/OcrUtil.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/util/OcrUtil.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.ocr.util; +package com.example.bigbrotherbe.global.ocr.util; import lombok.RequiredArgsConstructor; import org.apache.pdfbox.pdmodel.PDDocument;