Merge pull request #343 from Kernel360/fix/#340-알림-데이터-저장-에러-수정

fix: 예외 처리로 원래 트랜잭션에 영향 없도록 하기

Author: tomatozil

monicar-event-hub/src/main/java/org/eventhub/application/AlarmService.java

@@ -30,12 +30,16 @@ public Optional<Alarm> findById(Long vehicleId) {
 
 	@Transactional(propagation = Propagation.REQUIRES_NEW)
 	public Optional<Long> saveAlarmIfNecessary(Long vehicleId, Long totalDistance) {
-		boolean isNecessary = findById(vehicleId)
-			.map(alarm -> checkBiggerThanIntervalDistance(totalDistance, alarm.getDrivingDistance()))
-			.orElse(true);
+		try {
+			boolean isNecessary = alarmRepository.findByVehicleIdAlarmRequired(vehicleId)
+				.map(alarm -> checkBiggerThanIntervalDistance(totalDistance, alarm.getDrivingDistance()))
+				.orElse(true);
 
-		if (isNecessary) {
-			return Optional.ofNullable(alarmRepository.save(vehicleId));
+			if (isNecessary) {
+				return Optional.ofNullable(alarmRepository.save(vehicleId));
+			}
+		} catch (Exception e) {
+			log.error("Alarm 쿼리 예외 발생", e);
 		}
 		return Optional.empty();
 	}

monicar-event-hub/src/main/java/org/eventhub/application/port/AlarmRepository.java

@@ -6,5 +6,7 @@
 
 public interface AlarmRepository {
 	Optional<Alarm> findByVehicleId(Long vehicleId);
+
+	Optional<Alarm> findByVehicleIdAlarmRequired(Long vehicleId);
 	Long save(Long vehicleId);
 }

monicar-event-hub/src/main/java/org/eventhub/infrastructure/repository/AlarmRepositoryAdapter.java

@@ -2,25 +2,43 @@
 
 import java.util.Optional;
 
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
 import lombok.RequiredArgsConstructor;
 
 import org.eventhub.application.port.AlarmRepository;
 import org.eventhub.domain.Alarm;
 import org.eventhub.domain.AlarmStatus;
 import org.eventhub.infrastructure.repository.jpa.AlarmJpaRepository;
 import org.eventhub.infrastructure.repository.jpa.entity.AlarmEntity;
+import org.eventhub.infrastructure.repository.jpa.entity.QAlarmEntity;
 import org.springframework.stereotype.Repository;
 
 @RequiredArgsConstructor
 @Repository
 public class AlarmRepositoryAdapter implements AlarmRepository {
 	private final AlarmJpaRepository alarmJpaRepository;
+	private final JPAQueryFactory jpaQueryFactory;
 
 	@Override
-	public Optional<Alarm>  findByVehicleId(Long vehicleId) {
+	public Optional<Alarm> findByVehicleId(Long vehicleId) {
 		return alarmJpaRepository.findByVehicleId(vehicleId);
 	}
 
+	@Override
+	public Optional<Alarm> findByVehicleIdAlarmRequired(Long vehicleId) {
+		QAlarmEntity alarmEntity = QAlarmEntity.alarmEntity;
+
+		Optional<AlarmEntity> alarm = Optional.ofNullable(jpaQueryFactory.select(alarmEntity)
+			.from(alarmEntity)
+			.where(alarmEntity.id.eq(vehicleId)
+				.and(alarmEntity.status.eq(AlarmStatus.COMPLETED)))
+			.orderBy(alarmEntity.createdAt.desc())
+			.fetchFirst()
+		);
+		return alarm.map(AlarmEntity::toDomain);
+	}
+
 	@Override
 	public Long save(Long vehicleId) {
 		Alarm newAlarm = Alarm.builder()