From b59ee3ad4370ff25d7ac20714a3f4be6b35c1d32 Mon Sep 17 00:00:00 2001 From: Invidam Date: Thu, 21 Dec 2023 21:32:16 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koin/{ => domain}/auth/JwtProvider.java | 11 +++++---- .../track}/controller/TrackController.java | 12 ++++++---- .../domain/{ => track/domain}/Member.java | 5 ++-- .../domain/{ => track/domain}/TechStack.java | 4 ++-- .../koin/domain/{ => track/domain}/Track.java | 3 ++- .../{ => domain/track}/dto/TrackResponse.java | 8 ++++--- .../track}/dto/TrackSingleResponse.java | 14 ++++++----- .../track}/repository/MemberRepository.java | 6 +++-- .../repository/TechStackRepository.java | 6 +++-- .../track}/repository/TrackRepository.java | 6 +++-- .../track}/service/TrackService.java | 24 ++++++++++--------- .../user}/controller/UserController.java | 14 ++++++----- .../domain/user/{ => domain}/Student.java | 2 +- .../koin/domain/user/{ => domain}/User.java | 15 ++++++------ .../domain/user/{ => domain}/UserGender.java | 2 +- .../user/{ => domain}/UserIdentity.java | 2 +- .../domain/user/{ => domain}/UserToken.java | 6 +++-- .../domain/user/{ => domain}/UserType.java | 2 +- .../user}/dto/UserLoginRequest.java | 2 +- .../user}/dto/UserLoginResponse.java | 3 ++- .../user}/repository/UserRepository.java | 6 +++-- .../user}/repository/UserTokenRepository.java | 6 +++-- .../user}/service/UserService.java | 22 +++++++++-------- .../{domain => global/common}/BaseEntity.java | 12 ++++++---- .../{ => global}/config/JpaConfiguration.java | 2 +- .../exception}/GlobalExceptionHandler.java | 6 ++--- .../koin/acceptance/TrackApiTest.java | 22 +++++++++-------- .../koin/acceptance/UserApiTest.java | 20 ++++++++-------- 28 files changed, 139 insertions(+), 104 deletions(-) rename src/main/java/in/koreatech/koin/{ => domain}/auth/JwtProvider.java (92%) rename src/main/java/in/koreatech/koin/{ => domain/track}/controller/TrackController.java (78%) rename src/main/java/in/koreatech/koin/domain/{ => track/domain}/Member.java (93%) rename src/main/java/in/koreatech/koin/domain/{ => track/domain}/TechStack.java (93%) rename src/main/java/in/koreatech/koin/domain/{ => track/domain}/Track.java (91%) rename src/main/java/in/koreatech/koin/{ => domain/track}/dto/TrackResponse.java (91%) rename src/main/java/in/koreatech/koin/{ => domain/track}/dto/TrackSingleResponse.java (94%) rename src/main/java/in/koreatech/koin/{ => domain/track}/repository/MemberRepository.java (68%) rename src/main/java/in/koreatech/koin/{ => domain/track}/repository/TechStackRepository.java (69%) rename src/main/java/in/koreatech/koin/{ => domain/track}/repository/TrackRepository.java (72%) rename src/main/java/in/koreatech/koin/{ => domain/track}/service/TrackService.java (63%) rename src/main/java/in/koreatech/koin/{ => domain/user}/controller/UserController.java (76%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/Student.java (95%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/User.java (89%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/UserGender.java (54%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/UserIdentity.java (90%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/UserToken.java (94%) rename src/main/java/in/koreatech/koin/domain/user/{ => domain}/UserType.java (87%) rename src/main/java/in/koreatech/koin/{ => domain/user}/dto/UserLoginRequest.java (90%) rename src/main/java/in/koreatech/koin/{ => domain/user}/dto/UserLoginResponse.java (92%) rename src/main/java/in/koreatech/koin/{ => domain/user}/repository/UserRepository.java (72%) rename src/main/java/in/koreatech/koin/{ => domain/user}/repository/UserTokenRepository.java (70%) rename src/main/java/in/koreatech/koin/{ => domain/user}/service/UserService.java (74%) rename src/main/java/in/koreatech/koin/{domain => global/common}/BaseEntity.java (95%) rename src/main/java/in/koreatech/koin/{ => global}/config/JpaConfiguration.java (83%) rename src/main/java/in/koreatech/koin/{controller => global/exception}/GlobalExceptionHandler.java (90%) diff --git a/src/main/java/in/koreatech/koin/auth/JwtProvider.java b/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java similarity index 92% rename from src/main/java/in/koreatech/koin/auth/JwtProvider.java rename to src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java index 9f679dfe7..636c292f5 100644 --- a/src/main/java/in/koreatech/koin/auth/JwtProvider.java +++ b/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java @@ -1,16 +1,19 @@ -package in.koreatech.koin.auth; +package in.koreatech.koin.domain.auth; -import in.koreatech.koin.domain.user.User; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; import java.security.Key; import java.time.Instant; import java.util.Base64; import java.util.Date; + import javax.crypto.SecretKey; + import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import in.koreatech.koin.domain.user.domain.User; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; + @Component public class JwtProvider { diff --git a/src/main/java/in/koreatech/koin/controller/TrackController.java b/src/main/java/in/koreatech/koin/domain/track/controller/TrackController.java similarity index 78% rename from src/main/java/in/koreatech/koin/controller/TrackController.java rename to src/main/java/in/koreatech/koin/domain/track/controller/TrackController.java index 236028202..f37e001ab 100644 --- a/src/main/java/in/koreatech/koin/controller/TrackController.java +++ b/src/main/java/in/koreatech/koin/domain/track/controller/TrackController.java @@ -1,15 +1,17 @@ -package in.koreatech.koin.controller; +package in.koreatech.koin.domain.track.controller; -import in.koreatech.koin.dto.TrackResponse; -import in.koreatech.koin.dto.TrackSingleResponse; -import in.koreatech.koin.service.TrackService; import java.util.List; -import lombok.RequiredArgsConstructor; + 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.RestController; +import in.koreatech.koin.domain.track.dto.TrackResponse; +import in.koreatech.koin.domain.track.dto.TrackSingleResponse; +import in.koreatech.koin.domain.track.service.TrackService; +import lombok.RequiredArgsConstructor; + @RestController @RequiredArgsConstructor public class TrackController { diff --git a/src/main/java/in/koreatech/koin/domain/Member.java b/src/main/java/in/koreatech/koin/domain/track/domain/Member.java similarity index 93% rename from src/main/java/in/koreatech/koin/domain/Member.java rename to src/main/java/in/koreatech/koin/domain/track/domain/Member.java index 542fb0cad..055759714 100644 --- a/src/main/java/in/koreatech/koin/domain/Member.java +++ b/src/main/java/in/koreatech/koin/domain/track/domain/Member.java @@ -1,5 +1,6 @@ -package in.koreatech.koin.domain; +package in.koreatech.koin.domain.track.domain; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -56,7 +57,7 @@ public class Member extends BaseEntity { @Builder private Member(String name, String studentNumber, Long trackId, String position, String email, String imageUrl, - Boolean isDeleted) { + Boolean isDeleted) { this.name = name; this.studentNumber = studentNumber; this.trackId = trackId; diff --git a/src/main/java/in/koreatech/koin/domain/TechStack.java b/src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java similarity index 93% rename from src/main/java/in/koreatech/koin/domain/TechStack.java rename to src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java index 624edc356..e52fc3d81 100644 --- a/src/main/java/in/koreatech/koin/domain/TechStack.java +++ b/src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java @@ -1,5 +1,6 @@ -package in.koreatech.koin.domain; +package in.koreatech.koin.domain.track.domain; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -14,7 +15,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; - @Getter @Entity @Table(name = "tech_stacks") diff --git a/src/main/java/in/koreatech/koin/domain/Track.java b/src/main/java/in/koreatech/koin/domain/track/domain/Track.java similarity index 91% rename from src/main/java/in/koreatech/koin/domain/Track.java rename to src/main/java/in/koreatech/koin/domain/track/domain/Track.java index 6c731e782..c985f5456 100644 --- a/src/main/java/in/koreatech/koin/domain/Track.java +++ b/src/main/java/in/koreatech/koin/domain/track/domain/Track.java @@ -1,5 +1,6 @@ -package in.koreatech.koin.domain; +package in.koreatech.koin.domain.track.domain; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/in/koreatech/koin/dto/TrackResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java similarity index 91% rename from src/main/java/in/koreatech/koin/dto/TrackResponse.java rename to src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java index 97c9db700..c0e77243f 100644 --- a/src/main/java/in/koreatech/koin/dto/TrackResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java @@ -1,10 +1,12 @@ -package in.koreatech.koin.dto; +package in.koreatech.koin.domain.track.dto; + +import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.Track; -import java.time.LocalDateTime; + +import in.koreatech.koin.domain.track.domain.Track; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/dto/TrackSingleResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java similarity index 94% rename from src/main/java/in/koreatech/koin/dto/TrackSingleResponse.java rename to src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java index 555886df0..dbf6a6b28 100644 --- a/src/main/java/in/koreatech/koin/dto/TrackSingleResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java @@ -1,14 +1,16 @@ -package in.koreatech.koin.dto; +package in.koreatech.koin.domain.track.dto; + +import java.time.LocalDateTime; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.Member; -import in.koreatech.koin.domain.TechStack; -import in.koreatech.koin.domain.Track; -import java.time.LocalDateTime; -import java.util.List; + +import in.koreatech.koin.domain.track.domain.Member; +import in.koreatech.koin.domain.track.domain.TechStack; +import in.koreatech.koin.domain.track.domain.Track; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/repository/MemberRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java similarity index 68% rename from src/main/java/in/koreatech/koin/repository/MemberRepository.java rename to src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java index 882a43414..0a1eccbdf 100644 --- a/src/main/java/in/koreatech/koin/repository/MemberRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java @@ -1,9 +1,11 @@ -package in.koreatech.koin.repository; +package in.koreatech.koin.domain.track.repository; -import in.koreatech.koin.domain.Member; import java.util.List; + import org.springframework.data.repository.Repository; +import in.koreatech.koin.domain.track.domain.Member; + public interface MemberRepository extends Repository { Member save(Member member); diff --git a/src/main/java/in/koreatech/koin/repository/TechStackRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java similarity index 69% rename from src/main/java/in/koreatech/koin/repository/TechStackRepository.java rename to src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java index 2839ba3c4..471b6ac48 100644 --- a/src/main/java/in/koreatech/koin/repository/TechStackRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java @@ -1,9 +1,11 @@ -package in.koreatech.koin.repository; +package in.koreatech.koin.domain.track.repository; -import in.koreatech.koin.domain.TechStack; import java.util.List; + import org.springframework.data.repository.Repository; +import in.koreatech.koin.domain.track.domain.TechStack; + public interface TechStackRepository extends Repository { TechStack save(TechStack techStack); diff --git a/src/main/java/in/koreatech/koin/repository/TrackRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java similarity index 72% rename from src/main/java/in/koreatech/koin/repository/TrackRepository.java rename to src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java index 16207449e..1f55d3469 100644 --- a/src/main/java/in/koreatech/koin/repository/TrackRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java @@ -1,10 +1,12 @@ -package in.koreatech.koin.repository; +package in.koreatech.koin.domain.track.repository; -import in.koreatech.koin.domain.Track; import java.util.List; import java.util.Optional; + import org.springframework.data.repository.Repository; +import in.koreatech.koin.domain.track.domain.Track; + public interface TrackRepository extends Repository { Track save(Track track); diff --git a/src/main/java/in/koreatech/koin/service/TrackService.java b/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java similarity index 63% rename from src/main/java/in/koreatech/koin/service/TrackService.java rename to src/main/java/in/koreatech/koin/domain/track/service/TrackService.java index b08cdcfe6..9b7873adb 100644 --- a/src/main/java/in/koreatech/koin/service/TrackService.java +++ b/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java @@ -1,17 +1,19 @@ -package in.koreatech.koin.service; - -import in.koreatech.koin.domain.Member; -import in.koreatech.koin.domain.TechStack; -import in.koreatech.koin.domain.Track; -import in.koreatech.koin.dto.TrackResponse; -import in.koreatech.koin.dto.TrackSingleResponse; -import in.koreatech.koin.repository.MemberRepository; -import in.koreatech.koin.repository.TechStackRepository; -import in.koreatech.koin.repository.TrackRepository; +package in.koreatech.koin.domain.track.service; + import java.util.List; -import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Service; +import in.koreatech.koin.domain.track.domain.Member; +import in.koreatech.koin.domain.track.domain.TechStack; +import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.dto.TrackResponse; +import in.koreatech.koin.domain.track.dto.TrackSingleResponse; +import in.koreatech.koin.domain.track.repository.MemberRepository; +import in.koreatech.koin.domain.track.repository.TechStackRepository; +import in.koreatech.koin.domain.track.repository.TrackRepository; +import lombok.RequiredArgsConstructor; + @Service @RequiredArgsConstructor public class TrackService { diff --git a/src/main/java/in/koreatech/koin/controller/UserController.java b/src/main/java/in/koreatech/koin/domain/user/controller/UserController.java similarity index 76% rename from src/main/java/in/koreatech/koin/controller/UserController.java rename to src/main/java/in/koreatech/koin/domain/user/controller/UserController.java index 4fc251d22..d8cd202af 100644 --- a/src/main/java/in/koreatech/koin/controller/UserController.java +++ b/src/main/java/in/koreatech/koin/domain/user/controller/UserController.java @@ -1,16 +1,18 @@ -package in.koreatech.koin.controller; +package in.koreatech.koin.domain.user.controller; -import in.koreatech.koin.dto.UserLoginRequest; -import in.koreatech.koin.dto.UserLoginResponse; -import in.koreatech.koin.service.UserService; -import jakarta.validation.Valid; import java.net.URI; -import lombok.RequiredArgsConstructor; + import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import in.koreatech.koin.domain.user.dto.UserLoginRequest; +import in.koreatech.koin.domain.user.dto.UserLoginResponse; +import in.koreatech.koin.domain.user.service.UserService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; + @RestController @RequiredArgsConstructor public class UserController { diff --git a/src/main/java/in/koreatech/koin/domain/user/Student.java b/src/main/java/in/koreatech/koin/domain/user/domain/Student.java similarity index 95% rename from src/main/java/in/koreatech/koin/domain/user/Student.java rename to src/main/java/in/koreatech/koin/domain/user/domain/Student.java index a64029c93..80458a160 100644 --- a/src/main/java/in/koreatech/koin/domain/user/Student.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/Student.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/in/koreatech/koin/domain/user/User.java b/src/main/java/in/koreatech/koin/domain/user/domain/User.java similarity index 89% rename from src/main/java/in/koreatech/koin/domain/user/User.java rename to src/main/java/in/koreatech/koin/domain/user/domain/User.java index d7ce56cdf..b428d9edb 100644 --- a/src/main/java/in/koreatech/koin/domain/user/User.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/User.java @@ -1,6 +1,8 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; -import in.koreatech.koin.domain.BaseEntity; +import java.time.LocalDateTime; + +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -12,7 +14,6 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import java.time.LocalDateTime; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -92,10 +93,10 @@ public class User extends BaseEntity { @Builder public User(String password, String nickname, String name, String phoneNumber, UserType userType, - String email, - UserGender gender, Boolean isAuthed, LocalDateTime lastLoggedAt, String profileImageUrl, - Boolean isDeleted, - String authToken, String authExpiredAt, String resetToken, String resetExpiredAt) { + String email, + UserGender gender, Boolean isAuthed, LocalDateTime lastLoggedAt, String profileImageUrl, + Boolean isDeleted, + String authToken, String authExpiredAt, String resetToken, String resetExpiredAt) { this.password = password; this.nickname = nickname; this.name = name; diff --git a/src/main/java/in/koreatech/koin/domain/user/UserGender.java b/src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java similarity index 54% rename from src/main/java/in/koreatech/koin/domain/user/UserGender.java rename to src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java index 52b8372f0..fb74d23e4 100644 --- a/src/main/java/in/koreatech/koin/domain/user/UserGender.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; public enum UserGender { MAN, diff --git a/src/main/java/in/koreatech/koin/domain/user/UserIdentity.java b/src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java similarity index 90% rename from src/main/java/in/koreatech/koin/domain/user/UserIdentity.java rename to src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java index b11f349c9..42c862886 100644 --- a/src/main/java/in/koreatech/koin/domain/user/UserIdentity.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/domain/user/UserToken.java b/src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java similarity index 94% rename from src/main/java/in/koreatech/koin/domain/user/UserToken.java rename to src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java index efe335cae..22c378579 100644 --- a/src/main/java/in/koreatech/koin/domain/user/UserToken.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java @@ -1,11 +1,13 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; import java.util.concurrent.TimeUnit; -import lombok.Getter; + import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; import org.springframework.data.redis.core.TimeToLive; +import lombok.Getter; + @Getter @RedisHash("refreshToken") public class UserToken { diff --git a/src/main/java/in/koreatech/koin/domain/user/UserType.java b/src/main/java/in/koreatech/koin/domain/user/domain/UserType.java similarity index 87% rename from src/main/java/in/koreatech/koin/domain/user/UserType.java rename to src/main/java/in/koreatech/koin/domain/user/domain/UserType.java index 9eb5abe62..1193fc32b 100644 --- a/src/main/java/in/koreatech/koin/domain/user/UserType.java +++ b/src/main/java/in/koreatech/koin/domain/user/domain/UserType.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user; +package in.koreatech.koin.domain.user.domain; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/dto/UserLoginRequest.java b/src/main/java/in/koreatech/koin/domain/user/dto/UserLoginRequest.java similarity index 90% rename from src/main/java/in/koreatech/koin/dto/UserLoginRequest.java rename to src/main/java/in/koreatech/koin/domain/user/dto/UserLoginRequest.java index 25ea66541..aaab2a5da 100644 --- a/src/main/java/in/koreatech/koin/dto/UserLoginRequest.java +++ b/src/main/java/in/koreatech/koin/domain/user/dto/UserLoginRequest.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.dto; +package in.koreatech.koin.domain.user.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/in/koreatech/koin/dto/UserLoginResponse.java b/src/main/java/in/koreatech/koin/domain/user/dto/UserLoginResponse.java similarity index 92% rename from src/main/java/in/koreatech/koin/dto/UserLoginResponse.java rename to src/main/java/in/koreatech/koin/domain/user/dto/UserLoginResponse.java index d8e74d5c8..45f384a70 100644 --- a/src/main/java/in/koreatech/koin/dto/UserLoginResponse.java +++ b/src/main/java/in/koreatech/koin/domain/user/dto/UserLoginResponse.java @@ -1,6 +1,7 @@ -package in.koreatech.koin.dto; +package in.koreatech.koin.domain.user.dto; import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/repository/UserRepository.java b/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java similarity index 72% rename from src/main/java/in/koreatech/koin/repository/UserRepository.java rename to src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java index d38ad52af..e1127d377 100644 --- a/src/main/java/in/koreatech/koin/repository/UserRepository.java +++ b/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java @@ -1,9 +1,11 @@ -package in.koreatech.koin.repository; +package in.koreatech.koin.domain.user.repository; -import in.koreatech.koin.domain.user.User; import java.util.Optional; + import org.springframework.data.repository.Repository; +import in.koreatech.koin.domain.user.domain.User; + public interface UserRepository extends Repository { User save(User user); diff --git a/src/main/java/in/koreatech/koin/repository/UserTokenRepository.java b/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java similarity index 70% rename from src/main/java/in/koreatech/koin/repository/UserTokenRepository.java rename to src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java index dff4366e9..d2183d070 100644 --- a/src/main/java/in/koreatech/koin/repository/UserTokenRepository.java +++ b/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java @@ -1,9 +1,11 @@ -package in.koreatech.koin.repository; +package in.koreatech.koin.domain.user.repository; -import in.koreatech.koin.domain.user.UserToken; import java.util.Optional; + import org.springframework.data.repository.Repository; +import in.koreatech.koin.domain.user.domain.UserToken; + public interface UserTokenRepository extends Repository { UserToken save(UserToken userToken); diff --git a/src/main/java/in/koreatech/koin/service/UserService.java b/src/main/java/in/koreatech/koin/domain/user/service/UserService.java similarity index 74% rename from src/main/java/in/koreatech/koin/service/UserService.java rename to src/main/java/in/koreatech/koin/domain/user/service/UserService.java index 1244793ad..fba8e0715 100644 --- a/src/main/java/in/koreatech/koin/service/UserService.java +++ b/src/main/java/in/koreatech/koin/domain/user/service/UserService.java @@ -1,18 +1,20 @@ -package in.koreatech.koin.service; - -import in.koreatech.koin.auth.JwtProvider; -import in.koreatech.koin.domain.user.User; -import in.koreatech.koin.domain.user.UserToken; -import in.koreatech.koin.dto.UserLoginRequest; -import in.koreatech.koin.dto.UserLoginResponse; -import in.koreatech.koin.repository.UserRepository; -import in.koreatech.koin.repository.UserTokenRepository; +package in.koreatech.koin.domain.user.service; + import java.time.LocalDateTime; import java.util.UUID; -import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import in.koreatech.koin.domain.auth.JwtProvider; +import in.koreatech.koin.domain.user.domain.User; +import in.koreatech.koin.domain.user.domain.UserToken; +import in.koreatech.koin.domain.user.dto.UserLoginRequest; +import in.koreatech.koin.domain.user.dto.UserLoginResponse; +import in.koreatech.koin.domain.user.repository.UserRepository; +import in.koreatech.koin.domain.user.repository.UserTokenRepository; +import lombok.RequiredArgsConstructor; + @Service @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/src/main/java/in/koreatech/koin/domain/BaseEntity.java b/src/main/java/in/koreatech/koin/global/common/BaseEntity.java similarity index 95% rename from src/main/java/in/koreatech/koin/domain/BaseEntity.java rename to src/main/java/in/koreatech/koin/global/common/BaseEntity.java index 37c5f2943..814b1ac31 100644 --- a/src/main/java/in/koreatech/koin/domain/BaseEntity.java +++ b/src/main/java/in/koreatech/koin/global/common/BaseEntity.java @@ -1,14 +1,16 @@ -package in.koreatech.koin.domain; +package in.koreatech.koin.global.common; + +import java.time.LocalDateTime; + +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; import lombok.Getter; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; @Getter @MappedSuperclass diff --git a/src/main/java/in/koreatech/koin/config/JpaConfiguration.java b/src/main/java/in/koreatech/koin/global/config/JpaConfiguration.java similarity index 83% rename from src/main/java/in/koreatech/koin/config/JpaConfiguration.java rename to src/main/java/in/koreatech/koin/global/config/JpaConfiguration.java index f1a948c05..aa1acd063 100644 --- a/src/main/java/in/koreatech/koin/config/JpaConfiguration.java +++ b/src/main/java/in/koreatech/koin/global/config/JpaConfiguration.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.config; +package in.koreatech.koin.global.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/main/java/in/koreatech/koin/controller/GlobalExceptionHandler.java b/src/main/java/in/koreatech/koin/global/exception/GlobalExceptionHandler.java similarity index 90% rename from src/main/java/in/koreatech/koin/controller/GlobalExceptionHandler.java rename to src/main/java/in/koreatech/koin/global/exception/GlobalExceptionHandler.java index 9d3288582..c648df477 100644 --- a/src/main/java/in/koreatech/koin/controller/GlobalExceptionHandler.java +++ b/src/main/java/in/koreatech/koin/global/exception/GlobalExceptionHandler.java @@ -1,12 +1,12 @@ -package in.koreatech.koin.controller; +package in.koreatech.koin.global.exception; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Component; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import lombok.extern.slf4j.Slf4j; + @Slf4j @RestControllerAdvice public class GlobalExceptionHandler { diff --git a/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java b/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java index afb96932f..df5917291 100644 --- a/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java @@ -1,22 +1,24 @@ package in.koreatech.koin.acceptance; -import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.Member; -import in.koreatech.koin.domain.TechStack; -import in.koreatech.koin.domain.Track; -import in.koreatech.koin.repository.MemberRepository; -import in.koreatech.koin.repository.TechStackRepository; -import in.koreatech.koin.repository.TrackRepository; -import io.restassured.RestAssured; -import io.restassured.response.ExtractableResponse; -import io.restassured.response.Response; import java.time.format.DateTimeFormatter; + import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import in.koreatech.koin.AcceptanceTest; +import in.koreatech.koin.domain.track.domain.Member; +import in.koreatech.koin.domain.track.domain.TechStack; +import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.repository.MemberRepository; +import in.koreatech.koin.domain.track.repository.TechStackRepository; +import in.koreatech.koin.domain.track.repository.TrackRepository; +import io.restassured.RestAssured; +import io.restassured.response.ExtractableResponse; +import io.restassured.response.Response; + class TrackApiTest extends AcceptanceTest { @Autowired diff --git a/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java b/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java index 06c59555d..074e7051a 100644 --- a/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java @@ -1,22 +1,22 @@ package in.koreatech.koin.acceptance; - import static org.assertj.core.api.SoftAssertions.assertSoftly; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; + import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.user.User; -import in.koreatech.koin.domain.user.UserToken; -import in.koreatech.koin.domain.user.UserType; -import in.koreatech.koin.repository.UserRepository; -import in.koreatech.koin.repository.UserTokenRepository; +import in.koreatech.koin.domain.user.domain.User; +import in.koreatech.koin.domain.user.domain.UserToken; +import in.koreatech.koin.domain.user.domain.UserType; +import in.koreatech.koin.domain.user.repository.UserRepository; +import in.koreatech.koin.domain.user.repository.UserTokenRepository; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; class UserApiTest extends AcceptanceTest { From 55b455e012157c0905e8c6105e954d8abb8a57ec Mon Sep 17 00:00:00 2001 From: Invidam Date: Thu, 21 Dec 2023 21:48:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20DTO=20=EB=A0=88=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koin/domain/track/dto/TrackResponse.java | 23 +++--- .../domain/track/dto/TrackSingleResponse.java | 72 +++++++------------ .../domain/user/dto/UserLoginRequest.java | 13 ++-- .../domain/user/dto/UserLoginResponse.java | 19 ++--- .../koin/domain/user/service/UserService.java | 4 +- 5 files changed, 45 insertions(+), 86 deletions(-) diff --git a/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java index c0e77243f..67f40d1ed 100644 --- a/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java @@ -7,23 +7,16 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming; import in.koreatech.koin.domain.track.domain.Track; -import lombok.AllArgsConstructor; -import lombok.Getter; -@Getter -@AllArgsConstructor(access = lombok.AccessLevel.PRIVATE) @JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class) -public class TrackResponse { - - private Long id; - private String name; - private Integer headcount; - private Boolean isDeleted; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createdAt; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updatedAt; +public record TrackResponse( + Long id, + String name, + Integer headcount, + Boolean isDeleted, + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime createdAt, + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime updatedAt +) { public static TrackResponse from(Track track) { return new TrackResponse( diff --git a/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java index dbf6a6b28..bbf37c15e 100644 --- a/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java @@ -11,22 +11,12 @@ import in.koreatech.koin.domain.track.domain.Member; import in.koreatech.koin.domain.track.domain.TechStack; import in.koreatech.koin.domain.track.domain.Track; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class TrackSingleResponse { - - @JsonProperty("TrackName") - private String trackName; - - @JsonProperty("TechStacks") - private List innerTechStackResponses; - - @JsonProperty("Members") - private List innerMemberResponses; +public record TrackSingleResponse( + @JsonProperty("TrackName") String trackName, + @JsonProperty("TechStacks") List innerTechStackResponses, + @JsonProperty("Members") List innerMemberResponses +) { public static TrackSingleResponse of(Track track, List members, List techStacks) { return new TrackSingleResponse( @@ -40,21 +30,17 @@ public static TrackSingleResponse of(Track track, List members, List new IllegalArgumentException("잘못된 로그인 정보입니다.")); - if (!user.isSamePassword(request.getPassword())) { + if (!user.isSamePassword(request.password())) { throw new IllegalArgumentException("잘못된 로그인 정보입니다."); } From 22b491780336216566ba5264a5a7576637fe6991 Mon Sep 17 00:00:00 2001 From: Invidam Date: Tue, 26 Dec 2023 16:59:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=EC=83=81=EC=A0=90=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller}/ShopController.java | 6 +++--- .../koin/domain/shop/{ => domain}/Menu.java | 4 ++-- .../domain/shop/{ => domain}/MenuCategory.java | 4 ++-- .../domain/shop/{ => domain}/MenuCategoryMap.java | 2 +- .../koin/domain/shop/{ => domain}/MenuImage.java | 2 +- .../koin/domain/shop/{ => domain}/MenuOption.java | 4 ++-- .../shop => domain/shop/dto}/ShopMenuResponse.java | 10 +++++----- .../shop/repository}/MenuRepository.java | 4 ++-- .../shop => domain/shop/service}/ShopService.java | 14 +++++++------- .../in/koreatech/koin/acceptance/ShopApiTest.java | 12 ++++++------ 10 files changed, 31 insertions(+), 31 deletions(-) rename src/main/java/in/koreatech/koin/{controller/shop => domain/shop/controller}/ShopController.java (79%) rename src/main/java/in/koreatech/koin/domain/shop/{ => domain}/Menu.java (95%) rename src/main/java/in/koreatech/koin/domain/shop/{ => domain}/MenuCategory.java (93%) rename src/main/java/in/koreatech/koin/domain/shop/{ => domain}/MenuCategoryMap.java (97%) rename src/main/java/in/koreatech/koin/domain/shop/{ => domain}/MenuImage.java (96%) rename src/main/java/in/koreatech/koin/domain/shop/{ => domain}/MenuOption.java (93%) rename src/main/java/in/koreatech/koin/{dto/shop => domain/shop/dto}/ShopMenuResponse.java (90%) rename src/main/java/in/koreatech/koin/{repository/shop => domain/shop/repository}/MenuRepository.java (69%) rename src/main/java/in/koreatech/koin/{service/shop => domain/shop/service}/ShopService.java (76%) diff --git a/src/main/java/in/koreatech/koin/controller/shop/ShopController.java b/src/main/java/in/koreatech/koin/domain/shop/controller/ShopController.java similarity index 79% rename from src/main/java/in/koreatech/koin/controller/shop/ShopController.java rename to src/main/java/in/koreatech/koin/domain/shop/controller/ShopController.java index 71c6b8153..efb4520ef 100644 --- a/src/main/java/in/koreatech/koin/controller/shop/ShopController.java +++ b/src/main/java/in/koreatech/koin/domain/shop/controller/ShopController.java @@ -1,12 +1,12 @@ -package in.koreatech.koin.controller.shop; +package in.koreatech.koin.domain.shop.controller; 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.RestController; -import in.koreatech.koin.dto.shop.ShopMenuResponse; -import in.koreatech.koin.service.shop.ShopService; +import in.koreatech.koin.domain.shop.dto.ShopMenuResponse; +import in.koreatech.koin.domain.shop.service.ShopService; import lombok.RequiredArgsConstructor; @RestController diff --git a/src/main/java/in/koreatech/koin/domain/shop/Menu.java b/src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java similarity index 95% rename from src/main/java/in/koreatech/koin/domain/shop/Menu.java rename to src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java index 80b62296d..d31de6c65 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/Menu.java +++ b/src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java @@ -1,9 +1,9 @@ -package in.koreatech.koin.domain.shop; +package in.koreatech.koin.domain.shop.domain; import java.util.ArrayList; import java.util.List; -import in.koreatech.koin.domain.BaseEntity; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/in/koreatech/koin/domain/shop/MenuCategory.java b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java similarity index 93% rename from src/main/java/in/koreatech/koin/domain/shop/MenuCategory.java rename to src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java index 9659baafd..8621f733c 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/MenuCategory.java +++ b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java @@ -1,9 +1,9 @@ -package in.koreatech.koin.domain.shop; +package in.koreatech.koin.domain.shop.domain; import java.util.ArrayList; import java.util.List; -import in.koreatech.koin.domain.BaseEntity; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/in/koreatech/koin/domain/shop/MenuCategoryMap.java b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java similarity index 97% rename from src/main/java/in/koreatech/koin/domain/shop/MenuCategoryMap.java rename to src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java index 0c9478cb9..537fb5165 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/MenuCategoryMap.java +++ b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop; +package in.koreatech.koin.domain.shop.domain; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/shop/MenuImage.java b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java similarity index 96% rename from src/main/java/in/koreatech/koin/domain/shop/MenuImage.java rename to src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java index d99a29cd6..85f728397 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/MenuImage.java +++ b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop; +package in.koreatech.koin.domain.shop.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/in/koreatech/koin/domain/shop/MenuOption.java b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java similarity index 93% rename from src/main/java/in/koreatech/koin/domain/shop/MenuOption.java rename to src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java index ed4be6d7a..a783209f4 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/MenuOption.java +++ b/src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java @@ -1,6 +1,6 @@ -package in.koreatech.koin.domain.shop; +package in.koreatech.koin.domain.shop.domain; -import in.koreatech.koin.domain.BaseEntity; +import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/in/koreatech/koin/dto/shop/ShopMenuResponse.java b/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java similarity index 90% rename from src/main/java/in/koreatech/koin/dto/shop/ShopMenuResponse.java rename to src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java index 57e2842e9..093cafb72 100644 --- a/src/main/java/in/koreatech/koin/dto/shop/ShopMenuResponse.java +++ b/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java @@ -1,14 +1,14 @@ -package in.koreatech.koin.dto.shop; +package in.koreatech.koin.domain.shop.dto; import java.util.List; import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.shop.Menu; -import in.koreatech.koin.domain.shop.MenuCategory; -import in.koreatech.koin.domain.shop.MenuImage; -import in.koreatech.koin.domain.shop.MenuOption; +import in.koreatech.koin.domain.shop.domain.Menu; +import in.koreatech.koin.domain.shop.domain.MenuCategory; +import in.koreatech.koin.domain.shop.domain.MenuImage; +import in.koreatech.koin.domain.shop.domain.MenuOption; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/in/koreatech/koin/repository/shop/MenuRepository.java b/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java similarity index 69% rename from src/main/java/in/koreatech/koin/repository/shop/MenuRepository.java rename to src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java index 62d89cad2..18cce2a81 100644 --- a/src/main/java/in/koreatech/koin/repository/shop/MenuRepository.java +++ b/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java @@ -1,10 +1,10 @@ -package in.koreatech.koin.repository.shop; +package in.koreatech.koin.domain.shop.repository; import java.util.Optional; import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.shop.Menu; +import in.koreatech.koin.domain.shop.domain.Menu; public interface MenuRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/service/shop/ShopService.java b/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java similarity index 76% rename from src/main/java/in/koreatech/koin/service/shop/ShopService.java rename to src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java index 55f17d9b8..631a1cf89 100644 --- a/src/main/java/in/koreatech/koin/service/shop/ShopService.java +++ b/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java @@ -1,15 +1,15 @@ -package in.koreatech.koin.service.shop; +package in.koreatech.koin.domain.shop.service; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import in.koreatech.koin.domain.shop.Menu; -import in.koreatech.koin.domain.shop.MenuCategory; -import in.koreatech.koin.domain.shop.MenuCategoryMap; -import in.koreatech.koin.dto.shop.ShopMenuResponse; -import in.koreatech.koin.repository.shop.MenuRepository; +import in.koreatech.koin.domain.shop.domain.Menu; +import in.koreatech.koin.domain.shop.domain.MenuCategory; +import in.koreatech.koin.domain.shop.domain.MenuCategoryMap; +import in.koreatech.koin.domain.shop.dto.ShopMenuResponse; +import in.koreatech.koin.domain.shop.repository.MenuRepository; import lombok.RequiredArgsConstructor; @Service @@ -18,7 +18,7 @@ public class ShopService { private final MenuRepository menuRepository; - + public ShopMenuResponse findMenu(Long menuId) { Menu menu = menuRepository.findById(menuId) .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 메뉴입니다.")); diff --git a/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java b/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java index 60aff1e09..ffde01e45 100644 --- a/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java @@ -7,12 +7,12 @@ import org.springframework.http.HttpStatus; import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.shop.Menu; -import in.koreatech.koin.domain.shop.MenuCategory; -import in.koreatech.koin.domain.shop.MenuCategoryMap; -import in.koreatech.koin.domain.shop.MenuImage; -import in.koreatech.koin.domain.shop.MenuOption; -import in.koreatech.koin.repository.shop.MenuRepository; +import in.koreatech.koin.domain.shop.domain.Menu; +import in.koreatech.koin.domain.shop.domain.MenuCategory; +import in.koreatech.koin.domain.shop.domain.MenuCategoryMap; +import in.koreatech.koin.domain.shop.domain.MenuImage; +import in.koreatech.koin.domain.shop.domain.MenuOption; +import in.koreatech.koin.domain.shop.repository.MenuRepository; import io.restassured.RestAssured; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; From 94104afdf52995de42abecacf386c85a84794ca4 Mon Sep 17 00:00:00 2001 From: Invidam Date: Fri, 29 Dec 2023 15:29:49 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=ED=91=9C=ED=98=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../in/koreatech/koin/domain/auth/JwtProvider.java | 2 +- .../koin/domain/shop/dto/ShopMenuResponse.java | 8 ++++---- .../koin/domain/shop/{domain => model}/Menu.java | 2 +- .../domain/shop/{domain => model}/MenuCategory.java | 2 +- .../domain/shop/{domain => model}/MenuCategoryMap.java | 2 +- .../koin/domain/shop/{domain => model}/MenuImage.java | 2 +- .../koin/domain/shop/{domain => model}/MenuOption.java | 2 +- .../koin/domain/shop/repository/MenuRepository.java | 2 +- .../koin/domain/shop/service/ShopService.java | 6 +++--- .../koreatech/koin/domain/track/dto/TrackResponse.java | 2 +- .../koin/domain/track/dto/TrackSingleResponse.java | 6 +++--- .../koin/domain/track/{domain => model}/Member.java | 2 +- .../koin/domain/track/{domain => model}/TechStack.java | 2 +- .../koin/domain/track/{domain => model}/Track.java | 2 +- .../koin/domain/track/repository/MemberRepository.java | 2 +- .../domain/track/repository/TechStackRepository.java | 2 +- .../koin/domain/track/repository/TrackRepository.java | 2 +- .../koin/domain/track/service/TrackService.java | 6 +++--- .../koin/domain/user/{domain => model}/Student.java | 2 +- .../koin/domain/user/{domain => model}/User.java | 2 +- .../koin/domain/user/{domain => model}/UserGender.java | 2 +- .../domain/user/{domain => model}/UserIdentity.java | 2 +- .../koin/domain/user/{domain => model}/UserToken.java | 2 +- .../koin/domain/user/{domain => model}/UserType.java | 2 +- .../koin/domain/user/repository/UserRepository.java | 2 +- .../domain/user/repository/UserTokenRepository.java | 2 +- .../koin/domain/user/service/UserService.java | 4 ++-- .../java/in/koreatech/koin/acceptance/ShopApiTest.java | 10 +++++----- .../in/koreatech/koin/acceptance/TrackApiTest.java | 6 +++--- .../java/in/koreatech/koin/acceptance/UserApiTest.java | 6 +++--- 30 files changed, 48 insertions(+), 48 deletions(-) rename src/main/java/in/koreatech/koin/domain/shop/{domain => model}/Menu.java (98%) rename src/main/java/in/koreatech/koin/domain/shop/{domain => model}/MenuCategory.java (96%) rename src/main/java/in/koreatech/koin/domain/shop/{domain => model}/MenuCategoryMap.java (97%) rename src/main/java/in/koreatech/koin/domain/shop/{domain => model}/MenuImage.java (96%) rename src/main/java/in/koreatech/koin/domain/shop/{domain => model}/MenuOption.java (97%) rename src/main/java/in/koreatech/koin/domain/track/{domain => model}/Member.java (97%) rename src/main/java/in/koreatech/koin/domain/track/{domain => model}/TechStack.java (96%) rename src/main/java/in/koreatech/koin/domain/track/{domain => model}/Track.java (95%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/Student.java (95%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/User.java (98%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/UserGender.java (54%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/UserIdentity.java (90%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/UserToken.java (94%) rename src/main/java/in/koreatech/koin/domain/user/{domain => model}/UserType.java (87%) diff --git a/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java b/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java index 636c292f5..e688cf60c 100644 --- a/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java +++ b/src/main/java/in/koreatech/koin/domain/auth/JwtProvider.java @@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import in.koreatech.koin.domain.user.domain.User; +import in.koreatech.koin.domain.user.model.User; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; diff --git a/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java b/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java index 093cafb72..03dbaf604 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java +++ b/src/main/java/in/koreatech/koin/domain/shop/dto/ShopMenuResponse.java @@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.shop.domain.Menu; -import in.koreatech.koin.domain.shop.domain.MenuCategory; -import in.koreatech.koin.domain.shop.domain.MenuImage; -import in.koreatech.koin.domain.shop.domain.MenuOption; +import in.koreatech.koin.domain.shop.model.Menu; +import in.koreatech.koin.domain.shop.model.MenuCategory; +import in.koreatech.koin.domain.shop.model.MenuImage; +import in.koreatech.koin.domain.shop.model.MenuOption; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java b/src/main/java/in/koreatech/koin/domain/shop/model/Menu.java similarity index 98% rename from src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java rename to src/main/java/in/koreatech/koin/domain/shop/model/Menu.java index d31de6c65..0c89a4c53 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/domain/Menu.java +++ b/src/main/java/in/koreatech/koin/domain/shop/model/Menu.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop.domain; +package in.koreatech.koin.domain.shop.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java b/src/main/java/in/koreatech/koin/domain/shop/model/MenuCategory.java similarity index 96% rename from src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java rename to src/main/java/in/koreatech/koin/domain/shop/model/MenuCategory.java index 8621f733c..e9c73255d 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategory.java +++ b/src/main/java/in/koreatech/koin/domain/shop/model/MenuCategory.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop.domain; +package in.koreatech.koin.domain.shop.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java b/src/main/java/in/koreatech/koin/domain/shop/model/MenuCategoryMap.java similarity index 97% rename from src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java rename to src/main/java/in/koreatech/koin/domain/shop/model/MenuCategoryMap.java index 537fb5165..b5417e86f 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuCategoryMap.java +++ b/src/main/java/in/koreatech/koin/domain/shop/model/MenuCategoryMap.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop.domain; +package in.koreatech.koin.domain.shop.model; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java b/src/main/java/in/koreatech/koin/domain/shop/model/MenuImage.java similarity index 96% rename from src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java rename to src/main/java/in/koreatech/koin/domain/shop/model/MenuImage.java index 85f728397..5b7af596a 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuImage.java +++ b/src/main/java/in/koreatech/koin/domain/shop/model/MenuImage.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop.domain; +package in.koreatech.koin.domain.shop.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java b/src/main/java/in/koreatech/koin/domain/shop/model/MenuOption.java similarity index 97% rename from src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java rename to src/main/java/in/koreatech/koin/domain/shop/model/MenuOption.java index a783209f4..f7f61000a 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/domain/MenuOption.java +++ b/src/main/java/in/koreatech/koin/domain/shop/model/MenuOption.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.shop.domain; +package in.koreatech.koin.domain.shop.model; import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java b/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java index 18cce2a81..d06c52dbb 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java +++ b/src/main/java/in/koreatech/koin/domain/shop/repository/MenuRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.shop.domain.Menu; +import in.koreatech.koin.domain.shop.model.Menu; public interface MenuRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java b/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java index 631a1cf89..9d2ee55b2 100644 --- a/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java +++ b/src/main/java/in/koreatech/koin/domain/shop/service/ShopService.java @@ -5,9 +5,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import in.koreatech.koin.domain.shop.domain.Menu; -import in.koreatech.koin.domain.shop.domain.MenuCategory; -import in.koreatech.koin.domain.shop.domain.MenuCategoryMap; +import in.koreatech.koin.domain.shop.model.Menu; +import in.koreatech.koin.domain.shop.model.MenuCategory; +import in.koreatech.koin.domain.shop.model.MenuCategoryMap; import in.koreatech.koin.domain.shop.dto.ShopMenuResponse; import in.koreatech.koin.domain.shop.repository.MenuRepository; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java index 67f40d1ed..1058aaffe 100644 --- a/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackResponse.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.model.Track; @JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class) public record TrackResponse( diff --git a/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java index bbf37c15e..f7d4aa94b 100644 --- a/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java +++ b/src/main/java/in/koreatech/koin/domain/track/dto/TrackSingleResponse.java @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import in.koreatech.koin.domain.track.domain.Member; -import in.koreatech.koin.domain.track.domain.TechStack; -import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.model.Member; +import in.koreatech.koin.domain.track.model.TechStack; +import in.koreatech.koin.domain.track.model.Track; public record TrackSingleResponse( @JsonProperty("TrackName") String trackName, diff --git a/src/main/java/in/koreatech/koin/domain/track/domain/Member.java b/src/main/java/in/koreatech/koin/domain/track/model/Member.java similarity index 97% rename from src/main/java/in/koreatech/koin/domain/track/domain/Member.java rename to src/main/java/in/koreatech/koin/domain/track/model/Member.java index 055759714..02af84551 100644 --- a/src/main/java/in/koreatech/koin/domain/track/domain/Member.java +++ b/src/main/java/in/koreatech/koin/domain/track/model/Member.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.track.domain; +package in.koreatech.koin.domain.track.model; import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java b/src/main/java/in/koreatech/koin/domain/track/model/TechStack.java similarity index 96% rename from src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java rename to src/main/java/in/koreatech/koin/domain/track/model/TechStack.java index e52fc3d81..75858abca 100644 --- a/src/main/java/in/koreatech/koin/domain/track/domain/TechStack.java +++ b/src/main/java/in/koreatech/koin/domain/track/model/TechStack.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.track.domain; +package in.koreatech.koin.domain.track.model; import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/track/domain/Track.java b/src/main/java/in/koreatech/koin/domain/track/model/Track.java similarity index 95% rename from src/main/java/in/koreatech/koin/domain/track/domain/Track.java rename to src/main/java/in/koreatech/koin/domain/track/model/Track.java index c985f5456..febf0b2b7 100644 --- a/src/main/java/in/koreatech/koin/domain/track/domain/Track.java +++ b/src/main/java/in/koreatech/koin/domain/track/model/Track.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.track.domain; +package in.koreatech.koin.domain.track.model; import in.koreatech.koin.global.common.BaseEntity; import jakarta.persistence.Column; diff --git a/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java index 0a1eccbdf..1bc1fe713 100644 --- a/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/MemberRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.track.domain.Member; +import in.koreatech.koin.domain.track.model.Member; public interface MemberRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java index 471b6ac48..939175a1b 100644 --- a/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/TechStackRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.track.domain.TechStack; +import in.koreatech.koin.domain.track.model.TechStack; public interface TechStackRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java b/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java index 1f55d3469..6c44c1bf7 100644 --- a/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java +++ b/src/main/java/in/koreatech/koin/domain/track/repository/TrackRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.model.Track; public interface TrackRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java b/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java index 9b7873adb..2c447f9d5 100644 --- a/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java +++ b/src/main/java/in/koreatech/koin/domain/track/service/TrackService.java @@ -4,9 +4,9 @@ import org.springframework.stereotype.Service; -import in.koreatech.koin.domain.track.domain.Member; -import in.koreatech.koin.domain.track.domain.TechStack; -import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.model.Member; +import in.koreatech.koin.domain.track.model.TechStack; +import in.koreatech.koin.domain.track.model.Track; import in.koreatech.koin.domain.track.dto.TrackResponse; import in.koreatech.koin.domain.track.dto.TrackSingleResponse; import in.koreatech.koin.domain.track.repository.MemberRepository; diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/Student.java b/src/main/java/in/koreatech/koin/domain/user/model/Student.java similarity index 95% rename from src/main/java/in/koreatech/koin/domain/user/domain/Student.java rename to src/main/java/in/koreatech/koin/domain/user/model/Student.java index 80458a160..eb0900893 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/Student.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/Student.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/User.java b/src/main/java/in/koreatech/koin/domain/user/model/User.java similarity index 98% rename from src/main/java/in/koreatech/koin/domain/user/domain/User.java rename to src/main/java/in/koreatech/koin/domain/user/model/User.java index b428d9edb..5f3acc685 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/User.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/User.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; import java.time.LocalDateTime; diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java b/src/main/java/in/koreatech/koin/domain/user/model/UserGender.java similarity index 54% rename from src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java rename to src/main/java/in/koreatech/koin/domain/user/model/UserGender.java index fb74d23e4..d8dd6d82d 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/UserGender.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/UserGender.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; public enum UserGender { MAN, diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java b/src/main/java/in/koreatech/koin/domain/user/model/UserIdentity.java similarity index 90% rename from src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java rename to src/main/java/in/koreatech/koin/domain/user/model/UserIdentity.java index 42c862886..791d24627 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/UserIdentity.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/UserIdentity.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java b/src/main/java/in/koreatech/koin/domain/user/model/UserToken.java similarity index 94% rename from src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java rename to src/main/java/in/koreatech/koin/domain/user/model/UserToken.java index 22c378579..5502e0e5a 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/UserToken.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/UserToken.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/in/koreatech/koin/domain/user/domain/UserType.java b/src/main/java/in/koreatech/koin/domain/user/model/UserType.java similarity index 87% rename from src/main/java/in/koreatech/koin/domain/user/domain/UserType.java rename to src/main/java/in/koreatech/koin/domain/user/model/UserType.java index 1193fc32b..01bc02fba 100644 --- a/src/main/java/in/koreatech/koin/domain/user/domain/UserType.java +++ b/src/main/java/in/koreatech/koin/domain/user/model/UserType.java @@ -1,4 +1,4 @@ -package in.koreatech.koin.domain.user.domain; +package in.koreatech.koin.domain.user.model; import lombok.Getter; diff --git a/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java b/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java index e1127d377..3ecf5950f 100644 --- a/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java +++ b/src/main/java/in/koreatech/koin/domain/user/repository/UserRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.user.domain.User; +import in.koreatech.koin.domain.user.model.User; public interface UserRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java b/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java index d2183d070..562674d81 100644 --- a/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java +++ b/src/main/java/in/koreatech/koin/domain/user/repository/UserTokenRepository.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.Repository; -import in.koreatech.koin.domain.user.domain.UserToken; +import in.koreatech.koin.domain.user.model.UserToken; public interface UserTokenRepository extends Repository { diff --git a/src/main/java/in/koreatech/koin/domain/user/service/UserService.java b/src/main/java/in/koreatech/koin/domain/user/service/UserService.java index 3adf631a5..bbe2053d2 100644 --- a/src/main/java/in/koreatech/koin/domain/user/service/UserService.java +++ b/src/main/java/in/koreatech/koin/domain/user/service/UserService.java @@ -7,8 +7,8 @@ import org.springframework.transaction.annotation.Transactional; import in.koreatech.koin.domain.auth.JwtProvider; -import in.koreatech.koin.domain.user.domain.User; -import in.koreatech.koin.domain.user.domain.UserToken; +import in.koreatech.koin.domain.user.model.User; +import in.koreatech.koin.domain.user.model.UserToken; import in.koreatech.koin.domain.user.dto.UserLoginRequest; import in.koreatech.koin.domain.user.dto.UserLoginResponse; import in.koreatech.koin.domain.user.repository.UserRepository; diff --git a/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java b/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java index ffde01e45..72acf9604 100644 --- a/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/ShopApiTest.java @@ -7,11 +7,11 @@ import org.springframework.http.HttpStatus; import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.shop.domain.Menu; -import in.koreatech.koin.domain.shop.domain.MenuCategory; -import in.koreatech.koin.domain.shop.domain.MenuCategoryMap; -import in.koreatech.koin.domain.shop.domain.MenuImage; -import in.koreatech.koin.domain.shop.domain.MenuOption; +import in.koreatech.koin.domain.shop.model.Menu; +import in.koreatech.koin.domain.shop.model.MenuCategory; +import in.koreatech.koin.domain.shop.model.MenuCategoryMap; +import in.koreatech.koin.domain.shop.model.MenuImage; +import in.koreatech.koin.domain.shop.model.MenuOption; import in.koreatech.koin.domain.shop.repository.MenuRepository; import io.restassured.RestAssured; import io.restassured.response.ExtractableResponse; diff --git a/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java b/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java index df5917291..88aa2a375 100644 --- a/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/TrackApiTest.java @@ -9,9 +9,9 @@ import org.springframework.http.HttpStatus; import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.track.domain.Member; -import in.koreatech.koin.domain.track.domain.TechStack; -import in.koreatech.koin.domain.track.domain.Track; +import in.koreatech.koin.domain.track.model.Member; +import in.koreatech.koin.domain.track.model.TechStack; +import in.koreatech.koin.domain.track.model.Track; import in.koreatech.koin.domain.track.repository.MemberRepository; import in.koreatech.koin.domain.track.repository.TechStackRepository; import in.koreatech.koin.domain.track.repository.TrackRepository; diff --git a/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java b/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java index 074e7051a..a47f424c3 100644 --- a/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java +++ b/src/test/java/in/koreatech/koin/acceptance/UserApiTest.java @@ -8,9 +8,9 @@ import org.springframework.http.HttpStatus; import in.koreatech.koin.AcceptanceTest; -import in.koreatech.koin.domain.user.domain.User; -import in.koreatech.koin.domain.user.domain.UserToken; -import in.koreatech.koin.domain.user.domain.UserType; +import in.koreatech.koin.domain.user.model.User; +import in.koreatech.koin.domain.user.model.UserToken; +import in.koreatech.koin.domain.user.model.UserType; import in.koreatech.koin.domain.user.repository.UserRepository; import in.koreatech.koin.domain.user.repository.UserTokenRepository; import io.restassured.RestAssured;