Nyere callid + consumerid til Sigrun (#1999)

Author: jolarsen

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/registerdata/inntekt/sigrun/klient/SigrunRestClient.java

@@ -3,6 +3,8 @@
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.AUTH_HEADER;
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.CALL_ID;
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.CONSUMER_ID;
+import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.ENDA_NYERE_HEADER_CALL_ID;
+import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.ENDA_NYERE_HEADER_CONSUMER_ID;
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.FILTER;
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.FILTER_SSG;
 import static no.nav.foreldrepenger.abakus.registerdata.inntekt.sigrun.klient.SigrunRestConfig.INNTEKTSAAR;
@@ -99,9 +101,11 @@ private HttpRequestBase lagRequestSSG(long aktørId, String år) {
         request.setHeader(AUTH_HEADER, authHeaderValue);
         request.setHeader(CALL_ID, MDCOperations.getCallId());
         request.setHeader(NYE_HEADER_CALL_ID, MDCOperations.getCallId());
+        request.setHeader(ENDA_NYERE_HEADER_CALL_ID, MDCOperations.getCallId());
         request.setHeader("Accept", "application/json");
         request.setHeader(CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
         request.setHeader(NYE_HEADER_CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
+        request.setHeader(ENDA_NYERE_HEADER_CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
 
         return request;
     }
@@ -115,9 +119,11 @@ private HttpRequestBase lagRequestBS(String år, long aktørId) {
         request.addHeader(X_INNTEKTSÅR, år);
         request.setHeader(CALL_ID, MDCOperations.getCallId());
         request.setHeader(NYE_HEADER_CALL_ID, MDCOperations.getCallId());
+        request.setHeader(ENDA_NYERE_HEADER_CALL_ID, MDCOperations.getCallId());
         request.setHeader("Accept", "application/json");
         request.setHeader(CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
         request.setHeader(NYE_HEADER_CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
+        request.setHeader(ENDA_NYERE_HEADER_CONSUMER_ID, SubjectHandler.getSubjectHandler().getConsumerId());
         return request;
     }
 

domenetjenester/iay/src/main/java/no/nav/foreldrepenger/abakus/registerdata/inntekt/sigrun/klient/SigrunRestConfig.java

@@ -8,6 +8,9 @@ class SigrunRestConfig {
     static final String OIDC_AUTH_HEADER_PREFIX = "Bearer ";
     static final String NYE_HEADER_CALL_ID = "no.nav.callid";
     static final String NYE_HEADER_CONSUMER_ID = "no.nav.consumer.id";
+    static final String ENDA_NYERE_HEADER_CALL_ID = "Nav-Call-Id";
+    static final String ENDA_NYERE_HEADER_CONSUMER_ID = "Nav-Consumer-Id";
+
 
     //api/beregnetskatt
     static final String FILTER = "BeregnetSkattPensjonsgivendeInntekt";