Skip to content

Commit 08d92e6

Browse files
krharumkrharum
authored
Fix: Remove deprecated environment 't13' from configuration and relat… (#3754)
* Fjernet språkkode mot TPS * Fjernet visning avt TPS Q1 og Q2 miljøer
1 parent 211afa3 commit 08d92e6

File tree

34 files changed

+48
-378
lines changed

34 files changed

+48
-378
lines changed

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/KrrstubClient.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
import reactor.core.publisher.Mono;
2020

2121
import java.util.List;
22-
import java.util.stream.Stream;
2322

2423
import static java.util.Objects.nonNull;
25-
import static org.apache.logging.log4j.util.Strings.isNotBlank;
2624

2725
@Slf4j
2826
@Service
@@ -34,16 +32,10 @@ public class KrrstubClient implements ClientRegister {
3432
private final ErrorStatusDecoder errorStatusDecoder;
3533
private final TransactionHelperService transactionHelperService;
3634

37-
private static boolean isKrrMaalform(String spraak) {
38-
39-
return isNotBlank(spraak) && Stream.of("NB", "NN", "EN", "SE").anyMatch(spraak::equalsIgnoreCase);
40-
}
41-
4235
@Override
4336
public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson, BestillingProgress progress, boolean isOpprettEndre) {
4437

45-
if (nonNull(bestilling.getKrrstub()) ||
46-
(nonNull(bestilling.getTpsMessaging()) && isKrrMaalform(bestilling.getTpsMessaging().getSpraakKode()))) {
38+
if (nonNull(bestilling.getKrrstub())) {
4739

4840
var context = new MappingContext.Factory().getContext();
4941
context.setProperty("ident", dollyPerson.getIdent());

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java

-24
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
import ma.glasnost.orika.CustomMapper;
44
import ma.glasnost.orika.MapperFactory;
55
import ma.glasnost.orika.MappingContext;
6-
import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
76
import no.nav.dolly.domain.resultset.krrstub.DigitalKontaktdata;
87
import no.nav.dolly.domain.resultset.krrstub.RsDigitalKontaktdata;
98
import no.nav.dolly.mapper.MappingStrategy;
109
import org.springframework.stereotype.Component;
1110

1211
import java.time.ZoneId;
1312
import java.time.ZonedDateTime;
14-
import java.util.stream.Stream;
1513

1614
import static java.util.Objects.nonNull;
1715
import static org.apache.logging.log4j.util.Strings.isBlank;
@@ -46,7 +44,6 @@ public void mapAtoB(RsDigitalKontaktdata digitalKontaktdata, DigitalKontaktdata
4644

4745
kontaktdataRequest.setEpost(isBlank(digitalKontaktdata.getEpost()) ? null : digitalKontaktdata.getEpost());
4846
kontaktdataRequest.setSpraak(isBlank(digitalKontaktdata.getSpraak()) ? null : digitalKontaktdata.getSpraak());
49-
kobleMaalformTilSpraak((RsDollyUtvidetBestilling) context.getProperty("bestilling"), kontaktdataRequest);
5047
}
5148

5249
private String digdirFormatertTlfNummer(String mobil, String landkode) {
@@ -73,25 +70,4 @@ private ZonedDateTime getDato(RsDigitalKontaktdata digitalKontaktdata) {
7370
.byDefault()
7471
.register();
7572
}
76-
77-
private static void kobleMaalformTilSpraak(RsDollyUtvidetBestilling bestilling, DigitalKontaktdata digitalKontaktdata) {
78-
79-
String maalform = null;
80-
81-
if (nonNull(bestilling.getTpsMessaging()) && isKrrMaalform(bestilling.getTpsMessaging().getSpraakKode())) {
82-
maalform = bestilling.getTpsMessaging().getSpraakKode();
83-
}
84-
85-
if (isNotBlank(maalform) && isBlank(digitalKontaktdata.getSpraak())) {
86-
87-
digitalKontaktdata.setSpraak(isNotBlank(maalform) ? maalform.toLowerCase() : null);
88-
digitalKontaktdata.setSpraakOppdatert(ZonedDateTime.now());
89-
digitalKontaktdata.setRegistrert(true);
90-
}
91-
}
92-
93-
private static boolean isKrrMaalform(String spraak) {
94-
95-
return isNotBlank(spraak) && Stream.of("NB", "NN", "EN", "SE").anyMatch(spraak::equalsIgnoreCase);
96-
}
9773
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingClient.java

+9-22
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
5-
import ma.glasnost.orika.MapperFacade;
65
import no.nav.dolly.bestilling.ClientFuture;
76
import no.nav.dolly.bestilling.ClientRegister;
87
import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
@@ -15,7 +14,6 @@
1514
import no.nav.dolly.domain.resultset.dolly.DollyPerson;
1615
import no.nav.dolly.errorhandling.ErrorStatusDecoder;
1716
import no.nav.dolly.util.TransactionHelperService;
18-
import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO;
1917
import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
2018
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
2119
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +22,8 @@
2422
import reactor.core.publisher.Mono;
2523

2624
import java.time.Duration;
25+
import java.time.LocalDate;
26+
import java.time.LocalDateTime;
2727
import java.util.Collection;
2828
import java.util.List;
2929
import java.util.Map;
@@ -37,7 +37,6 @@
3737
import static no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator.tilfeldigUtlandskBankkonto;
3838
import static no.nav.dolly.errorhandling.ErrorStatusDecoder.getInfoVenter;
3939
import static org.apache.commons.lang3.BooleanUtils.isTrue;
40-
import static org.apache.commons.lang3.StringUtils.isNotBlank;
4140

4241
@Slf4j
4342
@Service
@@ -49,7 +48,6 @@ public class TpsMessagingClient implements ClientRegister {
4948
private static final String TPS_MESSAGING = "TPS";
5049

5150
private final TpsMessagingConsumer tpsMessagingConsumer;
52-
private final MapperFacade mapperFacade;
5351
private final PersonServiceConsumer personServiceConsumer;
5452
private final TransactionHelperService transactionHelperService;
5553
private final MiljoerConsumer miljoerConsumer;
@@ -91,8 +89,6 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
9189
.flatMap(this::getPersonData)
9290
.collectList()
9391
.flatMapMany(personer -> Flux.concat(
94-
sendSpraakkode(bestilling, dollyPerson.getIdent())
95-
.map(respons -> Map.of("SpråkKode", respons)),
9692
sendBankkontonummerNorge(bestilling, dollyPerson.getIdent())
9793
.map(respons -> Map.of("NorskBankkonto", respons)),
9894
sendBankkontonummerUtenland(bestilling, dollyPerson.getIdent())
@@ -126,10 +122,7 @@ private Flux<String> getError(Throwable error, List<String> miljoer) {
126122

127123
private boolean isTpsMessage(RsDollyUtvidetBestilling bestilling) {
128124

129-
return (nonNull(bestilling.getTpsMessaging()) &&
130-
isNotBlank(bestilling.getTpsMessaging().getSpraakKode())) ||
131-
132-
nonNull(bestilling.getBankkonto()) ||
125+
return nonNull(bestilling.getBankkonto()) ||
133126
nonNull(bestilling.getSkjerming()) ||
134127

135128
(nonNull(bestilling.getPdldata()) &&
@@ -183,17 +176,6 @@ private Flux<PdlPersonBolk.PersonBolk> getPersonData(List<String> identer) {
183176
.filter(personBolk -> nonNull(personBolk.getPerson()));
184177
}
185178

186-
private Mono<List<TpsMeldingResponseDTO>> sendSpraakkode(RsDollyUtvidetBestilling bestilling, String ident) {
187-
188-
return nonNull(bestilling.getTpsMessaging()) && nonNull(bestilling.getTpsMessaging().getSpraakKode()) ?
189-
190-
tpsMessagingConsumer.sendSpraakkodeRequest(ident, null,
191-
mapperFacade.map(bestilling.getTpsMessaging().getSpraakKode(), SpraakDTO.class))
192-
.collectList() :
193-
194-
Mono.just(emptyList());
195-
}
196-
197179
private Mono<List<TpsMeldingResponseDTO>> sendEgenansattSlett(RsDollyUtvidetBestilling bestilling,
198180
String ident) {
199181

@@ -211,7 +193,7 @@ private Mono<List<TpsMeldingResponseDTO>> sendEgenansatt(RsDollyUtvidetBestillin
211193
return nonNull(SkjermingUtil.getEgenansattDatoFom(bestilling)) ?
212194

213195
tpsMessagingConsumer.sendEgenansattRequest(ident, null,
214-
SkjermingUtil.getEgenansattDatoFom(bestilling).toLocalDate())
196+
toLocalDate(SkjermingUtil.getEgenansattDatoFom(bestilling)))
215197
.collectList() :
216198

217199
Mono.just(emptyList());
@@ -257,4 +239,9 @@ private Mono<List<TpsMeldingResponseDTO>> sendBankkontonummerUtenland(RsDollyUtv
257239
return Mono.just(emptyList());
258240
}
259241
}
242+
243+
private LocalDate toLocalDate(LocalDateTime datoOgTid) {
244+
245+
return nonNull(datoOgTid) ? datoOgTid.toLocalDate() : null;
246+
}
260247
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumer.java

-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
1313
import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
1414
import no.nav.testnav.libs.data.tpsmessagingservice.v1.PersonMiljoeDTO;
15-
import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO;
1615
import no.nav.testnav.libs.data.tpsmessagingservice.v1.TpsMeldingResponseDTO;
1716
import no.nav.testnav.libs.securitycore.domain.ServerProperties;
1817
import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
@@ -32,7 +31,6 @@ public class TpsMessagingConsumer implements ConsumerStatus {
3231
private static final String BASE_URL = "/api/v1/personer/{ident}";
3332
private static final String UTENLANDSK_BANKKONTO_URL = BASE_URL + "/bankkonto-utenlandsk";
3433
private static final String NORSK_BANKKONTO_URL = BASE_URL + "/bankkonto-norsk";
35-
private static final String SPRAAKKODE_URL = BASE_URL + "/spraakkode";
3634

3735
private final WebClient webClient;
3836
private final TokenExchange tokenService;
@@ -84,14 +82,6 @@ public Flux<TpsMeldingResponseDTO> deleteEgenansattRequest(String ident, List<St
8482
.flatMapMany(token -> new EgenansattDeleteCommand(webClient, ident, miljoer, token.getTokenValue()).call());
8583
}
8684

87-
@Timed(name = "providers", tags = { "operation", "tps_messaging_createSpraakkode" })
88-
public Flux<TpsMeldingResponseDTO> sendSpraakkodeRequest(String ident, List<String> miljoer, SpraakDTO body) {
89-
90-
return tokenService.exchange(serverProperties)
91-
.flatMapMany(token ->
92-
new TpsMessagingPostCommand(webClient, ident, miljoer, body, SPRAAKKODE_URL, token.getTokenValue()).call());
93-
}
94-
9585
@Timed(name = "providers", tags = { "operation", "tps_messaging_getPerson" })
9686
public Flux<PersonMiljoeDTO> getPerson(String ident, List<String> miljoer) {
9787

‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/tpsmessagingservice/RsTpsMessaging.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@JsonInclude(JsonInclude.Include.NON_NULL)
2323
public class RsTpsMessaging {
2424

25-
private String spraakKode;
2625
@Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")
2726
private LocalDate egenAnsattDatoFom;
2827
@Field(type = FieldType.Date, format = DateFormat.basic_date, pattern = "uuuu-MM-dd")

‎apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingTpsMessagingStatusMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@NoArgsConstructor(access = AccessLevel.PRIVATE)
2929
public final class BestillingTpsMessagingStatusMapper {
3030

31-
private static final List<String> HIDE_MILJOER = List.of("t13", "q5", "qa", "qx");
31+
private static final List<String> HIDE_MILJOER = List.of("q5", "qa", "qx");
3232
private static final String OKEY = "OK";
3333
private static final String ADVARSEL = "Advarsel: ";
3434
private static final String FEIL = "Feil: ";

‎apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/TestgruppeControllerPostTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void createBestilling()
101101
.thenReturn(Optional.of(new UserInfo(bruker.getBrukerId(), "", "", bruker.getBrukernavn())));
102102

103103
when(miljoerConsumer.getMiljoer())
104-
.thenReturn(Mono.just(List.of("t13", "q1", "q2", "q4", "qx")));
104+
.thenReturn(Mono.just(List.of("q1", "q2", "q4", "qx")));
105105

106106
Testgruppe testgruppe = Testgruppe
107107
.builder()

0 commit comments

Comments
 (0)