Skip to content

Commit 6ae0601

Browse files
committed
fiks ting
1 parent ba8e09c commit 6ae0601

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public static ArenaMigrationAction map(
3535
Deltakerstatuskode deltakerstatuskode = agreementAggregate.getDeltakerstatuskode();
3636
Tiltakstatuskode tiltakstatuskode = agreementAggregate.getTiltakstatuskode();
3737
boolean isFeilregistrert = avtale.isFeilregistrert();
38+
boolean isSluttdatoIDagEllerFremtiden = agreementAggregate.isSluttdatoIDagEllerFremtiden();
3839

3940
if (agreementAggregate.isDublett()) {
4041
return IGNORER;
@@ -59,8 +60,9 @@ public static ArenaMigrationAction map(
5960
case null, default -> ANNULLER;
6061
};
6162
case AVLYST -> ANNULLER;
62-
case AVSLUTT, GJENNOMFOR -> switch (deltakerstatuskode) {
63-
case FULLF, GJENN, TILBUD -> AVSLUTT;
63+
case AVSLUTT, GJENNOMFOR -> switch(deltakerstatuskode) {
64+
case FULLF -> AVSLUTT;
65+
case GJENN, TILBUD -> isSluttdatoIDagEllerFremtiden ? OPPDATER : AVSLUTT;
6466
case null, default -> ANNULLER;
6567
};
6668
case null, default -> throw new IllegalStateException(formatExceptionMsg(tiltakstatuskode, deltakerstatuskode));

0 commit comments

Comments
 (0)