From 0d27603499b0654ff573217c8f4deebcc7d16924 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:11:30 +0900 Subject: [PATCH 01/10] =?UTF-8?q?[#250]=20refactor:=20link=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=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 --- .../main/java/com/app/toaster/{ => link}/domain/Link.java | 2 +- .../toaster/{ => link}/infrastructure/LinkRepository.java | 7 ++----- .../{service/link => link/service}/LinkService.java | 6 +++--- .../com/app/toaster/toast/controller/ToastController.java | 2 +- .../app/toaster/toast/controller/response/WeekLinkDto.java | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => link}/domain/Link.java (96%) rename linkmind/src/main/java/com/app/toaster/{ => link}/infrastructure/LinkRepository.java (71%) rename linkmind/src/main/java/com/app/toaster/{service/link => link/service}/LinkService.java (87%) diff --git a/linkmind/src/main/java/com/app/toaster/domain/Link.java b/linkmind/src/main/java/com/app/toaster/link/domain/Link.java similarity index 96% rename from linkmind/src/main/java/com/app/toaster/domain/Link.java rename to linkmind/src/main/java/com/app/toaster/link/domain/Link.java index 48188126..e35e61f2 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Link.java +++ b/linkmind/src/main/java/com/app/toaster/link/domain/Link.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.link.domain; import com.fasterxml.jackson.annotation.JsonRootName; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/LinkRepository.java b/linkmind/src/main/java/com/app/toaster/link/infrastructure/LinkRepository.java similarity index 71% rename from linkmind/src/main/java/com/app/toaster/infrastructure/LinkRepository.java rename to linkmind/src/main/java/com/app/toaster/link/infrastructure/LinkRepository.java index 6a63beba..b99e7a44 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/LinkRepository.java +++ b/linkmind/src/main/java/com/app/toaster/link/infrastructure/LinkRepository.java @@ -1,13 +1,10 @@ -package com.app.toaster.infrastructure; +package com.app.toaster.link.infrastructure; -import com.app.toaster.domain.Category; -import com.app.toaster.domain.Link; -import com.app.toaster.domain.User; +import com.app.toaster.link.domain.Link; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; -import java.util.ArrayList; import java.util.List; @Repository diff --git a/linkmind/src/main/java/com/app/toaster/service/link/LinkService.java b/linkmind/src/main/java/com/app/toaster/link/service/LinkService.java similarity index 87% rename from linkmind/src/main/java/com/app/toaster/service/link/LinkService.java rename to linkmind/src/main/java/com/app/toaster/link/service/LinkService.java index 1358e865..adcc03d4 100644 --- a/linkmind/src/main/java/com/app/toaster/service/link/LinkService.java +++ b/linkmind/src/main/java/com/app/toaster/link/service/LinkService.java @@ -1,8 +1,8 @@ -package com.app.toaster.service.link; +package com.app.toaster.link.service; import com.app.toaster.toast.controller.response.WeekLinkDto; -import com.app.toaster.domain.Link; -import com.app.toaster.infrastructure.LinkRepository; +import com.app.toaster.link.domain.Link; +import com.app.toaster.link.infrastructure.LinkRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java index d875f895..9c315ff9 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.List; -import com.app.toaster.service.link.LinkService; +import com.app.toaster.link.service.LinkService; import com.app.toaster.toast.controller.request.*; import com.app.toaster.toast.controller.response.*; import org.springframework.http.HttpStatus; diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/response/WeekLinkDto.java b/linkmind/src/main/java/com/app/toaster/toast/controller/response/WeekLinkDto.java index 1046f1fd..d728e92b 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/response/WeekLinkDto.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/response/WeekLinkDto.java @@ -1,6 +1,6 @@ package com.app.toaster.toast.controller.response; -import com.app.toaster.domain.Link; +import com.app.toaster.link.domain.Link; public record WeekLinkDto(Long linkId, String linkTitle, String linkImg, String linkUrl) { public static WeekLinkDto of(Link link){ From 0d98f7b694c3c30c08499dde4b8cf320ad56bb5c Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:17:34 +0900 Subject: [PATCH 02/10] =?UTF-8?q?[#250]=20refactor:=20=ED=83=80=EC=9D=B4?= =?UTF-8?q?=EB=A8=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/app/toaster/domain/Category.java | 4 +--- .../app/toaster/service/auth/AuthService.java | 7 +------ .../service/category/CategoryService.java | 4 ++-- .../toaster/service/timer/TimerService.java | 18 +++++++++--------- .../controller/TimerController.java | 17 +++++------------ .../request}/CreateTimerRequestDto.java | 2 +- .../request}/UpdateTimerCommentDto.java | 2 +- .../request}/UpdateTimerDateTimeDto.java | 2 +- .../response}/CompletedTimerDto.java | 8 ++------ .../response}/GetTimerPageResponseDto.java | 2 +- .../response}/GetTimerResponseDto.java | 8 ++------ .../controller/response}/WaitingTimerDto.java | 6 ++---- .../toaster/{ => timer}/domain/Reminder.java | 5 ++++- .../infrastructure/TimerRepository.java | 8 +++----- 14 files changed, 35 insertions(+), 58 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => timer}/controller/TimerController.java (83%) rename linkmind/src/main/java/com/app/toaster/{controller/request/timer => timer/controller/request}/CreateTimerRequestDto.java (80%) rename linkmind/src/main/java/com/app/toaster/{controller/request/timer => timer/controller/request}/UpdateTimerCommentDto.java (54%) rename linkmind/src/main/java/com/app/toaster/{controller/request/timer => timer/controller/request}/UpdateTimerDateTimeDto.java (70%) rename linkmind/src/main/java/com/app/toaster/{controller/response/timer => timer/controller/response}/CompletedTimerDto.java (66%) rename linkmind/src/main/java/com/app/toaster/{controller/response/timer => timer/controller/response}/GetTimerPageResponseDto.java (78%) rename linkmind/src/main/java/com/app/toaster/{controller/response/timer => timer/controller/response}/GetTimerResponseDto.java (65%) rename linkmind/src/main/java/com/app/toaster/{controller/response/timer => timer/controller/response}/WaitingTimerDto.java (81%) rename linkmind/src/main/java/com/app/toaster/{ => timer}/domain/Reminder.java (90%) rename linkmind/src/main/java/com/app/toaster/{ => timer}/infrastructure/TimerRepository.java (79%) diff --git a/linkmind/src/main/java/com/app/toaster/domain/Category.java b/linkmind/src/main/java/com/app/toaster/domain/Category.java index 82003080..a7bc4549 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Category.java +++ b/linkmind/src/main/java/com/app/toaster/domain/Category.java @@ -1,12 +1,10 @@ package com.app.toaster.domain; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; +import com.app.toaster.timer.domain.Reminder; import jakarta.persistence.*; -import jakarta.validation.constraints.Size; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java b/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java index 93becbc8..0cb0fdae 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java +++ b/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java @@ -1,13 +1,10 @@ package com.app.toaster.service.auth; import java.io.IOException; -import java.time.LocalDateTime; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.context.request.WebRequest; import com.app.toaster.config.jwt.JwtService; @@ -18,17 +15,15 @@ import com.app.toaster.domain.SocialType; import com.app.toaster.domain.User; import com.app.toaster.exception.Error; -import com.app.toaster.exception.Success; import com.app.toaster.exception.model.CustomException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.exception.model.UnprocessableEntityException; -import com.app.toaster.external.client.discord.DiscordMessage; import com.app.toaster.external.client.discord.DiscordMessageProvider; import com.app.toaster.external.client.discord.NotificationDto; import com.app.toaster.external.client.discord.NotificationType; import com.app.toaster.external.client.slack.SlackApi; import com.app.toaster.infrastructure.CategoryRepository; -import com.app.toaster.infrastructure.TimerRepository; +import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.infrastructure.UserRepository; import com.app.toaster.popup.infrastructure.PopupManagerRepository; diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java index 7e477997..1d56926b 100644 --- a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java +++ b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java @@ -8,7 +8,7 @@ import com.app.toaster.controller.response.category.CategoryResponse; import com.app.toaster.controller.response.category.GetCategoryResponseDto; import com.app.toaster.domain.Category; -import com.app.toaster.domain.Reminder; +import com.app.toaster.timer.domain.Reminder; import com.app.toaster.toast.domain.Toast; import com.app.toaster.domain.User; import com.app.toaster.exception.Error; @@ -16,7 +16,7 @@ import com.app.toaster.exception.model.CustomException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.infrastructure.CategoryRepository; -import com.app.toaster.infrastructure.TimerRepository; +import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.infrastructure.UserRepository; diff --git a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java b/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java index 0d063d6b..f3484193 100644 --- a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java +++ b/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java @@ -1,14 +1,14 @@ package com.app.toaster.service.timer; -import com.app.toaster.controller.request.timer.CreateTimerRequestDto; -import com.app.toaster.controller.request.timer.UpdateTimerCommentDto; -import com.app.toaster.controller.request.timer.UpdateTimerDateTimeDto; -import com.app.toaster.controller.response.timer.CompletedTimerDto; -import com.app.toaster.controller.response.timer.GetTimerPageResponseDto; -import com.app.toaster.controller.response.timer.GetTimerResponseDto; -import com.app.toaster.controller.response.timer.WaitingTimerDto; +import com.app.toaster.timer.controller.request.CreateTimerRequestDto; +import com.app.toaster.timer.controller.request.UpdateTimerCommentDto; +import com.app.toaster.timer.controller.request.UpdateTimerDateTimeDto; +import com.app.toaster.timer.controller.response.CompletedTimerDto; +import com.app.toaster.timer.controller.response.GetTimerPageResponseDto; +import com.app.toaster.timer.controller.response.GetTimerResponseDto; +import com.app.toaster.timer.controller.response.WaitingTimerDto; import com.app.toaster.domain.Category; -import com.app.toaster.domain.Reminder; +import com.app.toaster.timer.domain.Reminder; import com.app.toaster.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.CustomException; @@ -16,7 +16,7 @@ import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.exception.model.UnauthorizedException; import com.app.toaster.infrastructure.CategoryRepository; -import com.app.toaster.infrastructure.TimerRepository; +import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/linkmind/src/main/java/com/app/toaster/controller/TimerController.java b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java similarity index 83% rename from linkmind/src/main/java/com/app/toaster/controller/TimerController.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java index f8e6612d..4ff76cd4 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/TimerController.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java @@ -1,24 +1,17 @@ -package com.app.toaster.controller; +package com.app.toaster.timer.controller; import com.app.toaster.common.dto.ApiResponse; import com.app.toaster.config.UserId; -import com.app.toaster.controller.request.timer.CreateTimerRequestDto; -import com.app.toaster.controller.request.timer.UpdateTimerCommentDto; -import com.app.toaster.controller.request.timer.UpdateTimerDateTimeDto; -import com.app.toaster.controller.response.timer.GetTimerResponseDto; -import com.app.toaster.exception.Error; +import com.app.toaster.timer.controller.request.CreateTimerRequestDto; +import com.app.toaster.timer.controller.request.UpdateTimerCommentDto; +import com.app.toaster.timer.controller.request.UpdateTimerDateTimeDto; +import com.app.toaster.timer.controller.response.GetTimerResponseDto; import com.app.toaster.exception.Success; -import com.app.toaster.exception.model.CustomException; import com.app.toaster.service.timer.TimerService; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import java.io.IOException; - @RestController @RequiredArgsConstructor @RequestMapping("/timer") diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/timer/CreateTimerRequestDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/request/CreateTimerRequestDto.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/request/timer/CreateTimerRequestDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/request/CreateTimerRequestDto.java index 43ead24f..7180246d 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/timer/CreateTimerRequestDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/request/CreateTimerRequestDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.timer; +package com.app.toaster.timer.controller.request; import lombok.Getter; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerCommentDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerCommentDto.java similarity index 54% rename from linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerCommentDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerCommentDto.java index effa0185..b4ea5884 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerCommentDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerCommentDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.timer; +package com.app.toaster.timer.controller.request; public record UpdateTimerCommentDto(String newComment) { } diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerDateTimeDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerDateTimeDto.java similarity index 70% rename from linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerDateTimeDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerDateTimeDto.java index b09485ac..46c6369a 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/timer/UpdateTimerDateTimeDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/request/UpdateTimerDateTimeDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.timer; +package com.app.toaster.timer.controller.request; import java.util.ArrayList; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/timer/CompletedTimerDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/response/CompletedTimerDto.java similarity index 66% rename from linkmind/src/main/java/com/app/toaster/controller/response/timer/CompletedTimerDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/response/CompletedTimerDto.java index 4d21a373..74228b43 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/timer/CompletedTimerDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/response/CompletedTimerDto.java @@ -1,10 +1,6 @@ -package com.app.toaster.controller.response.timer; +package com.app.toaster.timer.controller.response; -import com.app.toaster.controller.response.search.CategoryResult; -import com.app.toaster.controller.response.search.SearchCategoryResult; -import com.app.toaster.domain.Reminder; - -import java.util.List; +import com.app.toaster.timer.domain.Reminder; public record CompletedTimerDto(Long timerId, Long categoryId, String remindTime, String remindDate, String comment) { public static CompletedTimerDto of(Reminder timer,String remindTime, String remindDate){ diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerPageResponseDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerPageResponseDto.java similarity index 78% rename from linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerPageResponseDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerPageResponseDto.java index cd47332e..72120552 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerPageResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerPageResponseDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.timer; +package com.app.toaster.timer.controller.response; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerResponseDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerResponseDto.java similarity index 65% rename from linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerResponseDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerResponseDto.java index 9311b07b..ae436344 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/response/GetTimerResponseDto.java @@ -1,12 +1,8 @@ -package com.app.toaster.controller.response.timer; +package com.app.toaster.timer.controller.response; -import com.app.toaster.controller.response.search.CategoryResult; -import com.app.toaster.controller.response.search.SearchMainResult; -import com.app.toaster.controller.response.search.ToastResult; -import com.app.toaster.domain.Reminder; +import com.app.toaster.timer.domain.Reminder; import java.util.ArrayList; -import java.util.List; public record GetTimerResponseDto (String categoryName, String remindTime, diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/timer/WaitingTimerDto.java b/linkmind/src/main/java/com/app/toaster/timer/controller/response/WaitingTimerDto.java similarity index 81% rename from linkmind/src/main/java/com/app/toaster/controller/response/timer/WaitingTimerDto.java rename to linkmind/src/main/java/com/app/toaster/timer/controller/response/WaitingTimerDto.java index 91860816..8e779bea 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/timer/WaitingTimerDto.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/response/WaitingTimerDto.java @@ -1,10 +1,8 @@ -package com.app.toaster.controller.response.timer; +package com.app.toaster.timer.controller.response; -import com.app.toaster.domain.Reminder; +import com.app.toaster.timer.domain.Reminder; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; public record WaitingTimerDto(Long timerId, String remindTime, String remindDates, Boolean isAlarm, LocalDateTime updateAt, String comment, Long categoryId) { public static WaitingTimerDto of(Reminder timer, String remindTime, String remindDates) { diff --git a/linkmind/src/main/java/com/app/toaster/domain/Reminder.java b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java similarity index 90% rename from linkmind/src/main/java/com/app/toaster/domain/Reminder.java rename to linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java index 4f513176..ee31c76a 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Reminder.java +++ b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java @@ -1,5 +1,8 @@ -package com.app.toaster.domain; +package com.app.toaster.timer.domain; +import com.app.toaster.domain.Category; +import com.app.toaster.domain.IntegerListConverter; +import com.app.toaster.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/TimerRepository.java b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java similarity index 79% rename from linkmind/src/main/java/com/app/toaster/infrastructure/TimerRepository.java rename to linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java index 53183b93..29f01329 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/TimerRepository.java +++ b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java @@ -1,17 +1,15 @@ -package com.app.toaster.infrastructure; +package com.app.toaster.timer.infrastructure; import com.app.toaster.domain.Category; -import com.app.toaster.domain.Reminder; +import com.app.toaster.timer.domain.Reminder; import com.app.toaster.domain.User; -import org.checkerframework.checker.units.qual.C; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; import java.util.ArrayList; -import java.util.List; + @Repository public interface TimerRepository extends JpaRepository { From 86a90bdbf4dbd0a592fab20332dd3541e55e7333 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:23:10 +0900 Subject: [PATCH 03/10] =?UTF-8?q?[#250]=20refactor:=20=EC=B6=94=EC=B2=9C?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EB=B0=8F=20timer=20service=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RecommendSiteController.java | 7 +++---- .../toaster/{ => recommendsite}/domain/RecommendSite.java | 4 +--- .../com/app/toaster/{ => recommendsite}/domain/Topic.java | 2 +- .../infrastructure/RecommedSiteRepository.java | 7 ++----- .../service}/RecommendSiteService.java | 8 +++----- .../com/app/toaster/timer/controller/TimerController.java | 2 +- .../{service/timer => timer/service}/TimerService.java | 2 +- 7 files changed, 12 insertions(+), 20 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => recommendsite}/controller/RecommendSiteController.java (78%) rename linkmind/src/main/java/com/app/toaster/{ => recommendsite}/domain/RecommendSite.java (92%) rename linkmind/src/main/java/com/app/toaster/{ => recommendsite}/domain/Topic.java (83%) rename linkmind/src/main/java/com/app/toaster/{ => recommendsite}/infrastructure/RecommedSiteRepository.java (52%) rename linkmind/src/main/java/com/app/toaster/{service/recommendSite => recommendsite/service}/RecommendSiteService.java (60%) rename linkmind/src/main/java/com/app/toaster/{service/timer => timer/service}/TimerService.java (99%) diff --git a/linkmind/src/main/java/com/app/toaster/controller/RecommendSiteController.java b/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java similarity index 78% rename from linkmind/src/main/java/com/app/toaster/controller/RecommendSiteController.java rename to linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java index 0c742977..dad637e0 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/RecommendSiteController.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java @@ -1,13 +1,12 @@ -package com.app.toaster.controller; +package com.app.toaster.recommendsite.controller; import com.app.toaster.common.dto.ApiResponse; import com.app.toaster.config.UserId; -import com.app.toaster.domain.RecommendSite; +import com.app.toaster.recommendsite.domain.RecommendSite; import com.app.toaster.exception.Success; -import com.app.toaster.service.recommendSite.RecommendSiteService; +import com.app.toaster.recommendsite.service.RecommendSiteService; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/domain/RecommendSite.java b/linkmind/src/main/java/com/app/toaster/recommendsite/domain/RecommendSite.java similarity index 92% rename from linkmind/src/main/java/com/app/toaster/domain/RecommendSite.java rename to linkmind/src/main/java/com/app/toaster/recommendsite/domain/RecommendSite.java index 84af147d..ed392a9e 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/RecommendSite.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/domain/RecommendSite.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.recommendsite.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,8 +6,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - @Getter @Entity diff --git a/linkmind/src/main/java/com/app/toaster/domain/Topic.java b/linkmind/src/main/java/com/app/toaster/recommendsite/domain/Topic.java similarity index 83% rename from linkmind/src/main/java/com/app/toaster/domain/Topic.java rename to linkmind/src/main/java/com/app/toaster/recommendsite/domain/Topic.java index 09e36124..d20673dd 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Topic.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/domain/Topic.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.recommendsite.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/RecommedSiteRepository.java b/linkmind/src/main/java/com/app/toaster/recommendsite/infrastructure/RecommedSiteRepository.java similarity index 52% rename from linkmind/src/main/java/com/app/toaster/infrastructure/RecommedSiteRepository.java rename to linkmind/src/main/java/com/app/toaster/recommendsite/infrastructure/RecommedSiteRepository.java index 425ce2e3..fb2fbcee 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/RecommedSiteRepository.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/infrastructure/RecommedSiteRepository.java @@ -1,12 +1,9 @@ -package com.app.toaster.infrastructure; +package com.app.toaster.recommendsite.infrastructure; -import com.app.toaster.domain.RecommendSite; +import com.app.toaster.recommendsite.domain.RecommendSite; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.ArrayList; -import java.util.List; - public interface RecommedSiteRepository extends JpaRepository { } diff --git a/linkmind/src/main/java/com/app/toaster/service/recommendSite/RecommendSiteService.java b/linkmind/src/main/java/com/app/toaster/recommendsite/service/RecommendSiteService.java similarity index 60% rename from linkmind/src/main/java/com/app/toaster/service/recommendSite/RecommendSiteService.java rename to linkmind/src/main/java/com/app/toaster/recommendsite/service/RecommendSiteService.java index 8da86813..0fc66795 100644 --- a/linkmind/src/main/java/com/app/toaster/service/recommendSite/RecommendSiteService.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/service/RecommendSiteService.java @@ -1,12 +1,10 @@ -package com.app.toaster.service.recommendSite; +package com.app.toaster.recommendsite.service; -import com.app.toaster.domain.RecommendSite; -import com.app.toaster.infrastructure.RecommedSiteRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.recommendsite.domain.RecommendSite; +import com.app.toaster.recommendsite.infrastructure.RecommedSiteRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java index 4ff76cd4..31c1d353 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java @@ -7,7 +7,7 @@ import com.app.toaster.timer.controller.request.UpdateTimerDateTimeDto; import com.app.toaster.timer.controller.response.GetTimerResponseDto; import com.app.toaster.exception.Success; -import com.app.toaster.service.timer.TimerService; +import com.app.toaster.timer.service.TimerService; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; diff --git a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java similarity index 99% rename from linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java rename to linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java index f3484193..564ecc74 100644 --- a/linkmind/src/main/java/com/app/toaster/service/timer/TimerService.java +++ b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.timer; +package com.app.toaster.timer.service; import com.app.toaster.timer.controller.request.CreateTimerRequestDto; import com.app.toaster.timer.controller.request.UpdateTimerCommentDto; From 29a7d3aa22a545c6d2ff25c86fd71acf4caacce8 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:25:17 +0900 Subject: [PATCH 04/10] =?UTF-8?q?[#250]=20refactor:=20parsing=20service=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{service/parse => parse/service}/ParsingService.java | 2 +- .../java/com/app/toaster/toast/controller/ToastController.java | 2 +- .../main/java/com/app/toaster/toast/service/ToastService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename linkmind/src/main/java/com/app/toaster/{service/parse => parse/service}/ParsingService.java (98%) diff --git a/linkmind/src/main/java/com/app/toaster/service/parse/ParsingService.java b/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java similarity index 98% rename from linkmind/src/main/java/com/app/toaster/service/parse/ParsingService.java rename to linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java index 2df81e58..41d3c158 100644 --- a/linkmind/src/main/java/com/app/toaster/service/parse/ParsingService.java +++ b/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.parse; +package com.app.toaster.parse.service; import java.io.IOException; import java.net.ConnectException; diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java index 9c315ff9..d00465e9 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java @@ -22,7 +22,7 @@ // import com.app.toaster.config.UserId; import com.app.toaster.config.UserId; import com.app.toaster.exception.Success; -import com.app.toaster.service.parse.ParsingService; +import com.app.toaster.parse.service.ParsingService; import com.app.toaster.toast.service.ToastService; import jakarta.validation.Valid; diff --git a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java index dbeb7c9a..876476e1 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java +++ b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java @@ -28,7 +28,7 @@ import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.infrastructure.UserRepository; -import com.app.toaster.service.parse.ParsingService; +import com.app.toaster.parse.service.ParsingService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; From a2ffb045e467a9d6ccdc72f1f5b6f9a3406157e0 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:36:23 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[#250]=20refactor:=20auth,=20user=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => auth}/controller/AuthController.java | 12 +++++----- .../controller/request}/SignInRequestDto.java | 2 +- .../response}/SignInResponseDto.java | 2 +- .../controller/response}/TokenHealthDto.java | 2 +- .../response}/TokenResponseDto.java | 2 +- .../auth => auth/service}/AuthService.java | 22 +++++++++---------- .../service}/apple/AppleSignInService.java | 11 +++++----- .../apple/response/ApplePublicKey.java | 2 +- .../apple/response/ApplePublicKeys.java | 4 +--- .../service}/apple/verify/AppleJwtParser.java | 2 +- .../service}/apple/verify/EncryptUtils.java | 2 +- .../apple/verify/PublicKeyGenerator.java | 8 +++---- .../service}/kakao/KakaoAccount.java | 2 +- .../service}/kakao/KakaoSignInService.java | 3 +-- .../service}/kakao/KakaoUserProfile.java | 2 +- .../service}/kakao/KakaoUserResponse.java | 2 +- .../service}/kakao/LoginResult.java | 2 +- .../auth => auth/service}/kakao/Strategy.java | 2 +- .../controller/HealthCheckController.java | 4 ---- .../java/com/app/toaster/domain/Category.java | 1 + .../discord/DiscordMessageProvider.java | 5 +---- .../external/client/slack/SlackApi.java | 2 +- .../infrastructure/CategoryRepository.java | 5 +---- .../querydsl/CustomToastRepository.java | 2 +- .../controller/response}/OgResponse.java | 2 +- .../toaster/parse/service/ParsingService.java | 7 +----- .../service/category/CategoryService.java | 4 ++-- .../toaster/service/search/SearchService.java | 4 ++-- .../app/toaster/timer/domain/Reminder.java | 7 +----- .../timer/infrastructure/TimerRepository.java | 2 +- .../toaster/timer/service/TimerService.java | 4 ++-- .../com/app/toaster/toast/domain/Toast.java | 5 +---- .../toast/infrastructure/ToastRepository.java | 2 +- .../toaster/toast/service/ToastService.java | 6 ++--- .../{ => user}/controller/UserController.java | 7 +++--- .../request}/UpdateAllowedPush.java | 2 +- .../controller/response}/MyPageResponse.java | 2 +- .../controller/response}/SettingResponse.java | 2 +- .../toaster/{ => user}/domain/SocialType.java | 2 +- .../app/toaster/{ => user}/domain/User.java | 2 +- .../infrastructure/UserRepository.java | 6 ++--- .../{ => user}/service/UserService.java | 10 ++++----- .../querydsl/CustomToastRepositoryTest.java | 2 +- 43 files changed, 76 insertions(+), 105 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => auth}/controller/AuthController.java (85%) rename linkmind/src/main/java/com/app/toaster/{controller/request/auth => auth/controller/request}/SignInRequestDto.java (59%) rename linkmind/src/main/java/com/app/toaster/{controller/response/auth => auth/controller/response}/SignInResponseDto.java (89%) rename linkmind/src/main/java/com/app/toaster/{controller/response/auth => auth/controller/response}/TokenHealthDto.java (75%) rename linkmind/src/main/java/com/app/toaster/{controller/response/auth => auth/controller/response}/TokenResponseDto.java (81%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/AuthService.java (91%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/AppleSignInService.java (78%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/response/ApplePublicKey.java (67%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/response/ApplePublicKeys.java (84%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/verify/AppleJwtParser.java (97%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/verify/EncryptUtils.java (93%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/apple/verify/PublicKeyGenerator.java (88%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/KakaoAccount.java (56%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/KakaoSignInService.java (96%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/KakaoUserProfile.java (63%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/KakaoUserResponse.java (80%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/LoginResult.java (81%) rename linkmind/src/main/java/com/app/toaster/{service/auth => auth/service}/kakao/Strategy.java (51%) rename linkmind/src/main/java/com/app/toaster/{controller/response/parse => parse/controller/response}/OgResponse.java (80%) rename linkmind/src/main/java/com/app/toaster/{ => user}/controller/UserController.java (90%) rename linkmind/src/main/java/com/app/toaster/{controller/request/user => user/controller/request}/UpdateAllowedPush.java (54%) rename linkmind/src/main/java/com/app/toaster/{controller/response/user => user/controller/response}/MyPageResponse.java (87%) rename linkmind/src/main/java/com/app/toaster/{controller/response/user => user/controller/response}/SettingResponse.java (80%) rename linkmind/src/main/java/com/app/toaster/{ => user}/domain/SocialType.java (77%) rename linkmind/src/main/java/com/app/toaster/{ => user}/domain/User.java (97%) rename linkmind/src/main/java/com/app/toaster/{ => user}/infrastructure/UserRepository.java (79%) rename linkmind/src/main/java/com/app/toaster/{ => user}/service/UserService.java (94%) diff --git a/linkmind/src/main/java/com/app/toaster/controller/AuthController.java b/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java similarity index 85% rename from linkmind/src/main/java/com/app/toaster/controller/AuthController.java rename to linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java index 0bd3f6a7..0de5381a 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/AuthController.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller; +package com.app.toaster.auth.controller; import java.io.IOException; @@ -14,12 +14,12 @@ import com.app.toaster.common.dto.ApiResponse; // import com.app.toaster.config.UserId; import com.app.toaster.config.UserId; -import com.app.toaster.controller.request.auth.SignInRequestDto; -import com.app.toaster.controller.response.auth.SignInResponseDto; -import com.app.toaster.controller.response.auth.TokenHealthDto; -import com.app.toaster.controller.response.auth.TokenResponseDto; +import com.app.toaster.auth.controller.request.SignInRequestDto; +import com.app.toaster.auth.controller.response.SignInResponseDto; +import com.app.toaster.auth.controller.response.TokenHealthDto; +import com.app.toaster.auth.controller.response.TokenResponseDto; import com.app.toaster.exception.Success; -import com.app.toaster.service.auth.AuthService; +import com.app.toaster.auth.service.AuthService; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java b/linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java similarity index 59% rename from linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java rename to linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java index a8876bfe..72742468 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.auth; +package com.app.toaster.auth.controller.request; public record SignInRequestDto(String socialType, String fcmToken) { } diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java b/linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java similarity index 89% rename from linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java rename to linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java index eee40bf6..a7269605 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.auth; +package com.app.toaster.auth.controller.response; public record SignInResponseDto(Long userId, String accessToken, String refreshToken, String fcmToken, Boolean isRegistered,Boolean fcmIsAllowed, String profile) { public static SignInResponseDto of(Long userId, String accessToken, String refreshToken, String fcmToken, diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java b/linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java similarity index 75% rename from linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java rename to linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java index 7d65e852..42455b87 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.auth; +package com.app.toaster.auth.controller.response; public record TokenHealthDto(boolean tokenHealth) { public static TokenHealthDto of(boolean tokenHealth){return new TokenHealthDto(tokenHealth);} diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java b/linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java similarity index 81% rename from linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java rename to linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java index 37f2e926..a162c1ec 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.auth; +package com.app.toaster.auth.controller.response; public record TokenResponseDto(String accessToken, String refreshToken) { public static TokenResponseDto of(String accessToken, String refreshToken){ diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java similarity index 91% rename from linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java rename to linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java index 0cb0fdae..721fb484 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth; +package com.app.toaster.auth.service; import java.io.IOException; @@ -8,12 +8,12 @@ import com.app.toaster.config.jwt.JwtService; -import com.app.toaster.controller.request.auth.SignInRequestDto; -import com.app.toaster.controller.response.auth.SignInResponseDto; -import com.app.toaster.controller.response.auth.TokenHealthDto; -import com.app.toaster.controller.response.auth.TokenResponseDto; -import com.app.toaster.domain.SocialType; -import com.app.toaster.domain.User; +import com.app.toaster.auth.controller.request.SignInRequestDto; +import com.app.toaster.auth.controller.response.SignInResponseDto; +import com.app.toaster.auth.controller.response.TokenHealthDto; +import com.app.toaster.auth.controller.response.TokenResponseDto; +import com.app.toaster.user.domain.SocialType; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.CustomException; import com.app.toaster.exception.model.NotFoundException; @@ -25,11 +25,11 @@ import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import com.app.toaster.popup.infrastructure.PopupManagerRepository; -import com.app.toaster.service.auth.apple.AppleSignInService; -import com.app.toaster.service.auth.kakao.KakaoSignInService; -import com.app.toaster.service.auth.kakao.LoginResult; +import com.app.toaster.auth.service.apple.AppleSignInService; +import com.app.toaster.auth.service.kakao.KakaoSignInService; +import com.app.toaster.auth.service.kakao.LoginResult; import com.app.toaster.toast.service.ToastService; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java similarity index 78% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java index 7c7b8330..07630819 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.apple; +package com.app.toaster.auth.service.apple; import java.security.PublicKey; import java.util.Map; @@ -7,11 +7,10 @@ import org.springframework.stereotype.Service; import org.springframework.web.client.RestClient; -import com.app.toaster.service.auth.apple.response.ApplePublicKeys; -import com.app.toaster.service.auth.apple.verify.AppleJwtParser; -import com.app.toaster.service.auth.apple.verify.PublicKeyGenerator; -import com.app.toaster.service.auth.kakao.LoginResult; -import com.mysql.cj.log.Log; +import com.app.toaster.auth.service.apple.response.ApplePublicKeys; +import com.app.toaster.auth.service.apple.verify.AppleJwtParser; +import com.app.toaster.auth.service.apple.verify.PublicKeyGenerator; +import com.app.toaster.auth.service.kakao.LoginResult; import io.jsonwebtoken.Claims; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java similarity index 67% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java index 808848bc..eb321486 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.apple.response; +package com.app.toaster.auth.service.apple.response; public record ApplePublicKey( String kty, diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java similarity index 84% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java index 09be00ee..f7f56a30 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java @@ -1,12 +1,10 @@ -package com.app.toaster.service.auth.apple.response; +package com.app.toaster.auth.service.apple.response; import java.util.List; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.CustomException; -import lombok.extern.slf4j.Slf4j; - public record ApplePublicKeys(List keys) { public ApplePublicKey getMatchesKey(String alg, String kid) { diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/AppleJwtParser.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/AppleJwtParser.java similarity index 97% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/AppleJwtParser.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/AppleJwtParser.java index 1786b1d9..59febec3 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/AppleJwtParser.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/AppleJwtParser.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.apple.verify; +package com.app.toaster.auth.service.apple.verify; import java.security.PublicKey; import java.util.Base64; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/EncryptUtils.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/EncryptUtils.java similarity index 93% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/EncryptUtils.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/EncryptUtils.java index 0635998e..d1939c09 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/EncryptUtils.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/EncryptUtils.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.apple.verify; +package com.app.toaster.auth.service.apple.verify; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/PublicKeyGenerator.java b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/PublicKeyGenerator.java similarity index 88% rename from linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/PublicKeyGenerator.java rename to linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/PublicKeyGenerator.java index 11080824..6b272d5f 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/PublicKeyGenerator.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/PublicKeyGenerator.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.apple.verify; +package com.app.toaster.auth.service.apple.verify; import java.math.BigInteger; import java.security.KeyFactory; @@ -13,10 +13,8 @@ import com.app.toaster.exception.Error; import com.app.toaster.exception.model.CustomException; -import com.app.toaster.service.auth.apple.response.ApplePublicKey; -import com.app.toaster.service.auth.apple.response.ApplePublicKeys; - -import lombok.extern.slf4j.Slf4j; +import com.app.toaster.auth.service.apple.response.ApplePublicKey; +import com.app.toaster.auth.service.apple.response.ApplePublicKeys; @Component public class PublicKeyGenerator { diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoAccount.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoAccount.java similarity index 56% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoAccount.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoAccount.java index 131902fd..d6582e1e 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoAccount.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoAccount.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; public record KakaoAccount(KakaoUserProfile profile) { } diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoSignInService.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoSignInService.java similarity index 96% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoSignInService.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoSignInService.java index 814a4ba3..c0e1bbc5 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoSignInService.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoSignInService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; import java.util.HashMap; import java.util.Map; @@ -13,7 +13,6 @@ import org.springframework.web.client.RestTemplate; import com.app.toaster.exception.Error; -import com.app.toaster.exception.model.ForbiddenException; import com.app.toaster.exception.model.UnprocessableEntityException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.JsonArray; diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserProfile.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserProfile.java similarity index 63% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserProfile.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserProfile.java index 9044293c..5667e160 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserProfile.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserProfile.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; public record KakaoUserProfile(String nickname, String profileImageUrl) { } diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserResponse.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserResponse.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserResponse.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserResponse.java index 253ce5b9..c87a5883 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/KakaoUserResponse.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/KakaoUserResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; public record KakaoUserResponse(KakaoAccount kakaoAccount) { public static KakaoUserResponse of(KakaoAccount kakaoAccount){ diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/LoginResult.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/LoginResult.java similarity index 81% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/LoginResult.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/LoginResult.java index 556e48c8..0cf22581 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/LoginResult.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/LoginResult.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; public record LoginResult(String id, String profile, String nickname) { public static LoginResult of(String id, String profile,String nickname){ diff --git a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/Strategy.java b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/Strategy.java similarity index 51% rename from linkmind/src/main/java/com/app/toaster/service/auth/kakao/Strategy.java rename to linkmind/src/main/java/com/app/toaster/auth/service/kakao/Strategy.java index bfcdf390..1ebd0793 100644 --- a/linkmind/src/main/java/com/app/toaster/service/auth/kakao/Strategy.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/kakao/Strategy.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.auth.kakao; +package com.app.toaster.auth.service.kakao; public enum Strategy { WITHDRAWAL, diff --git a/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java b/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java index 43d22a44..0d8a72c7 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java +++ b/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java @@ -1,13 +1,9 @@ package com.app.toaster.controller; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.app.toaster.external.client.discord.DiscordMessageProvider; -import com.app.toaster.external.client.discord.NotificationDto; -import com.app.toaster.external.client.discord.NotificationType; -import com.app.toaster.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/domain/Category.java b/linkmind/src/main/java/com/app/toaster/domain/Category.java index a7bc4549..dc17d703 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Category.java +++ b/linkmind/src/main/java/com/app/toaster/domain/Category.java @@ -4,6 +4,7 @@ import com.app.toaster.timer.domain.Reminder; +import com.app.toaster.user.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/external/client/discord/DiscordMessageProvider.java b/linkmind/src/main/java/com/app/toaster/external/client/discord/DiscordMessageProvider.java index 2ec99663..90f23200 100644 --- a/linkmind/src/main/java/com/app/toaster/external/client/discord/DiscordMessageProvider.java +++ b/linkmind/src/main/java/com/app/toaster/external/client/discord/DiscordMessageProvider.java @@ -15,11 +15,8 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; -import com.app.toaster.exception.Error; -import com.app.toaster.exception.model.CustomException; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; -import feign.FeignException; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/linkmind/src/main/java/com/app/toaster/external/client/slack/SlackApi.java b/linkmind/src/main/java/com/app/toaster/external/client/slack/SlackApi.java index 6c352db8..eff05bbd 100644 --- a/linkmind/src/main/java/com/app/toaster/external/client/slack/SlackApi.java +++ b/linkmind/src/main/java/com/app/toaster/external/client/slack/SlackApi.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; import com.app.toaster.exception.Success; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import com.slack.api.Slack; import com.slack.api.model.block.Blocks; import com.slack.api.model.block.LayoutBlock; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java b/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java index 0b29c63b..3190da6b 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java +++ b/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java @@ -3,18 +3,15 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; -import com.app.toaster.controller.request.category.ChangeCateoryTitleDto; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import com.app.toaster.domain.Category; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.transaction.annotation.Transactional; public interface CategoryRepository extends JpaRepository { diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java b/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java index 25044802..062dc101 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java +++ b/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java @@ -15,7 +15,7 @@ // import com.app.toaster.domain.QToast; // import com.app.toaster.domain.QUser; // import com.app.toaster.toast.domain.Toast; -// import com.app.toaster.domain.User; +// import com.app.toaster.user.domain.User; // import com.querydsl.core.types.Path; // import com.querydsl.core.types.dsl.BooleanExpression; // import com.querydsl.jpa.impl.JPAQueryFactory; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/parse/OgResponse.java b/linkmind/src/main/java/com/app/toaster/parse/controller/response/OgResponse.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/response/parse/OgResponse.java rename to linkmind/src/main/java/com/app/toaster/parse/controller/response/OgResponse.java index c7960a9e..5f705545 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/parse/OgResponse.java +++ b/linkmind/src/main/java/com/app/toaster/parse/controller/response/OgResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.parse; +package com.app.toaster.parse.controller.response; public record OgResponse(String titleAdvanced, String imageAdvanced) { public static OgResponse of(String titleAdvanced, String imageAdvanced){ diff --git a/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java b/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java index 41d3c158..758674ff 100644 --- a/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java +++ b/linkmind/src/main/java/com/app/toaster/parse/service/ParsingService.java @@ -3,9 +3,6 @@ import java.io.IOException; import java.net.ConnectException; import java.net.MalformedURLException; -import java.nio.charset.StandardCharsets; -import java.util.Base64; -import java.util.List; import javax.net.ssl.SSLHandshakeException; @@ -18,13 +15,11 @@ // import com.app.toaster.external.client.aws.S3Service; -import com.app.toaster.controller.response.parse.OgResponse; +import com.app.toaster.parse.controller.response.OgResponse; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.CustomException; -import com.app.toaster.external.client.aws.AWSConfig; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @Service diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java index 1d56926b..796d31ff 100644 --- a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java +++ b/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java @@ -10,7 +10,7 @@ import com.app.toaster.domain.Category; import com.app.toaster.timer.domain.Reminder; import com.app.toaster.toast.domain.Toast; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.CustomException; @@ -18,7 +18,7 @@ import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java b/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java index ce4a86da..eef79d6f 100644 --- a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java +++ b/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java @@ -12,14 +12,14 @@ import com.app.toaster.toast.controller.response.ToastDto; import com.app.toaster.domain.Category; import com.app.toaster.toast.domain.Toast; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.Success; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.toast.infrastructure.ToastRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java index ee31c76a..20f26b23 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java +++ b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java @@ -2,21 +2,16 @@ import com.app.toaster.domain.Category; import com.app.toaster.domain.IntegerListConverter; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.jetbrains.annotations.NotNull; -import org.springframework.cglib.core.Local; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; -import java.util.List; @Entity @Getter diff --git a/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java index 29f01329..294cee2f 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java +++ b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java @@ -2,7 +2,7 @@ import com.app.toaster.domain.Category; import com.app.toaster.timer.domain.Reminder; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java index 564ecc74..bc99f840 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java +++ b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java @@ -9,7 +9,7 @@ import com.app.toaster.timer.controller.response.WaitingTimerDto; import com.app.toaster.domain.Category; import com.app.toaster.timer.domain.Reminder; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.CustomException; import com.app.toaster.exception.model.ForbiddenException; @@ -17,7 +17,7 @@ import com.app.toaster.exception.model.UnauthorizedException; import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java b/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java index eee99993..ace56fcd 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java +++ b/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java @@ -1,17 +1,14 @@ package com.app.toaster.toast.domain; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; import com.app.toaster.domain.Category; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Entity diff --git a/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java b/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java index d02a6870..710aa4f2 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java +++ b/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java @@ -1,7 +1,7 @@ package com.app.toaster.toast.infrastructure; import com.app.toaster.domain.Category; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java index 876476e1..b5736bef 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java +++ b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java @@ -13,12 +13,12 @@ import com.app.toaster.toast.controller.request.IsReadDto; import com.app.toaster.toast.controller.request.SaveToastDto; import com.app.toaster.toast.controller.request.UpdateToastDto; -import com.app.toaster.controller.response.parse.OgResponse; +import com.app.toaster.parse.controller.response.OgResponse; import com.app.toaster.toast.controller.response.IsReadResponse; import com.app.toaster.toast.controller.response.ModifiedTitle; import com.app.toaster.domain.Category; import com.app.toaster.toast.domain.Toast; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.CustomException; @@ -27,7 +27,7 @@ import com.app.toaster.external.client.aws.S3Service; import com.app.toaster.infrastructure.CategoryRepository; import com.app.toaster.toast.infrastructure.ToastRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; import com.app.toaster.parse.service.ParsingService; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/controller/UserController.java b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java similarity index 90% rename from linkmind/src/main/java/com/app/toaster/controller/UserController.java rename to linkmind/src/main/java/com/app/toaster/user/controller/UserController.java index 4767ae16..5abb2a9c 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/UserController.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller; +package com.app.toaster.user.controller; import java.util.HashMap; import java.util.Map; @@ -8,16 +8,15 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import com.app.toaster.common.dto.ApiResponse; import com.app.toaster.config.UserId; -import com.app.toaster.controller.request.user.UpdateAllowedPush; +import com.app.toaster.user.controller.request.UpdateAllowedPush; import com.app.toaster.exception.Success; -import com.app.toaster.service.UserService; +import com.app.toaster.user.service.UserService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/user/UpdateAllowedPush.java b/linkmind/src/main/java/com/app/toaster/user/controller/request/UpdateAllowedPush.java similarity index 54% rename from linkmind/src/main/java/com/app/toaster/controller/request/user/UpdateAllowedPush.java rename to linkmind/src/main/java/com/app/toaster/user/controller/request/UpdateAllowedPush.java index 052ebd75..83d24106 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/user/UpdateAllowedPush.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/request/UpdateAllowedPush.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.user; +package com.app.toaster.user.controller.request; public record UpdateAllowedPush(Boolean allowedPush) { } diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/user/MyPageResponse.java b/linkmind/src/main/java/com/app/toaster/user/controller/response/MyPageResponse.java similarity index 87% rename from linkmind/src/main/java/com/app/toaster/controller/response/user/MyPageResponse.java rename to linkmind/src/main/java/com/app/toaster/user/controller/response/MyPageResponse.java index 75a42668..0d3ae956 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/user/MyPageResponse.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/response/MyPageResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.user; +package com.app.toaster.user.controller.response; public record MyPageResponse(String nickname, String profile, Long allReadToast, Long thisWeekendRead, Long thisWeekendSaved ) { public static MyPageResponse of(String nickname, String profile, Long allReadToast, Long thisWeekendRead, Long thisWeekendSaved ){ diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/user/SettingResponse.java b/linkmind/src/main/java/com/app/toaster/user/controller/response/SettingResponse.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/response/user/SettingResponse.java rename to linkmind/src/main/java/com/app/toaster/user/controller/response/SettingResponse.java index 03bc862e..1f48d10c 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/user/SettingResponse.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/response/SettingResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.user; +package com.app.toaster.user.controller.response; public record SettingResponse(String nickname, Boolean fcmIsAllowed) { public static SettingResponse of(String nickname, Boolean fcmIsAllowed){ diff --git a/linkmind/src/main/java/com/app/toaster/domain/SocialType.java b/linkmind/src/main/java/com/app/toaster/user/domain/SocialType.java similarity index 77% rename from linkmind/src/main/java/com/app/toaster/domain/SocialType.java rename to linkmind/src/main/java/com/app/toaster/user/domain/SocialType.java index 9d5e83d1..3d63ff1b 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/SocialType.java +++ b/linkmind/src/main/java/com/app/toaster/user/domain/SocialType.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.user.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/linkmind/src/main/java/com/app/toaster/domain/User.java b/linkmind/src/main/java/com/app/toaster/user/domain/User.java similarity index 97% rename from linkmind/src/main/java/com/app/toaster/domain/User.java rename to linkmind/src/main/java/com/app/toaster/user/domain/User.java index 4dfcaf95..a09dec12 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/User.java +++ b/linkmind/src/main/java/com/app/toaster/user/domain/User.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.user.domain; import java.util.Objects; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/UserRepository.java b/linkmind/src/main/java/com/app/toaster/user/infrastructure/UserRepository.java similarity index 79% rename from linkmind/src/main/java/com/app/toaster/infrastructure/UserRepository.java rename to linkmind/src/main/java/com/app/toaster/user/infrastructure/UserRepository.java index 6c240e9e..e8091f5a 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/UserRepository.java +++ b/linkmind/src/main/java/com/app/toaster/user/infrastructure/UserRepository.java @@ -1,11 +1,11 @@ -package com.app.toaster.infrastructure; +package com.app.toaster.user.infrastructure; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import com.app.toaster.domain.SocialType; -import com.app.toaster.domain.User; +import com.app.toaster.user.domain.SocialType; +import com.app.toaster.user.domain.User; public interface UserRepository extends JpaRepository { Boolean existsBySocialIdAndSocialType(String socialId, SocialType socialType); diff --git a/linkmind/src/main/java/com/app/toaster/service/UserService.java b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java similarity index 94% rename from linkmind/src/main/java/com/app/toaster/service/UserService.java rename to linkmind/src/main/java/com/app/toaster/user/service/UserService.java index 3da664cd..47fc95dc 100644 --- a/linkmind/src/main/java/com/app/toaster/service/UserService.java +++ b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service; +package com.app.toaster.user.service; import com.app.toaster.controller.response.category.CategoryResponse; import com.app.toaster.controller.response.main.MainPageResponseDto; @@ -8,14 +8,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.app.toaster.controller.response.user.MyPageResponse; -import com.app.toaster.controller.response.user.SettingResponse; -import com.app.toaster.domain.User; +import com.app.toaster.user.controller.response.MyPageResponse; +import com.app.toaster.user.controller.response.SettingResponse; +import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.toast.infrastructure.ToastRepository; -import com.app.toaster.infrastructure.UserRepository; +import com.app.toaster.user.infrastructure.UserRepository; // import com.app.toaster.infrastructure.querydsl.CustomToastRepository; diff --git a/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java b/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java index e8cc47a2..3c1fe832 100644 --- a/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java +++ b/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java @@ -25,7 +25,7 @@ // import com.app.toaster.fixture.Fixture; // import com.app.toaster.infrastructure.CategoryRepository; // import com.app.toaster.toast.infrastructure.ToastRepository; -// import com.app.toaster.infrastructure.UserRepository; +// import com.app.toaster.user.infrastructure.UserRepository; // import com.querydsl.core.types.dsl.BooleanExpression; // import com.querydsl.jpa.impl.JPAQueryFactory; // From 2ce814447b93305f92316fc03d426ec684e90534 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:51:23 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[#250]=20refactor:=20category=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/toaster/auth/service/AuthService.java | 2 +- .../controller/CategoryController.java | 12 +- .../request}/ChangeCateoryPriorityDto.java | 2 +- .../request}/ChangeCateoryTitleDto.java | 2 +- .../request}/CreateCategoryDto.java | 2 +- .../request}/DeleteCategoryDto.java | 2 +- .../response}/CategoriesResponse.java | 2 +- .../response}/CategoryResponse.java | 2 +- .../response}/DuplicatedResponse.java | 2 +- .../response}/GetCategoryResponseDto.java | 2 +- .../{ => category}/domain/Category.java | 2 +- .../infrastructure/CategoryRepository.java | 4 +- .../service}/CategoryService.java | 18 +- .../{ => common}/domain/BaseTimeEntity.java | 2 +- .../domain/IntegerListConverter.java | 2 +- .../toaster/config/JpaQueryFactoryConfig.java | 17 -- .../response/main/MainPageResponseDto.java | 2 +- .../response/search/SearchCategoryResult.java | 2 - .../querydsl/CustomToastRepository.java | 154 ------------------ .../category/CategoryQueryService.java | 12 -- .../category/CategoryUpdateService.java | 12 -- .../toaster/service/search/SearchService.java | 4 +- .../app/toaster/timer/domain/Reminder.java | 4 +- .../timer/infrastructure/TimerRepository.java | 2 +- .../toaster/timer/service/TimerService.java | 4 +- .../com/app/toaster/toast/domain/Toast.java | 2 +- .../toast/infrastructure/ToastRepository.java | 2 +- .../toaster/toast/service/ToastService.java | 4 +- .../app/toaster/user/service/UserService.java | 6 +- .../querydsl/CustomToastRepositoryTest.java | 2 +- 30 files changed, 47 insertions(+), 240 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => category}/controller/CategoryController.java (88%) rename linkmind/src/main/java/com/app/toaster/{controller/request/category => category/controller/request}/ChangeCateoryPriorityDto.java (76%) rename linkmind/src/main/java/com/app/toaster/{controller/request/category => category/controller/request}/ChangeCateoryTitleDto.java (85%) rename linkmind/src/main/java/com/app/toaster/{controller/request/category => category/controller/request}/CreateCategoryDto.java (83%) rename linkmind/src/main/java/com/app/toaster/{controller/request/category => category/controller/request}/DeleteCategoryDto.java (75%) rename linkmind/src/main/java/com/app/toaster/{controller/response/category => category/controller/response}/CategoriesResponse.java (84%) rename linkmind/src/main/java/com/app/toaster/{controller/response/category => category/controller/response}/CategoryResponse.java (73%) rename linkmind/src/main/java/com/app/toaster/{controller/response/category => category/controller/response}/DuplicatedResponse.java (75%) rename linkmind/src/main/java/com/app/toaster/{controller/response/category => category/controller/response}/GetCategoryResponseDto.java (80%) rename linkmind/src/main/java/com/app/toaster/{ => category}/domain/Category.java (96%) rename linkmind/src/main/java/com/app/toaster/{ => category}/infrastructure/CategoryRepository.java (96%) rename linkmind/src/main/java/com/app/toaster/{service/category => category/service}/CategoryService.java (92%) rename linkmind/src/main/java/com/app/toaster/{ => common}/domain/BaseTimeEntity.java (94%) rename linkmind/src/main/java/com/app/toaster/{ => common}/domain/IntegerListConverter.java (95%) delete mode 100644 linkmind/src/main/java/com/app/toaster/config/JpaQueryFactoryConfig.java delete mode 100644 linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java delete mode 100644 linkmind/src/main/java/com/app/toaster/service/category/CategoryQueryService.java delete mode 100644 linkmind/src/main/java/com/app/toaster/service/category/CategoryUpdateService.java diff --git a/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java index 721fb484..0ab8096a 100644 --- a/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java @@ -22,7 +22,7 @@ import com.app.toaster.external.client.discord.NotificationDto; import com.app.toaster.external.client.discord.NotificationType; import com.app.toaster.external.client.slack.SlackApi; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.user.infrastructure.UserRepository; diff --git a/linkmind/src/main/java/com/app/toaster/controller/CategoryController.java b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java similarity index 88% rename from linkmind/src/main/java/com/app/toaster/controller/CategoryController.java rename to linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java index af14946f..d2cb300b 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/CategoryController.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java @@ -1,15 +1,17 @@ -package com.app.toaster.controller; +package com.app.toaster.category.controller; +import com.app.toaster.category.controller.request.ChangeCateoryPriorityDto; +import com.app.toaster.category.controller.request.ChangeCateoryTitleDto; +import com.app.toaster.category.controller.request.CreateCategoryDto; import com.app.toaster.common.dto.ApiResponse; import com.app.toaster.config.UserId; -import com.app.toaster.controller.request.category.*; -import com.app.toaster.controller.response.category.CategoriesResponse; +import com.app.toaster.category.controller.response.CategoriesResponse; import com.app.toaster.toast.controller.response.ToastFilter; -import com.app.toaster.controller.response.category.GetCategoryResponseDto; +import com.app.toaster.category.controller.response.GetCategoryResponseDto; import com.app.toaster.controller.valid.Severity; import com.app.toaster.controller.valid.TitleValid; import com.app.toaster.exception.Success; -import com.app.toaster.service.category.CategoryService; +import com.app.toaster.category.service.CategoryService; import com.app.toaster.service.search.SearchService; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryPriorityDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryPriorityDto.java similarity index 76% rename from linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryPriorityDto.java rename to linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryPriorityDto.java index c3276d18..4337f794 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryPriorityDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryPriorityDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.category; +package com.app.toaster.category.controller.request; import jakarta.validation.constraints.NotNull; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryTitleDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java similarity index 85% rename from linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryTitleDto.java rename to linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java index c05e4c16..7914db5d 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/category/ChangeCateoryTitleDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.category; +package com.app.toaster.category.controller.request; import com.app.toaster.controller.valid.Severity; import com.app.toaster.controller.valid.TitleValid; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/category/CreateCategoryDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java similarity index 83% rename from linkmind/src/main/java/com/app/toaster/controller/request/category/CreateCategoryDto.java rename to linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java index 39ba634b..ba083eee 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/category/CreateCategoryDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.category; +package com.app.toaster.category.controller.request; import com.app.toaster.controller.valid.Severity; import com.app.toaster.controller.valid.TitleValid; diff --git a/linkmind/src/main/java/com/app/toaster/controller/request/category/DeleteCategoryDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/DeleteCategoryDto.java similarity index 75% rename from linkmind/src/main/java/com/app/toaster/controller/request/category/DeleteCategoryDto.java rename to linkmind/src/main/java/com/app/toaster/category/controller/request/DeleteCategoryDto.java index a2c705c4..f65e784b 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/request/category/DeleteCategoryDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/DeleteCategoryDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.request.category; +package com.app.toaster.category.controller.request; import jakarta.validation.constraints.NotNull; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/category/CategoriesResponse.java b/linkmind/src/main/java/com/app/toaster/category/controller/response/CategoriesResponse.java similarity index 84% rename from linkmind/src/main/java/com/app/toaster/controller/response/category/CategoriesResponse.java rename to linkmind/src/main/java/com/app/toaster/category/controller/response/CategoriesResponse.java index 6c4c5d79..abb89d63 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/category/CategoriesResponse.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/response/CategoriesResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.category; +package com.app.toaster.category.controller.response; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/category/CategoryResponse.java b/linkmind/src/main/java/com/app/toaster/category/controller/response/CategoryResponse.java similarity index 73% rename from linkmind/src/main/java/com/app/toaster/controller/response/category/CategoryResponse.java rename to linkmind/src/main/java/com/app/toaster/category/controller/response/CategoryResponse.java index 8abb5567..84ee62f4 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/category/CategoryResponse.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/response/CategoryResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.category; +package com.app.toaster.category.controller.response; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/category/DuplicatedResponse.java b/linkmind/src/main/java/com/app/toaster/category/controller/response/DuplicatedResponse.java similarity index 75% rename from linkmind/src/main/java/com/app/toaster/controller/response/category/DuplicatedResponse.java rename to linkmind/src/main/java/com/app/toaster/category/controller/response/DuplicatedResponse.java index 8254fbde..606fd69c 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/category/DuplicatedResponse.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/response/DuplicatedResponse.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.category; +package com.app.toaster.category.controller.response; public record DuplicatedResponse(Boolean isDupicated) { public static DuplicatedResponse of(Boolean isDupicated){ diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/category/GetCategoryResponseDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/response/GetCategoryResponseDto.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/response/category/GetCategoryResponseDto.java rename to linkmind/src/main/java/com/app/toaster/category/controller/response/GetCategoryResponseDto.java index ee37086f..4424f4f4 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/category/GetCategoryResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/response/GetCategoryResponseDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.category; +package com.app.toaster.category.controller.response; import com.app.toaster.toast.controller.response.ToastDto; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/domain/Category.java b/linkmind/src/main/java/com/app/toaster/category/domain/Category.java similarity index 96% rename from linkmind/src/main/java/com/app/toaster/domain/Category.java rename to linkmind/src/main/java/com/app/toaster/category/domain/Category.java index dc17d703..9b3c34c7 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/Category.java +++ b/linkmind/src/main/java/com/app/toaster/category/domain/Category.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.category.domain; import java.time.LocalDateTime; diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java b/linkmind/src/main/java/com/app/toaster/category/infrastructure/CategoryRepository.java similarity index 96% rename from linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java rename to linkmind/src/main/java/com/app/toaster/category/infrastructure/CategoryRepository.java index 3190da6b..12b86c06 100644 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/CategoryRepository.java +++ b/linkmind/src/main/java/com/app/toaster/category/infrastructure/CategoryRepository.java @@ -1,4 +1,4 @@ -package com.app.toaster.infrastructure; +package com.app.toaster.category.infrastructure; import java.util.ArrayList; @@ -8,7 +8,7 @@ import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java b/linkmind/src/main/java/com/app/toaster/category/service/CategoryService.java similarity index 92% rename from linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java rename to linkmind/src/main/java/com/app/toaster/category/service/CategoryService.java index 796d31ff..fd7ffbd2 100644 --- a/linkmind/src/main/java/com/app/toaster/service/category/CategoryService.java +++ b/linkmind/src/main/java/com/app/toaster/category/service/CategoryService.java @@ -1,13 +1,15 @@ -package com.app.toaster.service.category; +package com.app.toaster.category.service; -import com.app.toaster.controller.request.category.*; -import com.app.toaster.controller.response.category.CategoriesResponse; -import com.app.toaster.controller.response.category.DuplicatedResponse; +import com.app.toaster.category.controller.request.ChangeCateoryPriorityDto; +import com.app.toaster.category.controller.request.ChangeCateoryTitleDto; +import com.app.toaster.category.controller.request.CreateCategoryDto; +import com.app.toaster.category.controller.response.CategoriesResponse; +import com.app.toaster.category.controller.response.DuplicatedResponse; import com.app.toaster.toast.controller.response.ToastDto; import com.app.toaster.toast.controller.response.ToastFilter; -import com.app.toaster.controller.response.category.CategoryResponse; -import com.app.toaster.controller.response.category.GetCategoryResponseDto; -import com.app.toaster.domain.Category; +import com.app.toaster.category.controller.response.CategoryResponse; +import com.app.toaster.category.controller.response.GetCategoryResponseDto; +import com.app.toaster.category.domain.Category; import com.app.toaster.timer.domain.Reminder; import com.app.toaster.toast.domain.Toast; import com.app.toaster.user.domain.User; @@ -15,7 +17,7 @@ import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.CustomException; import com.app.toaster.exception.model.NotFoundException; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.user.infrastructure.UserRepository; diff --git a/linkmind/src/main/java/com/app/toaster/domain/BaseTimeEntity.java b/linkmind/src/main/java/com/app/toaster/common/domain/BaseTimeEntity.java similarity index 94% rename from linkmind/src/main/java/com/app/toaster/domain/BaseTimeEntity.java rename to linkmind/src/main/java/com/app/toaster/common/domain/BaseTimeEntity.java index b261aa23..f5be0c98 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/BaseTimeEntity.java +++ b/linkmind/src/main/java/com/app/toaster/common/domain/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.common.domain; import jakarta.persistence.EntityListeners; diff --git a/linkmind/src/main/java/com/app/toaster/domain/IntegerListConverter.java b/linkmind/src/main/java/com/app/toaster/common/domain/IntegerListConverter.java similarity index 95% rename from linkmind/src/main/java/com/app/toaster/domain/IntegerListConverter.java rename to linkmind/src/main/java/com/app/toaster/common/domain/IntegerListConverter.java index 6d151397..6c5946be 100644 --- a/linkmind/src/main/java/com/app/toaster/domain/IntegerListConverter.java +++ b/linkmind/src/main/java/com/app/toaster/common/domain/IntegerListConverter.java @@ -1,4 +1,4 @@ -package com.app.toaster.domain; +package com.app.toaster.common.domain; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; diff --git a/linkmind/src/main/java/com/app/toaster/config/JpaQueryFactoryConfig.java b/linkmind/src/main/java/com/app/toaster/config/JpaQueryFactoryConfig.java deleted file mode 100644 index c020398e..00000000 --- a/linkmind/src/main/java/com/app/toaster/config/JpaQueryFactoryConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -// package com.app.toaster.config; -// -// import org.springframework.context.annotation.Bean; -// import org.springframework.context.annotation.Configuration; -// -// import com.querydsl.jpa.impl.JPAQueryFactory; -// -// import jakarta.persistence.EntityManager; -// -// @Configuration -// public class JpaQueryFactoryConfig { -// -// @Bean -// JPAQueryFactory jpaQueryFactory(EntityManager em) { -// return new JPAQueryFactory(em); -// } -// } \ No newline at end of file diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java b/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java index d094f004..1afc33dc 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java @@ -1,6 +1,6 @@ package com.app.toaster.controller.response.main; -import com.app.toaster.controller.response.category.CategoryResponse; +import com.app.toaster.category.controller.response.CategoryResponse; import lombok.Builder; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java b/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java index a1cb98ea..0399f4e5 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java +++ b/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java @@ -2,8 +2,6 @@ import java.util.List; -import com.app.toaster.domain.Category; - public record SearchCategoryResult(List categories) { public static SearchCategoryResult of(List categories){ return new SearchCategoryResult(categories); diff --git a/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java b/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java deleted file mode 100644 index 062dc101..00000000 --- a/linkmind/src/main/java/com/app/toaster/infrastructure/querydsl/CustomToastRepository.java +++ /dev/null @@ -1,154 +0,0 @@ -// package com.app.toaster.infrastructure.querydsl; -// -// import static com.app.toaster.domain.QToast.*; -// import static com.app.toaster.domain.QUser.*; -// -// import java.time.LocalDateTime; -// import java.util.ArrayList; -// import java.util.List; -// import org.springframework.data.jpa.repository.Modifying; -// import org.springframework.data.jpa.repository.Query; -// import org.springframework.data.repository.query.Param; -// import org.springframework.stereotype.Repository; -// -// import com.app.toaster.domain.Category; -// import com.app.toaster.domain.QToast; -// import com.app.toaster.domain.QUser; -// import com.app.toaster.toast.domain.Toast; -// import com.app.toaster.user.domain.User; -// import com.querydsl.core.types.Path; -// import com.querydsl.core.types.dsl.BooleanExpression; -// import com.querydsl.jpa.impl.JPAQueryFactory; -// -// import jakarta.persistence.EntityManager; -// import lombok.RequiredArgsConstructor; -// -// @Repository -// @RequiredArgsConstructor -// public class CustomToastRepository { -// private final JPAQueryFactory queryFactory; -// // private final EntityManager em; -// public List getAllByCategory(Category category){ -// return queryFactory.select(toast) -// .from(toast) -// .where(eqCategoryId(category.getCategoryId())) -// .fetch(); -// } -// -// private BooleanExpression eqCategoryId(Long id){ -// if (id == null){ -// return null; -// } -// return toast.category.categoryId.eq(id); -// } -// -// ArrayList findByIsReadAndCategory(Boolean isRead, Category category){ -// return null; -// }; -// -// ArrayList getAllByUser(User user){ -// return null; -// } -// -// List getAllByUserOrderByCreatedAtDesc(User user){ -// return null; -// } -// -// -// ArrayList getAllByUserAndIsReadIsTrue(User user){ -// return null; -// } -// -// -// // @Modifying -// // @Query("UPDATE Toast t SET t.category = null WHERE t.category.categoryId IN :categoryIds") -// // void updateCategoryIdsToNull(@Param("categoryIds") List categoryIds){ -// // } -// -// //querydsl의 수정은 bulkupdate라 영속성컨텍스트를 안거치기 때문에 무조건 flush,clear해주자. -// void updateCategoryIdsToNull(List categoryIds){ -// queryFactory.update(toast) -// .set(toast.category, (Category)null) -// .where(toast.category.categoryId.in(categoryIds)) -// .execute(); -// // em.flush(); //test 코드에서는 따로 em을 주입하는 중이므로 테스트 후 넣자. -// // em.clear(); -// } -// -// -// List searchToastsByQuery(Long userId, String query){ -// return queryFactory.select(toast) -// .from(toast) -// .leftJoin(toast.user, user).fetchJoin() -// .where(eqToastOwner(userId), containToastTitle(query)) -// .fetch(); -// } -// private BooleanExpression eqToastOwner(Long userId){ -// return userId != null?toast.user.userId.eq(userId):null; -// } -// -// private BooleanExpression containToastTitle(String query){ -// if (query == null || query.isEmpty() || query.isBlank()){ -// return null; -// } -// return toast.title.containsIgnoreCase(query); -// } -// -// -// -// Long countAllByUser(User user){ -// return null; -// } -// -// -// Long countALLByUserAndIsReadTrue(User user){ -// return null; -// } -// -// -// Long countALLByUserAndIsReadFalse(User user){ -// return null; -// } -// -// -// Long countAllByCategory(Category category){ -// return null; -// } -// -// -// Long countAllByCategoryAndIsReadTrue(Category category){ -// return null; -// } -// -// -// Long countAllByCategoryAndIsReadFalse(Category category){ -// return null; -// } -// -// -// Integer getUnReadToastNumber(Long userId){ -// -// Integer count = queryFactory.select(toast.count().intValue()) -// .from(toast) -// .where(eqToastOwner(userId).and(toast.isRead.isFalse())) -// .fetchOne(); -// return (count!=null)?count:0; -// } -// -// -// @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.createdAt >= :startOfWeek AND t.createdAt <= :endOfWeek") -// Long countAllByCreatedAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek, -// @Param("endOfWeek") LocalDateTime endOfWeek, @Param("user") User user){ -// return null; -// } -// -// -// @Query("SELECT COUNT(t) FROM Toast t WHERE t.user=:user AND t.isRead = true AND t.updateAt >= :startOfWeek AND t.updateAt <= :endOfWeek") -// Long countAllByUpdateAtThisWeek(@Param("startOfWeek") LocalDateTime startOfWeek, -// @Param("endOfWeek") LocalDateTime endOfWeek, -// @Param("user") User user){ -// return null; -// } -// -// -// } diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryQueryService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryQueryService.java deleted file mode 100644 index bb7f9f87..00000000 --- a/linkmind/src/main/java/com/app/toaster/service/category/CategoryQueryService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.app.toaster.service.category; - -import org.springframework.transaction.annotation.Transactional; - -import lombok.RequiredArgsConstructor; - -@Transactional(readOnly = true) -@RequiredArgsConstructor -public class CategoryQueryService { - - // R -} diff --git a/linkmind/src/main/java/com/app/toaster/service/category/CategoryUpdateService.java b/linkmind/src/main/java/com/app/toaster/service/category/CategoryUpdateService.java deleted file mode 100644 index 7b464601..00000000 --- a/linkmind/src/main/java/com/app/toaster/service/category/CategoryUpdateService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.app.toaster.service.category; - -import org.springframework.transaction.annotation.Transactional; - -import lombok.RequiredArgsConstructor; - -@Transactional -@RequiredArgsConstructor -public class CategoryUpdateService { - - // CUD -} diff --git a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java b/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java index eef79d6f..db969782 100644 --- a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java +++ b/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java @@ -10,14 +10,14 @@ import com.app.toaster.controller.response.search.CategoryResult; import com.app.toaster.controller.response.search.SearchMainResult; import com.app.toaster.toast.controller.response.ToastDto; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.toast.domain.Toast; import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; import com.app.toaster.exception.Success; import com.app.toaster.exception.model.BadRequestException; import com.app.toaster.exception.model.NotFoundException; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.infrastructure.CategoryRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.user.infrastructure.UserRepository; diff --git a/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java index 20f26b23..e2a8802a 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java +++ b/linkmind/src/main/java/com/app/toaster/timer/domain/Reminder.java @@ -1,7 +1,7 @@ package com.app.toaster.timer.domain; -import com.app.toaster.domain.Category; -import com.app.toaster.domain.IntegerListConverter; +import com.app.toaster.category.domain.Category; +import com.app.toaster.common.domain.IntegerListConverter; import com.app.toaster.user.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java index 294cee2f..b9153d8d 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java +++ b/linkmind/src/main/java/com/app/toaster/timer/infrastructure/TimerRepository.java @@ -1,6 +1,6 @@ package com.app.toaster.timer.infrastructure; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.timer.domain.Reminder; import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java index bc99f840..148e5f25 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java +++ b/linkmind/src/main/java/com/app/toaster/timer/service/TimerService.java @@ -7,7 +7,7 @@ import com.app.toaster.timer.controller.response.GetTimerPageResponseDto; import com.app.toaster.timer.controller.response.GetTimerResponseDto; import com.app.toaster.timer.controller.response.WaitingTimerDto; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.timer.domain.Reminder; import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; @@ -15,7 +15,7 @@ import com.app.toaster.exception.model.ForbiddenException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.exception.model.UnauthorizedException; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.infrastructure.CategoryRepository; import com.app.toaster.timer.infrastructure.TimerRepository; import com.app.toaster.user.infrastructure.UserRepository; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java b/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java index ace56fcd..07918e50 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java +++ b/linkmind/src/main/java/com/app/toaster/toast/domain/Toast.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.user.domain.User; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java b/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java index 710aa4f2..6be78d39 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java +++ b/linkmind/src/main/java/com/app/toaster/toast/infrastructure/ToastRepository.java @@ -1,6 +1,6 @@ package com.app.toaster.toast.infrastructure; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java index b5736bef..646d55b5 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java +++ b/linkmind/src/main/java/com/app/toaster/toast/service/ToastService.java @@ -16,7 +16,7 @@ import com.app.toaster.parse.controller.response.OgResponse; import com.app.toaster.toast.controller.response.IsReadResponse; import com.app.toaster.toast.controller.response.ModifiedTitle; -import com.app.toaster.domain.Category; +import com.app.toaster.category.domain.Category; import com.app.toaster.toast.domain.Toast; import com.app.toaster.user.domain.User; import com.app.toaster.exception.Error; @@ -25,7 +25,7 @@ import com.app.toaster.exception.model.ForbiddenException; import com.app.toaster.exception.model.NotFoundException; import com.app.toaster.external.client.aws.S3Service; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.infrastructure.CategoryRepository; import com.app.toaster.toast.infrastructure.ToastRepository; import com.app.toaster.user.infrastructure.UserRepository; import com.app.toaster.parse.service.ParsingService; diff --git a/linkmind/src/main/java/com/app/toaster/user/service/UserService.java b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java index 47fc95dc..ff868ffd 100644 --- a/linkmind/src/main/java/com/app/toaster/user/service/UserService.java +++ b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java @@ -1,9 +1,9 @@ package com.app.toaster.user.service; -import com.app.toaster.controller.response.category.CategoryResponse; +import com.app.toaster.category.controller.response.CategoryResponse; import com.app.toaster.controller.response.main.MainPageResponseDto; -import com.app.toaster.domain.Category; -import com.app.toaster.infrastructure.CategoryRepository; +import com.app.toaster.category.domain.Category; +import com.app.toaster.category.infrastructure.CategoryRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java b/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java index 3c1fe832..7d9f06e5 100644 --- a/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java +++ b/linkmind/src/test/java/com/app/toaster/infrastructure/querydsl/CustomToastRepositoryTest.java @@ -23,7 +23,7 @@ // import com.app.toaster.config.JpaQueryFactoryConfig; // import com.app.toaster.toast.domain.Toast; // import com.app.toaster.fixture.Fixture; -// import com.app.toaster.infrastructure.CategoryRepository; +// import com.app.toaster.category.infrastructure.CategoryRepository; // import com.app.toaster.toast.infrastructure.ToastRepository; // import com.app.toaster.user.infrastructure.UserRepository; // import com.querydsl.core.types.dsl.BooleanExpression; From 4b1db8fa489cb84ee57c7d2853212232b93783e3 Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 18:59:56 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[#250]=20refactor:=20search,=20mainpage?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/toaster/category/controller/CategoryController.java | 2 +- .../toaster/{ => mainpage}/controller/MainController.java | 4 ++-- .../controller/response}/MainPageResponseDto.java | 2 +- .../controller/response}/CategoryResult.java | 2 +- .../controller/response}/SearchCategoryResult.java | 2 +- .../controller/response}/SearchMainResult.java | 2 +- .../search => search/controller/response}/ToastResult.java | 2 +- .../{service/search => search/service}/SearchService.java | 6 +++--- .../com/app/toaster/user/controller/UserController.java | 2 +- .../main/java/com/app/toaster/user/service/UserService.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => mainpage}/controller/MainController.java (85%) rename linkmind/src/main/java/com/app/toaster/{controller/response/main => mainpage/controller/response}/MainPageResponseDto.java (82%) rename linkmind/src/main/java/com/app/toaster/{controller/response/search => search/controller/response}/CategoryResult.java (80%) rename linkmind/src/main/java/com/app/toaster/{controller/response/search => search/controller/response}/SearchCategoryResult.java (80%) rename linkmind/src/main/java/com/app/toaster/{controller/response/search => search/controller/response}/SearchMainResult.java (87%) rename linkmind/src/main/java/com/app/toaster/{controller/response/search => search/controller/response}/ToastResult.java (75%) rename linkmind/src/main/java/com/app/toaster/{service/search => search/service}/SearchService.java (92%) diff --git a/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java index d2cb300b..d8d9b1cb 100644 --- a/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java @@ -12,7 +12,7 @@ import com.app.toaster.controller.valid.TitleValid; import com.app.toaster.exception.Success; import com.app.toaster.category.service.CategoryService; -import com.app.toaster.service.search.SearchService; +import com.app.toaster.search.service.SearchService; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/controller/MainController.java b/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java similarity index 85% rename from linkmind/src/main/java/com/app/toaster/controller/MainController.java rename to linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java index fa442ff0..e5cbe131 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/MainController.java +++ b/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java @@ -1,11 +1,11 @@ -package com.app.toaster.controller; +package com.app.toaster.mainpage.controller; import com.app.toaster.config.UserId; import org.springframework.web.bind.annotation.*; import com.app.toaster.common.dto.ApiResponse; import com.app.toaster.controller.valid.TitleValid; -import com.app.toaster.service.search.SearchService; +import com.app.toaster.search.service.SearchService; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java b/linkmind/src/main/java/com/app/toaster/mainpage/controller/response/MainPageResponseDto.java similarity index 82% rename from linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java rename to linkmind/src/main/java/com/app/toaster/mainpage/controller/response/MainPageResponseDto.java index 1afc33dc..1643261a 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/main/MainPageResponseDto.java +++ b/linkmind/src/main/java/com/app/toaster/mainpage/controller/response/MainPageResponseDto.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.main; +package com.app.toaster.mainpage.controller.response; import com.app.toaster.category.controller.response.CategoryResponse; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/search/CategoryResult.java b/linkmind/src/main/java/com/app/toaster/search/controller/response/CategoryResult.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/response/search/CategoryResult.java rename to linkmind/src/main/java/com/app/toaster/search/controller/response/CategoryResult.java index 5e264c8e..8c7b98c7 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/search/CategoryResult.java +++ b/linkmind/src/main/java/com/app/toaster/search/controller/response/CategoryResult.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.search; +package com.app.toaster.search.controller.response; public record CategoryResult(Long categoryId, String title, Long toastNum) { public static CategoryResult of(Long categoryId, String title, Long toastNum){ diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java b/linkmind/src/main/java/com/app/toaster/search/controller/response/SearchCategoryResult.java similarity index 80% rename from linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java rename to linkmind/src/main/java/com/app/toaster/search/controller/response/SearchCategoryResult.java index 0399f4e5..81e160a1 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchCategoryResult.java +++ b/linkmind/src/main/java/com/app/toaster/search/controller/response/SearchCategoryResult.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.search; +package com.app.toaster.search.controller.response; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchMainResult.java b/linkmind/src/main/java/com/app/toaster/search/controller/response/SearchMainResult.java similarity index 87% rename from linkmind/src/main/java/com/app/toaster/controller/response/search/SearchMainResult.java rename to linkmind/src/main/java/com/app/toaster/search/controller/response/SearchMainResult.java index 6752ca47..2889a364 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/search/SearchMainResult.java +++ b/linkmind/src/main/java/com/app/toaster/search/controller/response/SearchMainResult.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.search; +package com.app.toaster.search.controller.response; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/controller/response/search/ToastResult.java b/linkmind/src/main/java/com/app/toaster/search/controller/response/ToastResult.java similarity index 75% rename from linkmind/src/main/java/com/app/toaster/controller/response/search/ToastResult.java rename to linkmind/src/main/java/com/app/toaster/search/controller/response/ToastResult.java index b4416fd5..1f703074 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/response/search/ToastResult.java +++ b/linkmind/src/main/java/com/app/toaster/search/controller/response/ToastResult.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.response.search; +package com.app.toaster.search.controller.response; public record ToastResult(Long toastId, String title) { public static ToastResult of(Long toastId, String title){ diff --git a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java b/linkmind/src/main/java/com/app/toaster/search/service/SearchService.java similarity index 92% rename from linkmind/src/main/java/com/app/toaster/service/search/SearchService.java rename to linkmind/src/main/java/com/app/toaster/search/service/SearchService.java index db969782..84c050e6 100644 --- a/linkmind/src/main/java/com/app/toaster/service/search/SearchService.java +++ b/linkmind/src/main/java/com/app/toaster/search/service/SearchService.java @@ -1,4 +1,4 @@ -package com.app.toaster.service.search; +package com.app.toaster.search.service; import java.util.List; import java.util.stream.Collectors; @@ -7,8 +7,8 @@ import org.springframework.transaction.annotation.Transactional; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.controller.response.search.CategoryResult; -import com.app.toaster.controller.response.search.SearchMainResult; +import com.app.toaster.search.controller.response.CategoryResult; +import com.app.toaster.search.controller.response.SearchMainResult; import com.app.toaster.toast.controller.response.ToastDto; import com.app.toaster.category.domain.Category; import com.app.toaster.toast.domain.Toast; diff --git a/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java index 5abb2a9c..aa717853 100644 --- a/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import com.app.toaster.controller.response.main.MainPageResponseDto; +import com.app.toaster.mainpage.controller.response.MainPageResponseDto; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/linkmind/src/main/java/com/app/toaster/user/service/UserService.java b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java index ff868ffd..8cbb787f 100644 --- a/linkmind/src/main/java/com/app/toaster/user/service/UserService.java +++ b/linkmind/src/main/java/com/app/toaster/user/service/UserService.java @@ -1,7 +1,7 @@ package com.app.toaster.user.service; import com.app.toaster.category.controller.response.CategoryResponse; -import com.app.toaster.controller.response.main.MainPageResponseDto; +import com.app.toaster.mainpage.controller.response.MainPageResponseDto; import com.app.toaster.category.domain.Category; import com.app.toaster.category.infrastructure.CategoryRepository; From 9ae3f1048f9d239f0d265b04051a5622bdef29fe Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 19:06:21 +0900 Subject: [PATCH 08/10] =?UTF-8?q?[#250]=20refactor:=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/app/toaster/auth/controller/AuthController.java | 2 +- .../main/java/com/app/toaster/auth/service/AuthService.java | 2 +- .../app/toaster/category/controller/CategoryController.java | 6 +++--- .../category/controller/request/ChangeCateoryTitleDto.java | 4 ++-- .../category/controller/request/CreateCategoryDto.java | 4 ++-- .../java/com/app/toaster/{ => common}/config/UserId.java | 2 +- .../com/app/toaster/{ => common}/config/UserIdResolver.java | 5 ++--- .../java/com/app/toaster/{ => common}/config/WebConfig.java | 2 +- .../com/app/toaster/{ => common}/config/jwt/JwtService.java | 2 +- .../controller/valid/marker/ToastValidationGroup.java | 4 ---- .../com/app/toaster/mainpage/controller/MainController.java | 4 ++-- .../com/app/toaster/popup/controller/PopupController.java | 4 +--- .../recommendsite/controller/RecommendSiteController.java | 2 +- .../com/app/toaster/timer/controller/TimerController.java | 2 +- .../com/app/toaster/toast/controller/ToastController.java | 2 +- .../app/toaster/toast/controller/request/SaveToastDto.java | 5 ----- .../toaster/toast/controller/request/UpdateToastDto.java | 6 +++--- .../com/app/toaster/user/controller/UserController.java | 2 +- .../{controller => utils/health}/HealthCheckController.java | 2 +- .../app/toaster/{controller => utils}/valid/Severity.java | 2 +- .../app/toaster/{controller => utils}/valid/TitleValid.java | 3 +-- .../toaster/{controller => utils}/valid/TitleValidator.java | 4 ++-- .../toaster/utils/valid/marker/ToastValidationGroup.java | 4 ++++ 23 files changed, 33 insertions(+), 42 deletions(-) rename linkmind/src/main/java/com/app/toaster/{ => common}/config/UserId.java (86%) rename linkmind/src/main/java/com/app/toaster/{ => common}/config/UserIdResolver.java (94%) rename linkmind/src/main/java/com/app/toaster/{ => common}/config/WebConfig.java (93%) rename linkmind/src/main/java/com/app/toaster/{ => common}/config/jwt/JwtService.java (98%) delete mode 100644 linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java rename linkmind/src/main/java/com/app/toaster/{controller => utils/health}/HealthCheckController.java (92%) rename linkmind/src/main/java/com/app/toaster/{controller => utils}/valid/Severity.java (79%) rename linkmind/src/main/java/com/app/toaster/{controller => utils}/valid/TitleValid.java (90%) rename linkmind/src/main/java/com/app/toaster/{controller => utils}/valid/TitleValidator.java (94%) create mode 100644 linkmind/src/main/java/com/app/toaster/utils/valid/marker/ToastValidationGroup.java diff --git a/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java b/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java index 0de5381a..9d53f49c 100644 --- a/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java +++ b/linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java @@ -13,7 +13,7 @@ import com.app.toaster.common.dto.ApiResponse; // import com.app.toaster.config.UserId; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.auth.controller.request.SignInRequestDto; import com.app.toaster.auth.controller.response.SignInResponseDto; import com.app.toaster.auth.controller.response.TokenHealthDto; diff --git a/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java index 0ab8096a..497234f8 100644 --- a/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java +++ b/linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.Transactional; -import com.app.toaster.config.jwt.JwtService; +import com.app.toaster.common.config.jwt.JwtService; import com.app.toaster.auth.controller.request.SignInRequestDto; import com.app.toaster.auth.controller.response.SignInResponseDto; import com.app.toaster.auth.controller.response.TokenHealthDto; diff --git a/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java index d8d9b1cb..dd4cb164 100644 --- a/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/CategoryController.java @@ -4,12 +4,12 @@ import com.app.toaster.category.controller.request.ChangeCateoryTitleDto; import com.app.toaster.category.controller.request.CreateCategoryDto; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.category.controller.response.CategoriesResponse; import com.app.toaster.toast.controller.response.ToastFilter; import com.app.toaster.category.controller.response.GetCategoryResponseDto; -import com.app.toaster.controller.valid.Severity; -import com.app.toaster.controller.valid.TitleValid; +import com.app.toaster.utils.valid.Severity; +import com.app.toaster.utils.valid.TitleValid; import com.app.toaster.exception.Success; import com.app.toaster.category.service.CategoryService; import com.app.toaster.search.service.SearchService; diff --git a/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java index 7914db5d..9a9f7b53 100644 --- a/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/ChangeCateoryTitleDto.java @@ -1,7 +1,7 @@ package com.app.toaster.category.controller.request; -import com.app.toaster.controller.valid.Severity; -import com.app.toaster.controller.valid.TitleValid; +import com.app.toaster.utils.valid.Severity; +import com.app.toaster.utils.valid.TitleValid; import jakarta.validation.constraints.NotNull; public record ChangeCateoryTitleDto( diff --git a/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java b/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java index ba083eee..64807482 100644 --- a/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java +++ b/linkmind/src/main/java/com/app/toaster/category/controller/request/CreateCategoryDto.java @@ -1,7 +1,7 @@ package com.app.toaster.category.controller.request; -import com.app.toaster.controller.valid.Severity; -import com.app.toaster.controller.valid.TitleValid; +import com.app.toaster.utils.valid.Severity; +import com.app.toaster.utils.valid.TitleValid; import jakarta.validation.constraints.NotNull; public record CreateCategoryDto(@TitleValid(payload = Severity.Error.class) @NotNull String categoryTitle) { diff --git a/linkmind/src/main/java/com/app/toaster/config/UserId.java b/linkmind/src/main/java/com/app/toaster/common/config/UserId.java similarity index 86% rename from linkmind/src/main/java/com/app/toaster/config/UserId.java rename to linkmind/src/main/java/com/app/toaster/common/config/UserId.java index 88bc0e8f..2b06b6cf 100644 --- a/linkmind/src/main/java/com/app/toaster/config/UserId.java +++ b/linkmind/src/main/java/com/app/toaster/common/config/UserId.java @@ -1,4 +1,4 @@ -package com.app.toaster.config; +package com.app.toaster.common.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/linkmind/src/main/java/com/app/toaster/config/UserIdResolver.java b/linkmind/src/main/java/com/app/toaster/common/config/UserIdResolver.java similarity index 94% rename from linkmind/src/main/java/com/app/toaster/config/UserIdResolver.java rename to linkmind/src/main/java/com/app/toaster/common/config/UserIdResolver.java index 2f2566e5..f1f1bbdf 100644 --- a/linkmind/src/main/java/com/app/toaster/config/UserIdResolver.java +++ b/linkmind/src/main/java/com/app/toaster/common/config/UserIdResolver.java @@ -1,5 +1,6 @@ -package com.app.toaster.config; +package com.app.toaster.common.config; +import com.app.toaster.common.config.jwt.JwtService; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; @@ -7,8 +8,6 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; -import com.app.toaster.config.jwt.JwtService; - import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/config/WebConfig.java b/linkmind/src/main/java/com/app/toaster/common/config/WebConfig.java similarity index 93% rename from linkmind/src/main/java/com/app/toaster/config/WebConfig.java rename to linkmind/src/main/java/com/app/toaster/common/config/WebConfig.java index c1e66998..dc9e16ab 100644 --- a/linkmind/src/main/java/com/app/toaster/config/WebConfig.java +++ b/linkmind/src/main/java/com/app/toaster/common/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.app.toaster.config; +package com.app.toaster.common.config; import java.util.List; diff --git a/linkmind/src/main/java/com/app/toaster/config/jwt/JwtService.java b/linkmind/src/main/java/com/app/toaster/common/config/jwt/JwtService.java similarity index 98% rename from linkmind/src/main/java/com/app/toaster/config/jwt/JwtService.java rename to linkmind/src/main/java/com/app/toaster/common/config/jwt/JwtService.java index e87d86e2..a7770db4 100644 --- a/linkmind/src/main/java/com/app/toaster/config/jwt/JwtService.java +++ b/linkmind/src/main/java/com/app/toaster/common/config/jwt/JwtService.java @@ -1,4 +1,4 @@ -package com.app.toaster.config.jwt; +package com.app.toaster.common.config.jwt; import static io.jsonwebtoken.Jwts.*; diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java b/linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java deleted file mode 100644 index 457405f8..00000000 --- a/linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.app.toaster.controller.valid.marker; - -public interface ToastValidationGroup { -} diff --git a/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java b/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java index e5cbe131..95ac49ac 100644 --- a/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java +++ b/linkmind/src/main/java/com/app/toaster/mainpage/controller/MainController.java @@ -1,10 +1,10 @@ package com.app.toaster.mainpage.controller; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import org.springframework.web.bind.annotation.*; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.controller.valid.TitleValid; +import com.app.toaster.utils.valid.TitleValid; import com.app.toaster.search.service.SearchService; import lombok.RequiredArgsConstructor; diff --git a/linkmind/src/main/java/com/app/toaster/popup/controller/PopupController.java b/linkmind/src/main/java/com/app/toaster/popup/controller/PopupController.java index a5681880..b90a16a7 100644 --- a/linkmind/src/main/java/com/app/toaster/popup/controller/PopupController.java +++ b/linkmind/src/main/java/com/app/toaster/popup/controller/PopupController.java @@ -3,10 +3,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.app.toaster.popup.controller.request.PopUpRequestDto; @@ -14,7 +12,7 @@ import com.app.toaster.popup.controller.response.PopupResponseDto; import com.app.toaster.popup.service.PopupService; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.exception.Success; import jakarta.validation.Valid; diff --git a/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java b/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java index dad637e0..38b5a0eb 100644 --- a/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java +++ b/linkmind/src/main/java/com/app/toaster/recommendsite/controller/RecommendSiteController.java @@ -1,7 +1,7 @@ package com.app.toaster.recommendsite.controller; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.recommendsite.domain.RecommendSite; import com.app.toaster.exception.Success; import com.app.toaster.recommendsite.service.RecommendSiteService; diff --git a/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java index 31c1d353..dd516533 100644 --- a/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java +++ b/linkmind/src/main/java/com/app/toaster/timer/controller/TimerController.java @@ -1,7 +1,7 @@ package com.app.toaster.timer.controller; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.timer.controller.request.CreateTimerRequestDto; import com.app.toaster.timer.controller.request.UpdateTimerCommentDto; import com.app.toaster.timer.controller.request.UpdateTimerDateTimeDto; diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java index d00465e9..096b9265 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/ToastController.java @@ -20,7 +20,7 @@ import com.app.toaster.common.dto.ApiResponse; // import com.app.toaster.config.UserId; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.exception.Success; import com.app.toaster.parse.service.ParsingService; import com.app.toaster.toast.service.ToastService; diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/request/SaveToastDto.java b/linkmind/src/main/java/com/app/toaster/toast/controller/request/SaveToastDto.java index bb8a50c8..96ebf28e 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/request/SaveToastDto.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/request/SaveToastDto.java @@ -1,9 +1,4 @@ package com.app.toaster.toast.controller.request; -import java.util.List; - -import com.app.toaster.controller.valid.Severity; -import com.app.toaster.controller.valid.TitleValid; - public record SaveToastDto(String linkUrl, Long categoryId) { } diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java b/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java index 18d19f9f..6a54a61f 100644 --- a/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java +++ b/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java @@ -1,9 +1,9 @@ package com.app.toaster.toast.controller.request; -import com.app.toaster.controller.valid.Severity; -import com.app.toaster.controller.valid.TitleValid; +import com.app.toaster.utils.valid.Severity; +import com.app.toaster.utils.valid.TitleValid; -import com.app.toaster.controller.valid.marker.ToastValidationGroup; +import com.app.toaster.utils.valid.marker.ToastValidationGroup; import jakarta.validation.constraints.NotNull; public record UpdateToastDto(Long toastId, @TitleValid(payload = Severity.Error.class, groups = {ToastValidationGroup.class}) @NotNull String title) { diff --git a/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java index aa717853..1ff45542 100644 --- a/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java +++ b/linkmind/src/main/java/com/app/toaster/user/controller/UserController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import com.app.toaster.common.dto.ApiResponse; -import com.app.toaster.config.UserId; +import com.app.toaster.common.config.UserId; import com.app.toaster.user.controller.request.UpdateAllowedPush; import com.app.toaster.exception.Success; import com.app.toaster.user.service.UserService; diff --git a/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java b/linkmind/src/main/java/com/app/toaster/utils/health/HealthCheckController.java similarity index 92% rename from linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java rename to linkmind/src/main/java/com/app/toaster/utils/health/HealthCheckController.java index 0d8a72c7..aad8785c 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/HealthCheckController.java +++ b/linkmind/src/main/java/com/app/toaster/utils/health/HealthCheckController.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller; +package com.app.toaster.utils.health; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/Severity.java b/linkmind/src/main/java/com/app/toaster/utils/valid/Severity.java similarity index 79% rename from linkmind/src/main/java/com/app/toaster/controller/valid/Severity.java rename to linkmind/src/main/java/com/app/toaster/utils/valid/Severity.java index 66bc5868..6f99ec2e 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/valid/Severity.java +++ b/linkmind/src/main/java/com/app/toaster/utils/valid/Severity.java @@ -1,4 +1,4 @@ -package com.app.toaster.controller.valid; +package com.app.toaster.utils.valid; import jakarta.validation.Payload; diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValid.java b/linkmind/src/main/java/com/app/toaster/utils/valid/TitleValid.java similarity index 90% rename from linkmind/src/main/java/com/app/toaster/controller/valid/TitleValid.java rename to linkmind/src/main/java/com/app/toaster/utils/valid/TitleValid.java index 9abe70aa..811f6a8e 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValid.java +++ b/linkmind/src/main/java/com/app/toaster/utils/valid/TitleValid.java @@ -1,10 +1,9 @@ -package com.app.toaster.controller.valid; +package com.app.toaster.utils.valid; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.util.ArrayList; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValidator.java b/linkmind/src/main/java/com/app/toaster/utils/valid/TitleValidator.java similarity index 94% rename from linkmind/src/main/java/com/app/toaster/controller/valid/TitleValidator.java rename to linkmind/src/main/java/com/app/toaster/utils/valid/TitleValidator.java index 01f6cdc1..5006f68a 100644 --- a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValidator.java +++ b/linkmind/src/main/java/com/app/toaster/utils/valid/TitleValidator.java @@ -1,6 +1,6 @@ -package com.app.toaster.controller.valid; +package com.app.toaster.utils.valid; -import com.app.toaster.controller.valid.marker.ToastValidationGroup; +import com.app.toaster.utils.valid.marker.ToastValidationGroup; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/linkmind/src/main/java/com/app/toaster/utils/valid/marker/ToastValidationGroup.java b/linkmind/src/main/java/com/app/toaster/utils/valid/marker/ToastValidationGroup.java new file mode 100644 index 00000000..46891c7c --- /dev/null +++ b/linkmind/src/main/java/com/app/toaster/utils/valid/marker/ToastValidationGroup.java @@ -0,0 +1,4 @@ +package com.app.toaster.utils.valid.marker; + +public interface ToastValidationGroup { +} From 30910ee25e6036cf07a660e2bc4246d694158f8c Mon Sep 17 00:00:00 2001 From: soohyun Date: Fri, 25 Oct 2024 19:08:03 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[#250]=20refactor:=20link=20id=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkmind/src/main/java/com/app/toaster/link/domain/Link.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkmind/src/main/java/com/app/toaster/link/domain/Link.java b/linkmind/src/main/java/com/app/toaster/link/domain/Link.java index e35e61f2..577d0a88 100644 --- a/linkmind/src/main/java/com/app/toaster/link/domain/Link.java +++ b/linkmind/src/main/java/com/app/toaster/link/domain/Link.java @@ -17,7 +17,7 @@ public class Link { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long Id; + private Long id; private String title; From 1cb6af6981604aad6b30ef40bbfc56e7a4bd09c6 Mon Sep 17 00:00:00 2001 From: soohyun <49307946+sss4920@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:23:36 +0900 Subject: [PATCH 10/10] [#250] chore: delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 4246d468f8c27eb9a802725fbfded47448378252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!EO^V5FMu}^{PV30i+%+acopVi&7yj+mIeO^wLFe02H#_2v*&$t8CI7qDXs& zU*JRd5`L$BW4ox;mMg8$j5K~@&y4MT-nG|6qz3cs1yP5HG?cLwp}0fX&)SeyXjum; z*T)&Wstk#(?xY2;(w**MPAK% zz2B;})?Rt=*I%t7{q))M*Ti>%d+OwIz-#ycqrpQ~ofIkN$w3Y0MKUc5TYiO)JB{d=4(Wh~bOhW1mF_dR zLE{0Uc07x)M1%ohKp4132EtybH}7!{GPE!t3_MH*cz-ZZ#yDW@(QO?l+!X-WMza&x z{L9EWCSV+}_6QF|`Bb1!RpE-Ed^*}qh>HW(9(_8gaQRSSWEE~G%8icxjSD9gdz4Zb z5C(2Du;!~BKK~E@e*eFnBsF0`82GOkQ0-wd9N>|{+1hwGK5Gs13zUW9YL9