feat. ta høyde for deltaker id i arena_agreement_migration

Det kan være flere deltakere på et tiltak. Derfor må vi ta høyde for dette.
navikt · Dec 11, 2024 · 7cdc665 · 7cdc665
1 parent 59019d0
commit 7cdc665
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/.../java/no/nav/tag/tiltaksgjennomforing/arena/models/migration/ArenaAgreementMigration.java b/.../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)

diff --git a/...a/no/nav/tag/tiltaksgjennomforing/arena/repository/ArenaAgreementMigrationRepository.java b/...a/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();

diff --git a/...n/java/no/nav/tag/tiltaksgjennomforing/arena/service/ArenaAgreementProcessingService.java b/...n/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,6 +110,7 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
                 case ArenaMigrationProcessResult.Ignored ignored ->
                     saveMigrationStatus(
                         tiltaksgjennomforingId,
+                        tiltakdeltakerId,
                         ArenaAgreementMigrationStatus.COMPLETED,
                         ignored.action(),
                         eksternId,
@@ -121,6 +124,7 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
             log.error("Feil ved prossesering av avtale fra Arena", e);
             saveMigrationStatus(
                 tiltaksgjennomforingId,
+                tiltakdeltakerId,
                 ArenaAgreementMigrationStatus.FAILED,
                 null,
                 eksternId,
@@ -131,6 +135,7 @@ public void process(ArenaAgreementAggregate agreementAggregate) {
 
     private void saveMigrationStatus(
             Integer tiltakgjennomforingId,
+            Integer tiltakdeltakerId,
             ArenaAgreementMigrationStatus status,
             ArenaMigrationAction action,
             UUID eksternId,
@@ -140,6 +145,7 @@ private void saveMigrationStatus(
             ArenaAgreementMigration.builder()
                 .id(UUID.randomUUID())
                 .tiltakgjennomforingId(tiltakgjennomforingId)
+                .tiltakdeltakerId(tiltakdeltakerId)
                 .status(status)
                 .action(action)
                 .avtaleId(agreementId)

diff --git a/src/main/resources/db/migration/V117__tiltakdeltaker_id_arena-agreement_migration.sql b/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);