[MERGE] #150 - 약속 신청 고민 작성/선택 중복 입력, 선택 안함 방지

[FEAT] #150 - 약속 신청 고민 작성/선택 중복 입력, 선택 안함 방지
TEAM-SEONYAK · Oct 7, 2024 · ec5ac6d · ec5ac6d
2 parents 886368c + ecd4069
commit ec5ac6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/org/sopt/seonyakServer/domain/appointment/service/AppointmentService.java b/src/main/java/org/sopt/seonyakServer/domain/appointment/service/AppointmentService.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import net.nurigo.sdk.NurigoApp;
 import net.nurigo.sdk.message.model.Message;
 import net.nurigo.sdk.message.request.SingleMessageSendingRequest;
@@ -37,7 +36,6 @@
 
 @Service
 @RequiredArgsConstructor
-@Slf4j
 public class AppointmentService {
 
     private final AppointmentRepository appointmentRepository;
@@ -64,8 +62,6 @@ public void init() {
     @Transactional
     public void postAppointment(AppointmentRequest appointmentRequest) {
         Member member = memberRepository.findMemberByIdOrThrow(principalHandler.getUserIdFromPrincipal());
-        log.info("member id: " + principalHandler.getUserIdFromPrincipal());
-        log.info("senior id: " + appointmentRequest.seniorId());
         Senior senior = seniorRepository.findSeniorByIdOrThrow(appointmentRequest.seniorId());
 
         // 자기 자신에게 약속을 신청하는 경우
@@ -78,6 +74,18 @@ public void postAppointment(AppointmentRequest appointmentRequest) {
             throw new CustomException(ErrorType.INVALID_SAME_SENIOR);
         }
 
+        // 두 고민이 전부 넘어온 경우
+        if ((appointmentRequest.topic() != null && !appointmentRequest.topic().isEmpty()) && (
+                appointmentRequest.personalTopic() != null && !appointmentRequest.personalTopic().isBlank())) {
+            throw new CustomException(ErrorType.INVALID_BOTH_TOPICS_PROVIDED);
+        }
+
+        // 두 고민이 전부 빈 값인 경우
+        if ((appointmentRequest.topic() == null || appointmentRequest.topic().isEmpty()) && (
+                appointmentRequest.personalTopic() == null || appointmentRequest.personalTopic().isBlank())) {
+            throw new CustomException(ErrorType.INVALID_NO_TOPIC_PROVIDED);
+        }
+
         Appointment appointment = Appointment.builder()
                 .member(member)
                 .senior(senior)

diff --git a/src/main/java/org/sopt/seonyakServer/global/exception/enums/ErrorType.java b/src/main/java/org/sopt/seonyakServer/global/exception/enums/ErrorType.java
@@ -39,6 +39,8 @@ public enum ErrorType {
     NO_RESPONSE_BODY_ERROR(HttpStatus.BAD_REQUEST, "40024", "Response Body가 존재하지 않습니다."),
     REDIRECT_URI_MISMATCH_ERROR(HttpStatus.BAD_REQUEST, "40025", "잘못된 Redirect Uri입니다."),
     INVALID_USER_TYPE_ERROR(HttpStatus.BAD_REQUEST, "40026", "유효하지 않은 User Type입니다."),
+    INVALID_BOTH_TOPICS_PROVIDED(HttpStatus.BAD_REQUEST, "40027", "고민은 선택/작성 중 하나만 골라야 합니다."),
+    INVALID_NO_TOPIC_PROVIDED(HttpStatus.BAD_REQUEST, "40028", "고민은 선택/작성 중 하나는 골라야 합니다."),
 
     // S3 관련 오류
     IMAGE_EXTENSION_ERROR(HttpStatus.BAD_REQUEST, "40051", "이미지 확장자는 jpg, png, webp만 가능합니다."),