[REFACTOR] 학습 목표 타입만 request body에 들어오는 경우 처리

Team-Smeme · Aug 7, 2023 · 11d0c01 · 11d0c01
1 parent 8bf9b14
commit 11d0c01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/main/java/com/smeme/server/dto/member/MemberPlanUpdateRequestDTO.java b/src/main/java/com/smeme/server/dto/member/MemberPlanUpdateRequestDTO.java
@@ -4,14 +4,16 @@
 import com.smeme.server.model.goal.GoalType;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+
+@Schema(description = "사용자 학습 계획 수정 요청")
 public record MemberPlanUpdateRequestDTO(
-        @Schema(description = "목표 타입", example = "HOBBY")
+        @Schema(description = "목표 Enum DEVELOP, HOBBY, APPLY, BUSINESS, EXAM, NONE", example = "HOBBY")
         GoalType target,
 
         @Schema(description = "학습 시간")
         TrainingTimeRequestDTO trainingTime,
 
         @Schema(description = "알람 여부", example = "true")
-        boolean hasAlarm
+        Boolean hasAlarm
 ) {
 }
diff --git a/src/main/java/com/smeme/server/service/MemberService.java b/src/main/java/com/smeme/server/service/MemberService.java
@@ -28,6 +28,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static java.util.Objects.nonNull;
+
 
 @Service
 @Transactional(readOnly = true)
@@ -77,10 +79,17 @@ public MemberGetResponseDTO getMember(Long memberId) {
     public void updateMemberPlan(Long memberId, MemberPlanUpdateRequestDTO requestDTO) {
         Member member = getMemberById(memberId);
 
-        if (!Objects.isNull(requestDTO.target())) member.updateGoal(requestDTO.target());
-        member.updateHasAlarm(requestDTO.hasAlarm());
-        trainingTimeRepository.deleteAll(member.getTrainingTimes());
-        if (!requestDTO.trainingTime().day().equals("")) { updateMemberTrainingTime(member, requestDTO);}
+        if (nonNull(requestDTO.target())) {
+            member.updateGoal(requestDTO.target());
+        }
+
+        if (nonNull(requestDTO.hasAlarm())) {
+            member.updateHasAlarm(requestDTO.hasAlarm());
+        }
+
+        if (nonNull(requestDTO.trainingTime()) && (!"".equals(requestDTO.trainingTime().day()))) {
+                updateMemberTrainingTime(member, requestDTO);
+        }
     }
 
     public MemberNameResponseDTO checkDuplicatedName(String name) {