가게 데이터 단일 조회 쿼리 함수 null 체크 방식 변경

if문 처리에서 optional 방식으로 변경

src/main/java/com/example/myongsick/domain/scrap/repository/ScrapRepositoryCustom.java

@@ -1,12 +1,13 @@
 package com.example.myongsick.domain.scrap.repository;
 
 import com.example.myongsick.domain.scrap.dto.ScrapCountResponse;
+import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.query.Param;
 
 public interface ScrapRepositoryCustom {
   Page<ScrapCountResponse> findAllByCampusWithPaging(@Param("campus") String campus, Pageable pageable);
 
-  ScrapCountResponse findByIdCustom(Long storeId);
+  Optional<ScrapCountResponse> findByIdCustom(Long storeId);
 }

src/main/java/com/example/myongsick/domain/scrap/repository/ScrapRepositoryImpl.java

@@ -13,6 +13,7 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -45,11 +46,11 @@ public Page<ScrapCountResponse> findAllByCampusWithPaging(String campus, Pageabl
   }
 
   @Override
-  public ScrapCountResponse findByIdCustom(Long storeId) {
-    return jpaQueryFactory.select(new QScrapCountResponse(store.id.as("storeId"), store.code, store.name, store.category, store.address, store.contact, store.urlAddress, store.distance, store.latitude, store.longitude, store.scrapList.size().as("scrapCount")))
+  public Optional<ScrapCountResponse> findByIdCustom(Long storeId) {
+    return Optional.ofNullable(jpaQueryFactory.select(new QScrapCountResponse(store.id.as("storeId"), store.code, store.name, store.category, store.address, store.contact, store.urlAddress, store.distance, store.latitude, store.longitude, store.scrapList.size().as("scrapCount")))
         .from(store)
         .where(store.id.eq(storeId))
-        .fetchOne();
+        .fetchOne());
   }
 
   private List<OrderSpecifier> getOrderSpecifier(Sort sort) {

src/main/java/com/example/myongsick/domain/scrap/service/ScrapServiceImpl.java

@@ -117,10 +117,6 @@ public void updateStore() {
   @Override
   public ScrapCountResponse getStoreOne(Long storeId) {
 //    return storeRepository.findByIdCustom(storeId).map(ScrapCountResponse::toDto).orElseThrow(NotFoundStoreException::new);
-    ScrapCountResponse scrapCountResponse = scrapRepositoryCustom.findByIdCustom(storeId);
-    if( scrapCountResponse == null ) {
-      throw new NotFoundStoreException();
-    }
-    return scrapCountResponse;
+    return scrapRepositoryCustom.findByIdCustom(storeId).orElseThrow(NotFoundStoreException::new);
   }
 }