Fjernet sykemelding-proxy

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java

@@ -60,7 +60,7 @@ public Mono<BestillingProgress> gjenopprett(RsDollyUtvidetBestilling bestilling,
 
     @Override
     public void release(List<String> identer) {
-        identer.forEach(ident -> sykemeldingConsumer.deleteTsmSykemeldinger(ident)
+        identer.forEach(ident -> sykemeldingConsumer.deleteSykemeldinger(ident)
                 .subscribe());
     }
 
@@ -108,6 +108,6 @@ private Mono<SykemeldingResponseDTO> postNySykemelding(RsSykemelding.RsNySykemel
                 .aktivitet(aktivitet)
                 .build();
 
-        return sykemeldingConsumer.postTsmSykemelding(request);
+        return sykemeldingConsumer.postSykemelding(request);
     }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingConsumer.java

@@ -41,17 +41,17 @@ public SykemeldingConsumer(
                 .build();
     }
 
-    @Timed(name = "providers", tags = { "operation", "nysykemelding_opprett" })
-    public Mono<SykemeldingResponseDTO> postTsmSykemelding(SykemeldingRequestDTO sykemeldingRequestDTO) {
+    @Timed(name = "providers", tags = { "operation", "sykemelding_opprett" })
+    public Mono<SykemeldingResponseDTO> postSykemelding(SykemeldingRequestDTO sykemeldingRequestDTO) {
 
-        log.info("Sykemelding sendt til tsm-input-dolly {}", Json.pretty(sykemeldingRequestDTO));
+        log.info("Sykemelding sendt til dolly-proxy {}", Json.pretty(sykemeldingRequestDTO));
 
         return tokenService.exchange(serverProperties)
                 .flatMap(token -> new SykemeldingPostCommand(webClient, sykemeldingRequestDTO, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = { "operation", "nysykemelding_delete" })
-    public Mono<Void> deleteTsmSykemeldinger(String ident) {
+    @Timed(name = "providers", tags = { "operation", "sykemelding_delete" })
+    public Mono<Void> deleteSykemeldinger(String ident) {
 
         log.info("Sletter nye sykemeldinger for ident: {}", ident);
 
@@ -66,6 +66,6 @@ public String serviceUrl() {
 
     @Override
     public String consumerName() {
-        return "testnav-sykemelding-proxy";
+        return "testnav-dolly-proxy";
     }
 }

apps/dolly-frontend/src/main/resources/application-local.yml

@@ -94,8 +94,6 @@ consumers:
     url: https://testnav-sykemelding-api-dev.intern.dev.nav.no
   testnav-arbeidssoekerregisteret-proxy:
     url: https://testnav-arbeidssoekerregisteret-proxy.intern.dev.nav.no
-  testnav-sykemelding-proxy:
-    url: https://testnav-sykemelding-proxy.intern.dev.nav.no
   testnav-api-oversikt-service:
     url: https://testnav-oversikt-service.intern.dev.nav.no
   testnav-nom-proxy:

apps/dolly-frontend/src/main/resources/application.yml

@@ -135,11 +135,6 @@ consumers:
     namespace: dolly
     url: http://testnav-arbeidsplassencv-proxy.dolly.svc.cluster.local
     cluster: dev-gcp
-  testnav-sykemelding-proxy:
-    name: testnav-sykemelding-proxy
-    namespace: dolly
-    url: http://testnav-sykemelding-proxy.dolly.svc.cluster.local
-    cluster: dev-gcp
   testnav-kodeverk-service:
     name: testnav-kodeverk-service
     namespace: dolly

docs/modules/ROOT/pages/index.adoc

@@ -771,7 +771,6 @@ Proxy (lenke til repo), Cluster (proxyens primære cluster utledet fra accessPol
 |link:https://github.com/navikt/testnorge/tree/master/proxies/saf-proxy[saf-proxy] |dev-gcp |- |detektert-saf-MILJOE |http://saf-MILJOE.teamdokumenthandtering.svc.nais.local |false |aktiv
 |link:https://github.com/navikt/testnorge/tree/master/proxies/sigrunstub-proxy[sigrunstub-proxy] |dev-gcp |- |- |- |false |aktiv
 |link:https://github.com/navikt/testnorge/tree/master/proxies/skjermingsregister-proxy[skjermingsregister-proxy] |dev-gcp |- |detektert-skjermede-personer |https://skjermede-personer.dev.adeo.no |false |aktiv
-|link:https://github.com/navikt/testnorge/tree/master/proxies/sykemelding-proxy[sykemelding-proxy] |dev-gcp |https://testnav-sykemelding-proxy.intern.dev.nav.no |syfosmregler, tsm-input-dolly |http://syfosmregler.teamsykmelding.svc.cluster.local, http://tsm-input-dolly.tsm.svc.cluster.local |true |aktiv
 |link:https://github.com/navikt/testnorge/tree/master/proxies/synthdata-meldekort-proxy[synthdata-meldekort-proxy] |dev-fss |https://testnav-synthdata-meldekort-proxy.intern.dev.nav.no |synthdata-arena-meldekort |https://synthdata-arena-meldekort.intern.dev.nav.no |true |aktiv
 |link:https://github.com/navikt/testnorge/tree/master/proxies/texas-proxy[texas-proxy] |dev-gcp |https://dolly-texas-proxy.intern.dev.nav.no |samler alle andre proxyer (WIP) |- |false |aktiv
 |link:https://github.com/navikt/testnorge/tree/master/proxies/trygdeetaten-nav-proxy[trygdeetaten-nav-proxy] |dev-gcp |- |detektert-synthdata-arena-meldekort |https://synthdata-arena-meldekort.intern.dev.nav.no |false |aktiv