Merge pull request #106 from Maum-eum/fix/#105

fix: 어르신 등록에 필요한 정보 수정

Author: Hszoo

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.env
 
 ### STS ###
 .apt_generated

src/main/java/com/example/springserver/domain/center/controller/ElderController.java

@@ -36,23 +36,23 @@ public CreateDto createElder(@PathVariable Long center_id,
         List<Inmate> inmateEnumList = StringTypeToEnumType(inmateTypes);
         // CreateRequestDto에 inmateTypes 설정
         createRequestDto.setInmateTypes(inmateEnumList);
-        Elder createdElder = elderService.createElder(center_id, createRequestDto, false, profileImg);
+        Elder createdElder = elderService.createElder(center_id, createRequestDto, profileImg);
         return ElderConverter.toCreateDto(createdElder);
     }
 
     // 센터 내 어르신 목록 조회
     @Operation(summary = "센터 내 어르신 목록 조회")
     @GetMapping
     public List<ResponseDto> getElderList(@PathVariable Long center_id) {
-        List<Elder> elderList = elderService.getElderList(center_id, false);
+        List<Elder> elderList = elderService.getElderList(center_id);
         return ElderConverter.toListDto(elderList);
     }
 
     // 센터 내 어르신 상세 조회
     @Operation(summary = "센터 내 어르신 상세 조회")
     @GetMapping("/{elder_id}")
     public ResponseDto getElderDetail(@PathVariable Long center_id, @PathVariable Long elder_id) {
-        Elder elderDetail = elderService.getElderDetail(center_id, elder_id, false);
+        Elder elderDetail = elderService.getElderDetail(center_id, elder_id);
         return ElderConverter.toResponseDto(elderDetail);
     }
 
@@ -65,23 +65,23 @@ public CreateDto tempCreateElder(@PathVariable Long center_id,
                                      @RequestPart(value = "profileImg", required = false) MultipartFile profileImg) {
         List<Inmate> inmateEnumList = StringTypeToEnumType(inmateTypes);
         createRequestDto.setInmateTypes(inmateEnumList);
-        Elder createdElder = elderService.createElder(center_id, createRequestDto, true, profileImg);
+        Elder createdElder = elderService.createElder(center_id, createRequestDto, profileImg);
         return ElderConverter.toCreateDto(createdElder);
     }
 
     // 임시 저장된 어르신 목록 조회
     @Operation(summary = "임시 저장된 어르신 목록 조회")
     @GetMapping("/temp")
     public List<ResponseDto> getTempElders(@PathVariable Long center_id) {
-        List<Elder> tempElders = elderService.getElderList(center_id, true);
+        List<Elder> tempElders = elderService.getElderList(center_id);
         return ElderConverter.toListDto(tempElders);
     }
 
     // 임시 저장된 어르신 상세 조회
     @Operation(summary = "임시 저장된 어르신 상세 조회")
     @GetMapping("/temp/{elder_id}")
     public ResponseDto getTempElders(@PathVariable Long center_id, @PathVariable Long elder_id) {
-        Elder elderDetail = elderService.getElderDetail(center_id, elder_id, true);
+        Elder elderDetail = elderService.getElderDetail(center_id, elder_id);
         return ElderConverter.toResponseDto(elderDetail);
     }
 

src/main/java/com/example/springserver/domain/center/converter/ElderConverter.java

@@ -38,7 +38,7 @@ public static Elder toElder(RequestDto request) {
                 .build();
     }
 
-    public static Elder toSaveElder(CreateRequestDto dto, boolean isTemporary, Center center, String imgUrl) {
+    public static Elder toSaveElder(CreateRequestDto dto, Center center, String imgUrl) {
         return Elder.builder()
                 .center(center)
                 .name(dto.getName())
@@ -48,7 +48,7 @@ public static Elder toSaveElder(CreateRequestDto dto, boolean isTemporary, Cente
                 .inmateTypes(dto.getInmateTypes())
                 .imgUrl(imgUrl)
                 .weight(dto.getWeight())
-                .isTemporarySave(isTemporary)
+                .isTemporarySave(dto.isTemporarySave())
                 .isNormal(dto.isNormal())
                 .hasShortTermMemoryLoss(dto.isHasShortTermMemoryLoss())
                 .wandersOutside(dto.isWandersOutside())

src/main/java/com/example/springserver/domain/center/entity/enums/ElderRate.java

@@ -2,5 +2,5 @@
 
 public enum ElderRate {
     // 임시
-    RATE1, RATE2, RATE3, RATE4, RATE5, RATE6, NONE
+    RATE1, RATE2, RATE3, RATE4, RATE5, RATE6, NORATE
 }

src/main/java/com/example/springserver/domain/center/repository/ElderRepository.java

@@ -13,6 +13,8 @@ public interface ElderRepository extends JpaRepository<Elder, Long> {
 
     Elder findByElderIdAndIsTemporarySave(Long elderId, boolean isTemporary);
 
+    List<Elder> findByCenter_CenterId(Long centerId);
+
     Optional<Elder> findByElderIdAndCenter_CenterId(Long elderId, Long centerId);
 
     // Mock 데이터 생성용

src/main/java/com/example/springserver/domain/center/service/ElderService.java

@@ -32,8 +32,8 @@ public class ElderService {
     private final S3Service s3Service;
 
     @Transactional
-    public Elder createElder(Long centerId, CreateRequestDto createDto, boolean isTemporary, MultipartFile profileImg) {
-        log.info("isTemporary 값 확인: {}", isTemporary); // 로그 추가
+    public Elder createElder(Long centerId, CreateRequestDto createDto, MultipartFile profileImg) {
+        log.info("isTemporary 값 확인: {}", createDto.isTemporarySave()); // 로그 추가
         Center validCenter = getValidCenter(centerId);
 
         // 이미지 적용
@@ -45,23 +45,25 @@ public Elder createElder(Long centerId, CreateRequestDto createDto, boolean isTe
         }
 
         // 어르신 정보 필수 입력 필드 검증 (일반 저장 / 임시 저장)
-        validateElderFields(isTemporary, createDto, imgUrl);
+        validateElderFields(createDto.isTemporarySave(), createDto, imgUrl);
 
-        Elder createdElder = elderRepository.save(ElderConverter.toSaveElder(createDto, isTemporary, validCenter, imgUrl));
+        Elder createdElder = elderRepository.save(ElderConverter.toSaveElder(createDto, validCenter, imgUrl));
         createdElder.changeCenter(validCenter);
 
         return createdElder;
     }
 
     @Transactional
-    public List<Elder> getElderList(Long centerId, boolean isTemporary) {
+    public List<Elder> getElderList(Long centerId) {
         getValidCenter(centerId);
-        return elderRepository.findByIsTemporarySave(isTemporary);
+        return elderRepository.findByCenter_CenterId(centerId);
+//        return elderRepository.findByIsTemporarySave(isTemporary);
     }
 
-    public Elder getElderDetail(Long centerId, Long elderId, boolean isTemporary) {
-        getValidElder(elderId, centerId);
-        return elderRepository.findByElderIdAndIsTemporarySave(elderId, isTemporary);
+    public Elder getElderDetail(Long centerId, Long elderId) {
+        // 임시 저장 여부와 관계 없이 어르신 상세 정보 가져오도록
+        return getValidElder(elderId, centerId);
+//        return elderRepository.findByElderIdAndIsTemporarySave(elderId, isTemporary);
     }
 
     @Transactional