Fix: Remove deprecated environment 't13' from configuration and related code #deploy-miljoer-service

Author: krharum

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

@@ -28,7 +28,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class BestillingTpsMessagingStatusMapper {
 
-    private static final List<String> HIDE_MILJOER = List.of("t13", "q5", "qa", "qx");
+    private static final List<String> HIDE_MILJOER = List.of("q5", "qa", "qx");
     private static final String OKEY = "OK";
     private static final String ADVARSEL = "Advarsel: ";
     private static final String FEIL = "Feil: ";

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

@@ -101,7 +101,7 @@ void createBestilling()
                 .thenReturn(Optional.of(new UserInfo(bruker.getBrukerId(), "", "", bruker.getBrukernavn())));
 
         when(miljoerConsumer.getMiljoer())
-                .thenReturn(Mono.just(List.of("t13", "q1", "q2", "q4", "qx")));
+                .thenReturn(Mono.just(List.of("q1", "q2", "q4", "qx")));
 
         Testgruppe testgruppe = Testgruppe
                 .builder()

apps/dolly-frontend/src/main/js/src/utils/hooks/useEnvironments.tsx

@@ -8,7 +8,7 @@ const getArenaMiljoerUrl = '/testnav-arena-forvalteren-proxy/api/v1/miljoe'
 const getInstMiljoerUrl = '/testnav-inst-proxy/api/v1/environment'
 const getDokarkivMiljoerUrl = '/testnav-dokarkiv-proxy/rest/miljoe'
 
-const prefetchedMiljoer = ['t13', 'q1', 'q2', 'q4', 'qx']
+const prefetchedMiljoer = ['q1', 'q2', 'q4', 'qx']
 const prefetchedPensjonMiljoer = ['q1', 'q2']
 const prefetchedArenaMiljoer = ['q1', 'q2', 'q4']
 const prefetchedInstMiljoer = { institusjonsoppholdEnvironments: ['q1', 'q2'] }

apps/dolly-frontend/src/main/js/src/utils/hooks/useOrganisasjoner.tsx

@@ -208,7 +208,7 @@ export const useOrganisasjonBestillingStatus = (
 
 export const useArbeidsforhold = (ident: string, harAaregBestilling: boolean, miljoe?: string) => {
 	const { dollyEnvironmentList } = useDollyEnvironments()
-	const unsupportedEnvironments = ['t13', 'qx']
+	const unsupportedEnvironments = ['qx']
 	const filteredEnvironments = dollyEnvironmentList
 		?.map((miljoe) => miljoe.id)
 		?.filter((miljoe) => !unsupportedEnvironments.includes(miljoe))

apps/faste-data-frontend/src/main/js/src/pages/FastePersonDataPage/FastePersonDataPage.tsx

@@ -24,7 +24,7 @@ const grupper = [
   'WIP',
 ];
 
-const miljoer = ['q1', 'q2', 'q4', 'qx', 't13'];
+const miljoer = ['q1', 'q2', 'q4', 'qx'];
 
 const toOptions = (options: string[]) =>
   options.map((value) => ({

apps/miljoer-service/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
 
 config:
-  miljoer: t13, q1, q2, q4, qx
+  miljoer: q1, q2, q4, qx
 
 spring:
   main:

apps/organisasjon-forvalter/src/main/java/no/nav/organisasjonforvalter/consumer/MiljoerServiceConsumer.java

@@ -41,7 +41,7 @@ public Set<String> getOrgMiljoer() {
                 .flatMap(token ->
                         new MiljoerServiceCommand(webClient, token.getTokenValue()).call())
                 .map(miljoer -> Flux.fromIterable(Arrays.asList(miljoer))
-                        .filter(env -> !env.equals("t13") && !env.equals("qx"))
+                        .filter(env -> !env.equals("qx"))
                         .collect(Collectors.toSet()))
                 .flatMap(Mono::from)
                 .cache(Duration.ofMinutes(5))