feat. ta høyde for deltaker id i arena_agreement_migration

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/migration/ArenaAgreementAggregate.java

@@ -73,12 +73,8 @@ public Optional<LocalDate> findSluttdato() {
             .findFirst();
     }
 
-    public boolean isTiltakDublett() {
-        return isDublett(eksternIdTiltak);
-    }
-
-    public boolean isDeltakerDublett() {
-        return isDublett(eksternIdDeltaker);
+    public boolean isDublett() {
+        return isDublett(eksternIdTiltak) || isDublett(eksternIdDeltaker);
     }
 
     public Optional<UUID> getEksternIdAsUuid() throws IllegalArgumentException {

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/migration/ArenaAgreementMigration.java

@@ -20,6 +20,7 @@ public class ArenaAgreementMigration {
     @Id
     private UUID id;
     private Integer tiltakgjennomforingId;
+    private Integer tiltakdeltakerId;
     @Enumerated(EnumType.STRING)
     private ArenaAgreementMigrationStatus status;
     @Enumerated(EnumType.STRING)

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/migration/ArenaMigrationAction.java

@@ -8,7 +8,6 @@
 import java.time.LocalDate;
 
 public enum ArenaMigrationAction {
-    HOPP_OVER,
     GJENOPPRETT,
     OPPRETT,
     OPPDATER,
@@ -21,14 +20,9 @@ public static ArenaMigrationAction map(ArenaAgreementAggregate agreementAggregat
         boolean isSluttdatoInTheFuture = agreementAggregate.findSluttdato()
             .map(sluttdato -> sluttdato.isAfter(LocalDate.now())).orElse(false);
 
-        if (agreementAggregate.isDeltakerDublett()) {
-            return HOPP_OVER;
-        }
-
-        if (agreementAggregate.isTiltakDublett()) {
+        if (agreementAggregate.isDublett()) {
             return IGNORER;
         }
-
         return switch (deltakerstatuskode) {
             case GJENN, TILBUD -> isSluttdatoInTheFuture ? OPPRETT : IGNORER;
             case null, default -> IGNORER;
@@ -46,11 +40,7 @@ public static ArenaMigrationAction map(
         boolean isSluttdatoIFremtiden = agreementAggregate.findSluttdato()
             .map(sluttdato -> sluttdato.isAfter(LocalDate.now())).orElse(false);
 
-        if (agreementAggregate.isDeltakerDublett()) {
-            return HOPP_OVER;
-        }
-
-        if (agreementAggregate.isTiltakDublett()) {
+        if (agreementAggregate.isDublett()) {
             return IGNORER;
         }
 

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/models/migration/ArenaMigrationProcessResult.java

@@ -3,7 +3,6 @@
 import no.nav.tag.tiltaksgjennomforing.avtale.Avtale;
 
 public sealed interface ArenaMigrationProcessResult {
-    record Skip(ArenaMigrationAction action) implements ArenaMigrationProcessResult {}
     record Ignored(ArenaMigrationAction action) implements ArenaMigrationProcessResult {}
     record Completed(ArenaMigrationAction action, Avtale avtale) implements ArenaMigrationProcessResult {}
 }

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/repository/ArenaAgreementMigrationRepository.java

@@ -34,10 +34,11 @@ public interface ArenaAgreementMigrationRepository extends JpaRepository<ArenaAg
                 atg.regDato
             )
         FROM ArenaTiltakgjennomforing atg
-        LEFT JOIN ArenaTiltakdeltaker atd ON atd.tiltakgjennomforingId = atg.tiltakgjennomforingId
+        FULL OUTER JOIN ArenaTiltakdeltaker atd ON atd.tiltakgjennomforingId = atg.tiltakgjennomforingId
         LEFT JOIN ArenaOrdsFnr aof ON atd.personId = aof.personId
         LEFT JOIN ArenaOrdsArbeidsgiver aoa ON atg.arbgivIdArrangor = aoa.arbgivIdArrangor
-        WHERE atg.tiltakgjennomforingId NOT IN (SELECT tiltakgjennomforingId FROM ArenaAgreementMigration)
+        WHERE atg.tiltakgjennomforingId NOT IN (SELECT tiltakgjennomforingId FROM ArenaAgreementMigration) OR
+              atd.tiltakdeltakerId NOT IN (SELECT tiltakdeltakerId FROM ArenaAgreementMigration)
         ORDER BY atd.tiltakgjennomforingId LIMIT 5000
     """)
     List<ArenaAgreementAggregate> findMigrationAgreementAggregates();

src/main/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementProcessingService.java

@@ -79,6 +79,7 @@ public ArenaAgreementProcessingService(
     public void process(ArenaAgreementAggregate agreementAggregate) {
         UUID eksternId = agreementAggregate.getEksternIdAsUuid().orElse(null);
         Integer tiltaksgjennomforingId = agreementAggregate.getTiltakgjennomforingId();
+        Integer tiltakdeltakerId = agreementAggregate.getTiltakdeltakerId();
 
         try {
             ArenaMigrationProcessResult result = agreementAggregate.getEksternIdAsUuid()
@@ -99,6 +100,7 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
                     );
                     saveMigrationStatus(
                         tiltaksgjennomforingId,
+                        tiltakdeltakerId,
                         ArenaAgreementMigrationStatus.COMPLETED,
                         completed.action(),
                         eksternId,
@@ -108,19 +110,18 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
                 case ArenaMigrationProcessResult.Ignored ignored ->
                     saveMigrationStatus(
                         tiltaksgjennomforingId,
+                        tiltakdeltakerId,
                         ArenaAgreementMigrationStatus.COMPLETED,
                         ignored.action(),
                         eksternId,
                         null
                     );
-                case ArenaMigrationProcessResult.Skip skip -> {
-                    // Gjør ingenting
-                }
             }
         } catch(Exception e) {
             log.error("Feil ved prossesering av avtale fra Arena", e);
             saveMigrationStatus(
                 tiltaksgjennomforingId,
+                tiltakdeltakerId,
                 ArenaAgreementMigrationStatus.FAILED,
                 null,
                 eksternId,
@@ -131,6 +132,7 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
 
     private void saveMigrationStatus(
             Integer tiltakgjennomforingId,
+            Integer tiltakdeltakerId,
             ArenaAgreementMigrationStatus status,
             ArenaMigrationAction action,
             UUID eksternId,
@@ -140,6 +142,7 @@ private void saveMigrationStatus(
             ArenaAgreementMigration.builder()
                 .id(UUID.randomUUID())
                 .tiltakgjennomforingId(tiltakgjennomforingId)
+                .tiltakdeltakerId(tiltakdeltakerId)
                 .status(status)
                 .action(action)
                 .avtaleId(agreementId)
@@ -152,20 +155,14 @@ private void saveMigrationStatus(
     private ArenaMigrationProcessResult updateAvtale(Avtale avtale, ArenaAgreementAggregate agreementAggregate) {
         ArenaMigrationAction action = ArenaMigrationAction.map(avtale, agreementAggregate);
         switch (action) {
-            case HOPP_OVER -> {
-                log.info(
-                    "Avtale har deltaker som er duplett i Arena. Hopper over avtalen. Den vil sannsynligvis bli oppdatert senere."
-                );
-                return new ArenaMigrationProcessResult.Skip(action);
-            }
             case IGNORER -> {
                 log.info(
                     "Avtale med id {} og status {} har tiltakstatus {}, deltakerstatus {} og tiltaket er {} i Arena. Ignorerer avtalen.",
                     avtale.getId(),
                     avtale.getStatus(),
                     agreementAggregate.getTiltakstatuskode(),
                     agreementAggregate.getDeltakerstatuskode(),
-                    agreementAggregate.isTiltakDublett() ? "dublett" : "ikke dublett"
+                    agreementAggregate.isDublett() ? "dublett" : "ikke dublett"
                 );
                 return new ArenaMigrationProcessResult.Ignored(action);
             }
@@ -218,20 +215,13 @@ private ArenaMigrationProcessResult updateAvtale(Avtale avtale, ArenaAgreementAg
     private ArenaMigrationProcessResult createAvtale(ArenaAgreementAggregate agreementAggregate) {
         ArenaMigrationAction action = ArenaMigrationAction.map(agreementAggregate);
 
-        if (ArenaMigrationAction.HOPP_OVER == action) {
-            log.info(
-                "Avtale har deltaker som er duplett i Arena. Hopper over avtalen. Den vil sannsynligvis bli oppdatert senere."
-            );
-            return new ArenaMigrationProcessResult.Skip(action);
-        }
-
         if (ArenaMigrationAction.IGNORER == action) {
             log.info(
                 "Avtale har tiltaksstatus {}, deltakerstatus {}, sluttdato {} og er {} i Arena. Ignorerer avtalen.",
                 agreementAggregate.getTiltakstatuskode(),
                 agreementAggregate.getDeltakerstatuskode(),
                 agreementAggregate.findSluttdato().orElse(null),
-                agreementAggregate.isTiltakDublett() ? "dublett" : "ikke dublett"
+                agreementAggregate.isDublett() ? "dublett" : "ikke dublett"
             );
             return new ArenaMigrationProcessResult.Ignored(action);
         }

src/main/resources/db/migration/V117__tiltakdeltaker_id_arena-agreement_migration.sql

@@ -0,0 +1,14 @@
+ALTER TABLE arena_agreement_migration ADD COLUMN tiltakdeltaker_id int;
+
+UPDATE arena_agreement_migration aam
+SET tiltakdeltaker_id = (
+    SELECT tiltakdeltaker_id
+    FROM arena_tiltakdeltaker
+    WHERE tiltakgjennomforing_id = aam.tiltakgjennomforing_id
+    LIMIT 1
+);
+
+ALTER TABLE arena_agreement_migration
+ADD CONSTRAINT arena_agreement_migration_tiltakdeltaker_id_fkey
+FOREIGN KEY (tiltakdeltaker_id)
+REFERENCES arena_tiltakdeltaker(tiltakdeltaker_id);