최종 수정

Author: minwoo0419

src/main/java/nutshell/server/repository/TimeBlockRepository.java

@@ -3,7 +3,6 @@
 import nutshell.server.domain.Task;
 import nutshell.server.domain.TimeBlock;
 import nutshell.server.domain.User;
-import nutshell.server.dto.timeBlock.response.TimeBlockDto;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -48,12 +47,12 @@ Boolean existsByTaskAndStartTimeBetweenAndEndTimeBetween(
     );
 
 
-    @Query("SELECT new nutshell.server.dto.timeBlock.response.TimeBlockDto(t.id, t.isAllTime, t.startTime, t.endTime) " +
+    @Query("SELECT t " +
             "FROM TimeBlock t " +
             "WHERE t.task = :task " +
             "AND t.startTime between :startTime and :endTime " +
             "AND t.endTime between :startTime and :endTime")
-    List<TimeBlockDto> findAllByTaskIdAndTimeRange(
+    List<TimeBlock> findAllByTaskIdAndTimeRange(
             final Task task,
             final LocalDateTime startTime,
             final LocalDateTime endTime

src/main/java/nutshell/server/service/timeBlock/TimeBlockService.java

@@ -66,7 +66,7 @@ public void update(
             throw new BusinessException(BusinessErrorCode.TIME_CONFLICT);
         }
         TimeBlock timeBlock = timeBlockRetriever.findByTaskAndId(task, timeBlockId);
-        timeBlockEditor.updateTime(timeBlock, timeBlockRequestDto.isAllTime(), timeBlock,timeBlockRequestDto.startTime(), timeBlockRequestDto.endTime());
+        timeBlockEditor.updateTime(timeBlock, timeBlockRequestDto.isAllTime(),timeBlockRequestDto.startTime(), timeBlockRequestDto.endTime());
     }
 
     @Transactional
@@ -96,7 +96,7 @@ public TimeBlockTasksDto getTimeBlocks(
                                 .name(task.getName())
                                 .status(task.getStatus().getContent())
                                 .timeBlocks(timeBlockRetriever.findAllByTaskIdAndTimeRange(task, startTime, endTime).stream().map(
-                                    timeBlock -> TimeBlock.of(timeBlock.isAllTime, timeBlock.startTime, timeBlock.endTime)
+                                        timeBlock -> TimeBlockDto.of(timeBlock.getId(), timeBlock.getIsAllTime(), timeBlock.getStartTime(), timeBlock.getEndTime())
                                 ).toList())
                                 .build()
                 ).toList();