diff --git a/src/main/java/dbdr/domain/careworker/controller/CareworkerAdminController.java b/src/main/java/dbdr/domain/careworker/controller/CareworkerAdminController.java index 59d22472..e0fc02e1 100644 --- a/src/main/java/dbdr/domain/careworker/controller/CareworkerAdminController.java +++ b/src/main/java/dbdr/domain/careworker/controller/CareworkerAdminController.java @@ -72,4 +72,4 @@ public ResponseEntity> deleteCareworker(@PathVariable careworkerService.deleteCareworkerByAdmin(careworkerId); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/controller/CareworkerController.java b/src/main/java/dbdr/domain/careworker/controller/CareworkerController.java index 5457f5d3..1a9ea81f 100644 --- a/src/main/java/dbdr/domain/careworker/controller/CareworkerController.java +++ b/src/main/java/dbdr/domain/careworker/controller/CareworkerController.java @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - @Tag(name = "[요양보호사] 마이페이지", description = "요양보호사 본인의 정보 조회 및 수정") @RestController @RequestMapping("/${spring.app.version}/careworker") diff --git a/src/main/java/dbdr/domain/careworker/controller/CareworkerInstitutionController.java b/src/main/java/dbdr/domain/careworker/controller/CareworkerInstitutionController.java index 3b977450..9d4bfae0 100644 --- a/src/main/java/dbdr/domain/careworker/controller/CareworkerInstitutionController.java +++ b/src/main/java/dbdr/domain/careworker/controller/CareworkerInstitutionController.java @@ -79,4 +79,4 @@ public ResponseEntity> deleteCareworker( careworkerService.deleteCareworker(careworkerId, institution.getId()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/dto/CareworkerMapper.java b/src/main/java/dbdr/domain/careworker/dto/CareworkerMapper.java index d23dbd11..4d28ffbd 100644 --- a/src/main/java/dbdr/domain/careworker/dto/CareworkerMapper.java +++ b/src/main/java/dbdr/domain/careworker/dto/CareworkerMapper.java @@ -32,5 +32,4 @@ protected Institution mapInstitution(Long institutionId) { return institutionService.getInstitutionById(institutionId); } - -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerRequest.java b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerRequest.java index 3fc546eb..5f75856d 100644 --- a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerRequest.java +++ b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerRequest.java @@ -36,5 +36,4 @@ public class CareworkerRequest { @NotBlank(message = "비밀번호는 필수 항목입니다.") private String loginPassword; - -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateAdminRequest.java b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateAdminRequest.java index de5c89f5..930eb452 100644 --- a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateAdminRequest.java +++ b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateAdminRequest.java @@ -34,8 +34,5 @@ public class CareworkerUpdateAdminRequest { @Pattern(regexp = "010\\d{8}", message = "010XXXXXXXX형식으로 입력해주세요.") private String phone; - - - // 비밀번호는 수정 불가 -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateInstitutionRequest.java b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateInstitutionRequest.java index 36bb1e0d..2fd261bf 100644 --- a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateInstitutionRequest.java +++ b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateInstitutionRequest.java @@ -8,7 +8,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; - @Getter @NoArgsConstructor @AllArgsConstructor @@ -28,6 +27,5 @@ public class CareworkerUpdateInstitutionRequest { @Pattern(regexp = "010\\d{8}", message = "010XXXXXXXX형식으로 입력해주세요.") private String phone; - // 요양원 권한 사용자는 institutionId를 변경할 수 없음 -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateRequest.java b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateRequest.java index 546376d2..03719794 100644 --- a/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateRequest.java +++ b/src/main/java/dbdr/domain/careworker/dto/request/CareworkerUpdateRequest.java @@ -1,6 +1,5 @@ package dbdr.domain.careworker.dto.request; - import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/dbdr/domain/careworker/dto/response/CareworkerResponse.java b/src/main/java/dbdr/domain/careworker/dto/response/CareworkerResponse.java index 55630cb2..50ac672e 100644 --- a/src/main/java/dbdr/domain/careworker/dto/response/CareworkerResponse.java +++ b/src/main/java/dbdr/domain/careworker/dto/response/CareworkerResponse.java @@ -16,4 +16,4 @@ public class CareworkerResponse { private String name; private String email; private String phone; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/careworker/repository/CareworkerRepository.java b/src/main/java/dbdr/domain/careworker/repository/CareworkerRepository.java index 86905cfc..03c0b69e 100644 --- a/src/main/java/dbdr/domain/careworker/repository/CareworkerRepository.java +++ b/src/main/java/dbdr/domain/careworker/repository/CareworkerRepository.java @@ -8,7 +8,6 @@ public interface CareworkerRepository extends JpaRepository { - List findAllByInstitutionId(Long institutionId); Optional findByLineUserId(String userId); diff --git a/src/main/java/dbdr/domain/careworker/service/CareworkerService.java b/src/main/java/dbdr/domain/careworker/service/CareworkerService.java index aa902bde..d597ac1d 100644 --- a/src/main/java/dbdr/domain/careworker/service/CareworkerService.java +++ b/src/main/java/dbdr/domain/careworker/service/CareworkerService.java @@ -258,5 +258,4 @@ public void updateLineUserId(String userId, String phoneNumber) { careworkerRepository.save(careworker); } - -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/chart/entity/HealthBloodPressure.java b/src/main/java/dbdr/domain/chart/entity/HealthBloodPressure.java index 168a25b2..62dd02cd 100644 --- a/src/main/java/dbdr/domain/chart/entity/HealthBloodPressure.java +++ b/src/main/java/dbdr/domain/chart/entity/HealthBloodPressure.java @@ -19,4 +19,4 @@ public class HealthBloodPressure { @Comment("혈압 최저") private String diastolic; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/chart/entity/PhysicalClear.java b/src/main/java/dbdr/domain/chart/entity/PhysicalClear.java index 3f58b809..6ba68c6b 100644 --- a/src/main/java/dbdr/domain/chart/entity/PhysicalClear.java +++ b/src/main/java/dbdr/domain/chart/entity/PhysicalClear.java @@ -18,4 +18,4 @@ public class PhysicalClear { @Comment("목욕 유무") private boolean bath; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/core/messaging/service/LineMessagingService.java b/src/main/java/dbdr/domain/core/messaging/service/LineMessagingService.java index 756b0a24..35c05d8e 100644 --- a/src/main/java/dbdr/domain/core/messaging/service/LineMessagingService.java +++ b/src/main/java/dbdr/domain/core/messaging/service/LineMessagingService.java @@ -1,6 +1,5 @@ package dbdr.domain.core.messaging.service; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.linecorp.bot.client.LineMessagingClient; diff --git a/src/main/java/dbdr/domain/core/messaging/service/SmsMessagingService.java b/src/main/java/dbdr/domain/core/messaging/service/SmsMessagingService.java index d0658d27..8b165dba 100644 --- a/src/main/java/dbdr/domain/core/messaging/service/SmsMessagingService.java +++ b/src/main/java/dbdr/domain/core/messaging/service/SmsMessagingService.java @@ -9,7 +9,6 @@ import net.nurigo.sdk.message.response.SingleMessageSentResponse; import net.nurigo.sdk.message.service.DefaultMessageService; - @Service public class SmsMessagingService implements MessagingService { private final DefaultMessageService defaultMessageService; diff --git a/src/main/java/dbdr/domain/excel/controller/ExcelController.java b/src/main/java/dbdr/domain/excel/controller/ExcelController.java index 63828038..a33a3ed5 100644 --- a/src/main/java/dbdr/domain/excel/controller/ExcelController.java +++ b/src/main/java/dbdr/domain/excel/controller/ExcelController.java @@ -107,4 +107,4 @@ public ResponseEntity uploadRecipientData( RecipientFileUploadResponse result = excelUploadService.uploadRecipientExcel(file, institution.getId()); return ResponseEntity.ok(result); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/excel/dto/CareworkerFileUploadResponse.java b/src/main/java/dbdr/domain/excel/dto/CareworkerFileUploadResponse.java index 83430592..fc810b60 100644 --- a/src/main/java/dbdr/domain/excel/dto/CareworkerFileUploadResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/CareworkerFileUploadResponse.java @@ -6,4 +6,4 @@ public record CareworkerFileUploadResponse( String storeName, List uploadedCareworkers, List failedCareworkers -) {} \ No newline at end of file +) {} diff --git a/src/main/java/dbdr/domain/excel/dto/ExcelCareworkerResponse.java b/src/main/java/dbdr/domain/excel/dto/ExcelCareworkerResponse.java index 3765aac2..0d1fd8a1 100644 --- a/src/main/java/dbdr/domain/excel/dto/ExcelCareworkerResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/ExcelCareworkerResponse.java @@ -14,4 +14,4 @@ public class ExcelCareworkerResponse { private String name; private String email; private String phone; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/excel/dto/ExcelGuardianResponse.java b/src/main/java/dbdr/domain/excel/dto/ExcelGuardianResponse.java index e2414468..ba4e5b04 100644 --- a/src/main/java/dbdr/domain/excel/dto/ExcelGuardianResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/ExcelGuardianResponse.java @@ -14,4 +14,4 @@ public class ExcelGuardianResponse { private String phone; private Long institution; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/excel/dto/ExcelRecipientResponse.java b/src/main/java/dbdr/domain/excel/dto/ExcelRecipientResponse.java index 65fb8e85..95111c3f 100644 --- a/src/main/java/dbdr/domain/excel/dto/ExcelRecipientResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/ExcelRecipientResponse.java @@ -21,4 +21,4 @@ public class ExcelRecipientResponse { private Long institution; private Long careworker; private Long guardian; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/excel/dto/GuardianFileUploadResponse.java b/src/main/java/dbdr/domain/excel/dto/GuardianFileUploadResponse.java index e977db63..71039737 100644 --- a/src/main/java/dbdr/domain/excel/dto/GuardianFileUploadResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/GuardianFileUploadResponse.java @@ -6,4 +6,4 @@ public record GuardianFileUploadResponse( String storeName, List uploadedGuardians, List failedGuardians -) {} \ No newline at end of file +) {} diff --git a/src/main/java/dbdr/domain/excel/dto/RecipientFileUploadResponse.java b/src/main/java/dbdr/domain/excel/dto/RecipientFileUploadResponse.java index 2efc1ac3..73402717 100644 --- a/src/main/java/dbdr/domain/excel/dto/RecipientFileUploadResponse.java +++ b/src/main/java/dbdr/domain/excel/dto/RecipientFileUploadResponse.java @@ -6,4 +6,4 @@ public record RecipientFileUploadResponse( String storeName, List uploadedRecipients, List failedRecipients -) {} \ No newline at end of file +) {} diff --git a/src/main/java/dbdr/domain/excel/service/ExcelDownloadService.java b/src/main/java/dbdr/domain/excel/service/ExcelDownloadService.java index 03b57c8b..c2f1940c 100644 --- a/src/main/java/dbdr/domain/excel/service/ExcelDownloadService.java +++ b/src/main/java/dbdr/domain/excel/service/ExcelDownloadService.java @@ -107,4 +107,4 @@ private byte[] convertWorkbookToByteArray(Workbook workbook) throws IOException return outputStream.toByteArray(); } } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/excel/service/ExcelUploadService.java b/src/main/java/dbdr/domain/excel/service/ExcelUploadService.java index cccfc77d..fe5d59d1 100644 --- a/src/main/java/dbdr/domain/excel/service/ExcelUploadService.java +++ b/src/main/java/dbdr/domain/excel/service/ExcelUploadService.java @@ -244,4 +244,4 @@ private String getCellValue(Cell cell) { private interface RowProcessor { void process(Row row); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/guardian/controller/GuardianInstitutionController.java b/src/main/java/dbdr/domain/guardian/controller/GuardianInstitutionController.java index e3c029de..10d39af0 100644 --- a/src/main/java/dbdr/domain/guardian/controller/GuardianInstitutionController.java +++ b/src/main/java/dbdr/domain/guardian/controller/GuardianInstitutionController.java @@ -4,8 +4,14 @@ import dbdr.domain.guardian.dto.request.GuardianUpdateRequest; import dbdr.domain.guardian.dto.response.GuardianResponse; import dbdr.domain.guardian.service.GuardianService; +import dbdr.domain.institution.entity.Institution; import dbdr.global.util.api.ApiUtils; +import dbdr.security.LoginInstitution; +import dbdr.security.model.AuthParam; +import dbdr.security.model.DbdrAuth; +import dbdr.security.model.Role; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import java.util.List; @@ -31,13 +37,17 @@ public class GuardianInstitutionController { @Operation(summary = "전체 보호자 정보 조회") @GetMapping - public ResponseEntity>> showAllGuardian() { - List guardianResponseList = guardianService.getAllGuardian(); + @DbdrAuth(targetRole = Role.INSTITUTION, authParam = AuthParam.LOGIN_INSTITUTION) + public ResponseEntity>> showAllGuardian( + @Parameter(hidden = true) @LoginInstitution Institution institution) { + List guardianResponseList = guardianService.getAllGuardianByInstitutionId( + institution.getId()); return ResponseEntity.ok(ApiUtils.success(guardianResponseList)); } @Operation(summary = "보호자 한 사람의 정보 조회") @GetMapping("/{guardianId}") + @DbdrAuth(targetRole = Role.INSTITUTION, authParam = AuthParam.GUARDIAN_ID, id = "guardianId") public ResponseEntity> showOneGuardian( @PathVariable("guardianId") Long guardianId) { GuardianResponse guardianResponse = guardianService.getGuardianById(guardianId); @@ -46,14 +56,18 @@ public ResponseEntity> showOneGuardian( @Operation(summary = "보호자 추가") @PostMapping + @DbdrAuth(targetRole = Role.INSTITUTION, authParam = AuthParam.LOGIN_INSTITUTION) public ResponseEntity> addGuardian( - @Valid @RequestBody GuardianRequest guardianRequest) { - GuardianResponse guardianResponse = guardianService.addGuardian(guardianRequest); + @Valid @RequestBody GuardianRequest guardianRequest, + @Parameter(hidden = true) @LoginInstitution Institution institution) { + GuardianResponse guardianResponse = guardianService.addGuardianByInstitution( + guardianRequest, institution.getId()); return ResponseEntity.status(HttpStatus.CREATED).body(ApiUtils.success(guardianResponse)); } @Operation(summary = "보호자 정보 수정") @PutMapping("/{guardianId}") + @DbdrAuth(targetRole = Role.INSTITUTION, authParam = AuthParam.GUARDIAN_ID, id = "guardianId") public ResponseEntity> updateGuardian( @PathVariable("guardianId") Long guardianId, @Valid @RequestBody GuardianUpdateRequest guardianRequest) { @@ -64,7 +78,9 @@ public ResponseEntity> updateGuardian( @Operation(summary = "보호자 삭제") @DeleteMapping("/{guardianId}") - public ResponseEntity> deleteGuardian(@PathVariable("guardianId") Long guardianId) { + @DbdrAuth(targetRole = Role.INSTITUTION, authParam = AuthParam.GUARDIAN_ID, id = "guardianId") + public ResponseEntity> deleteGuardian( + @PathVariable("guardianId") Long guardianId) { guardianService.deleteGuardianById(guardianId); return ResponseEntity.noContent().build(); } diff --git a/src/main/java/dbdr/domain/guardian/repository/GuardianRepository.java b/src/main/java/dbdr/domain/guardian/repository/GuardianRepository.java index 46187915..4975f677 100644 --- a/src/main/java/dbdr/domain/guardian/repository/GuardianRepository.java +++ b/src/main/java/dbdr/domain/guardian/repository/GuardianRepository.java @@ -19,4 +19,6 @@ public interface GuardianRepository extends JpaRepository { List findByAlertTime(LocalTime currentTime); Optional findByPhone(String phone); + + List findAllByInstitutionId(Long institutionId); } diff --git a/src/main/java/dbdr/domain/guardian/service/GuardianService.java b/src/main/java/dbdr/domain/guardian/service/GuardianService.java index f5c7d855..c15e2feb 100644 --- a/src/main/java/dbdr/domain/guardian/service/GuardianService.java +++ b/src/main/java/dbdr/domain/guardian/service/GuardianService.java @@ -84,6 +84,17 @@ public List getAllGuardian() { .toList(); } + @Transactional(readOnly = true) + public List getAllGuardianByInstitutionId(Long institutionId) { + List guardianList = guardianRepository.findAllByInstitutionId(institutionId); + return guardianList.stream() + .map(guardian -> new GuardianResponse(guardian.getId(), guardian.getPhone(), + guardian.getName(), + guardian.getInstitution().getId(), + guardian.isActive())) + .toList(); + } + @Transactional public GuardianResponse addGuardian(GuardianRequest guardianRequest) { ensureUniquePhone(guardianRequest.phone()); @@ -103,6 +114,25 @@ public GuardianResponse addGuardian(GuardianRequest guardianRequest) { guardian.getInstitution().getId(), guardian.isActive()); } + @Transactional + public GuardianResponse addGuardianByInstitution(GuardianRequest guardianRequest, Long institutionId) { + ensureUniquePhone(guardianRequest.phone()); + Institution institution = institutionRepository.findById(institutionId) + .orElseThrow(() -> new ApplicationException( + ApplicationError.INSTITUTION_NOT_FOUND)); + String password = passwordEncoder.encode(guardianRequest.loginPassword()); + Guardian guardian = Guardian.builder().phone(guardianRequest.phone()) + .name(guardianRequest.name()) + .phone(guardianRequest.phone()) + .loginPassword(password) + .institution(institution) + .build(); + guardian = guardianRepository.save(guardian); + alarmService.createGuardianAlarm(guardian); + return new GuardianResponse(guardian.getId(), guardian.getPhone(), guardian.getName(), + guardian.getInstitution().getId(), guardian.isActive()); + } + @Transactional public void deleteGuardianById(Long guardianId) { Guardian guardian = findGuardianById(guardianId); diff --git a/src/main/java/dbdr/domain/institution/entity/Institution.java b/src/main/java/dbdr/domain/institution/entity/Institution.java index 26345cfe..b13f6659 100644 --- a/src/main/java/dbdr/domain/institution/entity/Institution.java +++ b/src/main/java/dbdr/domain/institution/entity/Institution.java @@ -44,8 +44,4 @@ public void updateInstitution(String loginId, String loginPassword, Long institu this.institutionNumber = institutionNumber; this.institutionName = institutionName; } - - public void updatePassword(String encodedPassword) { - this.loginPassword = encodedPassword; - } } diff --git a/src/main/java/dbdr/domain/institution/repository/InstitutionRepository.java b/src/main/java/dbdr/domain/institution/repository/InstitutionRepository.java index d5a5784f..3872764e 100644 --- a/src/main/java/dbdr/domain/institution/repository/InstitutionRepository.java +++ b/src/main/java/dbdr/domain/institution/repository/InstitutionRepository.java @@ -6,9 +6,6 @@ public interface InstitutionRepository extends JpaRepository { boolean existsByInstitutionNumber(Long institutionNumber); - boolean existsByInstitutionName(String institutionName); boolean existsByLoginId(String loginId); - - Institution findByInstitutionNumber(Long institutionNumber); Institution findByLoginId(String loginId); } diff --git a/src/main/java/dbdr/domain/recipient/controller/RecipientCareworkerController.java b/src/main/java/dbdr/domain/recipient/controller/RecipientCareworkerController.java index 591aa31c..f6d49f35 100644 --- a/src/main/java/dbdr/domain/recipient/controller/RecipientCareworkerController.java +++ b/src/main/java/dbdr/domain/recipient/controller/RecipientCareworkerController.java @@ -79,4 +79,4 @@ public ResponseEntity> deleteRecipient( recipientService.deleteRecipientForCareworker(recipientId, careworker.getId()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/controller/RecipientGuardianController.java b/src/main/java/dbdr/domain/recipient/controller/RecipientGuardianController.java index 0155e62b..586b08be 100644 --- a/src/main/java/dbdr/domain/recipient/controller/RecipientGuardianController.java +++ b/src/main/java/dbdr/domain/recipient/controller/RecipientGuardianController.java @@ -44,4 +44,3 @@ public ResponseEntity> getRecipientById( return ResponseEntity.ok(ApiUtils.success(recipient)); } } - diff --git a/src/main/java/dbdr/domain/recipient/controller/RecipientInstitutionController.java b/src/main/java/dbdr/domain/recipient/controller/RecipientInstitutionController.java index 8d6fd7e5..6976d4ab 100644 --- a/src/main/java/dbdr/domain/recipient/controller/RecipientInstitutionController.java +++ b/src/main/java/dbdr/domain/recipient/controller/RecipientInstitutionController.java @@ -78,4 +78,4 @@ public ResponseEntity> deleteRecipient( recipientService.deleteRecipientForInstitution(recipientId, institution.getId()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/dto/request/RecipientRequest.java b/src/main/java/dbdr/domain/recipient/dto/request/RecipientRequest.java index 7be73e4d..eee06df0 100644 --- a/src/main/java/dbdr/domain/recipient/dto/request/RecipientRequest.java +++ b/src/main/java/dbdr/domain/recipient/dto/request/RecipientRequest.java @@ -60,4 +60,4 @@ public class RecipientRequest { @Schema(description = "돌봄대상자의 보호자 아이디", example = "11") @NotNull(message = "보호자 ID는 필수 항목입니다.") private Long guardianId; -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateCareworkerRequest.java b/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateCareworkerRequest.java index 0cc62cd7..df744745 100644 --- a/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateCareworkerRequest.java +++ b/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateCareworkerRequest.java @@ -42,4 +42,4 @@ public class RecipientUpdateCareworkerRequest { private LocalDate startDate; // institutionId, careworkerId, guardianId는 수정 불가 -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateInstitutionRequest.java b/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateInstitutionRequest.java index 68e150d1..07acf1a9 100644 --- a/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateInstitutionRequest.java +++ b/src/main/java/dbdr/domain/recipient/dto/request/RecipientUpdateInstitutionRequest.java @@ -49,5 +49,4 @@ public class RecipientUpdateInstitutionRequest { @NotNull(message = "보호자 ID는 필수 항목입니다.") private Long guardianId; - -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/entity/Recipient.java b/src/main/java/dbdr/domain/recipient/entity/Recipient.java index 0e3e0280..644e44b6 100644 --- a/src/main/java/dbdr/domain/recipient/entity/Recipient.java +++ b/src/main/java/dbdr/domain/recipient/entity/Recipient.java @@ -159,7 +159,4 @@ public void updateRecipientForAdmin(RecipientRequest recipientDTO, Institution i this.guardian = guardian; } //관리자용 - - - -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/repository/RecipientRepository.java b/src/main/java/dbdr/domain/recipient/repository/RecipientRepository.java index 046535af..4dbd0b48 100644 --- a/src/main/java/dbdr/domain/recipient/repository/RecipientRepository.java +++ b/src/main/java/dbdr/domain/recipient/repository/RecipientRepository.java @@ -21,4 +21,4 @@ public interface RecipientRepository extends JpaRepository { Optional findByIdAndInstitutionId(Long recipientId, Long institutionId); Optional findByIdAndGuardianId(Long recipientId, Long guardianId); -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/domain/recipient/service/RecipientService.java b/src/main/java/dbdr/domain/recipient/service/RecipientService.java index e97b585f..36be3a4f 100644 --- a/src/main/java/dbdr/domain/recipient/service/RecipientService.java +++ b/src/main/java/dbdr/domain/recipient/service/RecipientService.java @@ -273,4 +273,4 @@ private RecipientResponse toResponse(Recipient recipient) { recipient.getGuardian() != null ? recipient.getGuardian().getId() : null ); } -} \ No newline at end of file +} diff --git a/src/main/java/dbdr/global/configuration/RedisConfig.java b/src/main/java/dbdr/global/configuration/RedisConfig.java index 5f2ab732..537ea2a2 100644 --- a/src/main/java/dbdr/global/configuration/RedisConfig.java +++ b/src/main/java/dbdr/global/configuration/RedisConfig.java @@ -1,6 +1,5 @@ package dbdr.global.configuration; - import io.lettuce.core.ClientOptions; import io.lettuce.core.SocketOptions; import java.time.Duration; diff --git a/src/main/java/dbdr/global/exception/BusinessError.java b/src/main/java/dbdr/global/exception/BusinessError.java index 69aa1240..05dd5b07 100644 --- a/src/main/java/dbdr/global/exception/BusinessError.java +++ b/src/main/java/dbdr/global/exception/BusinessError.java @@ -8,7 +8,6 @@ @Getter public enum BusinessError { - LOGIN_FAILED(HttpStatus.UNAUTHORIZED, "로그인에 실패했습니다."), PERMISSION_DENIED(HttpStatus.FORBIDDEN, "권한이 없습니다."), CHART_CREATION_NOT_ALLOWED(HttpStatus.FORBIDDEN, "차트 작성 가능한 시간이 아닙니다."); diff --git a/src/main/java/dbdr/global/exception/BusinessException.java b/src/main/java/dbdr/global/exception/BusinessException.java index ace03235..71adfa19 100644 --- a/src/main/java/dbdr/global/exception/BusinessException.java +++ b/src/main/java/dbdr/global/exception/BusinessException.java @@ -1,6 +1,5 @@ package dbdr.global.exception; - import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @@ -18,4 +17,3 @@ public String getErrorMessage() { return businessError.getMessage(); } } - diff --git a/src/main/java/dbdr/global/exception/GlobalExceptionHandler.java b/src/main/java/dbdr/global/exception/GlobalExceptionHandler.java index 19dc3371..c5bc3790 100644 --- a/src/main/java/dbdr/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/dbdr/global/exception/GlobalExceptionHandler.java @@ -16,7 +16,6 @@ @Slf4j public class GlobalExceptionHandler { - @ExceptionHandler(MethodArgumentNotValidException.class) public ResponseEntity> methodArgumentNotValidExceptionHandler( MethodArgumentNotValidException exception) { @@ -32,7 +31,6 @@ public ResponseEntity> methodArgumentNotValidExceptio .body(ApiUtils.error(HttpStatus.BAD_REQUEST, error)); } - @ExceptionHandler(ApplicationException.class) public ResponseEntity> applicationExceptionHandler(ApplicationException ex) { log.error("Application error: {}, ErrorCode: {}", ex.getMessage(), ex.getApplicationError()); @@ -49,7 +47,6 @@ public ResponseEntity> businessExceptionHandler(Busin .body(ApiUtils.error(HttpStatus.BAD_REQUEST, ex.getBusinessError().getMessage())); } - @ExceptionHandler(IllegalArgumentException.class) public ResponseEntity> illegalArgumentExceptionHandler(IllegalArgumentException ex) { log.error("잘못된 인자 값: {}", ex.getMessage()); @@ -66,7 +63,6 @@ public ResponseEntity> nullPointerExceptionHandler(Nu .body(ApiUtils.error(HttpStatus.INTERNAL_SERVER_ERROR, "참조된 객체가 null입니다.")); } - @ExceptionHandler(HttpRequestMethodNotSupportedException.class) public ResponseEntity> httpRequestMethodNotSupportedExceptionHandler( HttpRequestMethodNotSupportedException ex) { @@ -76,7 +72,6 @@ public ResponseEntity> httpRequestMethodNotSupportedE .body(ApiUtils.error(HttpStatus.METHOD_NOT_ALLOWED, "지원되지 않는 HTTP 메서드 입니다.")); } - @ExceptionHandler(Exception.class) public ResponseEntity> generalExceptionHandler(Exception ex) { log.error("예상치 못한 오류 발생: {}", ex.getMessage(), ex); @@ -85,4 +80,3 @@ public ResponseEntity> generalExceptionHandler(Except .body(ApiUtils.error(HttpStatus.INTERNAL_SERVER_ERROR, "예상치 못한 오류가 발생했습니다.")); } } - diff --git a/src/main/java/dbdr/global/util/api/ApiUtils.java b/src/main/java/dbdr/global/util/api/ApiUtils.java index accad633..19176576 100644 --- a/src/main/java/dbdr/global/util/api/ApiUtils.java +++ b/src/main/java/dbdr/global/util/api/ApiUtils.java @@ -30,4 +30,3 @@ public record ApiResult(boolean success, T response, ApiError error) { public record ApiError(int status, T message) { } } - diff --git a/src/main/java/dbdr/openai/service/SummaryService.java b/src/main/java/dbdr/openai/service/SummaryService.java index 08da3cf4..2dcee8ee 100644 --- a/src/main/java/dbdr/openai/service/SummaryService.java +++ b/src/main/java/dbdr/openai/service/SummaryService.java @@ -34,9 +34,9 @@ public SummaryApiFinalResponse getFinalSummary(Long chartId) { private SummaryResponse getSummarization(Long chartId) { Summary summary = summaryRepository.findByChartId(chartId); - return new SummaryResponse(summary.getCognitiveManagement(), summary.getBodyManagement(), - summary.getRecoveryTraining(), summary.getConditionDisease(), - summary.getNursingManagement()); + return new SummaryResponse(summary.getConditionDisease(), summary.getBodyManagement(), + summary.getNursingManagement(), summary.getCognitiveManagement(), + summary.getRecoveryTraining()); } private TagResponse getTag(Long chartId) { diff --git a/src/main/java/dbdr/security/config/ExceptionHandlingFilter.java b/src/main/java/dbdr/security/config/ExceptionHandlingFilter.java index d848c366..35fb33c1 100644 --- a/src/main/java/dbdr/security/config/ExceptionHandlingFilter.java +++ b/src/main/java/dbdr/security/config/ExceptionHandlingFilter.java @@ -1,6 +1,5 @@ package dbdr.security.config; - import com.fasterxml.jackson.databind.ObjectMapper; import dbdr.global.util.api.ApiUtils; import io.jsonwebtoken.ExpiredJwtException; diff --git a/src/main/java/dbdr/security/config/SecurityConfig.java b/src/main/java/dbdr/security/config/SecurityConfig.java index 6f9aa9d0..7d990011 100644 --- a/src/main/java/dbdr/security/config/SecurityConfig.java +++ b/src/main/java/dbdr/security/config/SecurityConfig.java @@ -1,7 +1,7 @@ package dbdr.security.config; +import dbdr.security.model.BaseAuthenticationProvider; import dbdr.security.model.JwtProvider; -import dbdr.security.service.BaseAuthenticationProvider; import dbdr.security.service.BaseUserDetailsService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/dbdr/security/model/BaseAuthenticationProvider.java b/src/main/java/dbdr/security/model/BaseAuthenticationProvider.java index f8410cf5..d225744b 100644 --- a/src/main/java/dbdr/security/model/BaseAuthenticationProvider.java +++ b/src/main/java/dbdr/security/model/BaseAuthenticationProvider.java @@ -1,8 +1,8 @@ -package dbdr.security.service; +package dbdr.security.model; import dbdr.global.exception.ApplicationError; import dbdr.global.exception.ApplicationException; -import dbdr.security.model.BaseUserDetails; +import dbdr.security.service.BaseUserDetailsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/src/main/java/dbdr/security/model/BaseUserDetails.java b/src/main/java/dbdr/security/model/BaseUserDetails.java index fafb846e..786bd7a2 100644 --- a/src/main/java/dbdr/security/model/BaseUserDetails.java +++ b/src/main/java/dbdr/security/model/BaseUserDetails.java @@ -1,6 +1,5 @@ package dbdr.security.model; - import java.util.ArrayList; import java.util.Collection; import lombok.Builder; diff --git a/src/main/java/dbdr/security/model/DbdrAuth.java b/src/main/java/dbdr/security/model/DbdrAuth.java index 423af320..4ae4c414 100644 --- a/src/main/java/dbdr/security/model/DbdrAuth.java +++ b/src/main/java/dbdr/security/model/DbdrAuth.java @@ -27,5 +27,3 @@ AuthParam authParam() default AuthParam.NONE; String id() default ""; } - - diff --git a/src/main/java/dbdr/security/model/DbdrAuthAop.java b/src/main/java/dbdr/security/model/DbdrAuthAop.java index ef381b9e..08613894 100644 --- a/src/main/java/dbdr/security/model/DbdrAuthAop.java +++ b/src/main/java/dbdr/security/model/DbdrAuthAop.java @@ -33,7 +33,6 @@ public Object authCheck(ProceedingJoinPoint joinPoint) throws Throwable { id = args[0].toString(); } - if(!dbdrSeucrityService.hasAcesssPermission(role, authParam, id)) { log.info("권한이 없습니다."); throw new ApplicationException(ApplicationError.ACCESS_NOT_ALLOWED); diff --git a/src/main/java/dbdr/security/model/LoginGuardianArgumentResolver.java b/src/main/java/dbdr/security/model/LoginGuardianArgumentResolver.java index 57a40280..acde03c2 100644 --- a/src/main/java/dbdr/security/model/LoginGuardianArgumentResolver.java +++ b/src/main/java/dbdr/security/model/LoginGuardianArgumentResolver.java @@ -18,10 +18,8 @@ @RequiredArgsConstructor public class LoginGuardianArgumentResolver implements HandlerMethodArgumentResolver { - private final GuardianRepository guardianRepository; - @Override public boolean supportsParameter(MethodParameter parameter) { return parameter.getParameterAnnotation(LoginGuardian.class) != null && diff --git a/src/main/java/dbdr/security/model/Role.java b/src/main/java/dbdr/security/model/Role.java index f3b85e23..5c40c6f9 100644 --- a/src/main/java/dbdr/security/model/Role.java +++ b/src/main/java/dbdr/security/model/Role.java @@ -8,7 +8,4 @@ */ public enum Role { ADMIN,INSTITUTION,GUARDIAN,CAREWORKER; - - } - diff --git a/src/main/java/dbdr/security/service/DbdrSeucrityService.java b/src/main/java/dbdr/security/service/DbdrSeucrityService.java index 2926bef7..59863405 100644 --- a/src/main/java/dbdr/security/service/DbdrSeucrityService.java +++ b/src/main/java/dbdr/security/service/DbdrSeucrityService.java @@ -88,5 +88,4 @@ private BaseEntity findEntity(AuthParam type, long id) { }; } - } diff --git a/src/test/resources/database.yml b/src/test/resources/database.yml index bdbb4d75..cdba8a66 100644 --- a/src/test/resources/database.yml +++ b/src/test/resources/database.yml @@ -3,7 +3,7 @@ spring: name: dbdr jpa: hibernate: - ddl-auto: create + ddl-auto: validate show-sql: true database-platform: org.hibernate.dialect.H2Dialect properties: