Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomatozil merged 1 commit into from
Feb 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions monicar-event-hub/src/main/java/org/eventhub/application/AlarmService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 2 additions & 0 deletions monicar-event-hub/src/main/java/org/eventhub/application/port/AlarmRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@

public interface AlarmRepository {
Optional<Alarm> findByVehicleId(Long vehicleId);

Optional<Alarm> findByVehicleIdAlarmRequired(Long vehicleId);
Long save(Long vehicleId);
}
20 changes: 19 additions & 1 deletion ...vent-hub/src/main/java/org/eventhub/infrastructure/repository/AlarmRepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down