Fjerner feature toggle stopp_opensearch_indeksering

Author: klaramargrethehelgemo

src/main/java/no/nav/pto/veilarbportefolje/config/FeatureToggle.java

@@ -13,19 +13,13 @@ private FeatureToggle() {
     public static final String KAFKA_AIVEN_CONSUMERS_STOP = "veilarbportefolje.kafka_aiven_consumers_stop";
     public static final String KAFKA_SISTE_14A_STOP = "veilarbportefolje.kafka_siste_14a_stop";
     public static final String BRUK_FILTER_FOR_BRUKERINNSYN_TILGANGER = "veilarbportefolje.bruk_filter_for_brukerinnsyn_tilganger";
-    public static final String STOPP_OPENSEARCH_INDEKSERING = "veilarbportefolje.stopp_opensearch_indeksering";
     public static final String STOPP_KONSUMERING_FRA_PORTEFOLJE_HENDELSESFILTER_TOPIC = "veilarbportefolje.stopp_konsumering_fra_portefolje_hendelsesfilter_topic";
 
     public static boolean brukAvAliasIndeksering(DefaultUnleash defaultUnleash) {
         return defaultUnleash.isEnabled(FeatureToggle.ALIAS_INDEKSERING);
     }
 
-
     public static boolean brukFilterForBrukerinnsynTilganger(DefaultUnleash defaultUnleash) {
         return defaultUnleash.isEnabled(FeatureToggle.BRUK_FILTER_FOR_BRUKERINNSYN_TILGANGER);
     }
-
-    public static boolean stoppOpensearchIndeksering(DefaultUnleash defaultUnleash) {
-        return defaultUnleash.isEnabled(FeatureToggle.STOPP_OPENSEARCH_INDEKSERING);
-    }
 }

src/main/java/no/nav/pto/veilarbportefolje/persononinfo/PdlBrukerdataKafkaService.java

@@ -1,12 +1,10 @@
 package no.nav.pto.veilarbportefolje.persononinfo;
 
-import io.getunleash.DefaultUnleash;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.common.types.identer.AktorId;
 import no.nav.common.types.identer.Fnr;
-import no.nav.pto.veilarbportefolje.config.FeatureToggle;
 import no.nav.pto.veilarbportefolje.kafka.KafkaCommonNonKeyedConsumerService;
 import no.nav.pto.veilarbportefolje.opensearch.OpensearchIndexer;
 import no.nav.pto.veilarbportefolje.opensearch.OpensearchIndexerV2;
@@ -39,7 +37,6 @@ public class PdlBrukerdataKafkaService extends KafkaCommonNonKeyedConsumerServic
     private final BarnUnder18AarService barnUnder18AarService;
     private final OpensearchIndexer opensearchIndexer;
     private final OpensearchIndexerV2 opensearchIndexerV2;
-    private final DefaultUnleash defaultUnleash;
 
     @Override
     @SneakyThrows
@@ -60,14 +57,11 @@ public void behandleKafkaMeldingLogikk(PdlDokument pdlDokument) {
         if (pdlIdentRepository.harAktorIdUnderOppfolging(aktorIder)) {
             AktorId aktivAktorId = hentAktivAktor(pdlIdenter);
             secureLog.info("Det oppsto en PDL endring aktoer: {}", aktivAktorId);
-
             handterIdentEndring(pdlIdenter);
 
             handterBrukerDataEndring(pdlDokument.getHentPerson(), pdlIdenter);
 
-            if (!FeatureToggle.stoppOpensearchIndeksering(defaultUnleash)) {
-                oppdaterOpensearch(aktivAktorId, pdlIdenter);
-            }
+            oppdaterOpensearch(aktivAktorId, pdlIdenter);
         }
 
         if (barnUnder18AarService.erFnrBarnAvForelderUnderOppfolging(fnrs)) {
@@ -77,7 +71,6 @@ public void behandleKafkaMeldingLogikk(PdlDokument pdlDokument) {
 
             handterBarnEndring(pdlDokument.getHentPerson(), pdlIdenter);
 
-            if (!FeatureToggle.stoppOpensearchIndeksering(defaultUnleash)) {
                 List<Fnr> foreldreTilBarn = barnUnder18AarService.finnForeldreTilBarn(aktivtFnr);
 
                 foreldreTilBarn.forEach(fnrForelder -> {
@@ -89,7 +82,6 @@ public void behandleKafkaMeldingLogikk(PdlDokument pdlDokument) {
                             }
                         }
                 );
-            }
         }
     }
 

src/test/java/no/nav/pto/veilarbportefolje/persononinfo/BarnUnder18AarTest/BarnUnder18AarKafkaTest.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
-import io.getunleash.DefaultUnleash;
 import no.nav.common.client.pdl.PdlClientImpl;
 import no.nav.common.types.identer.AktorId;
 import no.nav.common.types.identer.Fnr;
@@ -65,8 +64,6 @@ public class BarnUnder18AarKafkaTest {
     private final String pdlDokumentBarn1MedDiskresjonskodeAsString = readFileAsJsonString("/PDL_Files/pdl_dokument_barn1_med_diskresjonskode.json", getClass());
     private final JdbcTemplate db;
 
-    @MockBean
-    private DefaultUnleash defaultUnleash;
     private final WireMockServer server = new WireMockServer();
 
 
@@ -107,8 +104,7 @@ public void setup() {
                 new BrukerServiceV2(this.pdlIdentRepository, this.oppfolgingsbrukerRepositoryV3, this.oppfolgingRepositoryV2),
                 this.barnUnder18AarService,
                 opensearchIndexer,
-                opensearchIndexerV2,
-                defaultUnleash
+                opensearchIndexerV2
         );
     }
 

src/test/java/no/nav/pto/veilarbportefolje/persononinfo/BarnUnder18AarTest/BarnUnder18AarMisterForeldreansvarTest.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.WireMockServer;
-import io.getunleash.DefaultUnleash;
 import no.nav.common.client.pdl.PdlClientImpl;
 import no.nav.common.types.identer.AktorId;
 import no.nav.common.types.identer.Fnr;
@@ -65,9 +64,6 @@ public class BarnUnder18AarMisterForeldreansvarTest {
     private final String pdlDokumentIngenBarn = readFileAsJsonString("/PDL_Files/pdl_dokument_ingen_barn.json", getClass());
     private final JdbcTemplate db;
 
-    @MockBean
-    private DefaultUnleash defaultUnleash;
-
     private final WireMockServer server = new WireMockServer();
 
 
@@ -94,7 +90,7 @@ public void setup() {
 
         server.start();
 
-        PdlPortefoljeClient pdlPortefoljeClient = new PdlPortefoljeClient(new PdlClientImpl("http://localhost:" + server.port(), () -> "SYSTEM_TOKEN"));
+        PdlPortefoljeClient pdlPortefoljeClient = new PdlPortefoljeClient(new PdlClientImpl("http://localhost:" + server.port(), () -> "SYSTEM_TOKEN", "B555"));
 
 
         barnUnder18AarService = new BarnUnder18AarService(barnUnder18AarRepository, pdlPortefoljeClient);
@@ -108,8 +104,7 @@ public void setup() {
                 new BrukerServiceV2(this.pdlIdentRepository, this.oppfolgingsbrukerRepositoryV3, this.oppfolgingRepositoryV2),
                 this.barnUnder18AarService,
                 opensearchIndexer,
-                opensearchIndexerV2,
-                defaultUnleash
+                opensearchIndexerV2
         );
     }
 

src/test/java/no/nav/pto/veilarbportefolje/persononinfo/PDLPersonBarnTest.java

@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.time.LocalDate;
@@ -33,7 +33,7 @@ public class PDLPersonBarnTest {
     private final JdbcTemplate db;
     private final PdlPersonRepository pdlPersonRepository;
 
-    @Autowired
+    @MockBean
     private PdlPortefoljeClient mockedPdlPortefoljeClient;
 
     private PdlService pdlService;

src/test/java/no/nav/pto/veilarbportefolje/persononinfo/PdlBrukerdataKafkaServiceTest.java

@@ -75,8 +75,7 @@ public PdlBrukerdataKafkaServiceTest() throws JsonProcessingException {
                 new BrukerServiceV2(pdlIdentRepository, oppfolgingsbrukerRepositoryV3, oppfolgingRepositoryV2),
                 barnUnder18AarService,
                 opensearchIndexer,
-                opensearchIndexerV2,
-                mockUnleash
+                opensearchIndexerV2
         );
     }