Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions tracky-consumer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-amqp'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'org.springframework.retry:spring-retry'
implementation 'org.springframework.boot:spring-boot-starter-aop'

implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.retry.annotation.EnableRetry;

@SpringBootApplication
@EntityScan(basePackages = {
Expand All @@ -15,6 +16,7 @@
"kernel360.trackyconsumer"
})
@ComponentScan(basePackages = "kernel360")
@EnableRetry
public class TrackyConsumerApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import java.time.LocalDate;
import java.util.List;
import kernel360.trackycore.core.domain.entity.enums.CarStatus;
import org.springframework.scheduling.annotation.Async;

import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.retry.annotation.Backoff;
import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import kernel360.trackyconsumer.consumer.application.dto.request.CarOnOffRequest;
Expand Down Expand Up @@ -36,7 +38,7 @@ public class ConsumerService {
private final RentDomainProvider rentDomainProvider;
private final TimeDistanceDomainProvider timeDistanceDomainProvider;

@Async("taskExecutor")
// @Async("taskExecutor")
@Transactional
public void receiveCycleInfo(GpsHistoryMessage request) {

Expand Down Expand Up @@ -138,6 +140,12 @@ private void processTimeDistance(List<CycleGpsRequest> cycleGpsRequests, CarEnti
saveTimeDistance(prevDate, prevHour, car, distance, seconds);
}

@Retryable(
value = OptimisticLockingFailureException.class,
maxAttempts = 3,
backoff = @Backoff(delay = 100, multiplier = 2, maxDelay = 2000),
listeners = "retryListener"
)
private void saveTimeDistance(LocalDate date, int hour, CarEntity car, double totalDistance, int seconds) {

timeDistanceDomainProvider.getTimeDistance(date, hour, car)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.Version;
import kernel360.trackycore.core.domain.entity.base.DateBaseEntity;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down Expand Up @@ -49,6 +50,9 @@ public class TimeDistanceEntity extends DateBaseEntity {
@Column(name = "seconds", nullable = false)
private int seconds;

@Version
private Long version;

private TimeDistanceEntity(
CarEntity car,
BizEntity biz,
Expand Down