🔗 :: (809) 모집의뢰서 상태 변경 스케줄러 수정

jobis-application/src/main/java/team/retum/jobis/domain/intern/event/WinterInternRegisteredEvent.java

@@ -4,11 +4,10 @@
 import lombok.Getter;
 import team.retum.jobis.domain.recruitment.model.Recruitment;
 
-import java.util.List;
-
 @Getter
 @AllArgsConstructor
 public class WinterInternRegisteredEvent {
 
-    private final List<Recruitment> recruitments;
+    private final Recruitment recruitments;
+
 }

jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/ApplyRecruitmentUseCase.java

@@ -5,6 +5,7 @@
 import team.retum.jobis.common.spi.PublishEventPort;
 import team.retum.jobis.common.spi.SecurityPort;
 import team.retum.jobis.domain.company.model.Company;
+import team.retum.jobis.domain.intern.event.WinterInternRegisteredEvent;
 import team.retum.jobis.domain.recruitment.dto.request.ApplyRecruitmentRequest;
 import team.retum.jobis.domain.recruitment.event.InterestedRecruitmentEvent;
 import team.retum.jobis.domain.recruitment.exception.RecruitmentAlreadyExistsException;
@@ -40,7 +41,7 @@ public void execute(ApplyRecruitmentRequest request) {
             .toList();
         commandRecruitAreaPort.saveAll(recruitAreas);
 
-        publishEventPort.publishEvent(new InterestedRecruitmentEvent(recruitment));
+        publishEventPort.publishEvent(new WinterInternRegisteredEvent(recruitment));
     }
 
     public void executeInterestCodeMatch() {

jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/ChangeRecruitmentStatusSchedulerUseCase.java

@@ -4,7 +4,6 @@
 import team.retum.jobis.common.annotation.UseCase;
 import team.retum.jobis.common.spi.PublishEventPort;
 import team.retum.jobis.domain.recruitment.event.RecruitmentStatusChangedEvent;
-import team.retum.jobis.domain.intern.event.WinterInternRegisteredEvent;
 import team.retum.jobis.domain.recruitment.model.Recruitment;
 import team.retum.jobis.domain.recruitment.spi.RecruitmentPort;
 
@@ -20,18 +19,11 @@ public class ChangeRecruitmentStatusSchedulerUseCase {
     public void execute() {
         List<Recruitment> recruitments = recruitmentPort.getAll();
 
-        List<Recruitment> updatedRecruitments = recruitments.stream()
-            .map(Recruitment::updateRecruitmentStatus)
-            .toList();
-
-        List<Recruitment> winterInternRecruitments = updatedRecruitments.stream()
-            .filter(Recruitment::isWinterIntern)
-            .toList();
-
-        publishEventPort.publishEvent(new RecruitmentStatusChangedEvent(updatedRecruitments));
-
-        if (!winterInternRecruitments.isEmpty()) {
-            publishEventPort.publishEvent(new WinterInternRegisteredEvent(winterInternRecruitments));
-        }
+        recruitmentPort.saveAll(
+            recruitments.stream()
+                .map(Recruitment::updateRecruitmentStatus)
+                .toList()
+        );
+        publishEventPort.publishEvent(new RecruitmentStatusChangedEvent(recruitments));
     }
 }

jobis-infrastructure/src/main/java/team/retum/jobis/domain/notification/presentation/NotificationWebAdapter.java

@@ -30,7 +30,6 @@ public class NotificationWebAdapter {
     private final SubscribeAllTopicsByToggleUseCase subscribeAllTopicsByToggleUseCase;
     private final QueryTopicsUseCase queryTopicsUseCase;
 
-
     @GetMapping
     public QueryNotificationsResponse queryNotifications(@RequestParam(value = "is_new", required = false) Boolean isNew) {
         return queryNotificationsUseCase.execute(isNew);

jobis-infrastructure/src/main/java/team/retum/jobis/event/intern/WinterInternEventHandler.java

@@ -9,14 +9,13 @@
 import team.retum.jobis.domain.company.exception.CompanyNotFoundException;
 import team.retum.jobis.domain.company.model.Company;
 import team.retum.jobis.domain.company.spi.QueryCompanyPort;
+import team.retum.jobis.domain.intern.event.WinterInternRegisteredEvent;
 import team.retum.jobis.domain.intern.event.WinterInternToggledEvent;
 import team.retum.jobis.domain.notification.model.Notification;
 import team.retum.jobis.domain.notification.model.Topic;
 import team.retum.jobis.domain.notification.spi.CommandNotificationPort;
-import team.retum.jobis.domain.intern.event.WinterInternRegisteredEvent;
-import team.retum.jobis.domain.recruitment.model.RecruitStatus;
-import team.retum.jobis.domain.recruitment.model.Recruitment;
 import team.retum.jobis.domain.user.model.User;
+import team.retum.jobis.domain.user.persistence.repository.UserJpaRepository;
 import team.retum.jobis.domain.user.spi.QueryUserPort;
 import team.retum.jobis.thirdparty.fcm.FCMUtil;
 
@@ -30,6 +29,7 @@ public class WinterInternEventHandler {
     private final CommandNotificationPort commandNotificationPort;
     private final QueryUserPort queryUserPort;
     private final QueryCompanyPort queryCompanyPort;
+    private final UserJpaRepository userJpaRepository;
 
     @Async("asyncTaskExecutor")
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
@@ -60,34 +60,28 @@ public void onWinterInternToggled(WinterInternToggledEvent event) {
     @Async("asyncTaskExecutor")
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     public void onWinterInternRegistered(WinterInternRegisteredEvent event) {
-        List<Recruitment> recruitments = event.getRecruitments();
-
-        for (Recruitment recruitment : recruitments) {
-            if (recruitment.isWinterIntern() && recruitment.getStatus() == RecruitStatus.RECRUITING) {
-                List<String> deviceTokens = queryUserPort.getDeviceTokenByTopic(Topic.WINTER_INTERN);
-
-                Company company = queryCompanyPort.getById(recruitment.getCompanyId())
-                    .orElseThrow(() -> CompanyNotFoundException.EXCEPTION);
+        List<String> deviceTokens = queryUserPort.getDeviceTokenByTopic(Topic.WINTER_INTERN);
 
-                String companyName = company.getName();
+        Company company = queryCompanyPort.getById(event.getRecruitments().getCompanyId())
+            .orElseThrow(() -> CompanyNotFoundException.EXCEPTION);
 
-                deviceTokens.forEach(deviceToken -> {
-                    User user = queryUserPort.getUserIdByDeviceToken(deviceToken);
+        String companyName = company.getName();
 
-                    Notification notification = Notification.builder()
-                        .title(companyName + " 겨울 인턴십 모집 공고 ⛄️")
-                        .content("겨울 인턴십 모집 의뢰서가 등록되었어요. 지금 확인해보세요!")
-                        .userId(user.getId())
-                        .detailId(recruitment.getId())
-                        .topic(Topic.WINTER_INTERN)
-                        .authority(Authority.STUDENT)
-                        .isNew(true)
-                        .build();
+        for (String deviceToken : deviceTokens) {
+            User user = queryUserPort.getUserIdByDeviceToken(deviceToken);
 
-                    commandNotificationPort.save(notification);
-                    fcmUtil.sendMessageToTopic(notification);
-                });
-            }
+            Notification notification = Notification.builder()
+                .title(companyName + " 겨울 인턴십 모집 공고 ⛄️")
+                .content("겨울 인턴십 모집 의뢰서가 등록되었어요. 지금 확인해보세요!")
+                .userId(user.getId())
+                .detailId(event.getRecruitments().getId())
+                .topic(Topic.WINTER_INTERN)
+                .authority(Authority.STUDENT)
+                .isNew(true)
+                .build();
+
+            commandNotificationPort.save(notification);
+            fcmUtil.sendMessageToTopic(notification);
         }
     }
 }