feat: add new endpoints for fetching mal-bestilling overview and fragments #deploy-test-dolly-backend #deploy-dolly-backend

krharum · krharum · commit 0b6d36ce628b · 2025-03-28T14:47:50.000+01:00
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/MalBestillingFragment.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/MalBestillingFragment.java
@@ -0,0 +1,6 @@
+package no.nav.dolly.domain.resultset.entity.bestilling;
+
+public interface MalBestillingFragment {
+
+    String getMalBruker();
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingSimple.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingSimple.java
@@ -0,0 +1,27 @@
+package no.nav.dolly.domain.resultset.entity.bestilling;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RsMalBestillingSimple {
+
+    private List<MalBruker> brukereMedMaler;
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class MalBruker {
+
+        private String brukernavn;
+        private String brukerId;
+    }
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bruker/RsBrukerUtenFavoritter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bruker/RsBrukerUtenFavoritter.java
@@ -20,5 +20,4 @@ public class RsBrukerUtenFavoritter {
     private String brukernavn;
     private Brukertype brukertype;
     private String epost;
-    private String navIdent;
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/MalBestillingController.java b/apps/dolly-backend/src/main/java/no/nav/dolly/provider/api/MalBestillingController.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestilling;
+import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestillingSimple;
 import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestillingWrapper;
 import no.nav.dolly.service.MalBestillingService;
 import org.springframework.cache.annotation.CacheEvict;
@@ -38,13 +39,22 @@ public RsMalBestilling createTemplateFromIdent(@PathVariable String ident,
 
     @Cacheable(value = CACHE_BESTILLING_MAL)
     @GetMapping
+    @Transactional
     @Operation(description = "Hent mal-bestilling, kan filtreres på en bruker")
     public RsMalBestillingWrapper getMalBestillinger(@RequestParam(required = false) String brukerId) {
 
         return isBlank(brukerId) ?
                 malBestillingService.getMalBestillinger() : malBestillingService.getMalbestillingByUser(brukerId);
     }
 
+    @GetMapping("/oversikt")
+    @Transactional(readOnly = true)
+    @Operation(description = "Hent oversikt bestillinger")
+    public RsMalBestillingSimple getMalBestillinger() {
+
+        return malBestillingService.getMalBestillingOversikt();
+    }
+
     @CacheEvict(value = { CACHE_BESTILLING_MAL }, allEntries = true)
     @PostMapping
     @Operation(description = "Opprett ny mal-bestilling fra bestillingId")
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingMalRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingMalRepository.java
@@ -2,6 +2,7 @@
 
 import no.nav.dolly.domain.jpa.BestillingMal;
 import no.nav.dolly.domain.jpa.Bruker;
+import no.nav.dolly.domain.resultset.entity.bestilling.MalBestillingFragment;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
@@ -10,11 +11,30 @@
 import java.util.List;
 
 public interface BestillingMalRepository extends CrudRepository<BestillingMal, Long> {
+
     @Modifying
     @Query("update BestillingMal b set b.malNavn = :malNavn where b.id = :id")
     void updateMalNavnById(@Param("id") Long id, @Param("malNavn") String malNavn);
 
     List<BestillingMal> findByBrukerAndMalNavn(Bruker bruker, String navn);
 
     List<BestillingMal> findByBruker(Bruker bruker);
+
+    @Query(value = """
+            select (b.brukernavn || ':' || b.bruker_id) malBruker from bruker b
+                join bestilling_mal bm on b.id = bm.bruker_id
+                and b.brukertype = 'AZURE'                                                  
+                group by malBruker
+                order by malBruker 
+            """, nativeQuery = true)
+    List<MalBestillingFragment> findAllByBrukertypeAzure();
+
+    @Query(value = """
+            select (b.brukernavn || ':' || b.bruker_id) malBruker from bruker b
+                join bestilling_mal bm on b.id = bm.bruker_id
+                and b.bruker_id in :brukerIds
+                group by malBruker
+                order by malBruker 
+            """, nativeQuery = true)
+    List<MalBestillingFragment> findAllByBrukerIdIn(@Param("brukerIds") List<String> brukerIds);
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/BrukerService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/BrukerService.java
@@ -90,8 +90,6 @@ public Bruker fjernFavoritt(Long gruppeId) {
     public List<Bruker> fetchBrukere() {
 
         var brukeren = fetchOrCreateBruker();
-        log.info("Hentet current bruker: id {} brukertype {}", brukeren.getBrukerId(), brukeren.getBrukertype());
-
         if (brukeren.getBrukertype() == AZURE) {
             return brukerRepository.findAllByOrderById();
 
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/MalBestillingService.java
@@ -5,11 +5,15 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
+import no.nav.dolly.consumer.brukerservice.BrukerServiceConsumer;
+import no.nav.dolly.consumer.brukerservice.dto.TilgangDTO;
 import no.nav.dolly.domain.jpa.Bestilling;
 import no.nav.dolly.domain.jpa.BestillingMal;
 import no.nav.dolly.domain.jpa.Bruker;
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
+import no.nav.dolly.domain.resultset.entity.bestilling.MalBestillingFragment;
 import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestilling;
+import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestillingSimple;
 import no.nav.dolly.domain.resultset.entity.bestilling.RsMalBestillingWrapper;
 import no.nav.dolly.domain.resultset.entity.bruker.RsBrukerUtenFavoritter;
 import no.nav.dolly.exceptions.NotFoundException;
@@ -29,14 +33,17 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING_MAL;
+import static no.nav.dolly.domain.jpa.Bruker.Brukertype.AZURE;
 import static no.nav.dolly.util.CurrentAuthentication.getUserId;
 
 @Service
@@ -49,6 +56,7 @@ public class MalBestillingService {
     private static final String EMPTY_JSON = "{}";
 
     private final BestillingMalRepository bestillingMalRepository;
+    private final BrukerServiceConsumer brukerServiceConsumer;
     private final BestillingRepository bestillingRepository;
     private final BrukerService brukerService;
     private final MapperFacade mapperFacade;
@@ -286,4 +294,33 @@ private static Set<String> toSet(String miljoer) {
                         .collect(Collectors.toSet()) :
                 Collections.emptySet();
     }
+
+    public RsMalBestillingSimple getMalBestillingOversikt() {
+
+        List<MalBestillingFragment> maler;
+        var brukeren = brukerService.fetchOrCreateBruker();
+        if (brukeren.getBrukertype() == AZURE) {
+            maler =  bestillingMalRepository.findAllByBrukertypeAzure();
+
+        } else {
+            var brukere = brukerServiceConsumer.getKollegaerIOrganisasjon(brukeren.getBrukerId())
+                    .map(TilgangDTO::getBrukere)
+                    .block();
+
+            maler = bestillingMalRepository.findAllByBrukerIdIn(brukere);
+        }
+
+        return RsMalBestillingSimple.builder()
+                .brukereMedMaler(
+                        maler.stream()
+                                .map(MalBestillingFragment::getMalBruker)
+                                .filter(Objects::nonNull)
+                                .map(malBruker -> malBruker.split(":"))
+                                .map(malBruker -> RsMalBestillingSimple.MalBruker.builder()
+                                        .brukernavn(malBruker[0])
+                                        .brukerId(malBruker[1])
+                                        .build())
+                                .toList())
+                .build();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,4 @@ public class RsBrukerUtenFavoritter {`
`20`	`20`	`private String brukernavn;`
`21`	`21`	`private Brukertype brukertype;`
`22`	`22`	`private String epost;`
`23`		`- private String navIdent;`
`24`	`23`	`}`