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 01ea984..ee5f0cc 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,6 +1,6 @@ package com.example.bigbrotherbe.domain.event.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; 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 71b9521..f203238 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,6 +1,6 @@ package com.example.bigbrotherbe.domain.faq.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; 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 c073472..68e1717 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,6 +1,6 @@ package com.example.bigbrotherbe.domain.meetings.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; 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 d89b171..7ed3be0 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,8 +8,8 @@ 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.global.email.entity.EmailRequest; -import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.email.dto.EmailRequest; +import com.example.bigbrotherbe.global.email.dto.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; 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 466b9ae..04f2ed5 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,8 +9,8 @@ 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.global.email.entity.EmailRequest; -import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.email.dto.EmailRequest; +import com.example.bigbrotherbe.global.email.dto.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; 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 ecb524d..1218cc3 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,6 +1,6 @@ package com.example.bigbrotherbe.domain.notice.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; import lombok.*; 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 38c392c..b31d7a4 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,6 +1,6 @@ package com.example.bigbrotherbe.domain.rule.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; 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 c3083c9..63f2536 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 @@ -1,6 +1,6 @@ package com.example.bigbrotherbe.domain.transactions.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.global.file.entity.File; import jakarta.persistence.*; 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 2f2a070..e5bf352 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 @@ -12,7 +12,7 @@ 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.dto.OcrDto; import com.example.bigbrotherbe.global.ocr.service.OcrService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -54,7 +54,7 @@ public void register(MultipartFile multipartFile, Long affiliationId) { throw new BusinessException(NOT_COUNCIL_MEMBER); } - OcrDTO ocrDTO = ocrService.extractText(multipartFile); + OcrDto ocrDTO = ocrService.extractText(multipartFile); List parseTransactions = ocrDTO.getParseTransactions(); String parseAccountNumber = ocrDTO.getParseAccountNumber(); diff --git a/src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java b/src/main/java/com/example/bigbrotherbe/global/common/config/EmailConfig.java similarity index 97% rename from src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java rename to src/main/java/com/example/bigbrotherbe/global/common/config/EmailConfig.java index 39db927..0a1921b 100644 --- a/src/main/java/com/example/bigbrotherbe/global/email/EmailConfig.java +++ b/src/main/java/com/example/bigbrotherbe/global/common/config/EmailConfig.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.global.email; +package com.example.bigbrotherbe.global.common.config; import java.util.Properties; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java b/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java index cdac1fb..88d7bd3 100644 --- a/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/component/MailChecker.java @@ -2,7 +2,7 @@ import com.example.bigbrotherbe.domain.member.component.MemberLoader; -import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.email.dto.EmailVerificationResult; import com.example.bigbrotherbe.global.common.exception.BusinessException; import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java b/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java index 290ab3d..38e5f12 100644 --- a/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/component/MailService.java @@ -3,7 +3,7 @@ import com.example.bigbrotherbe.domain.member.entity.EMailVerification; import com.example.bigbrotherbe.domain.member.repository.MailRepository; import com.example.bigbrotherbe.global.email.entity.Email; -import com.example.bigbrotherbe.global.email.entity.EmailVerificationResult; +import com.example.bigbrotherbe.global.email.dto.EmailVerificationResult; import com.example.bigbrotherbe.global.common.exception.BusinessException; import com.example.bigbrotherbe.global.common.exception.enums.ErrorCode; import java.time.Duration; diff --git a/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java b/src/main/java/com/example/bigbrotherbe/global/email/dto/EmailRequest.java similarity index 61% rename from src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java rename to src/main/java/com/example/bigbrotherbe/global/email/dto/EmailRequest.java index 7c481fc..4498375 100644 --- a/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailRequest.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/dto/EmailRequest.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.global.email.entity; +package com.example.bigbrotherbe.global.email.dto; import lombok.Getter; diff --git a/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java b/src/main/java/com/example/bigbrotherbe/global/email/dto/EmailVerificationResult.java similarity index 88% rename from src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java rename to src/main/java/com/example/bigbrotherbe/global/email/dto/EmailVerificationResult.java index 1d3d9e7..d0e727f 100644 --- a/src/main/java/com/example/bigbrotherbe/global/email/entity/EmailVerificationResult.java +++ b/src/main/java/com/example/bigbrotherbe/global/email/dto/EmailVerificationResult.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.global.email.entity; +package com.example.bigbrotherbe.global.email.dto; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/bigbrotherbe/domain/BaseTimeEntity.java b/src/main/java/com/example/bigbrotherbe/global/entity/BaseTimeEntity.java similarity index 92% rename from src/main/java/com/example/bigbrotherbe/domain/BaseTimeEntity.java rename to src/main/java/com/example/bigbrotherbe/global/entity/BaseTimeEntity.java index 328c951..fe963de 100644 --- a/src/main/java/com/example/bigbrotherbe/domain/BaseTimeEntity.java +++ b/src/main/java/com/example/bigbrotherbe/global/entity/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package com.example.bigbrotherbe.domain; +package com.example.bigbrotherbe.global.entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java b/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java index 43117ef..a8f6a90 100644 --- a/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java +++ b/src/main/java/com/example/bigbrotherbe/global/file/entity/File.java @@ -1,6 +1,6 @@ package com.example.bigbrotherbe.global.file.entity; -import com.example.bigbrotherbe.domain.BaseTimeEntity; +import com.example.bigbrotherbe.global.entity.BaseTimeEntity; import com.example.bigbrotherbe.domain.campusNotice.entity.CampusNotice; import com.example.bigbrotherbe.domain.event.entity.Event; import com.example.bigbrotherbe.domain.faq.entity.FAQ; @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; -import org.checkerframework.checker.units.qual.A; @Entity @Getter diff --git a/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java b/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDto.java similarity index 79% rename from src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java rename to src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDto.java index 125d26e..ece4a12 100644 --- a/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDTO.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/dto/OcrDto.java @@ -9,12 +9,12 @@ @Getter @Builder @AllArgsConstructor -public class OcrDTO { +public class OcrDto { private List parseTransactions; private String parseAccountNumber; - public static OcrDTO fromOcrResponse(List parseTransactions, String parseAccountNumber) { - return OcrDTO.builder() + public static OcrDto fromOcrResponse(List parseTransactions, String parseAccountNumber) { + return OcrDto.builder() .parseTransactions(parseTransactions) .parseAccountNumber(parseAccountNumber) .build(); diff --git a/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java index 6b3ac8c..337fd51 100644 --- a/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrService.java @@ -1,8 +1,8 @@ package com.example.bigbrotherbe.global.ocr.service; -import com.example.bigbrotherbe.global.ocr.dto.OcrDTO; +import com.example.bigbrotherbe.global.ocr.dto.OcrDto; import org.springframework.web.multipart.MultipartFile; public interface OcrService { - OcrDTO extractText(MultipartFile multipartFile); + OcrDto extractText(MultipartFile multipartFile); } diff --git a/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java index 399a9ad..29b43b5 100644 --- a/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java +++ b/src/main/java/com/example/bigbrotherbe/global/ocr/service/OcrServiceImpl.java @@ -1,6 +1,6 @@ package com.example.bigbrotherbe.global.ocr.service; -import com.example.bigbrotherbe.global.ocr.dto.OcrDTO; +import com.example.bigbrotherbe.global.ocr.dto.OcrDto; import com.example.bigbrotherbe.global.ocr.util.OcrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ public class OcrServiceImpl implements OcrService { private final OcrUtil ocrUtil; @Override - public OcrDTO extractText(MultipartFile multipartFile) { + public OcrDto extractText(MultipartFile multipartFile) { // ocr로 모든 text 추출한 거 String extractedText = ocrUtil.extractTextFromPDF(multipartFile); @@ -23,6 +23,6 @@ public OcrDTO extractText(MultipartFile multipartFile) { String parseAccountNumber = ocrUtil.parseAccountNumber(extractedText); // parsing 가공해서 응답 - return OcrDTO.fromOcrResponse(parseTransactions, parseAccountNumber); + return OcrDto.fromOcrResponse(parseTransactions, parseAccountNumber); } }