From c2897babd19639d017d5e3261bdb339adc0086ac Mon Sep 17 00:00:00 2001 From: nohy6630 Date: Thu, 23 May 2024 16:12:40 +0900 Subject: [PATCH] =?UTF-8?q?Rename:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LikeController.java | 4 ++-- .../activity/dto/response/ActivityDetailsRes.java | 4 +--- .../activity/dto/response/ReadMainActivityRes.java | 2 +- .../backend/domain/activity/entity/Activity.java | 3 +-- .../{like => activity}/entity/ActivityLike.java | 3 +-- .../repository/ActivityLikeRepository.java | 4 ++-- .../repository/custom/ActivityRepositoryCustom.java | 2 +- .../repository/custom/ActivityRepositoryImpl.java | 4 ++-- .../domain/activity/service/ActivityService.java | 7 ++----- .../{like => activity}/service/LikeService.java | 6 +++--- .../domain/{email => auth}/config/BCryptConfig.java | 2 +- .../domain/{email => auth}/config/MailConfig.java | 2 +- .../{login => auth}/controller/LoginController.java | 7 +++---- .../controller/RegisterController.java | 12 ++++++------ .../dto => auth/dto/request}/LoginRequest.java | 2 +- .../auth/oauth/controller/KakaoController.java | 2 +- .../{email => auth}/service/EmailService.java | 2 +- .../{login => auth}/service/LoginService.java | 2 +- .../{register => auth}/service/RegisterService.java | 5 ++--- .../chatting/service/LastAppointmentScheduler.java | 4 ++-- .../controller/ReviewController.java | 10 +++++----- .../dto/request/CreateReviewReq.java | 2 +- .../dto/response/ExperienceReviewsRes.java | 2 +- .../dto/response/MyReviewRes.java | 5 ++--- .../dto/response/ReadReviewsByMeRes.java | 4 ++-- .../dto/response/ReviewByMeRes.java | 5 ++--- .../{review => experience}/entity/Review.java | 4 +--- .../repository/ReviewRepository.java | 6 +++--- .../repository/custom/ReviewRepositoryCustom.java | 9 +++++++++ .../repository/custom/ReviewRepositoryImpl.java | 6 ++---- .../service/ReviewService.java | 12 ++++++------ .../repository/custom/ReviewRepositoryCustom.java | 9 --------- .../domain/user/controller/UserController.java | 2 +- .../dto => user/dto/request}/EmailRequest.java | 2 +- .../dto => user/dto/request}/RegisterRequest.java | 2 +- .../domain/user/dto/response/UserOnboardingRes.java | 2 +- .../{personality => user/entity}/Personality.java | 5 +---- .../teame/backend/domain/user/entity/User.java | 5 ++--- .../backend/domain/user/service/UserService.java | 10 +++++----- .../domain/user/controller/UserControllerTest.java | 13 ------------- 40 files changed, 81 insertions(+), 113 deletions(-) rename src/main/java/com/meetup/teame/backend/domain/{like => activity}/controller/LikeController.java (91%) rename src/main/java/com/meetup/teame/backend/domain/{like => activity}/entity/ActivityLike.java (88%) rename src/main/java/com/meetup/teame/backend/domain/{like => activity}/repository/ActivityLikeRepository.java (83%) rename src/main/java/com/meetup/teame/backend/domain/{like => activity}/service/LikeService.java (90%) rename src/main/java/com/meetup/teame/backend/domain/{email => auth}/config/BCryptConfig.java (86%) rename src/main/java/com/meetup/teame/backend/domain/{email => auth}/config/MailConfig.java (96%) rename src/main/java/com/meetup/teame/backend/domain/{login => auth}/controller/LoginController.java (90%) rename src/main/java/com/meetup/teame/backend/domain/{register => auth}/controller/RegisterController.java (86%) rename src/main/java/com/meetup/teame/backend/domain/{login/dto => auth/dto/request}/LoginRequest.java (79%) rename src/main/java/com/meetup/teame/backend/domain/{email => auth}/service/EmailService.java (97%) rename src/main/java/com/meetup/teame/backend/domain/{login => auth}/service/LoginService.java (94%) rename src/main/java/com/meetup/teame/backend/domain/{register => auth}/service/RegisterService.java (82%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/controller/ReviewController.java (81%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/dto/request/CreateReviewReq.java (78%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/dto/response/MyReviewRes.java (86%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/dto/response/ReadReviewsByMeRes.java (79%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/dto/response/ReviewByMeRes.java (90%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/entity/Review.java (90%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/repository/ReviewRepository.java (56%) create mode 100644 src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryCustom.java rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/repository/custom/ReviewRepositoryImpl.java (77%) rename src/main/java/com/meetup/teame/backend/domain/{review => experience}/service/ReviewService.java (82%) delete mode 100644 src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryCustom.java rename src/main/java/com/meetup/teame/backend/domain/{email/dto => user/dto/request}/EmailRequest.java (57%) rename src/main/java/com/meetup/teame/backend/domain/{register/dto => user/dto/request}/RegisterRequest.java (94%) rename src/main/java/com/meetup/teame/backend/domain/{personality => user/entity}/Personality.java (85%) diff --git a/src/main/java/com/meetup/teame/backend/domain/like/controller/LikeController.java b/src/main/java/com/meetup/teame/backend/domain/activity/controller/LikeController.java similarity index 91% rename from src/main/java/com/meetup/teame/backend/domain/like/controller/LikeController.java rename to src/main/java/com/meetup/teame/backend/domain/activity/controller/LikeController.java index 6ce4b68..975f256 100644 --- a/src/main/java/com/meetup/teame/backend/domain/like/controller/LikeController.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/controller/LikeController.java @@ -1,6 +1,6 @@ -package com.meetup.teame.backend.domain.like.controller; +package com.meetup.teame.backend.domain.activity.controller; -import com.meetup.teame.backend.domain.like.service.LikeService; +import com.meetup.teame.backend.domain.activity.service.LikeService; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ActivityDetailsRes.java b/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ActivityDetailsRes.java index c9c9333..0679df6 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ActivityDetailsRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ActivityDetailsRes.java @@ -1,14 +1,12 @@ package com.meetup.teame.backend.domain.activity.dto.response; import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.Comment; -import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Locale; diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ReadMainActivityRes.java b/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ReadMainActivityRes.java index ab7b791..a8f9033 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ReadMainActivityRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/dto/response/ReadMainActivityRes.java @@ -1,7 +1,7 @@ package com.meetup.teame.backend.domain.activity.dto.response; import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import lombok.*; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java b/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java index 2ac829f..a7c8c21 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/entity/Activity.java @@ -1,8 +1,7 @@ package com.meetup.teame.backend.domain.activity.entity; import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; -import com.meetup.teame.backend.domain.like.entity.ActivityLike; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.Comment; diff --git a/src/main/java/com/meetup/teame/backend/domain/like/entity/ActivityLike.java b/src/main/java/com/meetup/teame/backend/domain/activity/entity/ActivityLike.java similarity index 88% rename from src/main/java/com/meetup/teame/backend/domain/like/entity/ActivityLike.java rename to src/main/java/com/meetup/teame/backend/domain/activity/entity/ActivityLike.java index faf7779..a3397b2 100644 --- a/src/main/java/com/meetup/teame/backend/domain/like/entity/ActivityLike.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/entity/ActivityLike.java @@ -1,6 +1,5 @@ -package com.meetup.teame.backend.domain.like.entity; +package com.meetup.teame.backend.domain.activity.entity; -import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.user.entity.User; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/like/repository/ActivityLikeRepository.java b/src/main/java/com/meetup/teame/backend/domain/activity/repository/ActivityLikeRepository.java similarity index 83% rename from src/main/java/com/meetup/teame/backend/domain/like/repository/ActivityLikeRepository.java rename to src/main/java/com/meetup/teame/backend/domain/activity/repository/ActivityLikeRepository.java index 49cf047..37e7dc0 100644 --- a/src/main/java/com/meetup/teame/backend/domain/like/repository/ActivityLikeRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/repository/ActivityLikeRepository.java @@ -1,7 +1,7 @@ -package com.meetup.teame.backend.domain.like.repository; +package com.meetup.teame.backend.domain.activity.repository; import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.like.entity.ActivityLike; +import com.meetup.teame.backend.domain.activity.entity.ActivityLike; import com.meetup.teame.backend.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java b/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java index 81b561b..4cb119c 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java @@ -2,7 +2,7 @@ import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.activity.entity.AgencyType; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import com.meetup.teame.backend.domain.user.entity.User; import java.util.List; diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java b/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java index fc9185b..e6ac2da 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java @@ -2,7 +2,7 @@ import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.activity.entity.AgencyType; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import com.meetup.teame.backend.domain.user.entity.User; import com.querydsl.core.BooleanBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -12,7 +12,7 @@ import java.util.List; import static com.meetup.teame.backend.domain.activity.entity.QActivity.activity; -import static com.meetup.teame.backend.domain.like.entity.QActivityLike.activityLike; +import static com.meetup.teame.backend.domain.activity.entity.QActivityLike.activityLike; @RequiredArgsConstructor public class ActivityRepositoryImpl implements ActivityRepositoryCustom { diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java b/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java index 6f9d1ba..e617c87 100644 --- a/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java @@ -1,7 +1,6 @@ package com.meetup.teame.backend.domain.activity.service; import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; import com.meetup.teame.backend.domain.activity.dto.request.ReadActivitiesReq; import com.meetup.teame.backend.domain.activity.dto.response.ActivityDetailsRes; import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes; @@ -10,8 +9,8 @@ import com.meetup.teame.backend.domain.activity.entity.AgencyType; import com.meetup.teame.backend.domain.activity.repository.ActivityRepository; import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider; -import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.activity.repository.ActivityLikeRepository; +import com.meetup.teame.backend.domain.user.entity.Personality; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; import com.meetup.teame.backend.global.exception.CustomException; @@ -21,8 +20,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.net.URL; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/meetup/teame/backend/domain/like/service/LikeService.java b/src/main/java/com/meetup/teame/backend/domain/activity/service/LikeService.java similarity index 90% rename from src/main/java/com/meetup/teame/backend/domain/like/service/LikeService.java rename to src/main/java/com/meetup/teame/backend/domain/activity/service/LikeService.java index ad6bd5f..6f7462f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/like/service/LikeService.java +++ b/src/main/java/com/meetup/teame/backend/domain/activity/service/LikeService.java @@ -1,10 +1,10 @@ -package com.meetup.teame.backend.domain.like.service; +package com.meetup.teame.backend.domain.activity.service; import com.meetup.teame.backend.domain.activity.entity.Activity; import com.meetup.teame.backend.domain.activity.repository.ActivityRepository; import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider; -import com.meetup.teame.backend.domain.like.entity.ActivityLike; -import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository; +import com.meetup.teame.backend.domain.activity.entity.ActivityLike; +import com.meetup.teame.backend.domain.activity.repository.ActivityLikeRepository; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; import com.meetup.teame.backend.global.exception.CustomException; diff --git a/src/main/java/com/meetup/teame/backend/domain/email/config/BCryptConfig.java b/src/main/java/com/meetup/teame/backend/domain/auth/config/BCryptConfig.java similarity index 86% rename from src/main/java/com/meetup/teame/backend/domain/email/config/BCryptConfig.java rename to src/main/java/com/meetup/teame/backend/domain/auth/config/BCryptConfig.java index c26f92f..7ca8459 100644 --- a/src/main/java/com/meetup/teame/backend/domain/email/config/BCryptConfig.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/config/BCryptConfig.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.email.config; +package com.meetup.teame.backend.domain.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/meetup/teame/backend/domain/email/config/MailConfig.java b/src/main/java/com/meetup/teame/backend/domain/auth/config/MailConfig.java similarity index 96% rename from src/main/java/com/meetup/teame/backend/domain/email/config/MailConfig.java rename to src/main/java/com/meetup/teame/backend/domain/auth/config/MailConfig.java index 6f52783..b8b1fdf 100644 --- a/src/main/java/com/meetup/teame/backend/domain/email/config/MailConfig.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/config/MailConfig.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.email.config; +package com.meetup.teame.backend.domain.auth.config; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/meetup/teame/backend/domain/login/controller/LoginController.java b/src/main/java/com/meetup/teame/backend/domain/auth/controller/LoginController.java similarity index 90% rename from src/main/java/com/meetup/teame/backend/domain/login/controller/LoginController.java rename to src/main/java/com/meetup/teame/backend/domain/auth/controller/LoginController.java index 7f00a9e..fd4dddb 100644 --- a/src/main/java/com/meetup/teame/backend/domain/login/controller/LoginController.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/controller/LoginController.java @@ -1,11 +1,10 @@ -package com.meetup.teame.backend.domain.login.controller; +package com.meetup.teame.backend.domain.auth.controller; import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService; -import com.meetup.teame.backend.domain.login.dto.LoginRequest; -import com.meetup.teame.backend.domain.login.service.LoginService; +import com.meetup.teame.backend.domain.auth.dto.request.LoginRequest; +import com.meetup.teame.backend.domain.auth.service.LoginService; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; -import com.meetup.teame.backend.domain.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/meetup/teame/backend/domain/register/controller/RegisterController.java b/src/main/java/com/meetup/teame/backend/domain/auth/controller/RegisterController.java similarity index 86% rename from src/main/java/com/meetup/teame/backend/domain/register/controller/RegisterController.java rename to src/main/java/com/meetup/teame/backend/domain/auth/controller/RegisterController.java index d8c8f0b..392f4f3 100644 --- a/src/main/java/com/meetup/teame/backend/domain/register/controller/RegisterController.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/controller/RegisterController.java @@ -1,11 +1,11 @@ -package com.meetup.teame.backend.domain.register.controller; +package com.meetup.teame.backend.domain.auth.controller; import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService; -import com.meetup.teame.backend.domain.email.dto.EmailRequest; -import com.meetup.teame.backend.domain.email.service.EmailService; -import com.meetup.teame.backend.domain.login.service.LoginService; -import com.meetup.teame.backend.domain.register.dto.RegisterRequest; -import com.meetup.teame.backend.domain.register.service.RegisterService; +import com.meetup.teame.backend.domain.user.dto.request.EmailRequest; +import com.meetup.teame.backend.domain.auth.service.EmailService; +import com.meetup.teame.backend.domain.auth.service.LoginService; +import com.meetup.teame.backend.domain.user.dto.request.RegisterRequest; +import com.meetup.teame.backend.domain.auth.service.RegisterService; import com.meetup.teame.backend.domain.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/meetup/teame/backend/domain/login/dto/LoginRequest.java b/src/main/java/com/meetup/teame/backend/domain/auth/dto/request/LoginRequest.java similarity index 79% rename from src/main/java/com/meetup/teame/backend/domain/login/dto/LoginRequest.java rename to src/main/java/com/meetup/teame/backend/domain/auth/dto/request/LoginRequest.java index bb01050..e4421bc 100644 --- a/src/main/java/com/meetup/teame/backend/domain/login/dto/LoginRequest.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/dto/request/LoginRequest.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.login.dto; +package com.meetup.teame.backend.domain.auth.dto.request; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/meetup/teame/backend/domain/auth/oauth/controller/KakaoController.java b/src/main/java/com/meetup/teame/backend/domain/auth/oauth/controller/KakaoController.java index 81cb05f..1f80bfc 100644 --- a/src/main/java/com/meetup/teame/backend/domain/auth/oauth/controller/KakaoController.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/oauth/controller/KakaoController.java @@ -4,7 +4,7 @@ import com.meetup.teame.backend.domain.auth.oauth.dto.CreateOauthUserRequest; import com.meetup.teame.backend.domain.auth.oauth.dto.CreateUserRequest; import com.meetup.teame.backend.domain.auth.oauth.service.KakaoService; -import com.meetup.teame.backend.domain.login.service.LoginService; +import com.meetup.teame.backend.domain.auth.service.LoginService; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; import com.meetup.teame.backend.domain.user.service.UserService; diff --git a/src/main/java/com/meetup/teame/backend/domain/email/service/EmailService.java b/src/main/java/com/meetup/teame/backend/domain/auth/service/EmailService.java similarity index 97% rename from src/main/java/com/meetup/teame/backend/domain/email/service/EmailService.java rename to src/main/java/com/meetup/teame/backend/domain/auth/service/EmailService.java index 616649e..13086fd 100644 --- a/src/main/java/com/meetup/teame/backend/domain/email/service/EmailService.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/service/EmailService.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.email.service; +package com.meetup.teame.backend.domain.auth.service; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; diff --git a/src/main/java/com/meetup/teame/backend/domain/login/service/LoginService.java b/src/main/java/com/meetup/teame/backend/domain/auth/service/LoginService.java similarity index 94% rename from src/main/java/com/meetup/teame/backend/domain/login/service/LoginService.java rename to src/main/java/com/meetup/teame/backend/domain/auth/service/LoginService.java index 71a7fc0..1d24dec 100644 --- a/src/main/java/com/meetup/teame/backend/domain/login/service/LoginService.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/service/LoginService.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.login.service; +package com.meetup.teame.backend.domain.auth.service; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; diff --git a/src/main/java/com/meetup/teame/backend/domain/register/service/RegisterService.java b/src/main/java/com/meetup/teame/backend/domain/auth/service/RegisterService.java similarity index 82% rename from src/main/java/com/meetup/teame/backend/domain/register/service/RegisterService.java rename to src/main/java/com/meetup/teame/backend/domain/auth/service/RegisterService.java index 67a8b94..c5e02c7 100644 --- a/src/main/java/com/meetup/teame/backend/domain/register/service/RegisterService.java +++ b/src/main/java/com/meetup/teame/backend/domain/auth/service/RegisterService.java @@ -1,7 +1,6 @@ -package com.meetup.teame.backend.domain.register.service; +package com.meetup.teame.backend.domain.auth.service; -import com.meetup.teame.backend.domain.register.dto.RegisterRequest; -import com.meetup.teame.backend.domain.user.repository.UserRepository; +import com.meetup.teame.backend.domain.user.dto.request.RegisterRequest; import com.meetup.teame.backend.domain.user.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java b/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java index 59a2f28..15f79ef 100644 --- a/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java +++ b/src/main/java/com/meetup/teame/backend/domain/chatting/service/LastAppointmentScheduler.java @@ -4,8 +4,8 @@ import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.chatting.repository.DirectChatRoomRepository; import com.meetup.teame.backend.domain.chatting.repository.GroupChatRoomRepository; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.review.repository.ReviewRepository; +import com.meetup.teame.backend.domain.experience.entity.Review; +import com.meetup.teame.backend.domain.experience.repository.ReviewRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/controller/ReviewController.java b/src/main/java/com/meetup/teame/backend/domain/experience/controller/ReviewController.java similarity index 81% rename from src/main/java/com/meetup/teame/backend/domain/review/controller/ReviewController.java rename to src/main/java/com/meetup/teame/backend/domain/experience/controller/ReviewController.java index 2728778..a87d72f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/controller/ReviewController.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/controller/ReviewController.java @@ -1,9 +1,9 @@ -package com.meetup.teame.backend.domain.review.controller; +package com.meetup.teame.backend.domain.experience.controller; -import com.meetup.teame.backend.domain.review.dto.request.CreateReviewReq; -import com.meetup.teame.backend.domain.review.dto.response.ReadReviewsByMeRes; -import com.meetup.teame.backend.domain.review.dto.response.ReviewByMeRes; -import com.meetup.teame.backend.domain.review.service.ReviewService; +import com.meetup.teame.backend.domain.experience.dto.request.CreateReviewReq; +import com.meetup.teame.backend.domain.experience.dto.response.ReadReviewsByMeRes; +import com.meetup.teame.backend.domain.experience.dto.response.ReviewByMeRes; +import com.meetup.teame.backend.domain.experience.service.ReviewService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/dto/request/CreateReviewReq.java b/src/main/java/com/meetup/teame/backend/domain/experience/dto/request/CreateReviewReq.java similarity index 78% rename from src/main/java/com/meetup/teame/backend/domain/review/dto/request/CreateReviewReq.java rename to src/main/java/com/meetup/teame/backend/domain/experience/dto/request/CreateReviewReq.java index b9a92e3..a17b938 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/dto/request/CreateReviewReq.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/dto/request/CreateReviewReq.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.review.dto.request; +package com.meetup.teame.backend.domain.experience.dto.request; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ExperienceReviewsRes.java b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ExperienceReviewsRes.java index 74b5367..4395974 100644 --- a/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ExperienceReviewsRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ExperienceReviewsRes.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.meetup.teame.backend.domain.experience.entity.ExperienceType; -import com.meetup.teame.backend.domain.review.entity.Review; +import com.meetup.teame.backend.domain.experience.entity.Review; import com.meetup.teame.backend.domain.user.entity.User; import lombok.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/MyReviewRes.java b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/MyReviewRes.java similarity index 86% rename from src/main/java/com/meetup/teame/backend/domain/review/dto/response/MyReviewRes.java rename to src/main/java/com/meetup/teame/backend/domain/experience/dto/response/MyReviewRes.java index 7c42794..cb15397 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/MyReviewRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/MyReviewRes.java @@ -1,8 +1,7 @@ -package com.meetup.teame.backend.domain.review.dto.response; +package com.meetup.teame.backend.domain.experience.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.user.entity.User; +import com.meetup.teame.backend.domain.experience.entity.Review; import lombok.*; import java.time.LocalDate; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReadReviewsByMeRes.java b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReadReviewsByMeRes.java similarity index 79% rename from src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReadReviewsByMeRes.java rename to src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReadReviewsByMeRes.java index c5a8991..cb1ce5d 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReadReviewsByMeRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReadReviewsByMeRes.java @@ -1,6 +1,6 @@ -package com.meetup.teame.backend.domain.review.dto.response; +package com.meetup.teame.backend.domain.experience.dto.response; -import com.meetup.teame.backend.domain.review.entity.Review; +import com.meetup.teame.backend.domain.experience.entity.Review; import lombok.*; import java.util.List; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReviewByMeRes.java b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReviewByMeRes.java similarity index 90% rename from src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReviewByMeRes.java rename to src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReviewByMeRes.java index e43d802..e8d85bd 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/dto/response/ReviewByMeRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/dto/response/ReviewByMeRes.java @@ -1,8 +1,7 @@ -package com.meetup.teame.backend.domain.review.dto.response; +package com.meetup.teame.backend.domain.experience.dto.response; import com.fasterxml.jackson.annotation.JsonFormat; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.user.entity.Gender; +import com.meetup.teame.backend.domain.experience.entity.Review; import lombok.*; import java.time.LocalDate; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java b/src/main/java/com/meetup/teame/backend/domain/experience/entity/Review.java similarity index 90% rename from src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java rename to src/main/java/com/meetup/teame/backend/domain/experience/entity/Review.java index d75ab00..c1a67d9 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/entity/Review.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/entity/Review.java @@ -1,8 +1,6 @@ -package com.meetup.teame.backend.domain.review.entity; +package com.meetup.teame.backend.domain.experience.entity; import com.meetup.teame.backend.domain.chatting.entity.Appointment; -import com.meetup.teame.backend.domain.experience.entity.Experience; -import com.meetup.teame.backend.domain.experience.entity.ExperienceType; import com.meetup.teame.backend.domain.user.entity.User; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/repository/ReviewRepository.java b/src/main/java/com/meetup/teame/backend/domain/experience/repository/ReviewRepository.java similarity index 56% rename from src/main/java/com/meetup/teame/backend/domain/review/repository/ReviewRepository.java rename to src/main/java/com/meetup/teame/backend/domain/experience/repository/ReviewRepository.java index 412e3a7..6193f55 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/repository/ReviewRepository.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/repository/ReviewRepository.java @@ -1,7 +1,7 @@ -package com.meetup.teame.backend.domain.review.repository; +package com.meetup.teame.backend.domain.experience.repository; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.review.repository.custom.ReviewRepositoryCustom; +import com.meetup.teame.backend.domain.experience.entity.Review; +import com.meetup.teame.backend.domain.experience.repository.custom.ReviewRepositoryCustom; import com.meetup.teame.backend.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryCustom.java b/src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryCustom.java new file mode 100644 index 0000000..a497baf --- /dev/null +++ b/src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryCustom.java @@ -0,0 +1,9 @@ +package com.meetup.teame.backend.domain.experience.repository.custom; + +import com.meetup.teame.backend.domain.experience.entity.Review; + +import java.util.List; + +public interface ReviewRepositoryCustom { + List findReviewsByUserId(Long userId, String type); +} diff --git a/src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryImpl.java b/src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryImpl.java similarity index 77% rename from src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryImpl.java rename to src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryImpl.java index 7a54fed..c9dfe2f 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryImpl.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/repository/custom/ReviewRepositoryImpl.java @@ -1,15 +1,13 @@ -package com.meetup.teame.backend.domain.review.repository.custom; +package com.meetup.teame.backend.domain.experience.repository.custom; import com.meetup.teame.backend.domain.experience.entity.ExperienceType; -import com.meetup.teame.backend.domain.review.entity.QReview; -import com.meetup.teame.backend.domain.review.entity.Review; +import com.meetup.teame.backend.domain.experience.entity.Review; import com.querydsl.core.BooleanBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import java.util.List; -import static com.meetup.teame.backend.domain.experience.entity.QExperience.experience; import static com.meetup.teame.backend.domain.review.entity.QReview.review; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/service/ReviewService.java b/src/main/java/com/meetup/teame/backend/domain/experience/service/ReviewService.java similarity index 82% rename from src/main/java/com/meetup/teame/backend/domain/review/service/ReviewService.java rename to src/main/java/com/meetup/teame/backend/domain/experience/service/ReviewService.java index caa3548..7e2a5a8 100644 --- a/src/main/java/com/meetup/teame/backend/domain/review/service/ReviewService.java +++ b/src/main/java/com/meetup/teame/backend/domain/experience/service/ReviewService.java @@ -1,11 +1,11 @@ -package com.meetup.teame.backend.domain.review.service; +package com.meetup.teame.backend.domain.experience.service; import com.meetup.teame.backend.domain.auth.jwt.SecurityContextProvider; -import com.meetup.teame.backend.domain.review.dto.request.CreateReviewReq; -import com.meetup.teame.backend.domain.review.dto.response.ReadReviewsByMeRes; -import com.meetup.teame.backend.domain.review.dto.response.ReviewByMeRes; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.review.repository.ReviewRepository; +import com.meetup.teame.backend.domain.experience.dto.request.CreateReviewReq; +import com.meetup.teame.backend.domain.experience.dto.response.ReadReviewsByMeRes; +import com.meetup.teame.backend.domain.experience.dto.response.ReviewByMeRes; +import com.meetup.teame.backend.domain.experience.entity.Review; +import com.meetup.teame.backend.domain.experience.repository.ReviewRepository; import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.repository.UserRepository; import com.meetup.teame.backend.global.exception.CustomException; diff --git a/src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryCustom.java b/src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryCustom.java deleted file mode 100644 index 890b526..0000000 --- a/src/main/java/com/meetup/teame/backend/domain/review/repository/custom/ReviewRepositoryCustom.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.meetup.teame.backend.domain.review.repository.custom; - -import com.meetup.teame.backend.domain.review.entity.Review; - -import java.util.List; - -public interface ReviewRepositoryCustom { - List findReviewsByUserId(Long userId, String type); -} diff --git a/src/main/java/com/meetup/teame/backend/domain/user/controller/UserController.java b/src/main/java/com/meetup/teame/backend/domain/user/controller/UserController.java index 5923778..13a8cc6 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/controller/UserController.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/controller/UserController.java @@ -1,7 +1,7 @@ package com.meetup.teame.backend.domain.user.controller; import com.meetup.teame.backend.domain.activity.dto.response.ActivitySummaryRes; -import com.meetup.teame.backend.domain.review.dto.response.MyReviewRes; +import com.meetup.teame.backend.domain.experience.dto.response.MyReviewRes; import com.meetup.teame.backend.domain.user.dto.request.MyExperienceReq; import com.meetup.teame.backend.domain.user.dto.request.OnboardingReq; import com.meetup.teame.backend.domain.user.dto.request.ReadCalenderReq; diff --git a/src/main/java/com/meetup/teame/backend/domain/email/dto/EmailRequest.java b/src/main/java/com/meetup/teame/backend/domain/user/dto/request/EmailRequest.java similarity index 57% rename from src/main/java/com/meetup/teame/backend/domain/email/dto/EmailRequest.java rename to src/main/java/com/meetup/teame/backend/domain/user/dto/request/EmailRequest.java index 40ff2bf..772837d 100644 --- a/src/main/java/com/meetup/teame/backend/domain/email/dto/EmailRequest.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/dto/request/EmailRequest.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.email.dto; +package com.meetup.teame.backend.domain.user.dto.request; import lombok.Getter; diff --git a/src/main/java/com/meetup/teame/backend/domain/register/dto/RegisterRequest.java b/src/main/java/com/meetup/teame/backend/domain/user/dto/request/RegisterRequest.java similarity index 94% rename from src/main/java/com/meetup/teame/backend/domain/register/dto/RegisterRequest.java rename to src/main/java/com/meetup/teame/backend/domain/user/dto/request/RegisterRequest.java index a4c7ae1..cc47d94 100644 --- a/src/main/java/com/meetup/teame/backend/domain/register/dto/RegisterRequest.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/dto/request/RegisterRequest.java @@ -1,4 +1,4 @@ -package com.meetup.teame.backend.domain.register.dto; +package com.meetup.teame.backend.domain.user.dto.request; import com.meetup.teame.backend.domain.user.entity.Gender; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/UserOnboardingRes.java b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/UserOnboardingRes.java index 3637fac..5137cd2 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/dto/response/UserOnboardingRes.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/dto/response/UserOnboardingRes.java @@ -1,6 +1,6 @@ package com.meetup.teame.backend.domain.user.dto.response; -import com.meetup.teame.backend.domain.personality.Personality; +import com.meetup.teame.backend.domain.user.entity.Personality; import com.meetup.teame.backend.domain.user.entity.User; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/meetup/teame/backend/domain/personality/Personality.java b/src/main/java/com/meetup/teame/backend/domain/user/entity/Personality.java similarity index 85% rename from src/main/java/com/meetup/teame/backend/domain/personality/Personality.java rename to src/main/java/com/meetup/teame/backend/domain/user/entity/Personality.java index c168281..682d4ee 100644 --- a/src/main/java/com/meetup/teame/backend/domain/personality/Personality.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/entity/Personality.java @@ -1,13 +1,10 @@ -package com.meetup.teame.backend.domain.personality; +package com.meetup.teame.backend.domain.user.entity; -import com.meetup.teame.backend.domain.activity.entity.AgencyType; import com.meetup.teame.backend.global.exception.CustomException; import com.meetup.teame.backend.global.exception.ExceptionContent; import lombok.Getter; import lombok.RequiredArgsConstructor; -import java.util.Arrays; - @Getter @RequiredArgsConstructor public enum Personality { diff --git a/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java b/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java index 2f590b1..bb82bb3 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/entity/User.java @@ -2,10 +2,9 @@ import com.meetup.teame.backend.domain.chatting.entity.DirectChatRoom; import com.meetup.teame.backend.domain.chatting.entity.UserChatRoom; -import com.meetup.teame.backend.domain.personality.Personality; import com.meetup.teame.backend.domain.experience.entity.Experience; -import com.meetup.teame.backend.domain.like.entity.ActivityLike; -import com.meetup.teame.backend.domain.review.entity.Review; +import com.meetup.teame.backend.domain.activity.entity.ActivityLike; +import com.meetup.teame.backend.domain.experience.entity.Review; import com.meetup.teame.backend.domain.user.dto.request.UpdateUserReq; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java b/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java index d3f99ea..cb28322 100644 --- a/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java +++ b/src/main/java/com/meetup/teame/backend/domain/user/service/UserService.java @@ -9,11 +9,11 @@ import com.meetup.teame.backend.domain.chatting.entity.GroupChatRoom; import com.meetup.teame.backend.domain.experience.entity.Experience; import com.meetup.teame.backend.domain.experience.repository.ExperienceRepository; -import com.meetup.teame.backend.domain.like.repository.ActivityLikeRepository; -import com.meetup.teame.backend.domain.personality.Personality; -import com.meetup.teame.backend.domain.review.dto.response.MyReviewRes; -import com.meetup.teame.backend.domain.review.entity.Review; -import com.meetup.teame.backend.domain.review.repository.ReviewRepository; +import com.meetup.teame.backend.domain.activity.repository.ActivityLikeRepository; +import com.meetup.teame.backend.domain.user.entity.Personality; +import com.meetup.teame.backend.domain.experience.dto.response.MyReviewRes; +import com.meetup.teame.backend.domain.experience.entity.Review; +import com.meetup.teame.backend.domain.experience.repository.ReviewRepository; import com.meetup.teame.backend.domain.user.dto.request.MyExperienceReq; import com.meetup.teame.backend.domain.user.dto.request.OnboardingReq; import com.meetup.teame.backend.domain.user.dto.request.ReadCalenderReq; diff --git a/src/test/java/com/meetup/teame/backend/domain/user/controller/UserControllerTest.java b/src/test/java/com/meetup/teame/backend/domain/user/controller/UserControllerTest.java index d2fa3c5..643b002 100644 --- a/src/test/java/com/meetup/teame/backend/domain/user/controller/UserControllerTest.java +++ b/src/test/java/com/meetup/teame/backend/domain/user/controller/UserControllerTest.java @@ -1,13 +1,6 @@ package com.meetup.teame.backend.domain.user.controller; import com.fasterxml.jackson.databind.ObjectMapper; -import com.meetup.teame.backend.domain.activity.entity.Activity; -import com.meetup.teame.backend.domain.personality.Personality; -import com.meetup.teame.backend.domain.experience.entity.Experience; -import com.meetup.teame.backend.domain.experience.entity.ExperienceType; -import com.meetup.teame.backend.domain.user.dto.response.ReadMainRes; -import com.meetup.teame.backend.domain.user.entity.Gender; -import com.meetup.teame.backend.domain.user.entity.User; import com.meetup.teame.backend.domain.user.service.UserService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,17 +9,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import java.time.LocalDateTime; -import java.util.List; - -import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ExtendWith(MockitoExtension.class) class UserControllerTest {