Merge pull request #121 from prgrms-web-devcourse-final-project/dev

Dev

Author: KangDaegyeom

src/main/java/com/grepp/teamnotfound/app/controller/api/schedule/ScheduleApiController.java

@@ -22,7 +22,7 @@
 
 @AllArgsConstructor
 @RestController
-@RequestMapping(value = "/api/dashboard/v2", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(value = "/api/schedule/v2", produces = MediaType.APPLICATION_JSON_VALUE)
 @PreAuthorize("isAuthenticated()")
 public class ScheduleApiController {
 
@@ -86,4 +86,13 @@ public ResponseEntity<?> ScheduleIsDone(
         scheduleService.checkIsDone(principal.getUserId(), scheduleId);
         return ResponseEntity.ok(HttpStatus.ACCEPTED);
     }
+
+    @GetMapping("/vaccination/{petId}")
+    public ResponseEntity<?> NextVaccination(
+            @AuthenticationPrincipal Principal principal,
+            @PathVariable Long petId
+    ){
+        List<ScheduleDto> schedules = scheduleService.getNextVaccination(principal.getUserId(), petId);
+        return ResponseEntity.ok(Map.of("data", schedules));
+    }
 }

src/main/java/com/grepp/teamnotfound/app/model/schedule/ScheduleService.java

@@ -10,6 +10,7 @@
 import com.grepp.teamnotfound.app.model.schedule.repository.ScheduleRepository;
 import com.grepp.teamnotfound.app.model.user.entity.User;
 import com.grepp.teamnotfound.app.model.user.repository.UserRepository;
+import com.grepp.teamnotfound.app.model.vaccination.code.VaccineName;
 import com.grepp.teamnotfound.infra.error.exception.PetException;
 import com.grepp.teamnotfound.infra.error.exception.ScheduleException;
 import com.grepp.teamnotfound.infra.error.exception.UserException;
@@ -21,6 +22,8 @@
 import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -217,4 +220,34 @@ public void deleteVaccinationSchedule(Pet pet, String keywords) {
         schedules.forEach(schedule -> schedule.setDeletedAt(OffsetDateTime.now()));
         scheduleRepository.saveAll(schedules);
     }
+
+    @Transactional
+    public List<ScheduleDto> getNextVaccination(Long userId, Long petId) {
+        Pet pet = petRepository.findById(petId).orElseThrow(() -> new PetException(PetErrorCode.PET_NOT_FOUND));
+        userRepository.findById(userId).orElseThrow(() -> new UserException(UserErrorCode.USER_NOT_FOUND));
+
+        List<Schedule> schedules = new ArrayList<>();
+        for (VaccineName name: VaccineName.values()){
+            Optional<Schedule> schedule = scheduleRepository.findTop1ByPetAndNameContainingAndDeletedAtNullAndScheduleDateAfterOrderByScheduleDateAsc(pet, name.name(), LocalDate.now());
+            if (schedule.isPresent()){
+                schedules.add(schedule.get());
+            }
+        }
+
+        List<ScheduleDto> scheduleDtos = new ArrayList<>();
+
+        schedules.forEach(schedule ->
+                scheduleDtos.add(ScheduleDto.builder()
+                        .scheduleId(schedule.getScheduleId())
+                        .date(schedule.getScheduleDate())
+                        .name(schedule.getName())
+                        .cycle(schedule.getCycle())
+                        .cycleEnd(schedule.getCycleEnd())
+                        .isDone(schedule.getIsDone())
+                        .petName(schedule.getPet().getName())
+                        .petId(schedule.getPet().getPetId()).build())
+        );
+
+        return scheduleDtos;
+    }
 }

src/main/java/com/grepp/teamnotfound/app/model/schedule/repository/ScheduleRepository.java

@@ -7,6 +7,8 @@
 import feign.Param;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -23,4 +25,6 @@ public interface ScheduleRepository extends JpaRepository<Schedule, Long> {
 
     @Query("SELECT s FROM Schedule s WHERE s.scheduleDate = :tomorrow AND s.isDone = false AND s.deletedAt IS NULL")
     List<Schedule> findSchedulesForNotification(LocalDate tomorrow);
-}
+
+    Optional<Schedule> findTop1ByPetAndNameContainingAndDeletedAtNullAndScheduleDateAfterOrderByScheduleDateAsc(Pet pet, String name, LocalDate today);
+}