From cc35d521092be9f752640bafbfe1efcfcd6596b8 Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 27 Aug 2024 15:00:26 +0200 Subject: [PATCH 1/5] Logging #deploy-dolly-backend --- .../src/main/java/no/nav/dolly/service/NavigasjonService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java index f14625fe31..b1dcce3ffd 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/service/NavigasjonService.java @@ -1,6 +1,7 @@ package no.nav.dolly.service; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MappingContext; import no.nav.dolly.bestilling.pdldata.PdlDataConsumer; @@ -33,6 +34,7 @@ import static no.nav.dolly.util.IdentTypeUtil.isTenorIdent; @Service +@Slf4j @RequiredArgsConstructor public class NavigasjonService { @@ -88,6 +90,7 @@ private boolean filterOnBrukertype(String ident, Bruker.Brukertype brukertype) { private RsTestgruppe mapGruppe(Testgruppe testgruppe, String brukerId) { + log.info("BrukerId: {}", brukerId); var context = new MappingContext.Factory().getContext(); context.setProperty("brukerId", brukerId); return mapperFacade.map(testgruppe, RsTestgruppe.class, context); From 586edc94b88a6dc1727a2b780a829bac3d65edc2 Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 27 Aug 2024 15:04:13 +0200 Subject: [PATCH 2/5] Logging #deploy-dolly-backend --- .../no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java index 7361700298..f459767148 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java @@ -51,4 +51,4 @@ private static String getBrukerId(Bruker bruker) { return nonNull(bruker.getEidAv()) ? bruker.getEidAv().getBrukerId() : bruker.getNavIdent(); } } -} \ No newline at end of file +} From c1235a2ab56903e82709a49a7020f28bbbbf6583 Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 27 Aug 2024 15:08:39 +0200 Subject: [PATCH 3/5] deploy #deploy-dolly-backend --- .../no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java index f459767148..7361700298 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java @@ -51,4 +51,4 @@ private static String getBrukerId(Bruker bruker) { return nonNull(bruker.getEidAv()) ? bruker.getEidAv().getBrukerId() : bruker.getNavIdent(); } } -} +} \ No newline at end of file From b7dcb8a096f20957597886468422f5fa74f72a4a Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 27 Aug 2024 15:29:33 +0200 Subject: [PATCH 4/5] Tester endring #deploy-dolly-backend --- .../dolly/mapper/strategy/TestgruppeMappingStrategy.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java index 7361700298..ded4dad498 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategy.java @@ -9,9 +9,11 @@ import no.nav.dolly.domain.resultset.Tags; import no.nav.dolly.domain.resultset.entity.testgruppe.RsTestgruppe; import no.nav.dolly.mapper.MappingStrategy; +import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; import org.springframework.stereotype.Component; import static java.util.Objects.nonNull; +import static no.nav.dolly.util.CurrentAuthentication.getUserId; import static org.apache.commons.lang3.BooleanUtils.isTrue; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -19,6 +21,8 @@ @RequiredArgsConstructor public class TestgruppeMappingStrategy implements MappingStrategy { + private final GetUserInfo getUserInfo; + @Override public void register(MapperFactory factory) { factory.classMap(Testgruppe.class, RsTestgruppe.class) @@ -26,12 +30,14 @@ public void register(MapperFactory factory) { @Override public void mapAtoB(Testgruppe testgruppe, RsTestgruppe rsTestgruppe, MappingContext context) { + var brukerId = nonNull(context.getProperty("brukerId")) ? context.getProperty("brukerId") : getUserId(getUserInfo); + rsTestgruppe.setAntallIdenter(testgruppe.getTestidenter().size()); rsTestgruppe.setAntallIBruk((int) testgruppe.getTestidenter().stream() .filter(ident -> isTrue(ident.getIBruk())) .count()); rsTestgruppe.setFavorittIGruppen(!testgruppe.getFavorisertAv().isEmpty()); - rsTestgruppe.setErEierAvGruppe(nonNull(context.getProperty("brukerId")) && (context.getProperty("brukerId")).equals(getBrukerId(testgruppe.getOpprettetAv()))); + rsTestgruppe.setErEierAvGruppe(brukerId.equals(getBrukerId(testgruppe.getOpprettetAv()))); rsTestgruppe.setErLaast(isTrue(rsTestgruppe.getErLaast())); rsTestgruppe.setTags(testgruppe.getTags().stream() .filter(tag -> Tags.DOLLY != tag) From 6fa98d4173da536c88f7982ddbaab557d8db7601 Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 27 Aug 2024 15:36:42 +0200 Subject: [PATCH 5/5] Tester endring V2 #deploy-dolly-backend --- .../dolly/mapper/strategy/TestgruppeMappingStrategyTest.java | 3 ++- .../no/nav/dolly/mapper/strategy/TestidentMappingTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java index b24b18e177..a0edeb2e79 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestgruppeMappingStrategyTest.java @@ -10,6 +10,7 @@ import no.nav.dolly.domain.resultset.entity.testident.RsTestident; import no.nav.dolly.elastic.BestillingElasticRepository; import no.nav.dolly.mapper.utils.MapperTestUtils; +import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -37,7 +38,7 @@ class TestgruppeMappingStrategyTest { @BeforeEach public void setUpHappyPath() { - mapper = MapperTestUtils.createMapperFacadeForMappingStrategy(new TestgruppeMappingStrategy()); + mapper = MapperTestUtils.createMapperFacadeForMappingStrategy(new TestgruppeMappingStrategy(new GetUserInfo("dummy"))); MockedJwtAuthenticationTokenUtils.setJwtAuthenticationToken(); } diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestidentMappingTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestidentMappingTest.java index 30e50f657d..50927b6d33 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestidentMappingTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/TestidentMappingTest.java @@ -7,6 +7,7 @@ import no.nav.dolly.domain.jpa.Testident; import no.nav.dolly.domain.resultset.entity.testident.RsTestident; import no.nav.dolly.mapper.utils.MapperTestUtils; +import no.nav.testnav.libs.servletsecurity.action.GetUserInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,7 +22,7 @@ class TestidentMappingTest { @BeforeEach public void setUpHappyPath() { - mapper = MapperTestUtils.createMapperFacadeForMappingStrategy(new TestgruppeMappingStrategy()); + mapper = MapperTestUtils.createMapperFacadeForMappingStrategy(new TestgruppeMappingStrategy(new GetUserInfo("dummy"))); } @Test