MNG-22 refactor : 미션 관련 메소드 정리

Author: seungueonn

src/main/java/com/moing/backend/domain/mission/application/service/MissionRemindAlarmUseCase.java

@@ -12,7 +12,6 @@
 import com.moing.backend.global.config.fcm.dto.request.MultiRequest;
 import com.moing.backend.global.config.fcm.service.MultiMessageSender;
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
@@ -31,15 +30,14 @@ public class MissionRemindAlarmUseCase {
 
     private final MissionArchiveScheduleQueryService missionArchiveScheduleQueryService;
     private final MissionQueryService missionQueryService;
-    private final ApplicationEventPublisher eventPublisher;
 
     private final MultiMessageSender multiMessageSender;
     private final SaveMultiAlarmHistoryUseCase saveMultiAlarmHistoryUseCase;
 
     String REMIND_NAME = "미션 리마인드";
 
 
-    public Boolean sendRemindMissionAlarm() {
+    public void sendRemindMissionAlarm() {
 
         Random random = new Random(System.currentTimeMillis());
         String title = getTitle(random.nextInt(4));
@@ -50,16 +48,12 @@ public Boolean sendRemindMissionAlarm() {
         Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(remainMissionPeople);
         Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(remainMissionPeople);
 
-//        eventPublisher.publishEvent(new MultiFcmEvent(title, message, pushMemberIdAndToken, memberIdAndTokens,
-//                "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
-
         if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
             multiMessageSender.send(new MultiRequest(pushMemberIdAndToken.get(), title, message, "", REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
         }
         if (memberIdAndTokens.isPresent() && !memberIdAndTokens.get().isEmpty()) {
             saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(memberIdAndTokens.get()),"",title,message,REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue());
         }
-        return true;
     }
 
 
@@ -137,15 +131,15 @@ public Boolean sendRepeatMissionRemindOnMonday() {
 
     }
 
-    public Optional<List<MemberIdAndToken>> mapToMemberAndToken(List<Member> members) {
+    private Optional<List<MemberIdAndToken>> mapToMemberAndToken(List<Member> members) {
         return Optional.of(members.stream()
                 .map(member -> MemberIdAndToken.builder()
                         .fcmToken(member.getFcmToken())
                         .memberId(member.getMemberId())
                         .build())
                 .collect(Collectors.toList()));
     }
-    public Optional<List<MemberIdAndToken>> isPushMemberIdAndToken(List<Member> members) {
+    private Optional<List<MemberIdAndToken>> isPushMemberIdAndToken(List<Member> members) {
         return Optional.of(members.stream()
                 .map(member -> {
                     if (member.isRemindPush() && !member.isSignOut()) {

src/main/java/com/moing/backend/domain/mission/application/service/MissionTerminationUseCase.java

@@ -10,15 +10,14 @@
 import com.moing.backend.domain.mission.domain.entity.constant.MissionStatus;
 import com.moing.backend.domain.mission.domain.service.MissionQueryService;
 import com.moing.backend.domain.mission.domain.service.MissionSaveService;
-import com.moing.backend.domain.mission.exception.NoAccessCreateMission;
-import com.moing.backend.domain.mission.exception.NoAccessDeleteMission;
 import com.moing.backend.domain.mission.exception.NoAccessUpdateMission;
 import com.moing.backend.domain.team.domain.entity.Team;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
 @Transactional
@@ -31,17 +30,12 @@ public class MissionUpdateUseCase {
 
     public MissionCreateRes updateMission(String userSocialId, Long missionId, MissionReq missionReq) {
 
-
         Member member = memberGetService.getMemberBySocialId(userSocialId);
         Mission mission = missionQueryService.findMissionById(missionId);
         Team team = mission.getTeam();
 
         Long memberId = member.getMemberId();
 
-        /**
-         *  미션 생성자 확인
-         */
-
         if (!((memberId.equals(mission.getMakerId())) || memberId.equals(team.getLeaderId())) ) {
             throw new NoAccessUpdateMission();
         }
@@ -51,11 +45,11 @@ public MissionCreateRes updateMission(String userSocialId, Long missionId, Missi
 
     }
 
-    public MissionReadRes updateMissionStatus(String userSocialId, Long missionId) {
-
+    public MissionReadRes terminateMissionByUser(String userSocialId, Long missionId) {
 
         Member member = memberGetService.getMemberBySocialId(userSocialId);
         Long memberId = member.getMemberId();
+
         Mission findMission = missionQueryService.findMissionById(missionId);
         Team team = findMission.getTeam();
 
@@ -69,4 +63,10 @@ public MissionReadRes updateMissionStatus(String userSocialId, Long missionId) {
         return MissionMapper.mapToMissionReadRes(findMission,member);
 
     }
+
+    public void terminateMissionByAdmin() {
+        missionQueryService.findMissionByDueTo().stream().forEach(
+                mission -> mission.updateStatus(MissionStatus.END)
+        );
+    }
 }

src/main/java/com/moing/backend/domain/mission/application/service/MissionUpdateUseCase.java

@@ -128,13 +128,11 @@ private JPQLQuery<Long> RepeatMissionDonePeopleByWeek(NumberPath<Long> missionId
     @Override
     public Optional<List<Mission>> findMissionByDueTo() {
 
-        LocalDateTime now = LocalDateTime.now();
-
         return Optional.ofNullable(queryFactory
                 .selectFrom(mission)
                 .where(
-                        mission.dueTo.before(now),
                         mission.status.eq(MissionStatus.WAIT).or(mission.status.eq(MissionStatus.ONGOING)),
+                        mission.dueTo.before(LocalDateTime.now()),
                         mission.type.eq(MissionType.ONCE)
                 ).fetch());
     }

src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java

@@ -20,14 +20,11 @@
 @RequestMapping("/api/team/{teamId}/missions")
 public class MissionController {
 
-
     private final MissionCreateUseCase missionCreateUseCase;
     private final MissionReadUseCase missionReadUseCase;
     private final MissionUpdateUseCase missionUpdateUseCase;
     private final MissionDeleteUseCase missionDeleteUseCase;
 
-//    private final MissionRemindAlarmUseCase missionRemindAlarmUseCase;
-
     /**
      * 미션 조회
      * [GET] {teamId}/missions/{missionId}
@@ -39,8 +36,6 @@ public ResponseEntity<SuccessResponse<MissionReadRes>> getMission(@Authenticatio
         return ResponseEntity.ok(SuccessResponse.create(READ_MISSION_SUCCESS.getMessage(), this.missionReadUseCase.getMission(user.getSocialId(),missionId)));
     }
 
-
-
     /**
      * 미션 생성
      * [POST] {teamId}/missions
@@ -68,8 +63,8 @@ public ResponseEntity<SuccessResponse<MissionCreateRes>> updateMission(@Authenti
      * 작성자 : 정승연
      */
     @PutMapping("/{missionId}/end")
-    public ResponseEntity<SuccessResponse<MissionReadRes>> endMission(@AuthenticationPrincipal User user,@PathVariable("teamId") Long teamId,@PathVariable Long missionId) {
-        return ResponseEntity.ok(SuccessResponse.create(END_MISSION_SUCCESS.getMessage(), this.missionUpdateUseCase.updateMissionStatus(user.getSocialId(),missionId)));
+    public ResponseEntity<SuccessResponse<MissionReadRes>> terminateMission(@AuthenticationPrincipal User user, @PathVariable("teamId") Long teamId, @PathVariable Long missionId) {
+        return ResponseEntity.ok(SuccessResponse.create(END_MISSION_SUCCESS.getMessage(), this.missionUpdateUseCase.terminateMissionByUser(user.getSocialId(),missionId)));
     }
 
     /**
@@ -78,7 +73,7 @@ public ResponseEntity<SuccessResponse<MissionReadRes>> endMission(@Authenticatio
      * 작성자 : 정승연
      */
     @DeleteMapping("/{missionId}")
-    public ResponseEntity<SuccessResponse<Long>> deleteMission(@AuthenticationPrincipal User user,@PathVariable Long missionId) {
+    public ResponseEntity<SuccessResponse<Long>> deleteMission(@AuthenticationPrincipal User user,@PathVariable("teamId") Long teamId,@PathVariable Long missionId) {
         return ResponseEntity.ok(SuccessResponse.create(DELETE_MISSION_SUCCESS.getMessage(), this.missionDeleteUseCase.deleteMission(user.getSocialId(),missionId)));
     }
 
@@ -92,6 +87,7 @@ public ResponseEntity<SuccessResponse<Long>> deleteMission(@AuthenticationPrinci
     public ResponseEntity<SuccessResponse<String>> recommendMission(@AuthenticationPrincipal User user,@PathVariable Long teamId) {
         return ResponseEntity.ok(SuccessResponse.create(RECOMMEND_MISSION_SUCCESS.getMessage(), this.missionReadUseCase.getTeamCategory(teamId)));
     }
+
     /**
      * 미션 추천
      * [GET] {teamId}/missions/isLeader
@@ -103,10 +99,6 @@ public ResponseEntity<SuccessResponse<Boolean>> isLeader(@AuthenticationPrincipa
         return ResponseEntity.ok(SuccessResponse.create(RECOMMEND_MISSION_SUCCESS.getMessage(), this.missionCreateUseCase.getIsLeader(user.getSocialId(),teamId)));
     }
 
-//    @PostMapping("/remind")
-//    public ResponseEntity<SuccessResponse<Boolean>> remindAlarm(@AuthenticationPrincipal User user,@PathVariable Long teamId) {
-//        return ResponseEntity.ok(SuccessResponse.create(RECOMMEND_MISSION_SUCCESS.getMessage(), this.missionRemindAlarmUseCase.sendRepeatMissionRemind()));
-//    }
 
     /**
      * 미션 설명 확인 (미션 읽음 처리)
@@ -124,5 +116,4 @@ public ResponseEntity<SuccessResponse<MissionConfirmRes>> confirmMissionExplanat
 
 
 
-
 }

src/main/java/com/moing/backend/domain/mission/presentation/MissionController.java

@@ -9,19 +9,14 @@
 import com.moing.backend.domain.mission.application.service.MissionDeleteUseCase;
 import com.moing.backend.domain.mission.application.service.MissionReadUseCase;
 import com.moing.backend.domain.mission.application.service.MissionUpdateUseCase;
-import com.moing.backend.domain.mission.domain.repository.MissionRepository;
 import com.moing.backend.domain.mission.domain.service.MissionQueryService;
 import com.moing.backend.domain.mission.presentation.MissionController;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders;
-import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
 import static com.moing.backend.domain.mission.presentation.constant.MissionResponseMessage.CONFIRM_MISSION_SUCCESS;
@@ -35,7 +30,6 @@
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
 import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 
 @WebMvcTest(MissionController.class)
 public class MissionControllerTest extends CommonControllerTest {
@@ -366,7 +360,7 @@ public class MissionControllerTest extends CommonControllerTest {
                 .isLeader(Boolean.FALSE)
                 .build();
 
-        given(missionUpdateUseCase.updateMissionStatus(any(),any())).willReturn(output);
+        given(missionUpdateUseCase.terminateMissionByUser(any(),any())).willReturn(output);
 
         Long teamId = 2L;
         Long missionId = 1L;