refactor: 기록 단건 조회 시 Optional 로 감싸서 반환되도록 수정 - PR 리뷰 (#41)

depromeet · Jul 7, 2023 · 9fc7217 · 9fc7217
1 parent ed577b7
commit 9fc7217
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/...-api/src/test/java/com/depromeet/oversweet/record/service/DrinkRecordSaveServiceTest.java b/...-api/src/test/java/com/depromeet/oversweet/record/service/DrinkRecordSaveServiceTest.java
@@ -16,6 +16,9 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoSettings;
 
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
@@ -56,7 +59,7 @@ void saveDrinkRecordTest() {
         //when
         when(findMemberRepository.findMemberById(memberEntity.getId())).thenReturn(memberEntity);
         when(findDrinkRepository.findDrinkById(drinkEntity.getId())).thenReturn(drinkEntity);
-        when(findRecordsRepository.findRecordById(recordEntity.getId())).thenReturn(recordEntity);
+        when(findRecordsRepository.findRecordById(recordEntity.getId())).thenReturn(Optional.ofNullable(recordEntity));
 
         DrinkRecordSaveRequest saveRequest = DrinkRecordSaveRequest.builder()
                 .drinkId(drinkEntity.getId())
@@ -66,9 +69,10 @@ void saveDrinkRecordTest() {
 
         drinkRecordSaveService.saveDrinkRecord(memberEntity.getId(), saveRequest);
 
-        RecordEntity findRecord = findRecordsRepository.findRecordById(recordEntity.getId());
+        Optional<RecordEntity> findRecordOpt = findRecordsRepository.findRecordById(recordEntity.getId());
 
-        assertEquals(recordEntity.getId(), findRecord.getId());
+        assertThat(findRecordOpt.isPresent());
+        assertEquals(recordEntity.getId(), findRecordOpt.get().getId());
     }
 
 }
diff --git a/...src/main/java/com/depromeet/oversweet/domain/record/repository/FindRecordsRepository.java b/...src/main/java/com/depromeet/oversweet/domain/record/repository/FindRecordsRepository.java
@@ -4,12 +4,13 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 유저의 해당 기간 음료 당 조회 Interface
  */
 public interface FindRecordsRepository {
     List<RecordEntity> findRecordsByLocalDateTime(final Long memberId, final LocalDateTime startDate, LocalDateTime endDate);
 
-    RecordEntity findRecordById(Long id);
+    Optional<RecordEntity> findRecordById(Long id);
 }
diff --git a/...main/java/com/depromeet/oversweet/domain/record/repository/FindRecordsRepositoryImpl.java b/...main/java/com/depromeet/oversweet/domain/record/repository/FindRecordsRepositoryImpl.java
@@ -8,6 +8,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 import static com.depromeet.oversweet.domain.drink.entity.QDrinkEntity.drinkEntity;
 import static com.depromeet.oversweet.domain.franchise.entity.QFranchiseEntity.franchiseEntity;
@@ -42,12 +43,12 @@ public List<RecordEntity> findRecordsByLocalDateTime(final Long memberId, final
 
     @Override
     @Transactional(readOnly = true)
-    public RecordEntity findRecordById(Long id) {
-        return queryFactory.selectFrom(recordEntity)
+    public Optional<RecordEntity> findRecordById(Long id) {
+        return Optional.ofNullable(queryFactory.selectFrom(recordEntity)
                 .join(recordEntity.drink, drinkEntity).fetchJoin()
                 .join(recordEntity.drink.franchise, franchiseEntity).fetchJoin()
                 .where(recordEntity.member.id.eq(id))
-                .fetchOne();
+                .fetchOne());
     }
 }