Merge pull request #67 from ON-GI/develop

mii2026 · web-flow · commit af8037ed0243 · 2025-02-18T21:56:02.000+09:00
수정 사항 배포
diff --git a/src/main/java/com/ongi/backend/domain/caregiver/entity/Caregiver.java b/src/main/java/com/ongi/backend/domain/caregiver/entity/Caregiver.java
@@ -4,7 +4,6 @@
 import com.ongi.backend.domain.caregiver.dto.request.CaregiverSignupRequestDto;
 import com.ongi.backend.domain.caregiver.dto.request.CaregiverUpdateRequestDto;
 import jakarta.persistence.*;
-import jakarta.validation.Valid;
 import lombok.*;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
diff --git a/src/main/java/com/ongi/backend/domain/caregiver/entity/CaregiverInformation.java b/src/main/java/com/ongi/backend/domain/caregiver/entity/CaregiverInformation.java
@@ -10,6 +10,7 @@
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -56,6 +57,7 @@ public static CaregiverInformation from(InformationRequestDto request, Caregiver
                 .mobilityAssistance(request.getMobilityAssistanceEnum())
                 .dailyLivingAssistance(request.getDailyLivingAssistanceEnum())
                 .caregiver(caregiver)
+                .licenses(new ArrayList<CaregiverLicense>())
                 .build();
     }
 
diff --git a/src/main/java/com/ongi/backend/domain/caregiver/entity/CaregiverOptional.java b/src/main/java/com/ongi/backend/domain/caregiver/entity/CaregiverOptional.java
@@ -26,14 +26,14 @@ public class CaregiverOptional {
 
     public static CaregiverOptional from(OptionalRequestDto request, Caregiver caregiver) {
         return CaregiverOptional.builder()
-                .career(CaregiverCareer.fromString(request.career()))
+                .career(request.career() == null ? null : CaregiverCareer.fromString(request.career()))
                 .description(request.description())
                 .caregiver(caregiver)
                 .build();
     }
 
     public void updateFrom(@Valid OptionalRequestDto request) {
-        this.career = CaregiverCareer.fromString(request.career());
+        this.career = request.career() == null ? null : CaregiverCareer.fromString(request.career());
         this.description = request.description();
     }
 }
diff --git a/src/main/java/com/ongi/backend/domain/caregiver/service/CaregiverService.java b/src/main/java/com/ongi/backend/domain/caregiver/service/CaregiverService.java
@@ -120,10 +120,12 @@ private Caregiver saveCaregiver(CaregiverSignupRequestDto requestDto, String enc
         Caregiver caregiver = caregiverRepository.save(Caregiver.from(requestDto, encodedPassword));
 
         CaregiverInformation information = saveCaregiverInformation(requestDto.information(), caregiver);
-        CaregiverOptional optional = saveCaregiverOptional(requestDto.optional(), caregiver);
-
         caregiver.updateCaregiverInformation(information);
-        caregiver.updateCaregiverOptional(optional);
+
+        if(requestDto.optional() != null) {
+            CaregiverOptional optional = saveCaregiverOptional(requestDto.optional(), caregiver);
+            caregiver.updateCaregiverOptional(optional);
+        }
 
         return caregiver;
     }
diff --git a/src/main/java/com/ongi/backend/domain/center/controller/CenterController.java b/src/main/java/com/ongi/backend/domain/center/controller/CenterController.java
@@ -31,36 +31,36 @@ public CommonResponse<String> registerCenter(
     }
 
     @GetMapping("/search")
-    public CommonResponse<Object> findCenter(@RequestParam("centerName") String centerName) {
+    public CommonResponse<List<CenterResponseDto>> findCenter(@RequestParam("centerName") String centerName) {
         List<CenterResponseDto> result = centerService.findCenter(centerName);
         return CommonResponse.success(result);
     }
 
     @PostMapping("/{centerId}/profile")
-    public CommonResponse<Object> updateCenterProfileImage(
+    public CommonResponse<String> updateCenterProfileImage(
             @RequestParam(value = "profileImage", required = false) MultipartFile profileImage,
             @PathVariable("centerId") Long centerId) {
         centerService.updateCenterProfileImage(centerId, profileImage);
         return CommonResponse.success("센터 프로필 이미지를 성공적으로 등록했습니다.");
     }
 
     @PostMapping("/{centerId}/document")
-    public CommonResponse<Object> updateCenterDocument(
+    public CommonResponse<String> updateCenterDocument(
             @RequestParam(value = "centerDocument", required = false) MultipartFile centerDocument,
             @PathVariable("centerId") Long centerId) {
         centerService.updateCenterDocument(centerId, centerDocument);
         return CommonResponse.success("센터 증빙 자료를 성공적으로 등록했습니다.");
     }
 
     @PostMapping("/{centerId}/approve")
-    public CommonResponse<Object> approveCenterDocument(
+    public CommonResponse<String> approveCenterDocument(
             @PathVariable("centerId") Long centerId) {
         centerService.approveCenterDocument(centerId);
         return CommonResponse.success("센터 인증이 완료되었습니다.");
     }
 
     @DeleteMapping("/{centerId}")
-    public CommonResponse<Object> deleteCenter(
+    public CommonResponse<String> deleteCenter(
             @PathVariable("centerId") Long centerId) {
         centerService.deleteCenter(centerId);
         return CommonResponse.success("센터 삭제가 완료되었습니다.");
diff --git a/src/main/java/com/ongi/backend/domain/senior/controller/SeniorController.java b/src/main/java/com/ongi/backend/domain/senior/controller/SeniorController.java
@@ -2,6 +2,7 @@
 
 import com.ongi.backend.common.response.CommonResponse;
 import com.ongi.backend.domain.senior.dto.request.SeniorRequestDto;
+import com.ongi.backend.domain.senior.dto.response.SeniorResponseDto;
 import com.ongi.backend.domain.senior.service.SeniorService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -10,6 +11,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 
 @Slf4j
 @RestController
@@ -20,37 +23,37 @@ public class SeniorController {
     private final SeniorService seniorService;
 
     @GetMapping("/{seniorId}")
-    public CommonResponse<Object> findSenior(@PathVariable("seniorId") Long seniorId) {
+    public CommonResponse<SeniorResponseDto> findSenior(@PathVariable("seniorId") Long seniorId) {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
 
         return CommonResponse.success(seniorService.findSenior(seniorId, centerId));
     }
 
     @GetMapping("")
-    public CommonResponse<Object> findSeniors() {
+    public CommonResponse<List<SeniorResponseDto>> findSeniors() {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
 
         return CommonResponse.success(seniorService.findSeniorsByCenter(centerId));
     }
 
     @PostMapping()
-    public CommonResponse<Object> registerSenior(@Valid @RequestBody SeniorRequestDto seniorRequestDto) {
+    public CommonResponse<String> registerSenior(@Valid @RequestBody SeniorRequestDto seniorRequestDto) {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
 
         seniorService.registerSenior(seniorRequestDto, centerId);
         return CommonResponse.success("어르신 정보를 성공적으로 등록했습니다.");
     }
 
     @PostMapping("/{seniorId}")
-    public CommonResponse<Object> updateSenior(@Valid @RequestBody SeniorRequestDto seniorRequestDto, @PathVariable("seniorId") Long seniorId) {
+    public CommonResponse<String> updateSenior(@Valid @RequestBody SeniorRequestDto seniorRequestDto, @PathVariable("seniorId") Long seniorId) {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
 
         seniorService.updateSenior(seniorId, seniorRequestDto, centerId);
         return CommonResponse.success("어르신 정보를 성공적으로 수정했습니다.");
     }
 
     @PostMapping("/{seniorId}/profile")
-    public CommonResponse<Object> updateSeniorProfileImage(
+    public CommonResponse<String> updateSeniorProfileImage(
             @RequestParam(value = "profileImage", required = false) MultipartFile profileImage,
             @PathVariable("seniorId") Long seniorId) {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
@@ -60,7 +63,7 @@ public CommonResponse<Object> updateSeniorProfileImage(
     }
 
     @DeleteMapping("/{seniorId}")
-    public CommonResponse<Object> updateSenior(@PathVariable("seniorId") Long seniorId) {
+    public CommonResponse<String> updateSenior(@PathVariable("seniorId") Long seniorId) {
         Long centerId = (Long) SecurityContextHolder.getContext().getAuthentication().getCredentials();
 
         seniorService.deleteSenior(seniorId, centerId);

Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public class CaregiverOptional {`
`26`	`26`
`27`	`27`	`public static CaregiverOptional from(OptionalRequestDto request, Caregiver caregiver) {`
`28`	`28`	`return CaregiverOptional.builder()`
`29`		`- .career(CaregiverCareer.fromString(request.career()))`
	`29`	`+ .career(request.career() == null ? null : CaregiverCareer.fromString(request.career()))`
`30`	`30`	`.description(request.description())`
`31`	`31`	`.caregiver(caregiver)`
`32`	`32`	`.build();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public void updateFrom(@Valid OptionalRequestDto request) {`
`36`		`- this.career = CaregiverCareer.fromString(request.career());`
	`36`	`+ this.career = request.career() == null ? null : CaregiverCareer.fromString(request.career());`
`37`	`37`	`this.description = request.description();`
`38`	`38`	`}`
`39`	`39`	`}`