ORG-1906: Korrigere oppslag lederForRessurser (5)

navikt · Apr 11, 2024 · 0218407 · 0218407
1 parent 4c3978e
commit 0218407
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/apps/backend/src/main/java/no/nav/data/team/resource/NomGraphClient.java b/apps/backend/src/main/java/no/nav/data/team/resource/NomGraphClient.java
@@ -20,10 +20,7 @@
 import no.nav.data.team.resource.dto.NomGraphQlResponse.SingleRessurs;
 import no.nav.data.team.resource.dto.NomGraphQlResponse.SingleRessurs.DataWrapper;
 import no.nav.data.team.resource.dto.ResourceUnitsResponse;
-import no.nav.nom.graphql.model.LederOrgEnhetDto;
-import no.nav.nom.graphql.model.OrgEnhetDto;
-import no.nav.nom.graphql.model.OrgEnhetsKoblingDto;
-import no.nav.nom.graphql.model.RessursDto;
+import no.nav.nom.graphql.model.*;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -150,23 +147,21 @@ public List<String> getLeaderMembers(String navIdent) {
                 directMembers.addAll(okRessurser.map(RessursDto::getNavident).filter(Objects::nonNull).toList());
             }
 
-            var subDepMembers = new ArrayList<String>();
-            for (var org : orgenheter) {
-                for (var organisering : org.getOrganiseringer()){
-                    var oe = organisering.getOrgEnhet();
-                    var ledere = oe.getLeder();
-                    for(var l : ledere){
-                        var lRes = l.getRessurs();
-                        var skalTa = !lRes.getNavident().equals(navIdent) && ressursHarEnRelevantOrgtilknytning(lRes, org.getId());
-                        if(skalTa){
-                            subDepMembers.add(lRes.getNavident());
-                        }
-                    }
-                }
-            }
+            var subDepMembers = orgenheter.stream()
+                    .map(OrgEnhetDto::getOrganiseringer)
+                    .flatMap(Collection::stream)
+                    .map(OrganiseringDto::getOrgEnhet)
+                    .map(OrgEnhetDto::getLeder)
+                    .flatMap(Collection::stream)
+                    .map(OrgEnhetsLederDto::getRessurs)
+                    .map(RessursDto::getNavident)
+                    .filter(Objects::nonNull)
+                    .filter(id -> !id.equals(navIdent))
+                    .toList();
+
 
             var x = UUID.randomUUID();
-            log.debug("{}: getLeaderMembers for {}: orgenheter size {}, directMembers size {}, subDepartmentMembers size {}",x, navIdent, orgenheter.size(), directMembers.size(), subDepMembers.size());
+            log.debug("{}: getLeaderMembers for {}: orgenheter size {}, directMembers size {}, subDepartmentMembers size {}",x, navIdent, orgenheter.size(), directMembers.size(), subDepMembers);
             log.debug("{}\n{}",x,res.getBody().toString());
             return Stream.concat(directMembers.stream(), subDepMembers.stream())
                     .distinct()