diff --git a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/event/ArenaEventStatus.java b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/event/ArenaEventStatus.java index b674a2774..26340aae0 100644 --- a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/event/ArenaEventStatus.java +++ b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/event/ArenaEventStatus.java @@ -2,7 +2,6 @@ public enum ArenaEventStatus { CREATED, - PROCESSING, DONE, IGNORED, FAILED, diff --git a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementService.java b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementService.java index 502de3169..034829504 100644 --- a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementService.java +++ b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementService.java @@ -2,13 +2,9 @@ import lombok.extern.slf4j.Slf4j; import no.nav.tag.tiltaksgjennomforing.arena.models.migration.ArenaAgreementAggregate; -import no.nav.tag.tiltaksgjennomforing.arena.models.migration.ArenaAgreementMigration; -import no.nav.tag.tiltaksgjennomforing.arena.models.migration.ArenaAgreementMigrationStatus; import no.nav.tag.tiltaksgjennomforing.arena.repository.ArenaAgreementMigrationRepository; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.List; @Slf4j @@ -26,25 +22,8 @@ public ArenaAgreementService( this.arenaAgreementMigrationRepository = arenaAgreementMigrationRepository; } - @Transactional public List getArenaAgreementsForProcessing() { - List agreementAggregates = arenaAgreementMigrationRepository.findMigrationAgreementAggregates(); - - arenaAgreementMigrationRepository.saveAll( - arenaAgreementMigrationRepository - .findMigrationAgreementAggregates() - .stream() - .map(aggregate -> - ArenaAgreementMigration.builder() - .tiltakgjennomforingId(aggregate.getTiltakgjennomforingId()) - .status(ArenaAgreementMigrationStatus.PROCESSING) - .modified(LocalDateTime.now()) - .build() - ) - .toList() - ); - - return agreementAggregates; + return arenaAgreementMigrationRepository.findMigrationAgreementAggregates(); } public void processAgreements(List agreements) { diff --git a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaEventProcessingJobService.java b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaEventProcessingJobService.java index 07740824e..4633acec4 100644 --- a/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaEventProcessingJobService.java +++ b/src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaEventProcessingJobService.java @@ -33,7 +33,7 @@ public List getAndUpdateEvents() { .map(arenaEvent -> isMaxRetry(arenaEvent) ? arenaEvent.toBuilder().status(ArenaEventStatus.FAILED).build() - : arenaEvent.toBuilder().status(ArenaEventStatus.PROCESSING).retryCount(arenaEvent.getRetryCount() + 1).build() + : arenaEvent.toBuilder().retryCount(arenaEvent.getRetryCount() + 1).build() ) .toList();