[refac] change the optional return value to boolean

Team-Hankki · Jul 16, 2024 · 245c8ad · 245c8ad
1 parent d5e0c7d
commit 245c8ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -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<UniversityStore> 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/.../org/hankki/hankkiserver/domain/universitystore/repository/UniversityStoreRepository.java b/.../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<UniversityStore, Long> {
 
-    Optional<UniversityStore> findByUniversityIdAndStore(Long universityId, Store store);
+    boolean existsByUniversityIdAndStore(Long universityId, Store store);
 }