feat: Acceptance, reject API

src/main/java/com/fullcar/carpool/application/form/FormService.java

@@ -89,15 +89,22 @@ public List<FormResponseDto> readReceivedFormList(Member member) {
     }
 
     @Transactional
-    public FormResponseDto.FormDetailDto updateForm(FormId formId, FormUpdateDto formUpdateDto) {
+    public FormResponseDto.FormDetailDto updateForm(Member member, FormId formId, FormUpdateDto formUpdateDto) {
         Form form = formRepository.findByFormIdAndIsDeletedOrThrow(formId, false);
         form.changeFormState(formUpdateDto);
 
-        Member member = memberRepository.findByIdAndIsDeletedOrThrow(form.getPassenger().getMemberId(), false);
+        Carpool carpool = carpoolRepository.findByCarpoolIdAndIsDeletedOrThrow(form.getCarpoolId(), false);
+
+        if (!carpool.isMyCarpool(member.getId())) {
+            throw new CustomException(ErrorCode.CANNOT_CHANGE_FORM_STATE);
+        }
 
         return formMapper.toDetailDto(
                 formRepository.saveAndFlush(form),
-                member
+                memberRepository.findByIdAndIsDeletedOrThrow(
+                        form.getPassenger().getMemberId(),
+                        false
+                )
         );
     }
 

src/main/java/com/fullcar/carpool/domain/form/Form.java

@@ -2,6 +2,8 @@
 
 import com.fullcar.carpool.domain.carpool.CarpoolId;
 import com.fullcar.carpool.presentation.form.dto.request.FormUpdateDto;
+import com.fullcar.core.exception.CustomException;
+import com.fullcar.core.response.ErrorCode;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
@@ -18,7 +20,7 @@
 @EntityListeners(AuditingEntityListener.class)
 @Table(name = "form")
 public class Form {
-    private static final String REJECT_MESSAGE = "카풀 매칭에 실패했어. 다른 카풀을 찾아보세요!";
+    private static final String REJECT_MESSAGE = "카풀 매칭에 실패했어요. 다른 카풀을 찾아보세요!";
 
     @EmbeddedId
     private FormId formId;
@@ -36,8 +38,8 @@ public class Form {
     @Builder.Default
     private FormState formState = FormState.REQUEST;
 
-    @Column(name = "result_message")
-    private String resultMessage;
+    @Embedded
+    private ResultMessage resultMessage;
 
     @Embedded
     private Passenger passenger;
@@ -67,14 +69,22 @@ public void changeFormState(FormUpdateDto formUpdateDto) {
         else if (formState == FormState.REJECT) {
             this.reject();
         }
+        else {
+            throw new CustomException(ErrorCode.INVALID_FORM_STATE);
+        }
     }
     public void accept(String contact, String toPassenger) {
         this.formState = FormState.ACCEPT;
-        this.resultMessage = contact + "\n" + toPassenger;
+        this.resultMessage = ResultMessage.builder()
+                .contact(contact)
+                .toPassenger(toPassenger)
+                .build();
     }
 
     public void reject() {
         this.formState = FormState.REJECT;
-        this.resultMessage = REJECT_MESSAGE;
+        this.resultMessage = ResultMessage.builder()
+                .toPassenger(REJECT_MESSAGE)
+                .build();
     }
 }

src/main/java/com/fullcar/carpool/domain/form/ResultMessage.java

@@ -0,0 +1,17 @@
+package com.fullcar.carpool.domain.form;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import lombok.*;
+
+@Embeddable
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class ResultMessage {
+    private String contact;
+
+    @Column(name = "to_passenger")
+    private String toPassenger;
+}

src/main/java/com/fullcar/carpool/presentation/form/FormController.java

@@ -95,20 +95,22 @@ public ApiResponse<FormResponseDto.FormDetailDto> getForm(
         );
     }
 
-    @Operation(summary = "신청서 수락/거절 API")
+    @Operation(summary = "신청서 상태변경 API")
     @ApiResponses({
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "수락/거절 성공")
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "수정 성공")
     })
     @PatchMapping("/forms/{formId}")
     public ApiResponse<FormResponseDto.FormDetailDto> patchForm(
+            @Parameter(hidden = true)
+            @CurrentMember Member member,
             @Parameter(description = "신청서 id", required = true)
             @PathVariable Long formId,
             @Parameter(description = "신청서 상태변경 모델", required = true)
             @RequestBody FormUpdateDto formUpdateDto
             ) {
         return ApiResponse.success(
                 SuccessCode.UPDATE_SUCCESS,
-                formService.updateForm(new FormId(formId), formUpdateDto)
+                formService.updateForm(member, new FormId(formId), formUpdateDto)
         );
     }
 }

src/main/java/com/fullcar/carpool/presentation/form/dto/response/FormResponseDto.java

@@ -2,6 +2,7 @@
 
 import com.fullcar.carpool.domain.carpool.PeriodType;
 import com.fullcar.carpool.domain.form.FormState;
+import com.fullcar.carpool.domain.form.ResultMessage;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -51,7 +52,7 @@ public static class FormDetailDto extends FormResponseDto {
         private String content;
 
         @Schema(description = "신청서 결과 메시지")
-        String resultMessage;
+        ResultMessage resultMessage;
 
         @Schema(description = "카풀 id")
         Long carpoolId;

src/main/java/com/fullcar/core/response/ErrorCode.java

@@ -18,6 +18,8 @@ public enum ErrorCode {
     DUPLICATED_FORM(BAD_REQUEST, "이미 요청을 보낸 카풀입니다."),
     DUPLICATED_NICKNAME(BAD_REQUEST, "중복된 닉네임 입니다."),
     EXISTED_CAR_IN_MEMBER(BAD_REQUEST, "이미 차량이 등록되었습니다."),
+    CANNOT_CHANGE_FORM_STATE(BAD_REQUEST, "카풀에 등록된 운전자만 신청서 수락/거절을 할 수 있습니다."),
+    INVALID_FORM_STATE(BAD_REQUEST, "유효하지 않은 신청서 상태입니다."),
 
     /* 401 UNAUTHORIZED */
     UNAUTHORIZED_KAKAO_TOKEN(UNAUTHORIZED, "유효하지 않은 카카오 토큰"),