Increase delay in test ident retrieval and enhance resource creation logic

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/nom/NomClient.java

@@ -56,6 +56,9 @@ public Mono<BestillingProgress> gjenopprett(RsDollyUtvidetBestilling bestilling,
                     } else if (isNull(ressurs.getSluttDato()) && nonNull(bestilling.getNomdata().getSluttDato())) {
                         return nomConsumer.avsluttRessurs(dollyPerson.getIdent(),
                                 bestilling.getNomdata().getSluttDato().toLocalDate());
+                    } else if (nonNull(ressurs.getSluttDato()) && ressurs.getSluttDato().isBefore(LocalDate.now())) {
+                        return mapTilNomRequest(bestilling.getNomdata(), dollyPerson)
+                                .flatMap(nomConsumer::opprettRessurs);
                     } else {
                         return Mono.just(ressurs);
                     }

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettGruppeService.java

@@ -18,14 +18,13 @@
 import no.nav.dolly.repository.TestgruppeRepository;
 import no.nav.dolly.service.BestillingService;
 import no.nav.dolly.service.IdentService;
-import no.nav.dolly.util.ClearCacheUtil;
 import no.nav.dolly.service.TransactionHelperService;
+import no.nav.dolly.util.ClearCacheUtil;
 import org.springframework.cache.CacheManager;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 import reactor.util.function.Tuple2;
 
 import java.time.Duration;
@@ -91,7 +90,7 @@ public void executeAsync(Bestilling bestilling) {
 
             var counterIdentBestilling = new HashMap<String, Boolean>();
             identService.getTestidenterByGruppeId(bestilling.getGruppeId())
-                    .delayElements(Duration.ofMillis(1500))
+                    .delayElements(Duration.ofMillis(2000))
                     .flatMap(testident -> bestillingService.isStoppet(bestilling.getId())
                             .zipWith(Mono.just(testident)))
                     .takeWhile(tuple -> isFalse(tuple.getT1()))

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OpprettPersonerFraIdenterMedKriterierService.java

@@ -85,8 +85,8 @@ public void executeAsync(Bestilling bestilling) {
         if (nonNull(bestKriterier)) {
 
             availCheckService.checkAvailable(bestilling.getOpprettFraIdenter())
-                    .flatMap(progress -> bestillingService.isStoppet(bestilling.getId())
-                            .zipWith(Mono.just(progress)))
+                    .flatMap(avail -> bestillingService.isStoppet(bestilling.getId())
+                            .zipWith(Mono.just(avail)))
                     .takeWhile(tuple -> isFalse(tuple.getT1()))
                     .map(Tuple2::getT2)
                     .filter(AvailCheckService.AvailStatus::isAvailable)