From 2abb5c8ffea3084502f9a66d5844404a4f57bcde Mon Sep 17 00:00:00 2001 From: kkb Date: Sun, 23 Nov 2025 01:18:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/policy/SinglePolicyApiController.java | 4 ++-- .../pickyback/controller/user/UserController.java | 11 +++++++++++ .../bookmark/repository/BookmarkRepository.java | 1 + .../policy/dto}/SinglePolicyResponseDto.java | 2 +- .../policy/repository}/SinglePolicyRepository.java | 2 +- .../policy/service}/SinglePolicyService.java | 10 +++++----- .../example/pickyback/domain/user/entity/User.java | 1 - .../domain/user/repository/UserRepository.java | 7 +++++++ .../repository/bookmark/BookmarkRepository.java | 8 -------- .../repository/policy/PolicyStatsRepository.java | 7 ------- 10 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java rename picky-back/src/main/java/com/example/pickyback/{dto/policy => domain/policy/dto}/SinglePolicyResponseDto.java (97%) rename picky-back/src/main/java/com/example/pickyback/{repository/policy => domain/policy/repository}/SinglePolicyRepository.java (78%) rename picky-back/src/main/java/com/example/pickyback/{service/policy => domain/policy/service}/SinglePolicyService.java (81%) create mode 100644 picky-back/src/main/java/com/example/pickyback/domain/user/repository/UserRepository.java delete mode 100644 picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java delete mode 100644 picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java diff --git a/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java b/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java index ae8f655..807e076 100644 --- a/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java +++ b/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java @@ -1,8 +1,8 @@ package com.example.pickyback.controller.policy; -import com.example.pickyback.dto.policy.SinglePolicyResponseDto; +import com.example.pickyback.domain.policy.dto.SinglePolicyResponseDto; import com.example.pickyback.global.dto.ApiResponse; -import com.example.pickyback.service.policy.SinglePolicyService; +import com.example.pickyback.domain.policy.service.SinglePolicyService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java b/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java new file mode 100644 index 0000000..b472aca --- /dev/null +++ b/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java @@ -0,0 +1,11 @@ +package com.example.pickyback.controller.user; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/user") +public class UserController { +} diff --git a/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java b/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java index cb9b50a..699f3a1 100644 --- a/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java @@ -7,4 +7,5 @@ public interface BookmarkRepository extends JpaRepository { Page findByUserId(Long userId, Pageable pageable); + boolean existsByPolicyIdAndActive(Long policyId, boolean active); } diff --git a/picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java similarity index 97% rename from picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java index 7ed65d0..3a1265e 100644 --- a/picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java @@ -1,4 +1,4 @@ -package com.example.pickyback.dto.policy; +package com.example.pickyback.domain.policy.dto; import com.example.pickyback.domain.policy.entity.Policy; import com.example.pickyback.domain.policy.entity.PolicyStats; diff --git a/picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java similarity index 78% rename from picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java index 069f320..5b0794c 100644 --- a/picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java @@ -1,4 +1,4 @@ -package com.example.pickyback.repository.policy; +package com.example.pickyback.domain.policy.repository; import com.example.pickyback.domain.policy.entity.Policy; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java similarity index 81% rename from picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java index 630e81d..5a10764 100644 --- a/picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java @@ -1,13 +1,13 @@ -package com.example.pickyback.service.policy; +package com.example.pickyback.domain.policy.service; import static com.example.pickyback.global.exception.CommonErrorCode.POLICY_NOT_FOUNT_ERROR; +import com.example.pickyback.domain.bookmark.repository.BookmarkRepository; import com.example.pickyback.domain.policy.entity.Policy; import com.example.pickyback.domain.policy.entity.PolicyStats; -import com.example.pickyback.dto.policy.SinglePolicyResponseDto; -import com.example.pickyback.repository.bookmark.BookmarkRepository; -import com.example.pickyback.repository.policy.PolicyStatsRepository; -import com.example.pickyback.repository.policy.SinglePolicyRepository; +import com.example.pickyback.domain.policy.repository.PolicyStatsRepository; +import com.example.pickyback.domain.policy.dto.SinglePolicyResponseDto; +import com.example.pickyback.domain.policy.repository.SinglePolicyRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; diff --git a/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java b/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java index 7e30cdd..958a18e 100644 --- a/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java @@ -22,7 +22,6 @@ public class User extends BaseEntity { @Column(name = "income_bracket", nullable = false) private Long incomeBracket; - public static User create(Long incomeBracket) { User user = new User(); user.incomeBracket = incomeBracket; diff --git a/picky-back/src/main/java/com/example/pickyback/domain/user/repository/UserRepository.java b/picky-back/src/main/java/com/example/pickyback/domain/user/repository/UserRepository.java new file mode 100644 index 0000000..db678ca --- /dev/null +++ b/picky-back/src/main/java/com/example/pickyback/domain/user/repository/UserRepository.java @@ -0,0 +1,7 @@ +package com.example.pickyback.domain.user.repository; + +import com.example.pickyback.domain.user.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { +} diff --git a/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java b/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java deleted file mode 100644 index 6f355df..0000000 --- a/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.pickyback.repository.bookmark; - -import com.example.pickyback.domain.bookmark.entity.Bookmark; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BookmarkRepository extends JpaRepository { - boolean existsByPolicyIdAndActive(Long policyId, boolean active); -} diff --git a/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java b/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java deleted file mode 100644 index 471b31e..0000000 --- a/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.pickyback.repository.policy; - -import com.example.pickyback.domain.policy.entity.PolicyStats; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PolicyStatsRepository extends JpaRepository { -} From 1a2c3e7c266498bf23d86f39ab9a16c947247933 Mon Sep 17 00:00:00 2001 From: kkb Date: Sun, 23 Nov 2025 01:18:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=A4=91=EB=B3=B5=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/policy/SinglePolicyApiController.java | 4 ++-- .../pickyback/controller/user/UserController.java | 11 +++++++++++ .../bookmark/repository/BookmarkRepository.java | 2 ++ .../policy/dto}/SinglePolicyResponseDto.java | 2 +- .../policy/repository}/SinglePolicyRepository.java | 2 +- .../policy/service}/SinglePolicyService.java | 10 +++++----- .../example/pickyback/domain/user/entity/User.java | 1 - .../repository/bookmark/BookmarkRepository.java | 8 -------- .../repository/policy/PolicyStatsRepository.java | 7 ------- 9 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java rename picky-back/src/main/java/com/example/pickyback/{dto/policy => domain/policy/dto}/SinglePolicyResponseDto.java (97%) rename picky-back/src/main/java/com/example/pickyback/{repository/policy => domain/policy/repository}/SinglePolicyRepository.java (78%) rename picky-back/src/main/java/com/example/pickyback/{service/policy => domain/policy/service}/SinglePolicyService.java (81%) delete mode 100644 picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java delete mode 100644 picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java diff --git a/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java b/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java index ae8f655..807e076 100644 --- a/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java +++ b/picky-back/src/main/java/com/example/pickyback/controller/policy/SinglePolicyApiController.java @@ -1,8 +1,8 @@ package com.example.pickyback.controller.policy; -import com.example.pickyback.dto.policy.SinglePolicyResponseDto; +import com.example.pickyback.domain.policy.dto.SinglePolicyResponseDto; import com.example.pickyback.global.dto.ApiResponse; -import com.example.pickyback.service.policy.SinglePolicyService; +import com.example.pickyback.domain.policy.service.SinglePolicyService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java b/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java new file mode 100644 index 0000000..b472aca --- /dev/null +++ b/picky-back/src/main/java/com/example/pickyback/controller/user/UserController.java @@ -0,0 +1,11 @@ +package com.example.pickyback.controller.user; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/user") +public class UserController { +} diff --git a/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java b/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java index f4b712e..93ff6e4 100644 --- a/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/bookmark/repository/BookmarkRepository.java @@ -1,6 +1,7 @@ package com.example.pickyback.domain.bookmark.repository; import com.example.pickyback.domain.bookmark.entity.Bookmark; + import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -10,6 +11,7 @@ public interface BookmarkRepository extends JpaRepository { // 마이페이지 북마크 목록 Page findByUserId(Long userId, Pageable pageable); + boolean existsByPolicyIdAndActive(Long policyId, boolean active); // 북마크 중복 방지 boolean existsByUserIdAndPolicyIdAndActiveTrue(Long userId, Long policyId); diff --git a/picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java similarity index 97% rename from picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java index 7ed65d0..3a1265e 100644 --- a/picky-back/src/main/java/com/example/pickyback/dto/policy/SinglePolicyResponseDto.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/dto/SinglePolicyResponseDto.java @@ -1,4 +1,4 @@ -package com.example.pickyback.dto.policy; +package com.example.pickyback.domain.policy.dto; import com.example.pickyback.domain.policy.entity.Policy; import com.example.pickyback.domain.policy.entity.PolicyStats; diff --git a/picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java similarity index 78% rename from picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java index 069f320..5b0794c 100644 --- a/picky-back/src/main/java/com/example/pickyback/repository/policy/SinglePolicyRepository.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/repository/SinglePolicyRepository.java @@ -1,4 +1,4 @@ -package com.example.pickyback.repository.policy; +package com.example.pickyback.domain.policy.repository; import com.example.pickyback.domain.policy.entity.Policy; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java b/picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java similarity index 81% rename from picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java rename to picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java index 630e81d..5a10764 100644 --- a/picky-back/src/main/java/com/example/pickyback/service/policy/SinglePolicyService.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/policy/service/SinglePolicyService.java @@ -1,13 +1,13 @@ -package com.example.pickyback.service.policy; +package com.example.pickyback.domain.policy.service; import static com.example.pickyback.global.exception.CommonErrorCode.POLICY_NOT_FOUNT_ERROR; +import com.example.pickyback.domain.bookmark.repository.BookmarkRepository; import com.example.pickyback.domain.policy.entity.Policy; import com.example.pickyback.domain.policy.entity.PolicyStats; -import com.example.pickyback.dto.policy.SinglePolicyResponseDto; -import com.example.pickyback.repository.bookmark.BookmarkRepository; -import com.example.pickyback.repository.policy.PolicyStatsRepository; -import com.example.pickyback.repository.policy.SinglePolicyRepository; +import com.example.pickyback.domain.policy.repository.PolicyStatsRepository; +import com.example.pickyback.domain.policy.dto.SinglePolicyResponseDto; +import com.example.pickyback.domain.policy.repository.SinglePolicyRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; diff --git a/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java b/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java index 7e30cdd..958a18e 100644 --- a/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java +++ b/picky-back/src/main/java/com/example/pickyback/domain/user/entity/User.java @@ -22,7 +22,6 @@ public class User extends BaseEntity { @Column(name = "income_bracket", nullable = false) private Long incomeBracket; - public static User create(Long incomeBracket) { User user = new User(); user.incomeBracket = incomeBracket; diff --git a/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java b/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java deleted file mode 100644 index 6f355df..0000000 --- a/picky-back/src/main/java/com/example/pickyback/repository/bookmark/BookmarkRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.pickyback.repository.bookmark; - -import com.example.pickyback.domain.bookmark.entity.Bookmark; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface BookmarkRepository extends JpaRepository { - boolean existsByPolicyIdAndActive(Long policyId, boolean active); -} diff --git a/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java b/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java deleted file mode 100644 index 471b31e..0000000 --- a/picky-back/src/main/java/com/example/pickyback/repository/policy/PolicyStatsRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.pickyback.repository.policy; - -import com.example.pickyback.domain.policy.entity.PolicyStats; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PolicyStatsRepository extends JpaRepository { -}