Skip to content

fix: 알림 데이터 저장 에러 수정 #344

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 2 commits into from
Feb 17, 2025
Merged

fix: 알림 데이터 저장 에러 수정 #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5347c7c
fix: 알림 로직 수정, 쿼리 수정
tomatozil Feb 17, 2025
2aa266e
fix: 변수명 변경
tomatozil Feb 17, 2025
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
15 changes: 9 additions & 6 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 @@ -5,6 +5,7 @@
import org.eventhub.application.port.AlarmRepository;
import org.eventhub.application.port.AlarmSender;
import org.eventhub.domain.Alarm;
import org.eventhub.domain.AlarmStatus;
import org.eventhub.infrastructure.external.command.AlarmSend;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
Expand All @@ -24,20 +25,22 @@ public class AlarmService {
@Value("${alarm-interval-distance}")
private Integer alarmIntervalDistance;

public Optional<Alarm> findById(Long vehicleId) {
public Optional<Alarm> findByVehicleId(Long vehicleId) {
return alarmRepository.findByVehicleId(vehicleId);
}

@Transactional(propagation = Propagation.REQUIRES_NEW)
public Optional<Long> saveAlarmIfNecessary(Long vehicleId, Long totalDistance) {
try {
boolean isNecessary = alarmRepository.findByVehicleIdAlarmRequired(vehicleId)
.map(alarm -> checkBiggerThanIntervalDistance(totalDistance, alarm.getDrivingDistance()))
.orElse(true);
Optional<Alarm> alarm = alarmRepository.findRecentOneByVehicleId(vehicleId);
int targetDistance = alarm.map(Alarm::getDrivingDistance).orElse(0);

if (isNecessary) {
return Optional.ofNullable(alarmRepository.save(vehicleId));
if (checkBiggerThanIntervalDistance(totalDistance, targetDistance)) {
if (alarm.isEmpty() || alarm.get().getStatus().equals(AlarmStatus.COMPLETED)) {
return Optional.ofNullable(alarmRepository.save(vehicleId));
}
}
return Optional.empty();
} catch (Exception e) {
log.error("Alarm 쿼리 예외 발생", e);
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -7,6 +7,6 @@
public interface AlarmRepository {
Optional<Alarm> findByVehicleId(Long vehicleId);

Optional<Alarm> findByVehicleIdAlarmRequired(Long vehicleId);
Optional<Alarm> findRecentOneByVehicleId(Long vehicleId);
Long save(Long vehicleId);
}
5 changes: 2 additions & 3 deletions ...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 @@ -26,13 +26,12 @@ public Optional<Alarm> findByVehicleId(Long vehicleId) {
}

@Override
public Optional<Alarm> findByVehicleIdAlarmRequired(Long vehicleId) {
public Optional<Alarm> findRecentOneByVehicleId(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)))
.where(alarmEntity.vehicleId.eq(vehicleId))
.orderBy(alarmEntity.createdAt.desc())
.fetchFirst()
);
Expand Down