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

Dev

Author: KangDaegyeom

src/main/java/com/grepp/teamnotfound/app/controller/api/auth/AuthController.java

@@ -96,7 +96,7 @@ public ResponseEntity<ApiResponse<?>> registerAdmin(@RequestBody RegisterRequest
     @Operation(summary = "소셜 로그인")
     @GetMapping("v1/social-auth/{provider}")
     public ResponseEntity<?> socialLogin(@PathVariable String provider) {
-        ProviderType providerType = ProviderType.valueOf(provider.toLowerCase());
+        ProviderType providerType = ProviderType.valueOf(provider.toUpperCase());
         String url = customOAuth2UserService.getAuthUrl(providerType);
         return ResponseEntity.ok(url);
     }

src/main/java/com/grepp/teamnotfound/app/model/auth/oauth/CustomOAuth2UserService.java

@@ -144,6 +144,6 @@ private String generateNickname() {
     }
 
     public String getAuthUrl(ProviderType provider) {
-        return baseUrl + "/oauth2/authorization/" + provider;
+        return baseUrl + "/oauth2/authorization/" + provider.toString().toLowerCase();
     }
 }

src/main/java/com/grepp/teamnotfound/app/model/report/repository/ReportRepositoryImpl.java

@@ -107,7 +107,7 @@ private OrderSpecifier<?> getOrderSpecifier(ReportsListSortBy sortBy, AdminListS
                         .otherwise(1);
                 yield direction.isAsc() ? typeOrder.asc() : typeOrder.desc();
             }
-            case REASON -> direction.isAsc()? report.reason.asc() : report.reason.desc();
+            case REASON -> direction.isAsc()? report.category.asc() : report.category.desc();
             case STATUS -> {
                 NumberExpression<Integer> statusOrder = new CaseBuilder()
                         .when(report.state.eq(ReportState.REJECT)).then(3)

src/main/java/com/grepp/teamnotfound/app/model/vaccination/VaccinationService.java

@@ -193,7 +193,7 @@ public void createVaccinationSchedule(Long petId, Long userId){
             scheduleService.deleteVaccinationSchedule(pet, vaccine.getName().name() + " 추가_접종일");
 
             // 각 백신에 맞는 일정 등록 로직
-            if (VaccineType.ADDITIONAL.equals(dto.getVaccineType())) {
+            if (VaccineType.ADDITIONAL.equals(dto.getVaccineType()) && dto.getDeletedAt() == null) {
                 // 보강 접종(1년 단위)
                 ScheduleCreateRequestDto scheduleDto = ScheduleCreateRequestDto.builder()
                         .petId(pet.getPetId())
@@ -204,7 +204,7 @@ public void createVaccinationSchedule(Long petId, Long userId){
                         .build();
                 scheduleService.createSchedule(userId, scheduleDto);
 
-            } else if (dto.getCount() <= vaccine.getBoosterCount() + 1) {
+            } else if (dto.getCount() <= vaccine.getBoosterCount() + 1 && dto.getDeletedAt() == null) {
                 // 추가 접종(2주 단위)
                 LocalDate cycleEndDate = dto.getVaccineAt().plusWeeks((long) (vaccine.getBoosterCount() + 1 - dto.getCount()) * vaccine.getBoosterCycle() + 1);
                 ScheduleCreateRequestDto scheduleDto = ScheduleCreateRequestDto.builder()