From 11d0c0170c23193948fb5eabfdadd90232f5a81c Mon Sep 17 00:00:00 2001 From: "unsualc@likelion.org" Date: Tue, 8 Aug 2023 01:24:10 +0900 Subject: [PATCH] =?UTF-8?q?[REFACTOR]=20=ED=95=99=EC=8A=B5=20=EB=AA=A9?= =?UTF-8?q?=ED=91=9C=20=ED=83=80=EC=9E=85=EB=A7=8C=20request=20body?= =?UTF-8?q?=EC=97=90=20=EB=93=A4=EC=96=B4=EC=98=A4=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/member/MemberPlanUpdateRequestDTO.java | 6 ++++-- .../com/smeme/server/service/MemberService.java | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 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 index 0721a653..5034f436 100644 --- 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 index db4cd25d..67a73326 100644 --- 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) {