Merge pull request #112 from Central-MakeUs/dev

[운영 배포]

Author: 0sunset0

yakssok/src/main/java/server/yakssok/domain/medication_schedule/batch/job/MedicationRemindAlarmJob.java

@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,16 +14,13 @@
 import server.yakssok.domain.medication_schedule.domain.repository.MedicationScheduleRepository;
 import server.yakssok.domain.notification.application.service.PushService;
 import server.yakssok.domain.notification.presentation.dto.NotificationDTO;
-import server.yakssok.global.infra.rabbitmq.properties.MedicationQueueProperties;
 
 @Component
 @RequiredArgsConstructor
 public class MedicationRemindAlarmJob {
 
 	private final PushService pushService;
 	private final MedicationScheduleRepository medicationScheduleRepository;
-	private final RabbitTemplate rabbitTemplate;
-	private final MedicationQueueProperties medicationQueueProperties;
 	private final OverduePolicy overduePolicy;
 
 	@Transactional
@@ -38,13 +34,12 @@ public void sendNotTakenRemindMedicationAlarms() {
 			notTakenSchedules.stream().collect(Collectors.groupingBy(MedicationScheduleAlarmDto::userId));
 		for (Map.Entry<Long, List<MedicationScheduleAlarmDto>> entry : byUser.entrySet()) {
 			MedicationScheduleAlarmDto schedule = entry.getValue().get(0);
-			sendToMedicationQueue(NotificationDTO.fromNotTakenMedicationSchedule(schedule));
+			sendNotification(schedule);
 		}
 	}
 
-	private void sendToMedicationQueue(NotificationDTO notificationDTO) {
-		String exchange = medicationQueueProperties.exchange();
-		String routingKey = medicationQueueProperties.routingKey();
-		rabbitTemplate.convertAndSend(exchange, routingKey, notificationDTO);
+	private void sendNotification(MedicationScheduleAlarmDto schedule) {
+		NotificationDTO notificationDTO = NotificationDTO.fromMedicationSchedule(schedule);
+		pushService.sendNotification(notificationDTO);
 	}
 }