[#176] 신청서 삭제 (#182)

* feat(CrewMember): 올바르지 않는 유저 예외추가
- 유저가 해당 모임, 신청서등의 작성자가 아닐 때 발생하는 에러입니다.

* feat(CrewMember): 신청서 삭제 기능 추가
- 신청서는 신청서 아이디를 사용하여 삭제합니다.
- 신청서는 자신의 신청서만 삭제할 수 있습니다.
- 자신의 신청서인지 검증을 진행합니다.

* test(CrewMember): 신청서 삭제 기능 테스트

* test(CrewMember): Scheduler를 사용하여 신청서 매일 12시마다 삭제

* feat(Config): Scheduler 스레드 개수 설정하기

* feat(Config): Scheduling 비동기로 설정

---------

Co-authored-by: kwonjoosung <[email protected]>

Author: gw0215

src/main/java/com/prgrms/mukvengers/domain/crew/repository/CrewRepository.java

@@ -36,6 +36,6 @@ public interface CrewRepository extends JpaRepository<Crew, Long> {
 		SET c.status = 'FINISH'
 		WHERE c.status != 'FINISH' AND c.promiseTime < :time
 		""")
-	int updateStatusAll(@Param("time")LocalDateTime now);
+	int updateAllStatusToFinish(@Param("time") LocalDateTime now);
 
 }

src/main/java/com/prgrms/mukvengers/domain/proposal/api/ProposalController.java

@@ -8,6 +8,7 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -128,4 +129,15 @@ public class ProposalController {
 
 		return ResponseEntity.ok().build();
 	}
+
+	@DeleteMapping(value = "/proposals/{proposalId}")
+	public ResponseEntity<Void> delete
+		(
+			@PathVariable Long proposalId,
+			@AuthenticationPrincipal JwtAuthentication user
+		) {
+		proposalService.delete(proposalId, user.id());
+
+		return ResponseEntity.ok().build();
+	}
 }

src/main/java/com/prgrms/mukvengers/domain/proposal/repository/ProposalRepository.java

@@ -1,9 +1,11 @@
 package com.prgrms.mukvengers.domain.proposal.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -39,4 +41,12 @@ public interface ProposalRepository extends JpaRepository<Proposal, Long> {
 		""")
 	Optional<ProposalStatus> findByUserIdAndCrewId(@Param("userId") Long userId, @Param("crewId") Long crewId);
 
+	@Modifying
+	@Query(value = """
+		DELETE
+		FROM Proposal p
+		WHERE p.crewId IN (SELECT c.id FROM Crew c WHERE c.promiseTime < :time)
+		""")
+	int deleteProposalsByPromiseTime(@Param("time") LocalDateTime now);
+
 }

src/main/java/com/prgrms/mukvengers/domain/proposal/service/ProposalService.java

@@ -17,4 +17,6 @@ public interface ProposalService {
 	ProposalResponses getProposalsByMemberId(Long userId);
 
 	void updateProposalStatus(UpdateProposalRequest proposalRequest, Long userId, Long proposalId);
+
+	void delete(Long proposalId, Long userId);
 }

src/main/java/com/prgrms/mukvengers/domain/proposal/service/ProposalServiceImpl.java

@@ -28,6 +28,7 @@
 import com.prgrms.mukvengers.domain.proposal.model.Proposal;
 import com.prgrms.mukvengers.domain.proposal.model.vo.ProposalStatus;
 import com.prgrms.mukvengers.domain.proposal.repository.ProposalRepository;
+import com.prgrms.mukvengers.domain.user.exception.InvalidUserException;
 import com.prgrms.mukvengers.domain.user.exception.UserNotFoundException;
 import com.prgrms.mukvengers.domain.user.model.User;
 import com.prgrms.mukvengers.domain.user.repository.UserRepository;
@@ -180,4 +181,19 @@ private void registerCrewMember(Proposal proposal, Crew crew) {
 
 		crew.addCrewMember(crewMember);
 	}
+
+	@Override
+	@Transactional
+	public void delete(Long proposalId, Long userId) {
+
+		Proposal proposal = proposalRepository.findById(proposalId)
+			.orElseThrow(() -> new ProposalNotFoundException(proposalId));
+
+		if (!proposal.getUser().getId().equals(userId)) {
+			throw new InvalidUserException(userId);
+		}
+
+		proposalRepository.deleteById(proposalId);
+
+	}
 }

src/main/java/com/prgrms/mukvengers/domain/user/exception/InvalidUserException.java

@@ -0,0 +1,15 @@
+package com.prgrms.mukvengers.domain.user.exception;
+
+import com.prgrms.mukvengers.global.exception.ErrorCode;
+import com.prgrms.mukvengers.global.exception.ServiceException;
+
+public class InvalidUserException extends ServiceException {
+
+	private static final ErrorCode ERROR_CODE = ErrorCode.USER_INVALID;
+	private static final String MESSAGE_KEY = "exception.user.invalid";
+
+	public InvalidUserException(Long userId) {
+		super(ERROR_CODE, MESSAGE_KEY, new Object[] {userId});
+	}
+
+}

src/main/java/com/prgrms/mukvengers/global/exception/ErrorCode.java

@@ -21,7 +21,7 @@ public enum ErrorCode {
 
 	// User
 	USER_NOT_FOUND(HttpStatus.NOT_FOUND, "U001", "존재하지 않는 사용자입니다."),
-
+	USER_INVALID(HttpStatus.BAD_REQUEST, "U002", "권한이 없는 사용자입니다."),
 	// Store
 	STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "S001", "존재하지 않는 가게입니다."),
 

src/main/java/com/prgrms/mukvengers/global/scheduler/Scheduler.java

@@ -2,25 +2,38 @@
 
 import java.time.LocalDateTime;
 
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.prgrms.mukvengers.domain.crew.repository.CrewRepository;
+import com.prgrms.mukvengers.domain.proposal.repository.ProposalRepository;
 
 import lombok.RequiredArgsConstructor;
 
 @Component
+@EnableAsync
 @EnableScheduling
 @RequiredArgsConstructor
 public class Scheduler {
 
 	private final CrewRepository crewRepository;
+	private final ProposalRepository proposalRepository;
 
+	@Async
 	@Scheduled(cron = "0 0 * * * *", zone = "Asia/Seoul")
 	@Transactional
 	public void changStatusOvertimeCrew() {
-		crewRepository.updateStatusAll(LocalDateTime.now());
+		crewRepository.updateAllStatusToFinish(LocalDateTime.now());
+	}
+
+	@Async
+	@Scheduled(cron = "0 0 0 * * *", zone = "Asia/Seoul")
+	@Transactional
+	public void deleteProposalOverTimeCrew() {
+		proposalRepository.deleteProposalsByPromiseTime(LocalDateTime.now());
 	}
 }

src/main/resources/application.yml

@@ -29,6 +29,11 @@ spring:
   slack:
     webhook: ${SLACK_WEBHOOK}
 
+  task:
+    scheduling:
+      pool:
+        size: 2
+
 # front server
 front:
   server: "https://kkini.vercel.app"

src/test/java/com/prgrms/mukvengers/base/RepositoryTest.java

@@ -17,6 +17,7 @@
 import com.prgrms.mukvengers.domain.crew.model.Crew;
 import com.prgrms.mukvengers.domain.crew.repository.CrewRepository;
 import com.prgrms.mukvengers.domain.crewmember.repository.CrewMemberRepository;
+import com.prgrms.mukvengers.domain.proposal.repository.ProposalRepository;
 import com.prgrms.mukvengers.domain.review.repository.ReviewRepository;
 import com.prgrms.mukvengers.domain.store.model.Store;
 import com.prgrms.mukvengers.domain.store.repository.StoreRepository;
@@ -47,20 +48,31 @@ public abstract class RepositoryTest {
 	@Autowired
 	protected ChatRepository chatRepository;
 
-	protected User savedUser;
+	@Autowired
+	protected ProposalRepository proposalRepository;
+
+	protected User savedUser1;
+
+	protected User savedUser2;
 
 	protected Store savedStore;
 
 	protected List<Crew> crews;
 
-	protected Long savedUserId;
+	protected Long savedUser1Id;
+
+	protected Long savedUser2Id;
 
 	@BeforeEach
 	void setUp() {
 
-		savedUser = userRepository.save(createUser());
+		savedUser1 = userRepository.save(createUser("123"));
+
+		savedUser2 = userRepository.save(createUser("456"));
+
+		savedUser1Id = savedUser1.getId();
 
-		savedUserId = savedUser.getId();
+		savedUser2Id = savedUser2.getId();
 
 		savedStore = storeRepository.save(createStore());