From 245c8adb7218dd8d9f9c00833cb2d9e2276cab0f Mon Sep 17 00:00:00 2001 From: kgy1008 Date: Tue, 16 Jul 2024 16:18:59 +0900 Subject: [PATCH] [refac] change the optional return value to boolean --- .../hankkiserver/api/store/service/StoreQueryService.java | 7 +++---- .../api/store/service/UniversityStoreFinder.java | 7 ++----- .../repository/UniversityStoreRepository.java | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java index 74f4164e..fee68be5 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java @@ -87,9 +87,8 @@ public void validateDuplicatedStore(final StoreValidationCommand command) { } private void findUniversityStore(final Long universityId, final Store store) { - universityStoreFinder.findByUniversityIdAndStore(universityId, store) - .ifPresent(universityStore -> { - throw new ConflictException(StoreErrorCode.STORE_ALREADY_REGISTERED, new StoreDuplicateValidationResponse(store.getId())); - }); + if (universityStoreFinder.findByUniversityIdAndStore(universityId, store)) { + throw new ConflictException(StoreErrorCode.STORE_ALREADY_REGISTERED, new StoreDuplicateValidationResponse(store.getId())); + } } } diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/UniversityStoreFinder.java b/src/main/java/org/hankki/hankkiserver/api/store/service/UniversityStoreFinder.java index 280e68a8..318a896e 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/UniversityStoreFinder.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/UniversityStoreFinder.java @@ -2,19 +2,16 @@ import lombok.RequiredArgsConstructor; import org.hankki.hankkiserver.domain.store.model.Store; -import org.hankki.hankkiserver.domain.universitystore.model.UniversityStore; import org.hankki.hankkiserver.domain.universitystore.repository.UniversityStoreRepository; import org.springframework.stereotype.Component; -import java.util.Optional; - @Component @RequiredArgsConstructor public class UniversityStoreFinder { private final UniversityStoreRepository universityStoreRepository; - protected Optional findByUniversityIdAndStore(final Long universityId, final Store store) { - return universityStoreRepository.findByUniversityIdAndStore(universityId, store); + protected boolean findByUniversityIdAndStore(final Long universityId, final Store store) { + return universityStoreRepository.existsByUniversityIdAndStore(universityId, store); } } diff --git a/src/main/java/org/hankki/hankkiserver/domain/universitystore/repository/UniversityStoreRepository.java b/src/main/java/org/hankki/hankkiserver/domain/universitystore/repository/UniversityStoreRepository.java index 6d1b7efa..f4653170 100644 --- a/src/main/java/org/hankki/hankkiserver/domain/universitystore/repository/UniversityStoreRepository.java +++ b/src/main/java/org/hankki/hankkiserver/domain/universitystore/repository/UniversityStoreRepository.java @@ -4,9 +4,7 @@ import org.hankki.hankkiserver.domain.universitystore.model.UniversityStore; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.Optional; - public interface UniversityStoreRepository extends JpaRepository { - Optional findByUniversityIdAndStore(Long universityId, Store store); + boolean existsByUniversityIdAndStore(Long universityId, Store store); }