From 0e9d2eb2f3506dde152e369cead13930f87a2982 Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 00:21:50 +0900 Subject: [PATCH 1/6] [refactor] #151 mv domain related classes to domain package --- .../server/domain/{ => base}/BaseTimeEntity.java | 2 +- .../org/kkumulkkum/server/domain/enums/Role.java | 6 ------ .../server/domain/{ => meeting}/Meeting.java | 4 +++- .../meeting}/repository/MeetingRepository.java | 4 ++-- .../server/domain/{ => member}/Member.java | 5 ++++- .../member}/repository/MemberRepository.java | 4 ++-- .../server/domain/{ => participant}/Participant.java | 5 ++++- .../repository/ParticipantRepository.java | 4 ++-- .../domain/{enums => promise}/DressUpLevel.java | 2 +- .../server/domain/{ => promise}/Promise.java | 5 +++-- .../promise}/repository/PromiseRepository.java | 4 ++-- .../server/domain/{enums => user}/Provider.java | 2 +- .../java/org/kkumulkkum/server/domain/user/Role.java | 6 ++++++ .../kkumulkkum/server/domain/{ => user}/Token.java | 2 +- .../kkumulkkum/server/domain/{ => user}/User.java | 5 ++--- .../user}/repository/TokenRepository.java | 4 ++-- .../{ => domain/user}/repository/UserRepository.java | 6 +++--- .../server/domain/{ => userinfo}/UserInfo.java | 4 +++- .../userinfo}/repository/UserInfoRepository.java | 4 ++-- .../server/dto/auth/request/UserLoginDto.java | 2 +- .../server/dto/auth/response/UserTokenDto.java | 2 +- .../server/dto/meeting/MeetingMetCountDto.java | 2 +- .../server/dto/meeting/response/MeetingDto.java | 2 +- .../server/dto/meeting/response/MeetingIdDto.java | 2 +- .../server/dto/meeting/response/MeetingsDto.java | 2 +- .../dto/participant/response/LateComersDto.java | 2 +- .../participant/response/PreparationStatusDto.java | 2 +- .../server/dto/promise/PromiseCreateDto.java | 2 +- .../server/dto/promise/response/MainPromiseDto.java | 2 +- .../server/dto/promise/response/MainPromisesDto.java | 2 +- .../server/dto/promise/response/PromiseAddDto.java | 2 +- .../dto/promise/response/PromiseDetailDto.java | 2 +- .../server/dto/promise/response/PromisesDto.java | 2 +- .../kkumulkkum/server/dto/user/response/UserDto.java | 2 +- .../server/dto/user/response/UserNameDto.java | 2 +- .../kkumulkkum/server/service/auth/AuthService.java | 12 ++++++------ .../kkumulkkum/server/service/auth/TokenRemover.java | 2 +- .../server/service/auth/TokenRetriever.java | 4 ++-- .../kkumulkkum/server/service/auth/TokenSaver.java | 4 ++-- .../server/service/meeting/MeetingEditor.java | 2 +- .../server/service/meeting/MeetingRemover.java | 2 +- .../server/service/meeting/MeetingRetriever.java | 4 ++-- .../server/service/meeting/MeetingSaver.java | 4 ++-- .../server/service/meeting/MeetingService.java | 5 ++--- .../server/service/member/MemberRemover.java | 4 ++-- .../server/service/member/MemberRetreiver.java | 4 ++-- .../server/service/member/MemberSaver.java | 4 ++-- .../service/participant/ParticipantEditor.java | 2 +- .../service/participant/ParticipantRemover.java | 4 ++-- .../service/participant/ParticipantRetriever.java | 4 ++-- .../server/service/participant/ParticipantSaver.java | 4 ++-- .../service/participant/ParticipantService.java | 6 +++--- .../server/service/promise/PromiseEditor.java | 2 +- .../server/service/promise/PromiseRemover.java | 2 +- .../server/service/promise/PromiseRetriever.java | 4 ++-- .../server/service/promise/PromiseSaver.java | 4 ++-- .../server/service/promise/PromiseService.java | 6 +++++- .../kkumulkkum/server/service/user/UserRemover.java | 5 ++--- .../server/service/user/UserRetriever.java | 6 +++--- .../kkumulkkum/server/service/user/UserSaver.java | 4 ++-- .../kkumulkkum/server/service/user/UserService.java | 2 +- .../server/service/userInfo/UserInfoEditor.java | 2 +- .../server/service/userInfo/UserInfoRemover.java | 2 +- .../server/service/userInfo/UserInfoRetriever.java | 4 ++-- .../server/service/userInfo/UserInfoSaver.java | 4 ++-- 65 files changed, 120 insertions(+), 108 deletions(-) rename src/main/java/org/kkumulkkum/server/domain/{ => base}/BaseTimeEntity.java (92%) delete mode 100644 src/main/java/org/kkumulkkum/server/domain/enums/Role.java rename src/main/java/org/kkumulkkum/server/domain/{ => meeting}/Meeting.java (83%) rename src/main/java/org/kkumulkkum/server/{ => domain/meeting}/repository/MeetingRepository.java (89%) rename src/main/java/org/kkumulkkum/server/domain/{ => member}/Member.java (76%) rename src/main/java/org/kkumulkkum/server/{ => domain/member}/repository/MemberRepository.java (95%) rename src/main/java/org/kkumulkkum/server/domain/{ => participant}/Participant.java (90%) rename src/main/java/org/kkumulkkum/server/{ => domain/participant}/repository/ParticipantRepository.java (96%) rename src/main/java/org/kkumulkkum/server/domain/{enums => promise}/DressUpLevel.java (86%) rename src/main/java/org/kkumulkkum/server/domain/{ => promise}/Promise.java (93%) rename src/main/java/org/kkumulkkum/server/{ => domain/promise}/repository/PromiseRepository.java (95%) rename src/main/java/org/kkumulkkum/server/domain/{enums => user}/Provider.java (51%) create mode 100644 src/main/java/org/kkumulkkum/server/domain/user/Role.java rename src/main/java/org/kkumulkkum/server/domain/{ => user}/Token.java (93%) rename src/main/java/org/kkumulkkum/server/domain/{ => user}/User.java (85%) rename src/main/java/org/kkumulkkum/server/{ => domain/user}/repository/TokenRepository.java (68%) rename src/main/java/org/kkumulkkum/server/{ => domain/user}/repository/UserRepository.java (68%) rename src/main/java/org/kkumulkkum/server/domain/{ => userinfo}/UserInfo.java (92%) rename src/main/java/org/kkumulkkum/server/{ => domain/userinfo}/repository/UserInfoRepository.java (82%) diff --git a/src/main/java/org/kkumulkkum/server/domain/BaseTimeEntity.java b/src/main/java/org/kkumulkkum/server/domain/base/BaseTimeEntity.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/domain/BaseTimeEntity.java rename to src/main/java/org/kkumulkkum/server/domain/base/BaseTimeEntity.java index b8764c5..17b35d0 100644 --- a/src/main/java/org/kkumulkkum/server/domain/BaseTimeEntity.java +++ b/src/main/java/org/kkumulkkum/server/domain/base/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.base; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/org/kkumulkkum/server/domain/enums/Role.java b/src/main/java/org/kkumulkkum/server/domain/enums/Role.java deleted file mode 100644 index 25d7251..0000000 --- a/src/main/java/org/kkumulkkum/server/domain/enums/Role.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.kkumulkkum.server.domain.enums; - -public enum Role { - USER, - ADMIN -} diff --git a/src/main/java/org/kkumulkkum/server/domain/Meeting.java b/src/main/java/org/kkumulkkum/server/domain/meeting/Meeting.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/domain/Meeting.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/Meeting.java index 7dbb3d4..bb2206b 100644 --- a/src/main/java/org/kkumulkkum/server/domain/Meeting.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/Meeting.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.meeting; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,6 +6,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.BatchSize; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/repository/MeetingRepository.java b/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java similarity index 89% rename from src/main/java/org/kkumulkkum/server/repository/MeetingRepository.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java index b8c89b8..3a15a98 100644 --- a/src/main/java/org/kkumulkkum/server/repository/MeetingRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.meeting.repository; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/org/kkumulkkum/server/domain/Member.java b/src/main/java/org/kkumulkkum/server/domain/member/Member.java similarity index 76% rename from src/main/java/org/kkumulkkum/server/domain/Member.java rename to src/main/java/org/kkumulkkum/server/domain/member/Member.java index 9522315..878c31c 100644 --- a/src/main/java/org/kkumulkkum/server/domain/Member.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/Member.java @@ -1,10 +1,13 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.member; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; +import org.kkumulkkum.server.domain.meeting.Meeting; @Entity @Getter diff --git a/src/main/java/org/kkumulkkum/server/repository/MemberRepository.java b/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/repository/MemberRepository.java rename to src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java index a38a5b5..84bb412 100644 --- a/src/main/java/org/kkumulkkum/server/repository/MemberRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.member.repository; -import org.kkumulkkum.server.domain.Member; +import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.dto.member.response.MemberDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/org/kkumulkkum/server/domain/Participant.java b/src/main/java/org/kkumulkkum/server/domain/participant/Participant.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/domain/Participant.java rename to src/main/java/org/kkumulkkum/server/domain/participant/Participant.java index 33d13d6..729c1f0 100644 --- a/src/main/java/org/kkumulkkum/server/domain/Participant.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/Participant.java @@ -1,10 +1,13 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.participant; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.kkumulkkum.server.domain.promise.Promise; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; +import org.kkumulkkum.server.domain.member.Member; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/repository/ParticipantRepository.java b/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/repository/ParticipantRepository.java rename to src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java index 82a946e..e8d5ec4 100644 --- a/src/main/java/org/kkumulkkum/server/repository/ParticipantRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.participant.repository; -import org.kkumulkkum.server.domain.Participant; +import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; import org.kkumulkkum.server.dto.participant.response.LateComerDto; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/org/kkumulkkum/server/domain/enums/DressUpLevel.java b/src/main/java/org/kkumulkkum/server/domain/promise/DressUpLevel.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/domain/enums/DressUpLevel.java rename to src/main/java/org/kkumulkkum/server/domain/promise/DressUpLevel.java index e67b92f..6630a22 100644 --- a/src/main/java/org/kkumulkkum/server/domain/enums/DressUpLevel.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/DressUpLevel.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.domain.enums; +package org.kkumulkkum.server.domain.promise; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/domain/Promise.java b/src/main/java/org/kkumulkkum/server/domain/promise/Promise.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/domain/Promise.java rename to src/main/java/org/kkumulkkum/server/domain/promise/Promise.java index 26c14e9..7d5bd8b 100644 --- a/src/main/java/org/kkumulkkum/server/domain/Promise.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/Promise.java @@ -1,11 +1,12 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.promise; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.kkumulkkum.server.domain.enums.DressUpLevel; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; +import org.kkumulkkum.server.domain.meeting.Meeting; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/repository/PromiseRepository.java b/src/main/java/org/kkumulkkum/server/domain/promise/repository/PromiseRepository.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/repository/PromiseRepository.java rename to src/main/java/org/kkumulkkum/server/domain/promise/repository/PromiseRepository.java index b35aab8..b2e261b 100644 --- a/src/main/java/org/kkumulkkum/server/repository/PromiseRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/repository/PromiseRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.promise.repository; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/org/kkumulkkum/server/domain/enums/Provider.java b/src/main/java/org/kkumulkkum/server/domain/user/Provider.java similarity index 51% rename from src/main/java/org/kkumulkkum/server/domain/enums/Provider.java rename to src/main/java/org/kkumulkkum/server/domain/user/Provider.java index b5772fa..272e578 100644 --- a/src/main/java/org/kkumulkkum/server/domain/enums/Provider.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/Provider.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.domain.enums; +package org.kkumulkkum.server.domain.user; public enum Provider { KAKAO, diff --git a/src/main/java/org/kkumulkkum/server/domain/user/Role.java b/src/main/java/org/kkumulkkum/server/domain/user/Role.java new file mode 100644 index 0000000..ff9d778 --- /dev/null +++ b/src/main/java/org/kkumulkkum/server/domain/user/Role.java @@ -0,0 +1,6 @@ +package org.kkumulkkum.server.domain.user; + +public enum Role { + USER, + ADMIN +} diff --git a/src/main/java/org/kkumulkkum/server/domain/Token.java b/src/main/java/org/kkumulkkum/server/domain/user/Token.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/domain/Token.java rename to src/main/java/org/kkumulkkum/server/domain/user/Token.java index f88bfcb..bec5820 100644 --- a/src/main/java/org/kkumulkkum/server/domain/Token.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/Token.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.user; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/org/kkumulkkum/server/domain/User.java b/src/main/java/org/kkumulkkum/server/domain/user/User.java similarity index 85% rename from src/main/java/org/kkumulkkum/server/domain/User.java rename to src/main/java/org/kkumulkkum/server/domain/user/User.java index f1d5358..1d492e0 100644 --- a/src/main/java/org/kkumulkkum/server/domain/User.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/User.java @@ -1,12 +1,11 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.user; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.kkumulkkum.server.domain.enums.Provider; -import org.kkumulkkum.server.domain.enums.Role; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/org/kkumulkkum/server/repository/TokenRepository.java b/src/main/java/org/kkumulkkum/server/domain/user/repository/TokenRepository.java similarity index 68% rename from src/main/java/org/kkumulkkum/server/repository/TokenRepository.java rename to src/main/java/org/kkumulkkum/server/domain/user/repository/TokenRepository.java index 64da715..10dadbf 100644 --- a/src/main/java/org/kkumulkkum/server/repository/TokenRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/repository/TokenRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.user.repository; -import org.kkumulkkum.server.domain.Token; +import org.kkumulkkum.server.domain.user.Token; import org.springframework.data.repository.CrudRepository; import java.util.Optional; diff --git a/src/main/java/org/kkumulkkum/server/repository/UserRepository.java b/src/main/java/org/kkumulkkum/server/domain/user/repository/UserRepository.java similarity index 68% rename from src/main/java/org/kkumulkkum/server/repository/UserRepository.java rename to src/main/java/org/kkumulkkum/server/domain/user/repository/UserRepository.java index aeb6867..4fe8767 100644 --- a/src/main/java/org/kkumulkkum/server/repository/UserRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/repository/UserRepository.java @@ -1,7 +1,7 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.user.repository; -import org.kkumulkkum.server.domain.User; -import org.kkumulkkum.server.domain.enums.Provider; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.user.Provider; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/org/kkumulkkum/server/domain/UserInfo.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/UserInfo.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/domain/UserInfo.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/UserInfo.java index d2ba684..ae57b9d 100644 --- a/src/main/java/org/kkumulkkum/server/domain/UserInfo.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/UserInfo.java @@ -1,10 +1,12 @@ -package org.kkumulkkum.server.domain; +package org.kkumulkkum.server.domain.userinfo; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.kkumulkkum.server.domain.base.BaseTimeEntity; +import org.kkumulkkum.server.domain.user.User; @Entity @Getter diff --git a/src/main/java/org/kkumulkkum/server/repository/UserInfoRepository.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/repository/UserInfoRepository.java similarity index 82% rename from src/main/java/org/kkumulkkum/server/repository/UserInfoRepository.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/repository/UserInfoRepository.java index b87e26f..9fd6bd3 100644 --- a/src/main/java/org/kkumulkkum/server/repository/UserInfoRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/repository/UserInfoRepository.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.repository; +package org.kkumulkkum.server.domain.userinfo.repository; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java b/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java index 739115d..5b0ad42 100644 --- a/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java @@ -2,7 +2,7 @@ import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; -import org.kkumulkkum.server.domain.enums.Provider; +import org.kkumulkkum.server.domain.user.Provider; public record UserLoginDto( @NotNull diff --git a/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java b/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java index 4777218..bae25c3 100644 --- a/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.auth.response; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; public record UserTokenDto( String name, diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java b/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java index 72281fa..f2a784e 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.meeting; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; public record MeetingMetCountDto ( Meeting meeting, diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java index 1a219a1..adbcd86 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.meeting.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java index eabbd58..d9fe489 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.meeting.response; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; public record MeetingIdDto( Long meetingId diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java index b718d8b..7a5cf8b 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.meeting.response; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java b/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java index 61aa81a..ad48016 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.participant.response; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java b/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java index 5e5f167..c4110d9 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.participant.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Participant; +import org.kkumulkkum.server.domain.participant.Participant; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java index 73623c7..daf8387 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java @@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import org.kkumulkkum.server.domain.enums.DressUpLevel; +import org.kkumulkkum.server.domain.promise.DressUpLevel; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java index 57905f8..1890c08 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.promise.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java index a8baa67..4c08096 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.promise.response; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java index 343e235..2fbd0f1 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.promise.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java index a162069..78a18a0 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.promise.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java index 6bafac8..0180c5b 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.dto.promise.response; import com.fasterxml.jackson.annotation.JsonFormat; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java b/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java index 0e0d86e..e6bcea7 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.user.response; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; public record UserDto( Long userId, diff --git a/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java b/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java index 44e683b..fafc65b 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java +++ b/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.dto.user.response; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; public record UserNameDto( String name diff --git a/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java b/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java index 685b62d..99e8c4e 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java +++ b/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java @@ -5,12 +5,12 @@ import org.kkumulkkum.server.auth.openfeign.kakao.dto.SocialUserDto; import org.kkumulkkum.server.auth.openfeign.apple.service.AppleService; import org.kkumulkkum.server.auth.openfeign.kakao.service.KakaoService; -import org.kkumulkkum.server.domain.Member; -import org.kkumulkkum.server.domain.Token; -import org.kkumulkkum.server.domain.User; -import org.kkumulkkum.server.domain.UserInfo; -import org.kkumulkkum.server.domain.enums.Provider; -import org.kkumulkkum.server.domain.enums.Role; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.user.Token; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.userinfo.UserInfo; +import org.kkumulkkum.server.domain.user.Provider; +import org.kkumulkkum.server.domain.user.Role; import org.kkumulkkum.server.dto.auth.request.UserLoginDto; import org.kkumulkkum.server.dto.auth.response.JwtTokenDto; import org.kkumulkkum.server.dto.auth.response.UserTokenDto; diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java b/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java index b092068..dbbf140 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.auth; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.repository.TokenRepository; +import org.kkumulkkum.server.domain.user.repository.TokenRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java b/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java index 220cb57..1166e51 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java @@ -1,10 +1,10 @@ package org.kkumulkkum.server.service.auth; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Token; +import org.kkumulkkum.server.domain.user.Token; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.code.AuthErrorCode; -import org.kkumulkkum.server.repository.TokenRepository; +import org.kkumulkkum.server.domain.user.repository.TokenRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java b/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java index 3f125b4..81cd978 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.auth; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Token; -import org.kkumulkkum.server.repository.TokenRepository; +import org.kkumulkkum.server.domain.user.Token; +import org.kkumulkkum.server.domain.user.repository.TokenRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java index c67cc2a..f692f27 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java +++ b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.meeting; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.dto.meeting.request.MeetingCreateDto; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java index a368041..5e0e0a5 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.meeting; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.repository.MeetingRepository; +import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java index 336c74d..703a8cf 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java @@ -1,11 +1,11 @@ package org.kkumulkkum.server.service.meeting; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Meeting; +import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; import org.kkumulkkum.server.exception.MeetingException; import org.kkumulkkum.server.exception.code.MeetingErrorCode; -import org.kkumulkkum.server.repository.MeetingRepository; +import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java index 28426af..63195c8 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.meeting; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Meeting; -import org.kkumulkkum.server.repository.MeetingRepository; +import org.kkumulkkum.server.domain.meeting.Meeting; +import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java index 939266c..66146f3 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java +++ b/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java @@ -2,9 +2,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.domain.Meeting; -import org.kkumulkkum.server.domain.Member; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.meeting.Meeting; +import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; import org.kkumulkkum.server.dto.meeting.request.MeetingCreateDto; import org.kkumulkkum.server.dto.meeting.request.MeetingRegisterDto; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java b/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java index 31e9d14..d9f8fda 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.member; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Member; -import org.kkumulkkum.server.repository.MemberRepository; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.member.repository.MemberRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java b/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java index b1abb5d..d1a45b3 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java +++ b/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java @@ -1,11 +1,11 @@ package org.kkumulkkum.server.service.member; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Member; +import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.dto.member.response.MemberDto; import org.kkumulkkum.server.exception.MemberException; import org.kkumulkkum.server.exception.code.MemberErrorCode; -import org.kkumulkkum.server.repository.MemberRepository; +import org.kkumulkkum.server.domain.member.repository.MemberRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java b/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java index 75f988b..131233d 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.member; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Member; -import org.kkumulkkum.server.repository.MemberRepository; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.member.repository.MemberRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java index caf5a76..706deb5 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java +++ b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.participant; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Participant; +import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java index ada065f..5852616 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.participant; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Participant; -import org.kkumulkkum.server.repository.ParticipantRepository; +import org.kkumulkkum.server.domain.participant.Participant; +import org.kkumulkkum.server.domain.participant.repository.ParticipantRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java index 8cf537c..200f671 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java @@ -1,12 +1,12 @@ package org.kkumulkkum.server.service.participant; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Participant; +import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; import org.kkumulkkum.server.dto.participant.response.LateComerDto; import org.kkumulkkum.server.exception.ParticipantException; import org.kkumulkkum.server.exception.code.ParticipantErrorCode; -import org.kkumulkkum.server.repository.ParticipantRepository; +import org.kkumulkkum.server.domain.participant.repository.ParticipantRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java index 8012b6d..8f5a630 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.participant; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Participant; -import org.kkumulkkum.server.repository.ParticipantRepository; +import org.kkumulkkum.server.domain.participant.Participant; +import org.kkumulkkum.server.domain.participant.repository.ParticipantRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java index 76849d0..c927fe7 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java +++ b/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java @@ -2,9 +2,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.domain.Member; -import org.kkumulkkum.server.domain.Participant; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.participant.Participant; +import org.kkumulkkum.server.domain.promise.Promise; import org.kkumulkkum.server.dto.member.response.MemberDto; import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java index 9aeb583..5c34be5 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java +++ b/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.service.promise; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import org.kkumulkkum.server.dto.promise.PromiseCreateDto; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java index 60a1b62..308b389 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.promise; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.repository.PromiseRepository; +import org.kkumulkkum.server.domain.promise.repository.PromiseRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java index 5447609..c2b95b7 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java @@ -1,10 +1,10 @@ package org.kkumulkkum.server.service.promise; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Promise; +import org.kkumulkkum.server.domain.promise.Promise; import org.kkumulkkum.server.exception.PromiseException; import org.kkumulkkum.server.exception.code.PromiseErrorCode; -import org.kkumulkkum.server.repository.PromiseRepository; +import org.kkumulkkum.server.domain.promise.repository.PromiseRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java index 81cfc01..d8eaee7 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.promise; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.Promise; -import org.kkumulkkum.server.repository.PromiseRepository; +import org.kkumulkkum.server.domain.promise.Promise; +import org.kkumulkkum.server.domain.promise.repository.PromiseRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java b/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java index 3f42feb..48f8321 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java +++ b/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java @@ -2,7 +2,11 @@ import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.*; +import org.kkumulkkum.server.domain.meeting.Meeting; +import org.kkumulkkum.server.domain.member.Member; +import org.kkumulkkum.server.domain.participant.Participant; +import org.kkumulkkum.server.domain.promise.Promise; +import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.kkumulkkum.server.dto.promise.PromiseCreateDto; import org.kkumulkkum.server.dto.promise.response.*; import org.kkumulkkum.server.exception.PromiseException; diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java b/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java index d047b7a..54fd96d 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java @@ -1,9 +1,8 @@ package org.kkumulkkum.server.service.user; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.User; -import org.kkumulkkum.server.repository.UserRepository; -import org.kkumulkkum.server.service.userInfo.UserInfoRetriever; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.user.repository.UserRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java b/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java index 0c61c0a..4e136c8 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java @@ -1,11 +1,11 @@ package org.kkumulkkum.server.service.user; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.User; -import org.kkumulkkum.server.domain.enums.Provider; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.user.Provider; import org.kkumulkkum.server.exception.UserException; import org.kkumulkkum.server.exception.code.UserErrorCode; -import org.kkumulkkum.server.repository.UserRepository; +import org.kkumulkkum.server.domain.user.repository.UserRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java b/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java index 27e8f71..90cc0a0 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.user; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.User; -import org.kkumulkkum.server.repository.UserRepository; +import org.kkumulkkum.server.domain.user.User; +import org.kkumulkkum.server.domain.user.repository.UserRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserService.java b/src/main/java/org/kkumulkkum/server/service/user/UserService.java index cc97b46..09fc61c 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserService.java +++ b/src/main/java/org/kkumulkkum/server/service/user/UserService.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.kkumulkkum.server.dto.user.request.ImageUpdateDto; import org.kkumulkkum.server.dto.user.request.NameUpdateDto; import org.kkumulkkum.server.dto.user.response.UserDto; diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java index 225c832..23ac7bf 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java +++ b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.service.userInfo; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java index 2b8d428..563cbe0 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java +++ b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.service.userInfo; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.repository.UserInfoRepository; +import org.kkumulkkum.server.domain.userinfo.repository.UserInfoRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java index 982e344..9d6cdad 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java +++ b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java @@ -1,10 +1,10 @@ package org.kkumulkkum.server.service.userInfo; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.UserInfo; +import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.kkumulkkum.server.exception.UserException; import org.kkumulkkum.server.exception.code.UserErrorCode; -import org.kkumulkkum.server.repository.UserInfoRepository; +import org.kkumulkkum.server.domain.userinfo.repository.UserInfoRepository; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java index 771b5c0..fb40f55 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java +++ b/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.service.userInfo; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.domain.UserInfo; -import org.kkumulkkum.server.repository.UserInfoRepository; +import org.kkumulkkum.server.domain.userinfo.UserInfo; +import org.kkumulkkum.server.domain.userinfo.repository.UserInfoRepository; import org.springframework.stereotype.Component; @Component From a99eff197eba092c606e3eca09df6a952744bfb7 Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 01:04:05 +0900 Subject: [PATCH 2/6] [refactor] #151 add manager classes in domain package --- .../meeting => domain/meeting/manager}/MeetingEditor.java | 4 ++-- .../meeting => domain/meeting/manager}/MeetingRemover.java | 2 +- .../meeting/manager}/MeetingRetriever.java | 4 ++-- .../meeting => domain/meeting/manager}/MeetingSaver.java | 2 +- .../member => domain/member/manager}/MemberRemover.java | 2 +- .../member => domain/member/manager}/MemberRetreiver.java | 4 ++-- .../member => domain/member/manager}/MemberSaver.java | 2 +- .../participant/manager}/ParticipantEditor.java | 4 ++-- .../participant/manager}/ParticipantRemover.java | 2 +- .../participant/manager}/ParticipantRetriever.java | 6 +++--- .../participant/manager}/ParticipantSaver.java | 2 +- .../promise => domain/promise/manager}/PromiseEditor.java | 4 ++-- .../promise => domain/promise/manager}/PromiseRemover.java | 2 +- .../promise/manager}/PromiseRetriever.java | 2 +- .../promise => domain/promise/manager}/PromiseSaver.java | 2 +- .../{service/auth => domain/user/manager}/TokenRemover.java | 2 +- .../auth => domain/user/manager}/TokenRetriever.java | 2 +- .../{service/auth => domain/user/manager}/TokenSaver.java | 2 +- .../{service/user => domain/user/manager}/UserRemover.java | 2 +- .../user => domain/user/manager}/UserRetriever.java | 2 +- .../{service/user => domain/user/manager}/UserSaver.java | 2 +- .../userinfo/manager}/UserInfoEditor.java | 2 +- .../userinfo/manager}/UserInfoRemover.java | 2 +- .../userinfo/manager}/UserInfoRetriever.java | 2 +- .../userInfo => domain/userinfo/manager}/UserInfoSaver.java | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) rename src/main/java/org/kkumulkkum/server/{service/meeting => domain/meeting/manager}/MeetingEditor.java (76%) rename src/main/java/org/kkumulkkum/server/{service/meeting => domain/meeting/manager}/MeetingRemover.java (87%) rename src/main/java/org/kkumulkkum/server/{service/meeting => domain/meeting/manager}/MeetingRetriever.java (92%) rename src/main/java/org/kkumulkkum/server/{service/meeting => domain/meeting/manager}/MeetingSaver.java (88%) rename src/main/java/org/kkumulkkum/server/{service/member => domain/member/manager}/MemberRemover.java (91%) rename src/main/java/org/kkumulkkum/server/{service/member => domain/member/manager}/MemberRetreiver.java (93%) rename src/main/java/org/kkumulkkum/server/{service/member => domain/member/manager}/MemberSaver.java (88%) rename src/main/java/org/kkumulkkum/server/{service/participant => domain/participant/manager}/ParticipantEditor.java (88%) rename src/main/java/org/kkumulkkum/server/{service/participant => domain/participant/manager}/ParticipantRemover.java (92%) rename src/main/java/org/kkumulkkum/server/{service/participant => domain/participant/manager}/ParticipantRetriever.java (91%) rename src/main/java/org/kkumulkkum/server/{service/participant => domain/participant/manager}/ParticipantSaver.java (89%) rename src/main/java/org/kkumulkkum/server/{service/promise => domain/promise/manager}/PromiseEditor.java (86%) rename src/main/java/org/kkumulkkum/server/{service/promise => domain/promise/manager}/PromiseRemover.java (90%) rename src/main/java/org/kkumulkkum/server/{service/promise => domain/promise/manager}/PromiseRetriever.java (98%) rename src/main/java/org/kkumulkkum/server/{service/promise => domain/promise/manager}/PromiseSaver.java (88%) rename src/main/java/org/kkumulkkum/server/{service/auth => domain/user/manager}/TokenRemover.java (87%) rename src/main/java/org/kkumulkkum/server/{service/auth => domain/user/manager}/TokenRetriever.java (92%) rename src/main/java/org/kkumulkkum/server/{service/auth => domain/user/manager}/TokenSaver.java (88%) rename src/main/java/org/kkumulkkum/server/{service/user => domain/user/manager}/UserRemover.java (88%) rename src/main/java/org/kkumulkkum/server/{service/user => domain/user/manager}/UserRetriever.java (95%) rename src/main/java/org/kkumulkkum/server/{service/user => domain/user/manager}/UserSaver.java (88%) rename src/main/java/org/kkumulkkum/server/{service/userInfo => domain/userinfo/manager}/UserInfoEditor.java (90%) rename src/main/java/org/kkumulkkum/server/{service/userInfo => domain/userinfo/manager}/UserInfoRemover.java (87%) rename src/main/java/org/kkumulkkum/server/{service/userInfo => domain/userinfo/manager}/UserInfoRetriever.java (94%) rename src/main/java/org/kkumulkkum/server/{service/userInfo => domain/userinfo/manager}/UserInfoSaver.java (88%) diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingEditor.java similarity index 76% rename from src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingEditor.java index f692f27..bb72779 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingEditor.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingEditor.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.service.meeting; +package org.kkumulkkum.server.domain.meeting.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.meeting.Meeting; -import org.kkumulkkum.server.dto.meeting.request.MeetingCreateDto; +import org.kkumulkkum.server.api.meeting.dto.request.MeetingCreateDto; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRemover.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRemover.java index 5e0e0a5..04c9150 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.meeting; +package org.kkumulkkum.server.domain.meeting.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java index 703a8cf..c0818f1 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.service.meeting; +package org.kkumulkkum.server.domain.meeting.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.meeting.Meeting; -import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; +import org.kkumulkkum.server.api.meeting.dto.MeetingMetCountDto; import org.kkumulkkum.server.exception.MeetingException; import org.kkumulkkum.server.exception.code.MeetingErrorCode; import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java rename to src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingSaver.java index 63195c8..d7a5494 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.meeting; +package org.kkumulkkum.server.domain.meeting.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.meeting.Meeting; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRemover.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java rename to src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRemover.java index d9f8fda..932c52a 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.member; +package org.kkumulkkum.server.domain.member.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.member.Member; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java rename to src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java index d1a45b3..fc8c12d 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberRetreiver.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.service.member; +package org.kkumulkkum.server.domain.member.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.member.Member; -import org.kkumulkkum.server.dto.member.response.MemberDto; +import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; import org.kkumulkkum.server.exception.MemberException; import org.kkumulkkum.server.exception.code.MemberErrorCode; import org.kkumulkkum.server.domain.member.repository.MemberRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java rename to src/main/java/org/kkumulkkum/server/domain/member/manager/MemberSaver.java index 131233d..67a7a14 100644 --- a/src/main/java/org/kkumulkkum/server/service/member/MemberSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.member; +package org.kkumulkkum.server.domain.member.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.member.Member; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantEditor.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java rename to src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantEditor.java index 706deb5..6e7de48 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantEditor.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantEditor.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.service.participant; +package org.kkumulkkum.server.domain.participant.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.participant.Participant; -import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto; +import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRemover.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java rename to src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRemover.java index 5852616..79618e8 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.participant; +package org.kkumulkkum.server.domain.participant.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.participant.Participant; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java index 200f671..dd72375 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java @@ -1,9 +1,9 @@ -package org.kkumulkkum.server.service.participant; +package org.kkumulkkum.server.domain.participant.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.participant.Participant; -import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; -import org.kkumulkkum.server.dto.participant.response.LateComerDto; +import org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto; +import org.kkumulkkum.server.api.participant.dto.response.LateComerDto; import org.kkumulkkum.server.exception.ParticipantException; import org.kkumulkkum.server.exception.code.ParticipantErrorCode; import org.kkumulkkum.server.domain.participant.repository.ParticipantRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantSaver.java similarity index 89% rename from src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java rename to src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantSaver.java index 8f5a630..924577d 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.participant; +package org.kkumulkkum.server.domain.participant.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.participant.Participant; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseEditor.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java rename to src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseEditor.java index 5c34be5..1c0c271 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseEditor.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseEditor.java @@ -1,7 +1,7 @@ -package org.kkumulkkum.server.service.promise; +package org.kkumulkkum.server.domain.promise.manager; import org.kkumulkkum.server.domain.promise.Promise; -import org.kkumulkkum.server.dto.promise.PromiseCreateDto; +import org.kkumulkkum.server.api.promise.dto.request.PromiseCreateDto; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRemover.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java rename to src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRemover.java index 308b389..adda6c8 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.promise; +package org.kkumulkkum.server.domain.promise.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.promise.repository.PromiseRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java similarity index 98% rename from src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java index c2b95b7..6405353 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.promise; +package org.kkumulkkum.server.domain.promise.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java rename to src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseSaver.java index d8eaee7..9089e9f 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.promise; +package org.kkumulkkum.server.domain.promise.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRemover.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRemover.java index dbbf140..976a1cc 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.auth; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.repository.TokenRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java index 1166e51..b94cb88 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.auth; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.Token; diff --git a/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/TokenSaver.java index 81cd978..0111c2c 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/TokenSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.auth; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.Token; diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRemover.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/user/UserRemover.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/UserRemover.java index 54fd96d..7fc308c 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.user; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.User; diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java index 4e136c8..8de3946 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.user; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.User; diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/user/UserSaver.java rename to src/main/java/org/kkumulkkum/server/domain/user/manager/UserSaver.java index 90cc0a0..2c04b87 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.user; +package org.kkumulkkum.server.domain.user.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.User; diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoEditor.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoEditor.java index 23ac7bf..ccbbbda 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoEditor.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoEditor.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.userInfo; +package org.kkumulkkum.server.domain.userinfo.manager; import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRemover.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRemover.java index 563cbe0..2b2a75f 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRemover.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRemover.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.userInfo; +package org.kkumulkkum.server.domain.userinfo.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.userinfo.repository.UserInfoRepository; diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java index 9d6cdad..76f1401 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.userInfo; +package org.kkumulkkum.server.domain.userinfo.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.userinfo.UserInfo; diff --git a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoSaver.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java rename to src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoSaver.java index fb40f55..10e1eb1 100644 --- a/src/main/java/org/kkumulkkum/server/service/userInfo/UserInfoSaver.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoSaver.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.service.userInfo; +package org.kkumulkkum.server.domain.userinfo.manager; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.userinfo.UserInfo; From 51d489a477e2c35f88537b5c19ac448bd639cc04 Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 01:04:57 +0900 Subject: [PATCH 3/6] [refactor] #151 mv api related classes to api package --- .../server/advice/ResponseDtoAdvice.java | 2 +- .../auth}/controller/AuthController.java | 10 ++--- .../auth/dto}/request/UserLoginDto.java | 2 +- .../auth/dto}/response/JwtTokenDto.java | 2 +- .../auth/dto}/response/UserTokenDto.java | 2 +- .../auth/service}/AuthService.java | 35 +++++++++-------- .../common}/TestController.java | 11 +----- .../common => api/common/dto}/ErrorDto.java | 2 +- .../common/dto}/ResponseDto.java | 2 +- .../controller/MeetingController.java | 18 ++++----- .../meeting/dto}/MeetingMetCountDto.java | 2 +- .../dto}/request/MeetingCreateDto.java | 2 +- .../dto}/request/MeetingRegisterDto.java | 2 +- .../dto}/response/CreatedMeetingDto.java | 2 +- .../meeting/dto}/response/MeetingDto.java | 2 +- .../meeting/dto}/response/MeetingIdDto.java | 2 +- .../meeting/dto}/response/MeetingsDto.java | 2 +- .../meeting/dto}/response/MemberDto.java | 2 +- .../meeting/dto}/response/MembersDto.java | 2 +- .../meeting/service}/MeetingService.java | 38 ++++++++++--------- .../controller/ParticipantController.java | 14 +++---- .../dto}/ParticipantStatusUserInfoDto.java | 2 +- .../dto}/request/PreparationInfoDto.java | 2 +- .../response/AvailableParticipantsDto.java | 4 +- .../dto}/response/LateComerDto.java | 2 +- .../dto}/response/LateComersDto.java | 2 +- .../dto}/response/ParticipantDto.java | 2 +- .../dto}/response/ParticipantsDto.java | 2 +- .../dto}/response/PreparationStatusDto.java | 2 +- .../service}/ParticipantService.java | 19 ++++++---- .../controller/PromiseController.java | 8 ++-- .../dto/request}/PromiseCreateDto.java | 2 +- .../promise/dto}/response/MainPromiseDto.java | 2 +- .../dto}/response/MainPromisesDto.java | 2 +- .../promise/dto}/response/PromiseAddDto.java | 2 +- .../dto}/response/PromiseDetailDto.java | 2 +- .../promise/dto}/response/PromisesDto.java | 2 +- .../promise/service}/PromiseService.java | 20 ++++++---- .../user}/controller/UserController.java | 12 +++--- .../user/dto}/request/ImageUpdateDto.java | 2 +- .../user/dto}/request/NameUpdateDto.java | 2 +- .../user/dto}/response/UserDto.java | 2 +- .../user/dto}/response/UserNameDto.java | 2 +- .../user/service}/UserService.java | 14 +++---- .../aspect/MemberCheckByMeetingIdAspect.java | 2 +- .../aspect/MemberCheckByPromiseIdAspect.java | 2 +- .../server/aspect/ParticipantCheckAspect.java | 2 +- .../CustomJwtAuthenticationEntryPoint.java | 2 +- .../server/auth/jwt/JwtTokenProvider.java | 2 +- .../meeting/repository/MeetingRepository.java | 4 +- .../member/repository/MemberRepository.java | 6 +-- .../repository/ParticipantRepository.java | 8 ++-- .../kkumulkkum/server/dto/test/TestDto.java | 9 ----- 53 files changed, 151 insertions(+), 153 deletions(-) rename src/main/java/org/kkumulkkum/server/{ => api/auth}/controller/AuthController.java (84%) rename src/main/java/org/kkumulkkum/server/{dto/auth => api/auth/dto}/request/UserLoginDto.java (83%) rename src/main/java/org/kkumulkkum/server/{dto/auth => api/auth/dto}/response/JwtTokenDto.java (88%) rename src/main/java/org/kkumulkkum/server/{dto/auth => api/auth/dto}/response/UserTokenDto.java (86%) rename src/main/java/org/kkumulkkum/server/{service/auth => api/auth/service}/AuthService.java (82%) rename src/main/java/org/kkumulkkum/server/{controller => api/common}/TestController.java (75%) rename src/main/java/org/kkumulkkum/server/{dto/common => api/common/dto}/ErrorDto.java (79%) rename src/main/java/org/kkumulkkum/server/{dto/common => api/common/dto}/ResponseDto.java (90%) rename src/main/java/org/kkumulkkum/server/{ => api/meeting}/controller/MeetingController.java (83%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/MeetingMetCountDto.java (75%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/request/MeetingCreateDto.java (77%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/request/MeetingRegisterDto.java (55%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/response/CreatedMeetingDto.java (62%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/response/MeetingDto.java (92%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/response/MeetingIdDto.java (79%) rename src/main/java/org/kkumulkkum/server/{dto/meeting => api/meeting/dto}/response/MeetingsDto.java (93%) rename src/main/java/org/kkumulkkum/server/{dto/member => api/meeting/dto}/response/MemberDto.java (83%) rename src/main/java/org/kkumulkkum/server/{dto/member => api/meeting/dto}/response/MembersDto.java (83%) rename src/main/java/org/kkumulkkum/server/{service/meeting => api/meeting/service}/MeetingService.java (79%) rename src/main/java/org/kkumulkkum/server/{ => api/participant}/controller/ParticipantController.java (87%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/ParticipantStatusUserInfoDto.java (94%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/request/PreparationInfoDto.java (77%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/AvailableParticipantsDto.java (90%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/LateComerDto.java (83%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/LateComersDto.java (90%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/ParticipantDto.java (88%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/ParticipantsDto.java (84%) rename src/main/java/org/kkumulkkum/server/{dto/participant => api/participant/dto}/response/PreparationStatusDto.java (95%) rename src/main/java/org/kkumulkkum/server/{service/participant => api/participant/service}/ParticipantService.java (92%) rename src/main/java/org/kkumulkkum/server/{ => api/promise}/controller/PromiseController.java (93%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto/request}/PromiseCreateDto.java (94%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto}/response/MainPromiseDto.java (94%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto}/response/MainPromisesDto.java (87%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto}/response/PromiseAddDto.java (93%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto}/response/PromiseDetailDto.java (94%) rename src/main/java/org/kkumulkkum/server/{dto/promise => api/promise/dto}/response/PromisesDto.java (95%) rename src/main/java/org/kkumulkkum/server/{service/promise => api/promise/service}/PromiseService.java (91%) rename src/main/java/org/kkumulkkum/server/{ => api/user}/controller/UserController.java (79%) rename src/main/java/org/kkumulkkum/server/{dto/user => api/user/dto}/request/ImageUpdateDto.java (78%) rename src/main/java/org/kkumulkkum/server/{dto/user => api/user/dto}/request/NameUpdateDto.java (77%) rename src/main/java/org/kkumulkkum/server/{dto/user => api/user/dto}/response/UserDto.java (92%) rename src/main/java/org/kkumulkkum/server/{dto/user => api/user/dto}/response/UserNameDto.java (80%) rename src/main/java/org/kkumulkkum/server/{service/user => api/user/service}/UserService.java (86%) delete mode 100644 src/main/java/org/kkumulkkum/server/dto/test/TestDto.java diff --git a/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java b/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java index 9654001..8ac4fe0 100644 --- a/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java +++ b/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.advice; -import org.kkumulkkum.server.dto.common.ResponseDto; +import org.kkumulkkum.server.api.common.dto.ResponseDto; import org.kkumulkkum.server.exception.code.DefaultErrorCode; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; diff --git a/src/main/java/org/kkumulkkum/server/controller/AuthController.java b/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java similarity index 84% rename from src/main/java/org/kkumulkkum/server/controller/AuthController.java rename to src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java index 30ba825..51fac19 100644 --- a/src/main/java/org/kkumulkkum/server/controller/AuthController.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.auth.controller; import com.google.firebase.database.annotations.Nullable; import jakarta.validation.Valid; @@ -6,10 +6,10 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.annotation.UserId; import org.kkumulkkum.server.constant.AuthConstant; -import org.kkumulkkum.server.dto.auth.request.UserLoginDto; -import org.kkumulkkum.server.dto.auth.response.JwtTokenDto; -import org.kkumulkkum.server.dto.auth.response.UserTokenDto; -import org.kkumulkkum.server.service.auth.AuthService; +import org.kkumulkkum.server.api.auth.dto.request.UserLoginDto; +import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; +import org.kkumulkkum.server.api.auth.dto.response.UserTokenDto; +import org.kkumulkkum.server.api.auth.service.AuthService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/request/UserLoginDto.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/request/UserLoginDto.java index 5b0ad42..269a51c 100644 --- a/src/main/java/org/kkumulkkum/server/dto/auth/request/UserLoginDto.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/request/UserLoginDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.auth.request; +package org.kkumulkkum.server.api.auth.dto.request; import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/org/kkumulkkum/server/dto/auth/response/JwtTokenDto.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/response/JwtTokenDto.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/dto/auth/response/JwtTokenDto.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/response/JwtTokenDto.java index d36465d..269901e 100644 --- a/src/main/java/org/kkumulkkum/server/dto/auth/response/JwtTokenDto.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/response/JwtTokenDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.auth.response; +package org.kkumulkkum.server.api.auth.dto.response; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/response/UserTokenDto.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/response/UserTokenDto.java index bae25c3..8e189a1 100644 --- a/src/main/java/org/kkumulkkum/server/dto/auth/response/UserTokenDto.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/response/UserTokenDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.auth.response; +package org.kkumulkkum.server.api.auth.dto.response; import org.kkumulkkum.server.domain.userinfo.UserInfo; diff --git a/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java similarity index 82% rename from src/main/java/org/kkumulkkum/server/service/auth/AuthService.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java index 99e8c4e..d8f63e7 100644 --- a/src/main/java/org/kkumulkkum/server/service/auth/AuthService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java @@ -1,6 +1,19 @@ -package org.kkumulkkum.server.service.auth; +package org.kkumulkkum.server.api.auth.service; import lombok.RequiredArgsConstructor; +import org.kkumulkkum.server.domain.user.manager.TokenRemover; +import org.kkumulkkum.server.domain.user.manager.TokenRetriever; +import org.kkumulkkum.server.domain.user.manager.TokenSaver; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; +import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; +import org.kkumulkkum.server.domain.promise.manager.PromiseRetriever; +import org.kkumulkkum.server.domain.user.manager.UserRemover; +import org.kkumulkkum.server.domain.user.manager.UserRetriever; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRemover; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoSaver; import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; import org.kkumulkkum.server.auth.openfeign.kakao.dto.SocialUserDto; import org.kkumulkkum.server.auth.openfeign.apple.service.AppleService; @@ -11,23 +24,13 @@ import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.kkumulkkum.server.domain.user.Provider; import org.kkumulkkum.server.domain.user.Role; -import org.kkumulkkum.server.dto.auth.request.UserLoginDto; -import org.kkumulkkum.server.dto.auth.response.JwtTokenDto; -import org.kkumulkkum.server.dto.auth.response.UserTokenDto; +import org.kkumulkkum.server.api.auth.dto.request.UserLoginDto; +import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; +import org.kkumulkkum.server.api.auth.dto.response.UserTokenDto; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.code.AuthErrorCode; -import org.kkumulkkum.server.service.member.MemberRemover; -import org.kkumulkkum.server.service.member.MemberRetreiver; -import org.kkumulkkum.server.service.participant.ParticipantRemover; -import org.kkumulkkum.server.service.participant.ParticipantRetriever; -import org.kkumulkkum.server.service.promise.PromiseRemover; -import org.kkumulkkum.server.service.promise.PromiseRetriever; -import org.kkumulkkum.server.service.user.UserRemover; -import org.kkumulkkum.server.service.user.UserRetriever; -import org.kkumulkkum.server.service.user.UserSaver; -import org.kkumulkkum.server.service.userInfo.UserInfoRemover; -import org.kkumulkkum.server.service.userInfo.UserInfoRetriever; -import org.kkumulkkum.server.service.userInfo.UserInfoSaver; +import org.kkumulkkum.server.domain.member.manager.MemberRemover; +import org.kkumulkkum.server.domain.user.manager.UserSaver; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/controller/TestController.java b/src/main/java/org/kkumulkkum/server/api/common/TestController.java similarity index 75% rename from src/main/java/org/kkumulkkum/server/controller/TestController.java rename to src/main/java/org/kkumulkkum/server/api/common/TestController.java index 97cff66..29011b8 100644 --- a/src/main/java/org/kkumulkkum/server/controller/TestController.java +++ b/src/main/java/org/kkumulkkum/server/api/common/TestController.java @@ -1,15 +1,13 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.common; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; -import org.kkumulkkum.server.dto.auth.response.JwtTokenDto; -import org.kkumulkkum.server.dto.test.TestDto; +import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; import org.kkumulkkum.server.exception.BusinessException; import org.kkumulkkum.server.exception.code.BusinessErrorCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController @@ -18,11 +16,6 @@ public class TestController { private final JwtTokenProvider jwtTokenProvider; - @GetMapping("/v1/test/dto") - public ResponseEntity testDto() { - return ResponseEntity.ok(new TestDto("test")); - } - @GetMapping("/v1/test/default") public ResponseEntity testDefault() { throw new RuntimeException(); diff --git a/src/main/java/org/kkumulkkum/server/dto/common/ErrorDto.java b/src/main/java/org/kkumulkkum/server/api/common/dto/ErrorDto.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/dto/common/ErrorDto.java rename to src/main/java/org/kkumulkkum/server/api/common/dto/ErrorDto.java index 145f306..0eefedd 100644 --- a/src/main/java/org/kkumulkkum/server/dto/common/ErrorDto.java +++ b/src/main/java/org/kkumulkkum/server/api/common/dto/ErrorDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.common; +package org.kkumulkkum.server.api.common.dto; public record ErrorDto( int code, diff --git a/src/main/java/org/kkumulkkum/server/dto/common/ResponseDto.java b/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/dto/common/ResponseDto.java rename to src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java index 5b260ae..c356f13 100644 --- a/src/main/java/org/kkumulkkum/server/dto/common/ResponseDto.java +++ b/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.common; +package org.kkumulkkum.server.api.common.dto; import org.kkumulkkum.server.exception.code.DefaultErrorCode; diff --git a/src/main/java/org/kkumulkkum/server/controller/MeetingController.java b/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/controller/MeetingController.java rename to src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java index 87f7c72..e96ac3c 100644 --- a/src/main/java/org/kkumulkkum/server/controller/MeetingController.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java @@ -1,17 +1,17 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.meeting.controller; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.annotation.IsMemberByMeetingId; import org.kkumulkkum.server.annotation.UserId; -import org.kkumulkkum.server.dto.meeting.request.MeetingCreateDto; -import org.kkumulkkum.server.dto.meeting.request.MeetingRegisterDto; -import org.kkumulkkum.server.dto.meeting.response.CreatedMeetingDto; -import org.kkumulkkum.server.dto.meeting.response.MeetingDto; -import org.kkumulkkum.server.dto.meeting.response.MeetingIdDto; -import org.kkumulkkum.server.dto.meeting.response.MeetingsDto; -import org.kkumulkkum.server.dto.member.response.MembersDto; -import org.kkumulkkum.server.service.meeting.MeetingService; +import org.kkumulkkum.server.api.meeting.dto.request.MeetingCreateDto; +import org.kkumulkkum.server.api.meeting.dto.request.MeetingRegisterDto; +import org.kkumulkkum.server.api.meeting.dto.response.CreatedMeetingDto; +import org.kkumulkkum.server.api.meeting.dto.response.MeetingDto; +import org.kkumulkkum.server.api.meeting.dto.response.MeetingIdDto; +import org.kkumulkkum.server.api.meeting.dto.response.MeetingsDto; +import org.kkumulkkum.server.api.meeting.dto.response.MembersDto; +import org.kkumulkkum.server.api.meeting.service.MeetingService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/MeetingMetCountDto.java similarity index 75% rename from src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/MeetingMetCountDto.java index f2a784e..c61e72b 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/MeetingMetCountDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/MeetingMetCountDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting; +package org.kkumulkkum.server.api.meeting.dto; import org.kkumulkkum.server.domain.meeting.Meeting; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingCreateDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingCreateDto.java similarity index 77% rename from src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingCreateDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingCreateDto.java index c027317..f21533a 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingCreateDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingCreateDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.request; +package org.kkumulkkum.server.api.meeting.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingRegisterDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingRegisterDto.java similarity index 55% rename from src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingRegisterDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingRegisterDto.java index 27f60e1..8c6dc2f 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/request/MeetingRegisterDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/request/MeetingRegisterDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.request; +package org.kkumulkkum.server.api.meeting.dto.request; public record MeetingRegisterDto ( String invitationCode diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/CreatedMeetingDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/CreatedMeetingDto.java similarity index 62% rename from src/main/java/org/kkumulkkum/server/dto/meeting/response/CreatedMeetingDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/CreatedMeetingDto.java index 97d945d..2ff230e 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/CreatedMeetingDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/CreatedMeetingDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.response; +package org.kkumulkkum.server.api.meeting.dto.response; public record CreatedMeetingDto( Long meetingId, diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingDto.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingDto.java index adbcd86..2fcf536 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.response; +package org.kkumulkkum.server.api.meeting.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.meeting.Meeting; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingIdDto.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingIdDto.java index d9fe489..dbed4ee 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingIdDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingIdDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.response; +package org.kkumulkkum.server.api.meeting.dto.response; import org.kkumulkkum.server.domain.meeting.Meeting; diff --git a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingsDto.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingsDto.java index 7a5cf8b..7b9a4ef 100644 --- a/src/main/java/org/kkumulkkum/server/dto/meeting/response/MeetingsDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MeetingsDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.meeting.response; +package org.kkumulkkum.server.api.meeting.dto.response; import org.kkumulkkum.server.domain.meeting.Meeting; diff --git a/src/main/java/org/kkumulkkum/server/dto/member/response/MemberDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MemberDto.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/dto/member/response/MemberDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MemberDto.java index 77a9fcf..7274ded 100644 --- a/src/main/java/org/kkumulkkum/server/dto/member/response/MemberDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MemberDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.member.response; +package org.kkumulkkum.server.api.meeting.dto.response; public record MemberDto( Long memberId, diff --git a/src/main/java/org/kkumulkkum/server/dto/member/response/MembersDto.java b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MembersDto.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/dto/member/response/MembersDto.java rename to src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MembersDto.java index 3875f92..aeab1c6 100644 --- a/src/main/java/org/kkumulkkum/server/dto/member/response/MembersDto.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/dto/response/MembersDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.member.response; +package org.kkumulkkum.server.api.meeting.dto.response; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java b/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java rename to src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java index 66146f3..42b9372 100644 --- a/src/main/java/org/kkumulkkum/server/service/meeting/MeetingService.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java @@ -1,27 +1,31 @@ -package org.kkumulkkum.server.service.meeting; +package org.kkumulkkum.server.api.meeting.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.kkumulkkum.server.domain.meeting.manager.MeetingEditor; +import org.kkumulkkum.server.domain.meeting.manager.MeetingRemover; +import org.kkumulkkum.server.domain.meeting.manager.MeetingRetriever; +import org.kkumulkkum.server.domain.meeting.manager.MeetingSaver; +import org.kkumulkkum.server.domain.member.manager.MemberRemover; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; +import org.kkumulkkum.server.domain.member.manager.MemberSaver; import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.domain.member.Member; -import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; -import org.kkumulkkum.server.dto.meeting.request.MeetingCreateDto; -import org.kkumulkkum.server.dto.meeting.request.MeetingRegisterDto; -import org.kkumulkkum.server.dto.meeting.response.CreatedMeetingDto; -import org.kkumulkkum.server.dto.meeting.response.MeetingDto; -import org.kkumulkkum.server.dto.meeting.response.MeetingsDto; -import org.kkumulkkum.server.dto.member.response.MemberDto; -import org.kkumulkkum.server.dto.member.response.MembersDto; +import org.kkumulkkum.server.api.meeting.dto.MeetingMetCountDto; +import org.kkumulkkum.server.api.meeting.dto.request.MeetingCreateDto; +import org.kkumulkkum.server.api.meeting.dto.request.MeetingRegisterDto; +import org.kkumulkkum.server.api.meeting.dto.response.CreatedMeetingDto; +import org.kkumulkkum.server.api.meeting.dto.response.MeetingDto; +import org.kkumulkkum.server.api.meeting.dto.response.MeetingsDto; +import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; +import org.kkumulkkum.server.api.meeting.dto.response.MembersDto; import org.kkumulkkum.server.exception.MeetingException; import org.kkumulkkum.server.exception.code.MeetingErrorCode; -import org.kkumulkkum.server.service.member.MemberRemover; -import org.kkumulkkum.server.service.member.MemberRetreiver; -import org.kkumulkkum.server.service.member.MemberSaver; -import org.kkumulkkum.server.service.participant.ParticipantRemover; -import org.kkumulkkum.server.service.participant.ParticipantRetriever; -import org.kkumulkkum.server.service.promise.PromiseRemover; -import org.kkumulkkum.server.service.promise.PromiseRetriever; -import org.kkumulkkum.server.service.user.UserRetriever; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; +import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; +import org.kkumulkkum.server.domain.promise.manager.PromiseRetriever; +import org.kkumulkkum.server.domain.user.manager.UserRetriever; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/controller/ParticipantController.java b/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/controller/ParticipantController.java rename to src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java index b682d47..6b32946 100644 --- a/src/main/java/org/kkumulkkum/server/controller/ParticipantController.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java @@ -1,15 +1,15 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.participant.controller; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.annotation.IsMemberByPromiseId; import org.kkumulkkum.server.annotation.IsParticipant; import org.kkumulkkum.server.annotation.UserId; -import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto; -import org.kkumulkkum.server.dto.participant.response.AvailableParticipantsDto; -import org.kkumulkkum.server.dto.participant.response.LateComersDto; -import org.kkumulkkum.server.dto.participant.response.ParticipantsDto; -import org.kkumulkkum.server.dto.participant.response.PreparationStatusDto; -import org.kkumulkkum.server.service.participant.ParticipantService; +import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; +import org.kkumulkkum.server.api.participant.dto.response.AvailableParticipantsDto; +import org.kkumulkkum.server.api.participant.dto.response.LateComersDto; +import org.kkumulkkum.server.api.participant.dto.response.ParticipantsDto; +import org.kkumulkkum.server.api.participant.dto.response.PreparationStatusDto; +import org.kkumulkkum.server.api.participant.service.ParticipantService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/ParticipantStatusUserInfoDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/ParticipantStatusUserInfoDto.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/dto/participant/ParticipantStatusUserInfoDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/ParticipantStatusUserInfoDto.java index 698355b..3359078 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/ParticipantStatusUserInfoDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/ParticipantStatusUserInfoDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant; +package org.kkumulkkum.server.api.participant.dto; import java.time.LocalDateTime; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/request/PreparationInfoDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/request/PreparationInfoDto.java similarity index 77% rename from src/main/java/org/kkumulkkum/server/dto/participant/request/PreparationInfoDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/request/PreparationInfoDto.java index 7ee79a5..fedacdd 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/request/PreparationInfoDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/request/PreparationInfoDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.request; +package org.kkumulkkum.server.api.participant.dto.request; import jakarta.validation.constraints.Size; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/AvailableParticipantsDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/AvailableParticipantsDto.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/AvailableParticipantsDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/AvailableParticipantsDto.java index c58e0c0..20c5bbc 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/AvailableParticipantsDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/AvailableParticipantsDto.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; -import org.kkumulkkum.server.dto.member.response.MemberDto; +import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; import java.util.List; public record AvailableParticipantsDto( diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComerDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComerDto.java similarity index 83% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/LateComerDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComerDto.java index 70a744a..cf84f81 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComerDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComerDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; public record LateComerDto( Long participantId, diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComersDto.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComersDto.java index ad48016..94546e0 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/LateComersDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/LateComersDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantDto.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantDto.java index 5a3a277..29770b1 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; public record ParticipantDto( Long participantId, diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantsDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantsDto.java similarity index 84% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantsDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantsDto.java index 2defecd..4485be2 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/ParticipantsDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/ParticipantsDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/PreparationStatusDto.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java rename to src/main/java/org/kkumulkkum/server/api/participant/dto/response/PreparationStatusDto.java index c4110d9..d85fbcf 100644 --- a/src/main/java/org/kkumulkkum/server/dto/participant/response/PreparationStatusDto.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/dto/response/PreparationStatusDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.participant.response; +package org.kkumulkkum.server.api.participant.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.participant.Participant; diff --git a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java rename to src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java index c927fe7..4ecd336 100644 --- a/src/main/java/org/kkumulkkum/server/service/participant/ParticipantService.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java @@ -1,22 +1,25 @@ -package org.kkumulkkum.server.service.participant; +package org.kkumulkkum.server.api.participant.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.kkumulkkum.server.domain.participant.manager.ParticipantEditor; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; +import org.kkumulkkum.server.api.participant.dto.response.*; import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.domain.promise.Promise; -import org.kkumulkkum.server.dto.member.response.MemberDto; -import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; -import org.kkumulkkum.server.dto.participant.request.PreparationInfoDto; -import org.kkumulkkum.server.dto.participant.response.*; +import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; +import org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto; +import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; import org.kkumulkkum.server.exception.ParticipantException; import org.kkumulkkum.server.exception.code.ParticipantErrorCode; import org.kkumulkkum.server.external.FcmService; import org.kkumulkkum.server.external.dto.FcmMessageDto; import org.kkumulkkum.server.external.enums.FcmContent; -import org.kkumulkkum.server.service.member.MemberRetreiver; -import org.kkumulkkum.server.service.promise.PromiseRemover; -import org.kkumulkkum.server.service.promise.PromiseRetriever; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; +import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; +import org.kkumulkkum.server.domain.promise.manager.PromiseRetriever; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/controller/PromiseController.java b/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/controller/PromiseController.java rename to src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java index 1013d89..704697b 100644 --- a/src/main/java/org/kkumulkkum/server/controller/PromiseController.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.promise.controller; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -6,9 +6,9 @@ import org.kkumulkkum.server.annotation.IsMemberByPromiseId; import org.kkumulkkum.server.annotation.IsParticipant; import org.kkumulkkum.server.annotation.UserId; -import org.kkumulkkum.server.dto.promise.PromiseCreateDto; -import org.kkumulkkum.server.dto.promise.response.*; -import org.kkumulkkum.server.service.promise.PromiseService; +import org.kkumulkkum.server.api.promise.dto.request.PromiseCreateDto; +import org.kkumulkkum.server.api.promise.dto.response.*; +import org.kkumulkkum.server.api.promise.service.PromiseService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/request/PromiseCreateDto.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/request/PromiseCreateDto.java index daf8387..5d30217 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/PromiseCreateDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/request/PromiseCreateDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise; +package org.kkumulkkum.server.api.promise.dto.request; import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.annotation.Nullable; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromiseDto.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromiseDto.java index 1890c08..466bd93 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromiseDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromiseDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise.response; +package org.kkumulkkum.server.api.promise.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromisesDto.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromisesDto.java index 4c08096..7109652 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/MainPromisesDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/MainPromisesDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise.response; +package org.kkumulkkum.server.api.promise.dto.response; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseAddDto.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseAddDto.java index 2fbd0f1..70faaa3 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseAddDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseAddDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise.response; +package org.kkumulkkum.server.api.promise.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseDetailDto.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseDetailDto.java index 78a18a0..b341ed4 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromiseDetailDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromiseDetailDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise.response; +package org.kkumulkkum.server.api.promise.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromisesDto.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java rename to src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromisesDto.java index 0180c5b..3209e39 100644 --- a/src/main/java/org/kkumulkkum/server/dto/promise/response/PromisesDto.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/dto/response/PromisesDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.promise.response; +package org.kkumulkkum.server.api.promise.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; import org.kkumulkkum.server.domain.promise.Promise; diff --git a/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java rename to src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java index 48f8321..4193b85 100644 --- a/src/main/java/org/kkumulkkum/server/service/promise/PromiseService.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java @@ -1,21 +1,25 @@ -package org.kkumulkkum.server.service.promise; +package org.kkumulkkum.server.api.promise.service; import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; +import org.kkumulkkum.server.domain.promise.manager.PromiseEditor; +import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; +import org.kkumulkkum.server.domain.promise.manager.PromiseRetriever; +import org.kkumulkkum.server.domain.promise.manager.PromiseSaver; +import org.kkumulkkum.server.api.promise.dto.response.*; import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.domain.promise.Promise; import org.kkumulkkum.server.domain.userinfo.UserInfo; -import org.kkumulkkum.server.dto.promise.PromiseCreateDto; -import org.kkumulkkum.server.dto.promise.response.*; +import org.kkumulkkum.server.api.promise.dto.request.PromiseCreateDto; import org.kkumulkkum.server.exception.PromiseException; import org.kkumulkkum.server.exception.code.PromiseErrorCode; -import org.kkumulkkum.server.service.member.MemberRetreiver; -import org.kkumulkkum.server.service.participant.ParticipantRemover; -import org.kkumulkkum.server.service.participant.ParticipantRetriever; -import org.kkumulkkum.server.service.participant.ParticipantSaver; -import org.kkumulkkum.server.service.userInfo.UserInfoRetriever; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; +import org.kkumulkkum.server.domain.participant.manager.ParticipantSaver; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/controller/UserController.java b/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/controller/UserController.java rename to src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java index 9588aa3..8a343ec 100644 --- a/src/main/java/org/kkumulkkum/server/controller/UserController.java +++ b/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java @@ -1,13 +1,13 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.api.user.controller; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.annotation.UserId; -import org.kkumulkkum.server.dto.user.request.ImageUpdateDto; -import org.kkumulkkum.server.dto.user.request.NameUpdateDto; -import org.kkumulkkum.server.dto.user.response.UserDto; -import org.kkumulkkum.server.dto.user.response.UserNameDto; -import org.kkumulkkum.server.service.user.UserService; +import org.kkumulkkum.server.api.user.dto.request.ImageUpdateDto; +import org.kkumulkkum.server.api.user.dto.request.NameUpdateDto; +import org.kkumulkkum.server.api.user.dto.response.UserDto; +import org.kkumulkkum.server.api.user.dto.response.UserNameDto; +import org.kkumulkkum.server.api.user.service.UserService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/kkumulkkum/server/dto/user/request/ImageUpdateDto.java b/src/main/java/org/kkumulkkum/server/api/user/dto/request/ImageUpdateDto.java similarity index 78% rename from src/main/java/org/kkumulkkum/server/dto/user/request/ImageUpdateDto.java rename to src/main/java/org/kkumulkkum/server/api/user/dto/request/ImageUpdateDto.java index 84c5e7f..3816e16 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/request/ImageUpdateDto.java +++ b/src/main/java/org/kkumulkkum/server/api/user/dto/request/ImageUpdateDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.user.request; +package org.kkumulkkum.server.api.user.dto.request; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/org/kkumulkkum/server/dto/user/request/NameUpdateDto.java b/src/main/java/org/kkumulkkum/server/api/user/dto/request/NameUpdateDto.java similarity index 77% rename from src/main/java/org/kkumulkkum/server/dto/user/request/NameUpdateDto.java rename to src/main/java/org/kkumulkkum/server/api/user/dto/request/NameUpdateDto.java index 445caf2..3a5ea08 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/request/NameUpdateDto.java +++ b/src/main/java/org/kkumulkkum/server/api/user/dto/request/NameUpdateDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.user.request; +package org.kkumulkkum.server.api.user.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java b/src/main/java/org/kkumulkkum/server/api/user/dto/response/UserDto.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java rename to src/main/java/org/kkumulkkum/server/api/user/dto/response/UserDto.java index e6bcea7..3ca0576 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/response/UserDto.java +++ b/src/main/java/org/kkumulkkum/server/api/user/dto/response/UserDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.user.response; +package org.kkumulkkum.server.api.user.dto.response; import org.kkumulkkum.server.domain.userinfo.UserInfo; diff --git a/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java b/src/main/java/org/kkumulkkum/server/api/user/dto/response/UserNameDto.java similarity index 80% rename from src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java rename to src/main/java/org/kkumulkkum/server/api/user/dto/response/UserNameDto.java index fafc65b..f93ba10 100644 --- a/src/main/java/org/kkumulkkum/server/dto/user/response/UserNameDto.java +++ b/src/main/java/org/kkumulkkum/server/api/user/dto/response/UserNameDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.dto.user.response; +package org.kkumulkkum.server.api.user.dto.response; import org.kkumulkkum.server.domain.userinfo.UserInfo; diff --git a/src/main/java/org/kkumulkkum/server/service/user/UserService.java b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/service/user/UserService.java rename to src/main/java/org/kkumulkkum/server/api/user/service/UserService.java index 09fc61c..17809de 100644 --- a/src/main/java/org/kkumulkkum/server/service/user/UserService.java +++ b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java @@ -1,17 +1,17 @@ -package org.kkumulkkum.server.service.user; +package org.kkumulkkum.server.api.user.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoEditor; import org.kkumulkkum.server.domain.userinfo.UserInfo; -import org.kkumulkkum.server.dto.user.request.ImageUpdateDto; -import org.kkumulkkum.server.dto.user.request.NameUpdateDto; -import org.kkumulkkum.server.dto.user.response.UserDto; -import org.kkumulkkum.server.dto.user.response.UserNameDto; +import org.kkumulkkum.server.api.user.dto.request.ImageUpdateDto; +import org.kkumulkkum.server.api.user.dto.request.NameUpdateDto; +import org.kkumulkkum.server.api.user.dto.response.UserDto; +import org.kkumulkkum.server.api.user.dto.response.UserNameDto; import org.kkumulkkum.server.exception.AwsException; import org.kkumulkkum.server.exception.code.AwsErrorCode; import org.kkumulkkum.server.external.S3Service; -import org.kkumulkkum.server.service.userInfo.UserInfoEditor; -import org.kkumulkkum.server.service.userInfo.UserInfoRetriever; +import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java b/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java index 0c6d508..f03d826 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java +++ b/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java @@ -7,7 +7,7 @@ import org.kkumulkkum.server.annotation.IsMemberByMeetingId; import org.kkumulkkum.server.exception.MemberException; import org.kkumulkkum.server.exception.code.MemberErrorCode; -import org.kkumulkkum.server.service.member.MemberRetreiver; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java b/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java index 6caf630..88c85dc 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java +++ b/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java @@ -7,7 +7,7 @@ import org.kkumulkkum.server.annotation.IsMemberByPromiseId; import org.kkumulkkum.server.exception.MemberException; import org.kkumulkkum.server.exception.code.MemberErrorCode; -import org.kkumulkkum.server.service.member.MemberRetreiver; +import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java b/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java index 552f76e..35d4c96 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java +++ b/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java @@ -7,7 +7,7 @@ import org.kkumulkkum.server.annotation.IsParticipant; import org.kkumulkkum.server.exception.ParticipantException; import org.kkumulkkum.server.exception.code.ParticipantErrorCode; -import org.kkumulkkum.server.service.participant.ParticipantRetriever; +import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java b/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java index 1c99b66..c8c84ba 100644 --- a/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java +++ b/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java @@ -5,7 +5,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.constant.AuthConstant; -import org.kkumulkkum.server.dto.common.ResponseDto; +import org.kkumulkkum.server.api.common.dto.ResponseDto; import org.kkumulkkum.server.exception.code.AuthErrorCode; import org.kkumulkkum.server.exception.code.DefaultErrorCode; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java b/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java index a568346..93735fd 100644 --- a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java +++ b/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java @@ -5,7 +5,7 @@ import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; import org.kkumulkkum.server.constant.AuthConstant; -import org.kkumulkkum.server.dto.auth.response.JwtTokenDto; +import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.code.AuthErrorCode; import org.springframework.beans.factory.InitializingBean; diff --git a/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java b/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java index 3a15a98..1dac6ef 100644 --- a/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/repository/MeetingRepository.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.domain.meeting.repository; import org.kkumulkkum.server.domain.meeting.Meeting; -import org.kkumulkkum.server.dto.meeting.MeetingMetCountDto; +import org.kkumulkkum.server.api.meeting.dto.MeetingMetCountDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -18,7 +18,7 @@ public interface MeetingRepository extends JpaRepository { List findAllByUserId(Long userId); @Query(""" - SELECT new org.kkumulkkum.server.dto.meeting.MeetingMetCountDto (m, COUNT(p.id)) + SELECT new org.kkumulkkum.server.api.meeting.dto.MeetingMetCountDto (m, COUNT(p.id)) FROM Meeting m LEFT JOIN Promise p ON p.meeting.id = m.id AND p.isCompleted = true WHERE m.id = :meetingId diff --git a/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java b/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java index 84bb412..bfcbf61 100644 --- a/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/repository/MemberRepository.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.domain.member.repository; import org.kkumulkkum.server.domain.member.Member; -import org.kkumulkkum.server.dto.member.response.MemberDto; +import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -15,7 +15,7 @@ public interface MemberRepository extends JpaRepository { boolean existsByMeetingIdAndUserId(Long meetingId, Long userId); @Query(""" - SELECT new org.kkumulkkum.server.dto.member.response.MemberDto + SELECT new org.kkumulkkum.server.api.meeting.dto.response.MemberDto (m.id, ui.name, ui.profileImg) FROM Member m JOIN FETCH UserInfo ui ON m.user.id = ui.user.id @@ -51,7 +51,7 @@ SELECT CASE WHEN EXISTS ( Member findByUserIdAndPromiseId(Long userId, Long promiseId); @Query(""" - SELECT new org.kkumulkkum.server.dto.member.response.MemberDto + SELECT new org.kkumulkkum.server.api.meeting.dto.response.MemberDto (m.id, ui.name, ui.profileImg) FROM Member m JOIN m.meeting mt diff --git a/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java b/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java index e8d5ec4..65ef6f4 100644 --- a/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/repository/ParticipantRepository.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.domain.participant.repository; import org.kkumulkkum.server.domain.participant.Participant; -import org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto; -import org.kkumulkkum.server.dto.participant.response.LateComerDto; +import org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto; +import org.kkumulkkum.server.api.participant.dto.response.LateComerDto; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -18,7 +18,7 @@ public interface ParticipantRepository extends JpaRepository Optional findByPromiseIdAndUserId(Long promiseId, Long userId); @Query(""" - SELECT new org.kkumulkkum.server.dto.participant.ParticipantStatusUserInfoDto + SELECT new org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto (p.id, p.member.id, ui.name, ui.profileImg, p.preparationStartAt, p.departureAt, p.arrivalAt) FROM Participant p JOIN Member m ON p.member.id = m.id @@ -27,7 +27,7 @@ public interface ParticipantRepository extends JpaRepository List findAllByPromiseIdWithUserInfo(Long promiseId); @Query(""" - SELECT new org.kkumulkkum.server.dto.participant.response.LateComerDto + SELECT new org.kkumulkkum.server.api.participant.dto.response.LateComerDto (p.id, ui.name, ui.profileImg) FROM Participant p JOIN Member m ON p.member.id = m.id diff --git a/src/main/java/org/kkumulkkum/server/dto/test/TestDto.java b/src/main/java/org/kkumulkkum/server/dto/test/TestDto.java deleted file mode 100644 index b7825f9..0000000 --- a/src/main/java/org/kkumulkkum/server/dto/test/TestDto.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.kkumulkkum.server.dto.test; - -public record TestDto( - String test -) { - public static TestDto from(String test) { - return new TestDto(test); - } -} From 9503d7be515a05e8da5a4cc181a39c40f4cef056 Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 01:36:32 +0900 Subject: [PATCH 4/6] [refactor] #151 mv external related classes to external package & add misc to api --- .../kakao => api/auth}/dto/SocialUserDto.java | 2 +- .../auth/dto/verify}/ApplePublicKey.java | 2 +- .../auth/dto/verify}/ApplePublicKeys.java | 2 +- .../auth}/service/AppleService.java | 17 ++++++++--------- .../server/api/auth/service/AuthService.java | 4 +--- .../auth}/service/KakaoService.java | 8 ++++---- .../verify/AppleClientSecretGenerator.java | 2 +- .../auth/service}/verify/AppleJwtParser.java | 2 +- .../service}/verify/PublicKeyGenerator.java | 6 +++--- .../participant/service/ParticipantService.java | 6 +++--- .../server/api/user/service/UserService.java | 2 +- .../auth/openfeign/kakao/dto/KakaoAccount.java | 6 ------ .../server/{ => external}/config/AwsConfig.java | 2 +- .../config/FeignClientConfig.java | 2 +- .../{ => external}/config/FirebaseConfig.java | 2 +- .../naver/NaverLocationController.java} | 8 ++++---- .../{ => controller/naver}/dto/LocationDto.java | 2 +- .../naver}/dto/LocationsDto.java | 2 +- .../service}/apple/AppleFeignClient.java | 6 +++--- .../service}/apple/dto/AppleTokenDto.java | 2 +- .../{enums => service/fcm}/FcmContent.java | 2 +- .../external/{ => service/fcm}/FcmService.java | 4 ++-- .../{ => service/fcm}/dto/FcmMessageDto.java | 4 ++-- .../service}/kakao/KakaoFeignClient.java | 4 ++-- .../service/kakao/dto/KakaoAccount.java | 6 ++++++ .../service}/kakao/dto/KakaoUserDto.java | 2 +- .../{ => service/naver}/NaverService.java | 8 ++++---- .../naver}/dto/NaverLocationResponse.java | 2 +- .../external/{ => service/s3}/S3Service.java | 4 ++-- 29 files changed, 59 insertions(+), 62 deletions(-) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/kakao => api/auth}/dto/SocialUserDto.java (77%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple/dto => api/auth/dto/verify}/ApplePublicKey.java (69%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple/dto => api/auth/dto/verify}/ApplePublicKeys.java (90%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple => api/auth}/service/AppleService.java (81%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/kakao => api/auth}/service/KakaoService.java (78%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple => api/auth/service}/verify/AppleClientSecretGenerator.java (97%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple => api/auth/service}/verify/AppleJwtParser.java (96%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign/apple => api/auth/service}/verify/PublicKeyGenerator.java (89%) delete mode 100644 src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoAccount.java rename src/main/java/org/kkumulkkum/server/{ => external}/config/AwsConfig.java (97%) rename src/main/java/org/kkumulkkum/server/{ => external}/config/FeignClientConfig.java (86%) rename src/main/java/org/kkumulkkum/server/{ => external}/config/FirebaseConfig.java (96%) rename src/main/java/org/kkumulkkum/server/{controller/LocationController.java => external/controller/naver/NaverLocationController.java} (71%) rename src/main/java/org/kkumulkkum/server/external/{ => controller/naver}/dto/LocationDto.java (70%) rename src/main/java/org/kkumulkkum/server/external/{ => controller/naver}/dto/LocationsDto.java (78%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign => external/service}/apple/AppleFeignClient.java (86%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign => external/service}/apple/dto/AppleTokenDto.java (85%) rename src/main/java/org/kkumulkkum/server/external/{enums => service/fcm}/FcmContent.java (93%) rename src/main/java/org/kkumulkkum/server/external/{ => service/fcm}/FcmService.java (93%) rename src/main/java/org/kkumulkkum/server/external/{ => service/fcm}/dto/FcmMessageDto.java (77%) rename src/main/java/org/kkumulkkum/server/{auth/openfeign => external/service}/kakao/KakaoFeignClient.java (87%) create mode 100644 src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoAccount.java rename src/main/java/org/kkumulkkum/server/{auth/openfeign => external/service}/kakao/dto/KakaoUserDto.java (82%) rename src/main/java/org/kkumulkkum/server/external/{ => service/naver}/NaverService.java (93%) rename src/main/java/org/kkumulkkum/server/external/{ => service/naver}/dto/NaverLocationResponse.java (89%) rename src/main/java/org/kkumulkkum/server/external/{ => service/s3}/S3Service.java (96%) diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/SocialUserDto.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/SocialUserDto.java similarity index 77% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/SocialUserDto.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/SocialUserDto.java index d97f9f4..cfcd61e 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/SocialUserDto.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/SocialUserDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.kakao.dto; +package org.kkumulkkum.server.api.auth.dto; public record SocialUserDto(String platformId, String email) { diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKey.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKey.java similarity index 69% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKey.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKey.java index 3ef4abc..a06b05e 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKey.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKey.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.apple.dto; +package org.kkumulkkum.server.api.auth.dto.verify; public record ApplePublicKey( String kty, String kid, String use, String alg, String n, String e, String email diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKeys.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKeys.java rename to src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java index 3312e5c..5880382 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/ApplePublicKeys.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.apple.dto; +package org.kkumulkkum.server.api.auth.dto.verify; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.code.AuthErrorCode; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/service/AppleService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java similarity index 81% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/service/AppleService.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java index 343475e..e0a3230 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/service/AppleService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java @@ -1,22 +1,21 @@ -package org.kkumulkkum.server.auth.openfeign.apple.service; +package org.kkumulkkum.server.api.auth.service; import io.jsonwebtoken.Claims; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.auth.openfeign.apple.AppleFeignClient; -import org.kkumulkkum.server.auth.openfeign.apple.dto.ApplePublicKeys; -import org.kkumulkkum.server.auth.openfeign.apple.dto.AppleTokenDto; -import org.kkumulkkum.server.auth.openfeign.apple.verify.AppleClientSecretGenerator; -import org.kkumulkkum.server.auth.openfeign.apple.verify.AppleJwtParser; -import org.kkumulkkum.server.auth.openfeign.apple.verify.PublicKeyGenerator; -import org.kkumulkkum.server.auth.openfeign.kakao.dto.SocialUserDto; +import org.kkumulkkum.server.external.service.apple.AppleFeignClient; +import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKeys; +import org.kkumulkkum.server.external.service.apple.dto.AppleTokenDto; +import org.kkumulkkum.server.api.auth.service.verify.AppleClientSecretGenerator; +import org.kkumulkkum.server.api.auth.service.verify.AppleJwtParser; +import org.kkumulkkum.server.api.auth.service.verify.PublicKeyGenerator; +import org.kkumulkkum.server.api.auth.dto.SocialUserDto; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.BusinessException; import org.kkumulkkum.server.exception.code.AuthErrorCode; import org.kkumulkkum.server.exception.code.BusinessErrorCode; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.web.bind.MissingRequestHeaderException; import java.security.PublicKey; import java.util.Map; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java index d8f63e7..084b2ec 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java @@ -15,9 +15,7 @@ import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.kkumulkkum.server.domain.userinfo.manager.UserInfoSaver; import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; -import org.kkumulkkum.server.auth.openfeign.kakao.dto.SocialUserDto; -import org.kkumulkkum.server.auth.openfeign.apple.service.AppleService; -import org.kkumulkkum.server.auth.openfeign.kakao.service.KakaoService; +import org.kkumulkkum.server.api.auth.dto.SocialUserDto; import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.domain.user.Token; import org.kkumulkkum.server.domain.user.User; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/service/KakaoService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java similarity index 78% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/service/KakaoService.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java index b3b8f23..239afc7 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/service/KakaoService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java @@ -1,9 +1,9 @@ -package org.kkumulkkum.server.auth.openfeign.kakao.service; +package org.kkumulkkum.server.api.auth.service; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.auth.openfeign.kakao.KakaoFeignClient; -import org.kkumulkkum.server.auth.openfeign.kakao.dto.KakaoUserDto; -import org.kkumulkkum.server.auth.openfeign.kakao.dto.SocialUserDto; +import org.kkumulkkum.server.external.service.kakao.KakaoFeignClient; +import org.kkumulkkum.server.external.service.kakao.dto.KakaoUserDto; +import org.kkumulkkum.server.api.auth.dto.SocialUserDto; import org.kkumulkkum.server.constant.AuthConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleClientSecretGenerator.java b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleClientSecretGenerator.java similarity index 97% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleClientSecretGenerator.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleClientSecretGenerator.java index b60594c..a38954c 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleClientSecretGenerator.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleClientSecretGenerator.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.apple.verify; +package org.kkumulkkum.server.api.auth.service.verify; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleJwtParser.java b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleJwtParser.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java index e30f99f..71454db 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/AppleJwtParser.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.apple.verify; +package org.kkumulkkum.server.api.auth.service.verify; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/PublicKeyGenerator.java b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java similarity index 89% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/PublicKeyGenerator.java rename to src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java index 013a2fc..bfb4e48 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/verify/PublicKeyGenerator.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java @@ -1,7 +1,7 @@ -package org.kkumulkkum.server.auth.openfeign.apple.verify; +package org.kkumulkkum.server.api.auth.service.verify; -import org.kkumulkkum.server.auth.openfeign.apple.dto.ApplePublicKey; -import org.kkumulkkum.server.auth.openfeign.apple.dto.ApplePublicKeys; +import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKey; +import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKeys; import org.kkumulkkum.server.exception.AuthException; import org.kkumulkkum.server.exception.code.AuthErrorCode; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java index 4ecd336..c2eb14c 100644 --- a/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java @@ -14,9 +14,9 @@ import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; import org.kkumulkkum.server.exception.ParticipantException; import org.kkumulkkum.server.exception.code.ParticipantErrorCode; -import org.kkumulkkum.server.external.FcmService; -import org.kkumulkkum.server.external.dto.FcmMessageDto; -import org.kkumulkkum.server.external.enums.FcmContent; +import org.kkumulkkum.server.external.service.fcm.FcmService; +import org.kkumulkkum.server.external.service.fcm.dto.FcmMessageDto; +import org.kkumulkkum.server.external.service.fcm.FcmContent; import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; import org.kkumulkkum.server.domain.promise.manager.PromiseRetriever; diff --git a/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java index 17809de..4c6f93a 100644 --- a/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java +++ b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java @@ -10,7 +10,7 @@ import org.kkumulkkum.server.api.user.dto.response.UserNameDto; import org.kkumulkkum.server.exception.AwsException; import org.kkumulkkum.server.exception.code.AwsErrorCode; -import org.kkumulkkum.server.external.S3Service; +import org.kkumulkkum.server.external.service.s3.S3Service; import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoAccount.java b/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoAccount.java deleted file mode 100644 index c5ab69f..0000000 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoAccount.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.kkumulkkum.server.auth.openfeign.kakao.dto; - -public record KakaoAccount( - String email -) { -} diff --git a/src/main/java/org/kkumulkkum/server/config/AwsConfig.java b/src/main/java/org/kkumulkkum/server/external/config/AwsConfig.java similarity index 97% rename from src/main/java/org/kkumulkkum/server/config/AwsConfig.java rename to src/main/java/org/kkumulkkum/server/external/config/AwsConfig.java index 49817dd..9fe3b2c 100644 --- a/src/main/java/org/kkumulkkum/server/config/AwsConfig.java +++ b/src/main/java/org/kkumulkkum/server/external/config/AwsConfig.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.external.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/kkumulkkum/server/config/FeignClientConfig.java b/src/main/java/org/kkumulkkum/server/external/config/FeignClientConfig.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/config/FeignClientConfig.java rename to src/main/java/org/kkumulkkum/server/external/config/FeignClientConfig.java index 1182b92..395efc4 100644 --- a/src/main/java/org/kkumulkkum/server/config/FeignClientConfig.java +++ b/src/main/java/org/kkumulkkum/server/external/config/FeignClientConfig.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.external.config; import org.kkumulkkum.server.ServerApplication; import org.springframework.cloud.openfeign.EnableFeignClients; diff --git a/src/main/java/org/kkumulkkum/server/config/FirebaseConfig.java b/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/config/FirebaseConfig.java rename to src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java index 1da0082..063ddcc 100644 --- a/src/main/java/org/kkumulkkum/server/config/FirebaseConfig.java +++ b/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.external.config; import com.google.auth.oauth2.GoogleCredentials; import com.google.firebase.FirebaseApp; diff --git a/src/main/java/org/kkumulkkum/server/controller/LocationController.java b/src/main/java/org/kkumulkkum/server/external/controller/naver/NaverLocationController.java similarity index 71% rename from src/main/java/org/kkumulkkum/server/controller/LocationController.java rename to src/main/java/org/kkumulkkum/server/external/controller/naver/NaverLocationController.java index 43f9b78..5b365fb 100644 --- a/src/main/java/org/kkumulkkum/server/controller/LocationController.java +++ b/src/main/java/org/kkumulkkum/server/external/controller/naver/NaverLocationController.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.controller; +package org.kkumulkkum.server.external.controller.naver; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.external.NaverService; -import org.kkumulkkum.server.external.dto.LocationsDto; +import org.kkumulkkum.server.external.service.naver.NaverService; +import org.kkumulkkum.server.external.controller.naver.dto.LocationsDto; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -10,7 +10,7 @@ @RestController @RequiredArgsConstructor -public class LocationController { +public class NaverLocationController { private final NaverService naverService; diff --git a/src/main/java/org/kkumulkkum/server/external/dto/LocationDto.java b/src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationDto.java similarity index 70% rename from src/main/java/org/kkumulkkum/server/external/dto/LocationDto.java rename to src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationDto.java index 061f475..7658275 100644 --- a/src/main/java/org/kkumulkkum/server/external/dto/LocationDto.java +++ b/src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.external.dto; +package org.kkumulkkum.server.external.controller.naver.dto; public record LocationDto( diff --git a/src/main/java/org/kkumulkkum/server/external/dto/LocationsDto.java b/src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationsDto.java similarity index 78% rename from src/main/java/org/kkumulkkum/server/external/dto/LocationsDto.java rename to src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationsDto.java index b62044b..c3d8567 100644 --- a/src/main/java/org/kkumulkkum/server/external/dto/LocationsDto.java +++ b/src/main/java/org/kkumulkkum/server/external/controller/naver/dto/LocationsDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.external.dto; +package org.kkumulkkum.server.external.controller.naver.dto; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/AppleFeignClient.java b/src/main/java/org/kkumulkkum/server/external/service/apple/AppleFeignClient.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/AppleFeignClient.java rename to src/main/java/org/kkumulkkum/server/external/service/apple/AppleFeignClient.java index e5f162e..cb46138 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/AppleFeignClient.java +++ b/src/main/java/org/kkumulkkum/server/external/service/apple/AppleFeignClient.java @@ -1,7 +1,7 @@ -package org.kkumulkkum.server.auth.openfeign.apple; +package org.kkumulkkum.server.external.service.apple; -import org.kkumulkkum.server.auth.openfeign.apple.dto.ApplePublicKeys; -import org.kkumulkkum.server.auth.openfeign.apple.dto.AppleTokenDto; +import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKeys; +import org.kkumulkkum.server.external.service.apple.dto.AppleTokenDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/AppleTokenDto.java b/src/main/java/org/kkumulkkum/server/external/service/apple/dto/AppleTokenDto.java similarity index 85% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/AppleTokenDto.java rename to src/main/java/org/kkumulkkum/server/external/service/apple/dto/AppleTokenDto.java index 627e0e2..85caabb 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/apple/dto/AppleTokenDto.java +++ b/src/main/java/org/kkumulkkum/server/external/service/apple/dto/AppleTokenDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.apple.dto; +package org.kkumulkkum.server.external.service.apple.dto; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/src/main/java/org/kkumulkkum/server/external/enums/FcmContent.java b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmContent.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/external/enums/FcmContent.java rename to src/main/java/org/kkumulkkum/server/external/service/fcm/FcmContent.java index a79ffb9..64abf05 100644 --- a/src/main/java/org/kkumulkkum/server/external/enums/FcmContent.java +++ b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmContent.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.external.enums; +package org.kkumulkkum.server.external.service.fcm; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/external/FcmService.java b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/external/FcmService.java rename to src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java index 2582b2d..960c035 100644 --- a/src/main/java/org/kkumulkkum/server/external/FcmService.java +++ b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java @@ -1,11 +1,11 @@ -package org.kkumulkkum.server.external; +package org.kkumulkkum.server.external.service.fcm; import com.google.firebase.messaging.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.kkumulkkum.server.exception.FirebaseException; import org.kkumulkkum.server.exception.code.FirebaseErrorCode; -import org.kkumulkkum.server.external.dto.FcmMessageDto; +import org.kkumulkkum.server.external.service.fcm.dto.FcmMessageDto; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/external/dto/FcmMessageDto.java b/src/main/java/org/kkumulkkum/server/external/service/fcm/dto/FcmMessageDto.java similarity index 77% rename from src/main/java/org/kkumulkkum/server/external/dto/FcmMessageDto.java rename to src/main/java/org/kkumulkkum/server/external/service/fcm/dto/FcmMessageDto.java index 9e3fe21..bd28188 100644 --- a/src/main/java/org/kkumulkkum/server/external/dto/FcmMessageDto.java +++ b/src/main/java/org/kkumulkkum/server/external/service/fcm/dto/FcmMessageDto.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.external.dto; +package org.kkumulkkum.server.external.service.fcm.dto; -import org.kkumulkkum.server.external.enums.FcmContent; +import org.kkumulkkum.server.external.service.fcm.FcmContent; public record FcmMessageDto( String title, diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/KakaoFeignClient.java b/src/main/java/org/kkumulkkum/server/external/service/kakao/KakaoFeignClient.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/KakaoFeignClient.java rename to src/main/java/org/kkumulkkum/server/external/service/kakao/KakaoFeignClient.java index 85c1bd8..a45765d 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/KakaoFeignClient.java +++ b/src/main/java/org/kkumulkkum/server/external/service/kakao/KakaoFeignClient.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.auth.openfeign.kakao; +package org.kkumulkkum.server.external.service.kakao; -import org.kkumulkkum.server.auth.openfeign.kakao.dto.KakaoUserDto; +import org.kkumulkkum.server.external.service.kakao.dto.KakaoUserDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoAccount.java b/src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoAccount.java new file mode 100644 index 0000000..6dd9da7 --- /dev/null +++ b/src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoAccount.java @@ -0,0 +1,6 @@ +package org.kkumulkkum.server.external.service.kakao.dto; + +public record KakaoAccount( + String email +) { +} diff --git a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoUserDto.java b/src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoUserDto.java similarity index 82% rename from src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoUserDto.java rename to src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoUserDto.java index 7ee0dff..a2aa318 100644 --- a/src/main/java/org/kkumulkkum/server/auth/openfeign/kakao/dto/KakaoUserDto.java +++ b/src/main/java/org/kkumulkkum/server/external/service/kakao/dto/KakaoUserDto.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth.openfeign.kakao.dto; +package org.kkumulkkum.server.external.service.kakao.dto; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/src/main/java/org/kkumulkkum/server/external/NaverService.java b/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/external/NaverService.java rename to src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java index 61d6efc..e26c684 100644 --- a/src/main/java/org/kkumulkkum/server/external/NaverService.java +++ b/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java @@ -1,10 +1,10 @@ -package org.kkumulkkum.server.external; +package org.kkumulkkum.server.external.service.naver; import org.kkumulkkum.server.exception.OpenApiException; import org.kkumulkkum.server.exception.code.OpenApiErrorCode; -import org.kkumulkkum.server.external.dto.LocationDto; -import org.kkumulkkum.server.external.dto.LocationsDto; -import org.kkumulkkum.server.external.dto.NaverLocationResponse; +import org.kkumulkkum.server.external.controller.naver.dto.LocationDto; +import org.kkumulkkum.server.external.controller.naver.dto.LocationsDto; +import org.kkumulkkum.server.external.service.naver.dto.NaverLocationResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatusCode; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/external/dto/NaverLocationResponse.java b/src/main/java/org/kkumulkkum/server/external/service/naver/dto/NaverLocationResponse.java similarity index 89% rename from src/main/java/org/kkumulkkum/server/external/dto/NaverLocationResponse.java rename to src/main/java/org/kkumulkkum/server/external/service/naver/dto/NaverLocationResponse.java index 840f716..8eda910 100644 --- a/src/main/java/org/kkumulkkum/server/external/dto/NaverLocationResponse.java +++ b/src/main/java/org/kkumulkkum/server/external/service/naver/dto/NaverLocationResponse.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.external.dto; +package org.kkumulkkum.server.external.service.naver.dto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/external/S3Service.java b/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/external/S3Service.java rename to src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java index 66e9b79..c18341e 100644 --- a/src/main/java/org/kkumulkkum/server/external/S3Service.java +++ b/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java @@ -1,6 +1,6 @@ -package org.kkumulkkum.server.external; +package org.kkumulkkum.server.external.service.s3; -import org.kkumulkkum.server.config.AwsConfig; +import org.kkumulkkum.server.external.config.AwsConfig; import org.kkumulkkum.server.exception.AwsException; import org.kkumulkkum.server.exception.code.AwsErrorCode; import org.springframework.beans.factory.annotation.Value; From 27f33b21d101a671f382f567c3f2e0524d5aef9a Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 02:03:00 +0900 Subject: [PATCH 5/6] [refactor] #151 mv common related classes to common package --- .../server/api/auth/controller/AuthController.java | 4 ++-- .../server/api/auth/dto/verify/ApplePublicKeys.java | 4 ++-- .../server/api/auth/service/AppleService.java | 8 ++++---- .../server/api/auth/service/AuthService.java | 6 +++--- .../server/api/auth/service/KakaoService.java | 2 +- .../api/auth/service/verify/AppleJwtParser.java | 5 ++--- .../api/auth/service/verify/PublicKeyGenerator.java | 4 ++-- .../kkumulkkum/server/api/common/TestController.java | 6 +++--- .../server/api/common/dto/ResponseDto.java | 2 +- .../api/meeting/controller/MeetingController.java | 4 ++-- .../server/api/meeting/service/MeetingService.java | 4 ++-- .../controller/ParticipantController.java | 6 +++--- .../api/participant/service/ParticipantService.java | 4 ++-- .../api/promise/controller/PromiseController.java | 8 ++++---- .../server/api/promise/service/PromiseService.java | 4 ++-- .../server/api/user/controller/UserController.java | 2 +- .../server/api/user/service/UserService.java | 4 ++-- .../{ => common}/advice/ResponseDtoAdvice.java | 4 ++-- .../auth}/annotation/IsMemberByMeetingId.java | 2 +- .../auth}/annotation/IsMemberByPromiseId.java | 2 +- .../{ => common/auth}/annotation/IsParticipant.java | 2 +- .../server/{ => common/auth}/annotation/UserId.java | 4 ++-- .../auth}/aspect/MemberCheckByMeetingIdAspect.java | 8 ++++---- .../auth}/aspect/MemberCheckByPromiseIdAspect.java | 8 ++++---- .../auth}/aspect/ParticipantCheckAspect.java | 8 ++++---- .../auth/authentication}/UserAuthentication.java | 2 +- .../{ => common/auth}/config/SecurityConfig.java | 10 +++++----- .../{ => common/auth}/constant/AuthConstant.java | 2 +- .../auth/filter}/JwtAuthenticationFilter.java | 9 +++++---- .../auth/filter}/JwtExceptionFilter.java | 8 ++++---- .../auth/handler}/CustomAccessDeniedHandler.java | 2 +- .../handler}/CustomJwtAuthenticationEntryPoint.java | 8 ++++---- .../{ => common}/auth/jwt/JwtTokenProvider.java | 8 ++++---- .../{ => common}/auth/jwt/JwtTokenValidator.java | 6 +++--- .../server/{ => common}/config/AsyncConfig.java | 2 +- .../{ => common}/config/JpaAuditingConfig.java | 2 +- .../server/{ => common}/exception/AuthException.java | 4 ++-- .../server/{ => common}/exception/AwsException.java | 4 ++-- .../{ => common}/exception/BusinessException.java | 4 ++-- .../{ => common}/exception/FirebaseException.java | 4 ++-- .../{ => common}/exception/MeetingException.java | 4 ++-- .../{ => common}/exception/MemberException.java | 4 ++-- .../{ => common}/exception/OpenApiException.java | 4 ++-- .../{ => common}/exception/ParticipantException.java | 4 ++-- .../{ => common}/exception/PromiseException.java | 4 ++-- .../server/{ => common}/exception/UserException.java | 4 ++-- .../exception}/advice/GlobalExceptionHandler.java | 6 +++--- .../{ => common}/exception/code/AuthErrorCode.java | 2 +- .../{ => common}/exception/code/AwsErrorCode.java | 2 +- .../exception/code/BusinessErrorCode.java | 2 +- .../exception/code/DefaultErrorCode.java | 2 +- .../exception/code/FirebaseErrorCode.java | 2 +- .../exception/code/MeetingErrorCode.java | 2 +- .../{ => common}/exception/code/MemberErrorCode.java | 2 +- .../exception/code/OpenApiErrorCode.java | 2 +- .../exception/code/ParticipantErrorCode.java | 2 +- .../exception/code/PromiseErrorCode.java | 2 +- .../{ => common}/exception/code/UserErrorCode.java | 2 +- .../log/config/LogFilterConfig.java} | 8 ++++---- .../{ => common}/log/discord/DiscordAppender.java | 12 ++++++------ .../{ => common}/log/discord/DiscordWebHook.java | 12 ++++++------ .../server/{ => common}/log/filter/MDCFilter.java | 6 +++--- .../log/filter/ServletWrappingFilter.java | 4 ++-- .../server/{ => common}/log/model/Author.java | 2 +- .../server/{ => common}/log/model/EmbedObject.java | 6 +++--- .../server/{ => common}/log/model/Field.java | 2 +- .../server/{ => common}/log/model/Footer.java | 2 +- .../server/{ => common}/log/model/Image.java | 2 +- .../server/{ => common}/log/model/JsonObject.java | 2 +- .../server/{ => common}/log/model/Thumbnail.java | 2 +- .../server/{ => common}/log/util/ApiCallUtil.java | 4 ++-- .../{ => common}/log/util/HttpRequestUtil.java | 4 ++-- .../server/{ => common}/log/util/MDCUtil.java | 2 +- .../server/{ => common}/log/util/StringUtil.java | 2 +- .../log/wrapper/CachedBodyRequestWrapper.java | 2 +- .../log/wrapper/CachedBodyServletInputStream.java | 2 +- .../domain/meeting/manager/MeetingRetriever.java | 4 ++-- .../domain/member/manager/MemberRetreiver.java | 4 ++-- .../participant/manager/ParticipantRetriever.java | 4 ++-- .../domain/promise/manager/PromiseRetriever.java | 4 ++-- .../server/domain/user/manager/TokenRetriever.java | 4 ++-- .../server/domain/user/manager/UserRetriever.java | 4 ++-- .../domain/userinfo/manager/UserInfoRetriever.java | 4 ++-- .../server/external/config/FirebaseConfig.java | 4 ++-- .../server/external/service/fcm/FcmService.java | 4 ++-- .../server/external/service/naver/NaverService.java | 4 ++-- .../server/external/service/s3/S3Service.java | 4 ++-- src/main/resources/discord-appender.xml | 2 +- 88 files changed, 182 insertions(+), 182 deletions(-) rename src/main/java/org/kkumulkkum/server/{ => common}/advice/ResponseDtoAdvice.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/annotation/IsMemberByMeetingId.java (84%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/annotation/IsMemberByPromiseId.java (84%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/annotation/IsParticipant.java (84%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/annotation/UserId.java (66%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/aspect/MemberCheckByMeetingIdAspect.java (80%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/aspect/MemberCheckByPromiseIdAspect.java (80%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/aspect/ParticipantCheckAspect.java (80%) rename src/main/java/org/kkumulkkum/server/{auth => common/auth/authentication}/UserAuthentication.java (91%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/config/SecurityConfig.java (86%) rename src/main/java/org/kkumulkkum/server/{ => common/auth}/constant/AuthConstant.java (92%) rename src/main/java/org/kkumulkkum/server/{auth => common/auth/filter}/JwtAuthenticationFilter.java (86%) rename src/main/java/org/kkumulkkum/server/{auth => common/auth/filter}/JwtExceptionFilter.java (86%) rename src/main/java/org/kkumulkkum/server/{auth => common/auth/handler}/CustomAccessDeniedHandler.java (94%) rename src/main/java/org/kkumulkkum/server/{auth => common/auth/handler}/CustomJwtAuthenticationEntryPoint.java (88%) rename src/main/java/org/kkumulkkum/server/{ => common}/auth/jwt/JwtTokenProvider.java (91%) rename src/main/java/org/kkumulkkum/server/{ => common}/auth/jwt/JwtTokenValidator.java (87%) rename src/main/java/org/kkumulkkum/server/{ => common}/config/AsyncConfig.java (94%) rename src/main/java/org/kkumulkkum/server/{ => common}/config/JpaAuditingConfig.java (82%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/AuthException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/AwsException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/BusinessException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/FirebaseException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/MeetingException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/MemberException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/OpenApiException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/ParticipantException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/PromiseException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/UserException.java (63%) rename src/main/java/org/kkumulkkum/server/{ => common/exception}/advice/GlobalExceptionHandler.java (98%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/AuthErrorCode.java (97%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/AwsErrorCode.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/BusinessErrorCode.java (96%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/DefaultErrorCode.java (75%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/FirebaseErrorCode.java (90%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/MeetingErrorCode.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/MemberErrorCode.java (90%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/OpenApiErrorCode.java (91%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/ParticipantErrorCode.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/PromiseErrorCode.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common}/exception/code/UserErrorCode.java (87%) rename src/main/java/org/kkumulkkum/server/{config/FilterConfig.java => common/log/config/LogFilterConfig.java} (79%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/discord/DiscordAppender.java (92%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/discord/DiscordWebHook.java (93%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/filter/MDCFilter.java (91%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/filter/ServletWrappingFilter.java (90%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/Author.java (81%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/EmbedObject.java (93%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/Field.java (81%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/Footer.java (79%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/Image.java (75%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/JsonObject.java (97%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/model/Thumbnail.java (76%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/util/ApiCallUtil.java (91%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/util/HttpRequestUtil.java (96%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/util/MDCUtil.java (96%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/util/StringUtil.java (98%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/wrapper/CachedBodyRequestWrapper.java (95%) rename src/main/java/org/kkumulkkum/server/{ => common}/log/wrapper/CachedBodyServletInputStream.java (95%) diff --git a/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java b/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java index 51fac19..099718c 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/controller/AuthController.java @@ -4,8 +4,8 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.annotation.UserId; -import org.kkumulkkum.server.constant.AuthConstant; +import org.kkumulkkum.server.common.auth.annotation.UserId; +import org.kkumulkkum.server.common.auth.constant.AuthConstant; import org.kkumulkkum.server.api.auth.dto.request.UserLoginDto; import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; import org.kkumulkkum.server.api.auth.dto.response.UserTokenDto; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java index 5880382..9f021c9 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/dto/verify/ApplePublicKeys.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.api.auth.dto.verify; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import java.util.List; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java index e0a3230..4144047 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/AppleService.java @@ -10,10 +10,10 @@ import org.kkumulkkum.server.api.auth.service.verify.AppleJwtParser; import org.kkumulkkum.server.api.auth.service.verify.PublicKeyGenerator; import org.kkumulkkum.server.api.auth.dto.SocialUserDto; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.BusinessException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.BusinessException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java index 084b2ec..cb8531d 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/AuthService.java @@ -14,7 +14,7 @@ import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRemover; import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.kkumulkkum.server.domain.userinfo.manager.UserInfoSaver; -import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; +import org.kkumulkkum.server.common.auth.jwt.JwtTokenProvider; import org.kkumulkkum.server.api.auth.dto.SocialUserDto; import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.domain.user.Token; @@ -25,8 +25,8 @@ import org.kkumulkkum.server.api.auth.dto.request.UserLoginDto; import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; import org.kkumulkkum.server.api.auth.dto.response.UserTokenDto; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.kkumulkkum.server.domain.member.manager.MemberRemover; import org.kkumulkkum.server.domain.user.manager.UserSaver; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java b/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java index 239afc7..2abc8fb 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/KakaoService.java @@ -4,7 +4,7 @@ import org.kkumulkkum.server.external.service.kakao.KakaoFeignClient; import org.kkumulkkum.server.external.service.kakao.dto.KakaoUserDto; import org.kkumulkkum.server.api.auth.dto.SocialUserDto; -import org.kkumulkkum.server.constant.AuthConstant; +import org.kkumulkkum.server.common.auth.constant.AuthConstant; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java index 71454db..7a4ba0d 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/AppleJwtParser.java @@ -3,9 +3,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.jsonwebtoken.*; -import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.springframework.stereotype.Component; import java.security.PublicKey; diff --git a/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java index bfb4e48..797d567 100644 --- a/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java +++ b/src/main/java/org/kkumulkkum/server/api/auth/service/verify/PublicKeyGenerator.java @@ -2,8 +2,8 @@ import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKey; import org.kkumulkkum.server.api.auth.dto.verify.ApplePublicKeys; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.springframework.stereotype.Component; import java.math.BigInteger; diff --git a/src/main/java/org/kkumulkkum/server/api/common/TestController.java b/src/main/java/org/kkumulkkum/server/api/common/TestController.java index 29011b8..6c33727 100644 --- a/src/main/java/org/kkumulkkum/server/api/common/TestController.java +++ b/src/main/java/org/kkumulkkum/server/api/common/TestController.java @@ -1,10 +1,10 @@ package org.kkumulkkum.server.api.common; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; +import org.kkumulkkum.server.common.auth.jwt.JwtTokenProvider; import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; -import org.kkumulkkum.server.exception.BusinessException; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.exception.BusinessException; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java b/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java index c356f13..9371819 100644 --- a/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java +++ b/src/main/java/org/kkumulkkum/server/api/common/dto/ResponseDto.java @@ -1,6 +1,6 @@ package org.kkumulkkum.server.api.common.dto; -import org.kkumulkkum.server.exception.code.DefaultErrorCode; +import org.kkumulkkum.server.common.exception.code.DefaultErrorCode; public record ResponseDto ( boolean success, diff --git a/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java b/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java index e96ac3c..1b7aa66 100644 --- a/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/controller/MeetingController.java @@ -2,8 +2,8 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.annotation.IsMemberByMeetingId; -import org.kkumulkkum.server.annotation.UserId; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByMeetingId; +import org.kkumulkkum.server.common.auth.annotation.UserId; import org.kkumulkkum.server.api.meeting.dto.request.MeetingCreateDto; import org.kkumulkkum.server.api.meeting.dto.request.MeetingRegisterDto; import org.kkumulkkum.server.api.meeting.dto.response.CreatedMeetingDto; diff --git a/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java b/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java index 42b9372..d455f56 100644 --- a/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java +++ b/src/main/java/org/kkumulkkum/server/api/meeting/service/MeetingService.java @@ -19,8 +19,8 @@ import org.kkumulkkum.server.api.meeting.dto.response.MeetingsDto; import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; import org.kkumulkkum.server.api.meeting.dto.response.MembersDto; -import org.kkumulkkum.server.exception.MeetingException; -import org.kkumulkkum.server.exception.code.MeetingErrorCode; +import org.kkumulkkum.server.common.exception.MeetingException; +import org.kkumulkkum.server.common.exception.code.MeetingErrorCode; import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; import org.kkumulkkum.server.domain.promise.manager.PromiseRemover; diff --git a/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java b/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java index 6b32946..08248b9 100644 --- a/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/controller/ParticipantController.java @@ -1,9 +1,9 @@ package org.kkumulkkum.server.api.participant.controller; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.annotation.IsMemberByPromiseId; -import org.kkumulkkum.server.annotation.IsParticipant; -import org.kkumulkkum.server.annotation.UserId; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByPromiseId; +import org.kkumulkkum.server.common.auth.annotation.IsParticipant; +import org.kkumulkkum.server.common.auth.annotation.UserId; import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; import org.kkumulkkum.server.api.participant.dto.response.AvailableParticipantsDto; import org.kkumulkkum.server.api.participant.dto.response.LateComersDto; diff --git a/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java index c2eb14c..0b055f2 100644 --- a/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java +++ b/src/main/java/org/kkumulkkum/server/api/participant/service/ParticipantService.java @@ -12,8 +12,8 @@ import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; import org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto; import org.kkumulkkum.server.api.participant.dto.request.PreparationInfoDto; -import org.kkumulkkum.server.exception.ParticipantException; -import org.kkumulkkum.server.exception.code.ParticipantErrorCode; +import org.kkumulkkum.server.common.exception.ParticipantException; +import org.kkumulkkum.server.common.exception.code.ParticipantErrorCode; import org.kkumulkkum.server.external.service.fcm.FcmService; import org.kkumulkkum.server.external.service.fcm.dto.FcmMessageDto; import org.kkumulkkum.server.external.service.fcm.FcmContent; diff --git a/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java b/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java index 704697b..d7d924f 100644 --- a/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/controller/PromiseController.java @@ -2,10 +2,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.annotation.IsMemberByMeetingId; -import org.kkumulkkum.server.annotation.IsMemberByPromiseId; -import org.kkumulkkum.server.annotation.IsParticipant; -import org.kkumulkkum.server.annotation.UserId; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByMeetingId; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByPromiseId; +import org.kkumulkkum.server.common.auth.annotation.IsParticipant; +import org.kkumulkkum.server.common.auth.annotation.UserId; import org.kkumulkkum.server.api.promise.dto.request.PromiseCreateDto; import org.kkumulkkum.server.api.promise.dto.response.*; import org.kkumulkkum.server.api.promise.service.PromiseService; diff --git a/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java index 4193b85..0ba5c38 100644 --- a/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java +++ b/src/main/java/org/kkumulkkum/server/api/promise/service/PromiseService.java @@ -13,8 +13,8 @@ import org.kkumulkkum.server.domain.promise.Promise; import org.kkumulkkum.server.domain.userinfo.UserInfo; import org.kkumulkkum.server.api.promise.dto.request.PromiseCreateDto; -import org.kkumulkkum.server.exception.PromiseException; -import org.kkumulkkum.server.exception.code.PromiseErrorCode; +import org.kkumulkkum.server.common.exception.PromiseException; +import org.kkumulkkum.server.common.exception.code.PromiseErrorCode; import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.kkumulkkum.server.domain.participant.manager.ParticipantRemover; import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; diff --git a/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java b/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java index 8a343ec..b080d18 100644 --- a/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java +++ b/src/main/java/org/kkumulkkum/server/api/user/controller/UserController.java @@ -2,7 +2,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.annotation.UserId; +import org.kkumulkkum.server.common.auth.annotation.UserId; import org.kkumulkkum.server.api.user.dto.request.ImageUpdateDto; import org.kkumulkkum.server.api.user.dto.request.NameUpdateDto; import org.kkumulkkum.server.api.user.dto.response.UserDto; diff --git a/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java index 4c6f93a..a708df9 100644 --- a/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java +++ b/src/main/java/org/kkumulkkum/server/api/user/service/UserService.java @@ -8,8 +8,8 @@ import org.kkumulkkum.server.api.user.dto.request.NameUpdateDto; import org.kkumulkkum.server.api.user.dto.response.UserDto; import org.kkumulkkum.server.api.user.dto.response.UserNameDto; -import org.kkumulkkum.server.exception.AwsException; -import org.kkumulkkum.server.exception.code.AwsErrorCode; +import org.kkumulkkum.server.common.exception.AwsException; +import org.kkumulkkum.server.common.exception.code.AwsErrorCode; import org.kkumulkkum.server.external.service.s3.S3Service; import org.kkumulkkum.server.domain.userinfo.manager.UserInfoRetriever; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java b/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java rename to src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java index 8ac4fe0..410b90d 100644 --- a/src/main/java/org/kkumulkkum/server/advice/ResponseDtoAdvice.java +++ b/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java @@ -1,7 +1,7 @@ -package org.kkumulkkum.server.advice; +package org.kkumulkkum.server.common.advice; import org.kkumulkkum.server.api.common.dto.ResponseDto; -import org.kkumulkkum.server.exception.code.DefaultErrorCode; +import org.kkumulkkum.server.common.exception.code.DefaultErrorCode; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; diff --git a/src/main/java/org/kkumulkkum/server/annotation/IsMemberByMeetingId.java b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByMeetingId.java similarity index 84% rename from src/main/java/org/kkumulkkum/server/annotation/IsMemberByMeetingId.java rename to src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByMeetingId.java index 0fd8bf4..ca10021 100644 --- a/src/main/java/org/kkumulkkum/server/annotation/IsMemberByMeetingId.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByMeetingId.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.annotation; +package org.kkumulkkum.server.common.auth.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/kkumulkkum/server/annotation/IsMemberByPromiseId.java b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByPromiseId.java similarity index 84% rename from src/main/java/org/kkumulkkum/server/annotation/IsMemberByPromiseId.java rename to src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByPromiseId.java index 3201cb2..5b8e7b1 100644 --- a/src/main/java/org/kkumulkkum/server/annotation/IsMemberByPromiseId.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsMemberByPromiseId.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.annotation; +package org.kkumulkkum.server.common.auth.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/kkumulkkum/server/annotation/IsParticipant.java b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsParticipant.java similarity index 84% rename from src/main/java/org/kkumulkkum/server/annotation/IsParticipant.java rename to src/main/java/org/kkumulkkum/server/common/auth/annotation/IsParticipant.java index 7fb64cd..7bade6b 100644 --- a/src/main/java/org/kkumulkkum/server/annotation/IsParticipant.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/annotation/IsParticipant.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.annotation; +package org.kkumulkkum.server.common.auth.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/kkumulkkum/server/annotation/UserId.java b/src/main/java/org/kkumulkkum/server/common/auth/annotation/UserId.java similarity index 66% rename from src/main/java/org/kkumulkkum/server/annotation/UserId.java rename to src/main/java/org/kkumulkkum/server/common/auth/annotation/UserId.java index 6956cfe..5511b8f 100644 --- a/src/main/java/org/kkumulkkum/server/annotation/UserId.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/annotation/UserId.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.annotation; +package org.kkumulkkum.server.common.auth.annotation; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -9,6 +9,6 @@ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) -@AuthenticationPrincipal(expression="T(org.kkumulkkum.server.auth.jwt.JwtTokenProvider).checkPrincipal(#this)") +@AuthenticationPrincipal(expression="T(org.kkumulkkum.server.common.auth.jwt.JwtTokenProvider).checkPrincipal(#this)") public @interface UserId { } diff --git a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java b/src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByMeetingIdAspect.java similarity index 80% rename from src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java rename to src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByMeetingIdAspect.java index f03d826..1374a8c 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByMeetingIdAspect.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByMeetingIdAspect.java @@ -1,12 +1,12 @@ -package org.kkumulkkum.server.aspect; +package org.kkumulkkum.server.common.auth.aspect; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.kkumulkkum.server.annotation.IsMemberByMeetingId; -import org.kkumulkkum.server.exception.MemberException; -import org.kkumulkkum.server.exception.code.MemberErrorCode; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByMeetingId; +import org.kkumulkkum.server.common.exception.MemberException; +import org.kkumulkkum.server.common.exception.code.MemberErrorCode; import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java b/src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByPromiseIdAspect.java similarity index 80% rename from src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java rename to src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByPromiseIdAspect.java index 88c85dc..befafa7 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/MemberCheckByPromiseIdAspect.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/aspect/MemberCheckByPromiseIdAspect.java @@ -1,12 +1,12 @@ -package org.kkumulkkum.server.aspect; +package org.kkumulkkum.server.common.auth.aspect; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.kkumulkkum.server.annotation.IsMemberByPromiseId; -import org.kkumulkkum.server.exception.MemberException; -import org.kkumulkkum.server.exception.code.MemberErrorCode; +import org.kkumulkkum.server.common.auth.annotation.IsMemberByPromiseId; +import org.kkumulkkum.server.common.exception.MemberException; +import org.kkumulkkum.server.common.exception.code.MemberErrorCode; import org.kkumulkkum.server.domain.member.manager.MemberRetreiver; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java b/src/main/java/org/kkumulkkum/server/common/auth/aspect/ParticipantCheckAspect.java similarity index 80% rename from src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java rename to src/main/java/org/kkumulkkum/server/common/auth/aspect/ParticipantCheckAspect.java index 35d4c96..3e71e45 100644 --- a/src/main/java/org/kkumulkkum/server/aspect/ParticipantCheckAspect.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/aspect/ParticipantCheckAspect.java @@ -1,12 +1,12 @@ -package org.kkumulkkum.server.aspect; +package org.kkumulkkum.server.common.auth.aspect; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.kkumulkkum.server.annotation.IsParticipant; -import org.kkumulkkum.server.exception.ParticipantException; -import org.kkumulkkum.server.exception.code.ParticipantErrorCode; +import org.kkumulkkum.server.common.auth.annotation.IsParticipant; +import org.kkumulkkum.server.common.exception.ParticipantException; +import org.kkumulkkum.server.common.exception.code.ParticipantErrorCode; import org.kkumulkkum.server.domain.participant.manager.ParticipantRetriever; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/auth/UserAuthentication.java b/src/main/java/org/kkumulkkum/server/common/auth/authentication/UserAuthentication.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/auth/UserAuthentication.java rename to src/main/java/org/kkumulkkum/server/common/auth/authentication/UserAuthentication.java index 8acb178..579b1cc 100644 --- a/src/main/java/org/kkumulkkum/server/auth/UserAuthentication.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/authentication/UserAuthentication.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth; +package org.kkumulkkum.server.common.auth.authentication; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/org/kkumulkkum/server/config/SecurityConfig.java b/src/main/java/org/kkumulkkum/server/common/auth/config/SecurityConfig.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/config/SecurityConfig.java rename to src/main/java/org/kkumulkkum/server/common/auth/config/SecurityConfig.java index 19ef146..3001800 100644 --- a/src/main/java/org/kkumulkkum/server/config/SecurityConfig.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/config/SecurityConfig.java @@ -1,10 +1,10 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.common.auth.config; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.auth.CustomAccessDeniedHandler; -import org.kkumulkkum.server.auth.CustomJwtAuthenticationEntryPoint; -import org.kkumulkkum.server.auth.JwtAuthenticationFilter; -import org.kkumulkkum.server.auth.JwtExceptionFilter; +import org.kkumulkkum.server.common.auth.handler.CustomAccessDeniedHandler; +import org.kkumulkkum.server.common.auth.handler.CustomJwtAuthenticationEntryPoint; +import org.kkumulkkum.server.common.auth.filter.JwtAuthenticationFilter; +import org.kkumulkkum.server.common.auth.filter.JwtExceptionFilter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/src/main/java/org/kkumulkkum/server/constant/AuthConstant.java b/src/main/java/org/kkumulkkum/server/common/auth/constant/AuthConstant.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/constant/AuthConstant.java rename to src/main/java/org/kkumulkkum/server/common/auth/constant/AuthConstant.java index 2fb76b8..9517d3d 100644 --- a/src/main/java/org/kkumulkkum/server/constant/AuthConstant.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/constant/AuthConstant.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.constant; +package org.kkumulkkum.server.common.auth.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/auth/JwtAuthenticationFilter.java b/src/main/java/org/kkumulkkum/server/common/auth/filter/JwtAuthenticationFilter.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/auth/JwtAuthenticationFilter.java rename to src/main/java/org/kkumulkkum/server/common/auth/filter/JwtAuthenticationFilter.java index c859d82..6accedf 100644 --- a/src/main/java/org/kkumulkkum/server/auth/JwtAuthenticationFilter.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/filter/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth; +package org.kkumulkkum.server.common.auth.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -6,9 +6,10 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.NonNull; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.auth.jwt.JwtTokenProvider; -import org.kkumulkkum.server.auth.jwt.JwtTokenValidator; -import org.kkumulkkum.server.constant.AuthConstant; +import org.kkumulkkum.server.common.auth.authentication.UserAuthentication; +import org.kkumulkkum.server.common.auth.jwt.JwtTokenProvider; +import org.kkumulkkum.server.common.auth.jwt.JwtTokenValidator; +import org.kkumulkkum.server.common.auth.constant.AuthConstant; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/auth/JwtExceptionFilter.java b/src/main/java/org/kkumulkkum/server/common/auth/filter/JwtExceptionFilter.java similarity index 86% rename from src/main/java/org/kkumulkkum/server/auth/JwtExceptionFilter.java rename to src/main/java/org/kkumulkkum/server/common/auth/filter/JwtExceptionFilter.java index acd7d08..0602b0a 100644 --- a/src/main/java/org/kkumulkkum/server/auth/JwtExceptionFilter.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/filter/JwtExceptionFilter.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth; +package org.kkumulkkum.server.common.auth.filter; import io.jsonwebtoken.JwtException; import jakarta.servlet.FilterChain; @@ -7,9 +7,9 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/src/main/java/org/kkumulkkum/server/auth/CustomAccessDeniedHandler.java b/src/main/java/org/kkumulkkum/server/common/auth/handler/CustomAccessDeniedHandler.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/auth/CustomAccessDeniedHandler.java rename to src/main/java/org/kkumulkkum/server/common/auth/handler/CustomAccessDeniedHandler.java index 2240569..824a27f 100644 --- a/src/main/java/org/kkumulkkum/server/auth/CustomAccessDeniedHandler.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/handler/CustomAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.auth; +package org.kkumulkkum.server.common.auth.handler; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java b/src/main/java/org/kkumulkkum/server/common/auth/handler/CustomJwtAuthenticationEntryPoint.java similarity index 88% rename from src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java rename to src/main/java/org/kkumulkkum/server/common/auth/handler/CustomJwtAuthenticationEntryPoint.java index c8c84ba..dc73549 100644 --- a/src/main/java/org/kkumulkkum/server/auth/CustomJwtAuthenticationEntryPoint.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/handler/CustomJwtAuthenticationEntryPoint.java @@ -1,13 +1,13 @@ -package org.kkumulkkum.server.auth; +package org.kkumulkkum.server.common.auth.handler; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.constant.AuthConstant; +import org.kkumulkkum.server.common.auth.constant.AuthConstant; import org.kkumulkkum.server.api.common.dto.ResponseDto; -import org.kkumulkkum.server.exception.code.AuthErrorCode; -import org.kkumulkkum.server.exception.code.DefaultErrorCode; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.code.DefaultErrorCode; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java b/src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenProvider.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java rename to src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenProvider.java index 93735fd..9b2e323 100644 --- a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenProvider.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenProvider.java @@ -1,13 +1,13 @@ -package org.kkumulkkum.server.auth.jwt; +package org.kkumulkkum.server.common.auth.jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Header; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; -import org.kkumulkkum.server.constant.AuthConstant; +import org.kkumulkkum.server.common.auth.constant.AuthConstant; import org.kkumulkkum.server.api.auth.dto.response.JwtTokenDto; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenValidator.java b/src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenValidator.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenValidator.java rename to src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenValidator.java index 9bb8d27..dc4f5bd 100644 --- a/src/main/java/org/kkumulkkum/server/auth/jwt/JwtTokenValidator.java +++ b/src/main/java/org/kkumulkkum/server/common/auth/jwt/JwtTokenValidator.java @@ -1,11 +1,11 @@ -package org.kkumulkkum.server.auth.jwt; +package org.kkumulkkum.server.common.auth.jwt; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.MalformedJwtException; import io.jsonwebtoken.UnsupportedJwtException; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/kkumulkkum/server/config/AsyncConfig.java b/src/main/java/org/kkumulkkum/server/common/config/AsyncConfig.java similarity index 94% rename from src/main/java/org/kkumulkkum/server/config/AsyncConfig.java rename to src/main/java/org/kkumulkkum/server/common/config/AsyncConfig.java index a3b18b2..fcfba4c 100644 --- a/src/main/java/org/kkumulkkum/server/config/AsyncConfig.java +++ b/src/main/java/org/kkumulkkum/server/common/config/AsyncConfig.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurer; diff --git a/src/main/java/org/kkumulkkum/server/config/JpaAuditingConfig.java b/src/main/java/org/kkumulkkum/server/common/config/JpaAuditingConfig.java similarity index 82% rename from src/main/java/org/kkumulkkum/server/config/JpaAuditingConfig.java rename to src/main/java/org/kkumulkkum/server/common/config/JpaAuditingConfig.java index 0a9e1b8..0a5fe13 100644 --- a/src/main/java/org/kkumulkkum/server/config/JpaAuditingConfig.java +++ b/src/main/java/org/kkumulkkum/server/common/config/JpaAuditingConfig.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/main/java/org/kkumulkkum/server/exception/AuthException.java b/src/main/java/org/kkumulkkum/server/common/exception/AuthException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/AuthException.java rename to src/main/java/org/kkumulkkum/server/common/exception/AuthException.java index c8d65cb..3b12eaf 100644 --- a/src/main/java/org/kkumulkkum/server/exception/AuthException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/AuthException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/AwsException.java b/src/main/java/org/kkumulkkum/server/common/exception/AwsException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/AwsException.java rename to src/main/java/org/kkumulkkum/server/common/exception/AwsException.java index 1db508e..9d1ed84 100644 --- a/src/main/java/org/kkumulkkum/server/exception/AwsException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/AwsException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.AwsErrorCode; +import org.kkumulkkum.server.common.exception.code.AwsErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/BusinessException.java b/src/main/java/org/kkumulkkum/server/common/exception/BusinessException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/BusinessException.java rename to src/main/java/org/kkumulkkum/server/common/exception/BusinessException.java index 245fcf2..24f611c 100644 --- a/src/main/java/org/kkumulkkum/server/exception/BusinessException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/BusinessException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/FirebaseException.java b/src/main/java/org/kkumulkkum/server/common/exception/FirebaseException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/FirebaseException.java rename to src/main/java/org/kkumulkkum/server/common/exception/FirebaseException.java index b8a4791..d0e68b1 100644 --- a/src/main/java/org/kkumulkkum/server/exception/FirebaseException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/FirebaseException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.FirebaseErrorCode; +import org.kkumulkkum.server.common.exception.code.FirebaseErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/MeetingException.java b/src/main/java/org/kkumulkkum/server/common/exception/MeetingException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/MeetingException.java rename to src/main/java/org/kkumulkkum/server/common/exception/MeetingException.java index 1ae20f4..b7691fd 100644 --- a/src/main/java/org/kkumulkkum/server/exception/MeetingException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/MeetingException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.MeetingErrorCode; +import org.kkumulkkum.server.common.exception.code.MeetingErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/MemberException.java b/src/main/java/org/kkumulkkum/server/common/exception/MemberException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/MemberException.java rename to src/main/java/org/kkumulkkum/server/common/exception/MemberException.java index d9d57fb..6464810 100644 --- a/src/main/java/org/kkumulkkum/server/exception/MemberException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/MemberException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.MemberErrorCode; +import org.kkumulkkum.server.common.exception.code.MemberErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/OpenApiException.java b/src/main/java/org/kkumulkkum/server/common/exception/OpenApiException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/OpenApiException.java rename to src/main/java/org/kkumulkkum/server/common/exception/OpenApiException.java index 532c82c..63a17fc 100644 --- a/src/main/java/org/kkumulkkum/server/exception/OpenApiException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/OpenApiException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.OpenApiErrorCode; +import org.kkumulkkum.server.common.exception.code.OpenApiErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/ParticipantException.java b/src/main/java/org/kkumulkkum/server/common/exception/ParticipantException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/ParticipantException.java rename to src/main/java/org/kkumulkkum/server/common/exception/ParticipantException.java index 541da77..9f86e62 100644 --- a/src/main/java/org/kkumulkkum/server/exception/ParticipantException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/ParticipantException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.ParticipantErrorCode; +import org.kkumulkkum.server.common.exception.code.ParticipantErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/PromiseException.java b/src/main/java/org/kkumulkkum/server/common/exception/PromiseException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/PromiseException.java rename to src/main/java/org/kkumulkkum/server/common/exception/PromiseException.java index 5a89b5a..d1dd784 100644 --- a/src/main/java/org/kkumulkkum/server/exception/PromiseException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/PromiseException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.PromiseErrorCode; +import org.kkumulkkum.server.common.exception.code.PromiseErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/exception/UserException.java b/src/main/java/org/kkumulkkum/server/common/exception/UserException.java similarity index 63% rename from src/main/java/org/kkumulkkum/server/exception/UserException.java rename to src/main/java/org/kkumulkkum/server/common/exception/UserException.java index 184098c..baa2a9c 100644 --- a/src/main/java/org/kkumulkkum/server/exception/UserException.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/UserException.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.exception; +package org.kkumulkkum.server.common.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.kkumulkkum.server.exception.code.UserErrorCode; +import org.kkumulkkum.server.common.exception.code.UserErrorCode; @Getter @RequiredArgsConstructor diff --git a/src/main/java/org/kkumulkkum/server/advice/GlobalExceptionHandler.java b/src/main/java/org/kkumulkkum/server/common/exception/advice/GlobalExceptionHandler.java similarity index 98% rename from src/main/java/org/kkumulkkum/server/advice/GlobalExceptionHandler.java rename to src/main/java/org/kkumulkkum/server/common/exception/advice/GlobalExceptionHandler.java index 15329b2..d575d65 100644 --- a/src/main/java/org/kkumulkkum/server/advice/GlobalExceptionHandler.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/advice/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ -package org.kkumulkkum.server.advice; +package org.kkumulkkum.server.common.exception.advice; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.*; -import org.kkumulkkum.server.exception.code.*; +import org.kkumulkkum.server.common.exception.*; +import org.kkumulkkum.server.common.exception.code.*; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/AuthErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/AuthErrorCode.java similarity index 97% rename from src/main/java/org/kkumulkkum/server/exception/code/AuthErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/AuthErrorCode.java index 5ac5cba..c534e7e 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/AuthErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/AuthErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/AwsErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/AwsErrorCode.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/exception/code/AwsErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/AwsErrorCode.java index 517cfe8..99cfc9b 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/AwsErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/AwsErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/BusinessErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/BusinessErrorCode.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/exception/code/BusinessErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/BusinessErrorCode.java index 1b1a16c..c1dc5e0 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/BusinessErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/BusinessErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/DefaultErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/DefaultErrorCode.java similarity index 75% rename from src/main/java/org/kkumulkkum/server/exception/code/DefaultErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/DefaultErrorCode.java index e43eaeb..90f2d5d 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/DefaultErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/DefaultErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import org.springframework.http.HttpStatus; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/FirebaseErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/FirebaseErrorCode.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/exception/code/FirebaseErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/FirebaseErrorCode.java index 3a13bdf..03dd3f9 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/FirebaseErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/FirebaseErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/MeetingErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/MeetingErrorCode.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/exception/code/MeetingErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/MeetingErrorCode.java index a554e99..363bdb1 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/MeetingErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/MeetingErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/MemberErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/MemberErrorCode.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/exception/code/MemberErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/MemberErrorCode.java index 2ef9cd2..648d2ab 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/MemberErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/MemberErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/OpenApiErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/OpenApiErrorCode.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/exception/code/OpenApiErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/OpenApiErrorCode.java index 25848c1..9e4abb4 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/OpenApiErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/OpenApiErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/ParticipantErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/ParticipantErrorCode.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/exception/code/ParticipantErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/ParticipantErrorCode.java index 9e223d6..608dffd 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/ParticipantErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/ParticipantErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/PromiseErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/PromiseErrorCode.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/exception/code/PromiseErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/PromiseErrorCode.java index 48750ae..aaa783f 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/PromiseErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/PromiseErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/exception/code/UserErrorCode.java b/src/main/java/org/kkumulkkum/server/common/exception/code/UserErrorCode.java similarity index 87% rename from src/main/java/org/kkumulkkum/server/exception/code/UserErrorCode.java rename to src/main/java/org/kkumulkkum/server/common/exception/code/UserErrorCode.java index f848831..ae3eb08 100644 --- a/src/main/java/org/kkumulkkum/server/exception/code/UserErrorCode.java +++ b/src/main/java/org/kkumulkkum/server/common/exception/code/UserErrorCode.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.exception.code; +package org.kkumulkkum.server.common.exception.code; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/kkumulkkum/server/config/FilterConfig.java b/src/main/java/org/kkumulkkum/server/common/log/config/LogFilterConfig.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/config/FilterConfig.java rename to src/main/java/org/kkumulkkum/server/common/log/config/LogFilterConfig.java index 5a705c6..b4e8889 100644 --- a/src/main/java/org/kkumulkkum/server/config/FilterConfig.java +++ b/src/main/java/org/kkumulkkum/server/common/log/config/LogFilterConfig.java @@ -1,13 +1,13 @@ -package org.kkumulkkum.server.config; +package org.kkumulkkum.server.common.log.config; -import org.kkumulkkum.server.log.filter.ServletWrappingFilter; -import org.kkumulkkum.server.log.filter.MDCFilter; +import org.kkumulkkum.server.common.log.filter.ServletWrappingFilter; +import org.kkumulkkum.server.common.log.filter.MDCFilter; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration -public class FilterConfig { +public class LogFilterConfig { @Bean public FilterRegistrationBean secondFilter() { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>( diff --git a/src/main/java/org/kkumulkkum/server/log/discord/DiscordAppender.java b/src/main/java/org/kkumulkkum/server/common/log/discord/DiscordAppender.java similarity index 92% rename from src/main/java/org/kkumulkkum/server/log/discord/DiscordAppender.java rename to src/main/java/org/kkumulkkum/server/common/log/discord/DiscordAppender.java index 109a0e0..f13c4d0 100644 --- a/src/main/java/org/kkumulkkum/server/log/discord/DiscordAppender.java +++ b/src/main/java/org/kkumulkkum/server/common/log/discord/DiscordAppender.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.discord; +package org.kkumulkkum.server.common.log.discord; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; @@ -7,11 +7,11 @@ import io.micrometer.core.instrument.util.StringEscapeUtils; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.BusinessException; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; -import org.kkumulkkum.server.log.model.EmbedObject; -import org.kkumulkkum.server.log.util.MDCUtil; -import org.kkumulkkum.server.log.util.StringUtil; +import org.kkumulkkum.server.common.exception.BusinessException; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.log.model.EmbedObject; +import org.kkumulkkum.server.common.log.util.MDCUtil; +import org.kkumulkkum.server.common.log.util.StringUtil; import java.awt.*; import java.io.IOException; diff --git a/src/main/java/org/kkumulkkum/server/log/discord/DiscordWebHook.java b/src/main/java/org/kkumulkkum/server/common/log/discord/DiscordWebHook.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/log/discord/DiscordWebHook.java rename to src/main/java/org/kkumulkkum/server/common/log/discord/DiscordWebHook.java index 2de5e2a..751e1f8 100644 --- a/src/main/java/org/kkumulkkum/server/log/discord/DiscordWebHook.java +++ b/src/main/java/org/kkumulkkum/server/common/log/discord/DiscordWebHook.java @@ -1,10 +1,10 @@ -package org.kkumulkkum.server.log.discord; +package org.kkumulkkum.server.common.log.discord; -import org.kkumulkkum.server.exception.BusinessException; -import org.kkumulkkum.server.exception.code.BusinessErrorCode; -import org.kkumulkkum.server.log.model.*; -import org.kkumulkkum.server.log.model.Image; -import org.kkumulkkum.server.log.util.ApiCallUtil; +import org.kkumulkkum.server.common.exception.BusinessException; +import org.kkumulkkum.server.common.exception.code.BusinessErrorCode; +import org.kkumulkkum.server.common.log.model.*; +import org.kkumulkkum.server.common.log.model.Image; +import org.kkumulkkum.server.common.log.util.ApiCallUtil; import java.awt.*; import java.io.IOException; diff --git a/src/main/java/org/kkumulkkum/server/log/filter/MDCFilter.java b/src/main/java/org/kkumulkkum/server/common/log/filter/MDCFilter.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/log/filter/MDCFilter.java rename to src/main/java/org/kkumulkkum/server/common/log/filter/MDCFilter.java index fa0e029..fce0ba0 100644 --- a/src/main/java/org/kkumulkkum/server/log/filter/MDCFilter.java +++ b/src/main/java/org/kkumulkkum/server/common/log/filter/MDCFilter.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.filter; +package org.kkumulkkum.server.common.log.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -6,8 +6,8 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.log.util.HttpRequestUtil; -import org.kkumulkkum.server.log.util.MDCUtil; +import org.kkumulkkum.server.common.log.util.MDCUtil; +import org.kkumulkkum.server.common.log.util.HttpRequestUtil; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/src/main/java/org/kkumulkkum/server/log/filter/ServletWrappingFilter.java b/src/main/java/org/kkumulkkum/server/common/log/filter/ServletWrappingFilter.java similarity index 90% rename from src/main/java/org/kkumulkkum/server/log/filter/ServletWrappingFilter.java rename to src/main/java/org/kkumulkkum/server/common/log/filter/ServletWrappingFilter.java index aeac431..3a9b099 100644 --- a/src/main/java/org/kkumulkkum/server/log/filter/ServletWrappingFilter.java +++ b/src/main/java/org/kkumulkkum/server/common/log/filter/ServletWrappingFilter.java @@ -1,10 +1,10 @@ -package org.kkumulkkum.server.log.filter; +package org.kkumulkkum.server.common.log.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.kkumulkkum.server.log.wrapper.CachedBodyRequestWrapper; +import org.kkumulkkum.server.common.log.wrapper.CachedBodyRequestWrapper; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/src/main/java/org/kkumulkkum/server/log/model/Author.java b/src/main/java/org/kkumulkkum/server/common/log/model/Author.java similarity index 81% rename from src/main/java/org/kkumulkkum/server/log/model/Author.java rename to src/main/java/org/kkumulkkum/server/common/log/model/Author.java index 8060663..055cd77 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/Author.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/Author.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/model/EmbedObject.java b/src/main/java/org/kkumulkkum/server/common/log/model/EmbedObject.java similarity index 93% rename from src/main/java/org/kkumulkkum/server/log/model/EmbedObject.java rename to src/main/java/org/kkumulkkum/server/common/log/model/EmbedObject.java index b6b9b8b..81c5850 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/EmbedObject.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/EmbedObject.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import java.awt.*; import java.util.ArrayList; @@ -43,7 +43,7 @@ public class EmbedObject { /** * Discord Embed Message 사진 */ - private Image image; + private org.kkumulkkum.server.common.log.model.Image image; /** * Discord Embed Message 작성자 @@ -99,7 +99,7 @@ public EmbedObject setThumbnail(String url) { return this; } - public Image getImage() { + public org.kkumulkkum.server.common.log.model.Image getImage() { return image; } diff --git a/src/main/java/org/kkumulkkum/server/log/model/Field.java b/src/main/java/org/kkumulkkum/server/common/log/model/Field.java similarity index 81% rename from src/main/java/org/kkumulkkum/server/log/model/Field.java rename to src/main/java/org/kkumulkkum/server/common/log/model/Field.java index 7ec22ef..d3945c3 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/Field.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/Field.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/model/Footer.java b/src/main/java/org/kkumulkkum/server/common/log/model/Footer.java similarity index 79% rename from src/main/java/org/kkumulkkum/server/log/model/Footer.java rename to src/main/java/org/kkumulkkum/server/common/log/model/Footer.java index d05b2f1..3e95665 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/Footer.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/Footer.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/model/Image.java b/src/main/java/org/kkumulkkum/server/common/log/model/Image.java similarity index 75% rename from src/main/java/org/kkumulkkum/server/log/model/Image.java rename to src/main/java/org/kkumulkkum/server/common/log/model/Image.java index 1db0ae7..5189f41 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/Image.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/Image.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/model/JsonObject.java b/src/main/java/org/kkumulkkum/server/common/log/model/JsonObject.java similarity index 97% rename from src/main/java/org/kkumulkkum/server/log/model/JsonObject.java rename to src/main/java/org/kkumulkkum/server/common/log/model/JsonObject.java index ac33163..88ab91b 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/JsonObject.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/JsonObject.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import java.lang.reflect.Array; import java.util.HashMap; diff --git a/src/main/java/org/kkumulkkum/server/log/model/Thumbnail.java b/src/main/java/org/kkumulkkum/server/common/log/model/Thumbnail.java similarity index 76% rename from src/main/java/org/kkumulkkum/server/log/model/Thumbnail.java rename to src/main/java/org/kkumulkkum/server/common/log/model/Thumbnail.java index 5788116..24262ea 100644 --- a/src/main/java/org/kkumulkkum/server/log/model/Thumbnail.java +++ b/src/main/java/org/kkumulkkum/server/common/log/model/Thumbnail.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.model; +package org.kkumulkkum.server.common.log.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/util/ApiCallUtil.java b/src/main/java/org/kkumulkkum/server/common/log/util/ApiCallUtil.java similarity index 91% rename from src/main/java/org/kkumulkkum/server/log/util/ApiCallUtil.java rename to src/main/java/org/kkumulkkum/server/common/log/util/ApiCallUtil.java index 0f18c77..8943e77 100644 --- a/src/main/java/org/kkumulkkum/server/log/util/ApiCallUtil.java +++ b/src/main/java/org/kkumulkkum/server/common/log/util/ApiCallUtil.java @@ -1,9 +1,9 @@ -package org.kkumulkkum.server.log.util; +package org.kkumulkkum.server.common.log.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.log.model.JsonObject; +import org.kkumulkkum.server.common.log.model.JsonObject; import javax.net.ssl.HttpsURLConnection; import java.io.IOException; diff --git a/src/main/java/org/kkumulkkum/server/log/util/HttpRequestUtil.java b/src/main/java/org/kkumulkkum/server/common/log/util/HttpRequestUtil.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/log/util/HttpRequestUtil.java rename to src/main/java/org/kkumulkkum/server/common/log/util/HttpRequestUtil.java index af6e6cd..23ccb33 100644 --- a/src/main/java/org/kkumulkkum/server/log/util/HttpRequestUtil.java +++ b/src/main/java/org/kkumulkkum/server/common/log/util/HttpRequestUtil.java @@ -1,11 +1,11 @@ -package org.kkumulkkum.server.log.util; +package org.kkumulkkum.server.common.log.util; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.log.wrapper.CachedBodyRequestWrapper; +import org.kkumulkkum.server.common.log.wrapper.CachedBodyRequestWrapper; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.WebUtils; diff --git a/src/main/java/org/kkumulkkum/server/log/util/MDCUtil.java b/src/main/java/org/kkumulkkum/server/common/log/util/MDCUtil.java similarity index 96% rename from src/main/java/org/kkumulkkum/server/log/util/MDCUtil.java rename to src/main/java/org/kkumulkkum/server/common/log/util/MDCUtil.java index 114f986..ac8546e 100644 --- a/src/main/java/org/kkumulkkum/server/log/util/MDCUtil.java +++ b/src/main/java/org/kkumulkkum/server/common/log/util/MDCUtil.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.util; +package org.kkumulkkum.server.common.log.util; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/kkumulkkum/server/log/util/StringUtil.java b/src/main/java/org/kkumulkkum/server/common/log/util/StringUtil.java similarity index 98% rename from src/main/java/org/kkumulkkum/server/log/util/StringUtil.java rename to src/main/java/org/kkumulkkum/server/common/log/util/StringUtil.java index 80fd85e..e1113bf 100644 --- a/src/main/java/org/kkumulkkum/server/log/util/StringUtil.java +++ b/src/main/java/org/kkumulkkum/server/common/log/util/StringUtil.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.util; +package org.kkumulkkum.server.common.log.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyRequestWrapper.java b/src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyRequestWrapper.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyRequestWrapper.java rename to src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyRequestWrapper.java index 12a1f10..cd7d9cd 100644 --- a/src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyRequestWrapper.java +++ b/src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyRequestWrapper.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.wrapper; +package org.kkumulkkum.server.common.log.wrapper; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyServletInputStream.java b/src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyServletInputStream.java similarity index 95% rename from src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyServletInputStream.java rename to src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyServletInputStream.java index 7b964dc..b76df2a 100644 --- a/src/main/java/org/kkumulkkum/server/log/wrapper/CachedBodyServletInputStream.java +++ b/src/main/java/org/kkumulkkum/server/common/log/wrapper/CachedBodyServletInputStream.java @@ -1,4 +1,4 @@ -package org.kkumulkkum.server.log.wrapper; +package org.kkumulkkum.server.common.log.wrapper; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; diff --git a/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java index c0818f1..ebee788 100644 --- a/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/meeting/manager/MeetingRetriever.java @@ -3,8 +3,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.meeting.Meeting; import org.kkumulkkum.server.api.meeting.dto.MeetingMetCountDto; -import org.kkumulkkum.server.exception.MeetingException; -import org.kkumulkkum.server.exception.code.MeetingErrorCode; +import org.kkumulkkum.server.common.exception.MeetingException; +import org.kkumulkkum.server.common.exception.code.MeetingErrorCode; import org.kkumulkkum.server.domain.meeting.repository.MeetingRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java index fc8c12d..5e380ec 100644 --- a/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java +++ b/src/main/java/org/kkumulkkum/server/domain/member/manager/MemberRetreiver.java @@ -3,8 +3,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.member.Member; import org.kkumulkkum.server.api.meeting.dto.response.MemberDto; -import org.kkumulkkum.server.exception.MemberException; -import org.kkumulkkum.server.exception.code.MemberErrorCode; +import org.kkumulkkum.server.common.exception.MemberException; +import org.kkumulkkum.server.common.exception.code.MemberErrorCode; import org.kkumulkkum.server.domain.member.repository.MemberRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java index dd72375..0a5a50c 100644 --- a/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/participant/manager/ParticipantRetriever.java @@ -4,8 +4,8 @@ import org.kkumulkkum.server.domain.participant.Participant; import org.kkumulkkum.server.api.participant.dto.ParticipantStatusUserInfoDto; import org.kkumulkkum.server.api.participant.dto.response.LateComerDto; -import org.kkumulkkum.server.exception.ParticipantException; -import org.kkumulkkum.server.exception.code.ParticipantErrorCode; +import org.kkumulkkum.server.common.exception.ParticipantException; +import org.kkumulkkum.server.common.exception.code.ParticipantErrorCode; import org.kkumulkkum.server.domain.participant.repository.ParticipantRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java index 6405353..eda34c2 100644 --- a/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/promise/manager/PromiseRetriever.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.promise.Promise; -import org.kkumulkkum.server.exception.PromiseException; -import org.kkumulkkum.server.exception.code.PromiseErrorCode; +import org.kkumulkkum.server.common.exception.PromiseException; +import org.kkumulkkum.server.common.exception.code.PromiseErrorCode; import org.kkumulkkum.server.domain.promise.repository.PromiseRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java index b94cb88..e5dbd84 100644 --- a/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/TokenRetriever.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.Token; -import org.kkumulkkum.server.exception.AuthException; -import org.kkumulkkum.server.exception.code.AuthErrorCode; +import org.kkumulkkum.server.common.exception.AuthException; +import org.kkumulkkum.server.common.exception.code.AuthErrorCode; import org.kkumulkkum.server.domain.user.repository.TokenRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java index 8de3946..973f922 100644 --- a/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/user/manager/UserRetriever.java @@ -3,8 +3,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.user.User; import org.kkumulkkum.server.domain.user.Provider; -import org.kkumulkkum.server.exception.UserException; -import org.kkumulkkum.server.exception.code.UserErrorCode; +import org.kkumulkkum.server.common.exception.UserException; +import org.kkumulkkum.server.common.exception.code.UserErrorCode; import org.kkumulkkum.server.domain.user.repository.UserRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java index 76f1401..2f81284 100644 --- a/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java +++ b/src/main/java/org/kkumulkkum/server/domain/userinfo/manager/UserInfoRetriever.java @@ -2,8 +2,8 @@ import lombok.RequiredArgsConstructor; import org.kkumulkkum.server.domain.userinfo.UserInfo; -import org.kkumulkkum.server.exception.UserException; -import org.kkumulkkum.server.exception.code.UserErrorCode; +import org.kkumulkkum.server.common.exception.UserException; +import org.kkumulkkum.server.common.exception.code.UserErrorCode; import org.kkumulkkum.server.domain.userinfo.repository.UserInfoRepository; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java b/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java index 063ddcc..a36c9fe 100644 --- a/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java +++ b/src/main/java/org/kkumulkkum/server/external/config/FirebaseConfig.java @@ -5,8 +5,8 @@ import com.google.firebase.FirebaseOptions; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.FirebaseException; -import org.kkumulkkum.server.exception.code.FirebaseErrorCode; +import org.kkumulkkum.server.common.exception.FirebaseException; +import org.kkumulkkum.server.common.exception.code.FirebaseErrorCode; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; diff --git a/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java index 960c035..f5e386c 100644 --- a/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java +++ b/src/main/java/org/kkumulkkum/server/external/service/fcm/FcmService.java @@ -3,8 +3,8 @@ import com.google.firebase.messaging.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.kkumulkkum.server.exception.FirebaseException; -import org.kkumulkkum.server.exception.code.FirebaseErrorCode; +import org.kkumulkkum.server.common.exception.FirebaseException; +import org.kkumulkkum.server.common.exception.code.FirebaseErrorCode; import org.kkumulkkum.server.external.service.fcm.dto.FcmMessageDto; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java b/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java index e26c684..a846fa2 100644 --- a/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java +++ b/src/main/java/org/kkumulkkum/server/external/service/naver/NaverService.java @@ -1,7 +1,7 @@ package org.kkumulkkum.server.external.service.naver; -import org.kkumulkkum.server.exception.OpenApiException; -import org.kkumulkkum.server.exception.code.OpenApiErrorCode; +import org.kkumulkkum.server.common.exception.OpenApiException; +import org.kkumulkkum.server.common.exception.code.OpenApiErrorCode; import org.kkumulkkum.server.external.controller.naver.dto.LocationDto; import org.kkumulkkum.server.external.controller.naver.dto.LocationsDto; import org.kkumulkkum.server.external.service.naver.dto.NaverLocationResponse; diff --git a/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java b/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java index c18341e..ee5a3dd 100644 --- a/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java +++ b/src/main/java/org/kkumulkkum/server/external/service/s3/S3Service.java @@ -1,8 +1,8 @@ package org.kkumulkkum.server.external.service.s3; import org.kkumulkkum.server.external.config.AwsConfig; -import org.kkumulkkum.server.exception.AwsException; -import org.kkumulkkum.server.exception.code.AwsErrorCode; +import org.kkumulkkum.server.common.exception.AwsException; +import org.kkumulkkum.server.common.exception.code.AwsErrorCode; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/resources/discord-appender.xml b/src/main/resources/discord-appender.xml index b95e152..525fd89 100644 --- a/src/main/resources/discord-appender.xml +++ b/src/main/resources/discord-appender.xml @@ -1,5 +1,5 @@ - + ${DISCORD_WEBHOOK_URI} 개 큰 에러 나는 꾸물꿈 https://github.com/user-attachments/assets/452211e9-0c88-41e9-a49c-42c3b099a197 From 5dd638ddb25220c6143866480725cdb68ae54323 Mon Sep 17 00:00:00 2001 From: tkdwns414 Date: Sun, 22 Sep 2024 02:04:16 +0900 Subject: [PATCH 6/6] [refactor] #151 add todo to explain unbounded packaging --- .../org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java b/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java index 410b90d..6895f1a 100644 --- a/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java +++ b/src/main/java/org/kkumulkkum/server/common/advice/ResponseDtoAdvice.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; +// TODO: 구현을 숨기고 이해를 어렵게한다는 이유로 곧 disable될 예정 @RestControllerAdvice(basePackages = "org.kkumulkkum.server") public class ResponseDtoAdvice implements ResponseBodyAdvice {