fix

pagopa · Jan 10, 2025 · 7672652 · 7672652
1 parent ff3edbe
commit 7672652
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/it/gov/pagopa/payhub/auth/dto/IamUserInfoDTO.java b/src/main/java/it/gov/pagopa/payhub/auth/dto/IamUserInfoDTO.java
@@ -17,6 +17,7 @@ public class IamUserInfoDTO {
   private String name;
   private String issuer;
   private IamUserOrganizationRolesDTO organizationAccess;
+  private Long brokerId;
 
   // field calculated upon registration
   private String innerUserId;

diff --git a/src/main/java/it/gov/pagopa/payhub/auth/service/user/IamUserInfoDTO2UserInfoMapper.java b/src/main/java/it/gov/pagopa/payhub/auth/service/user/IamUserInfoDTO2UserInfoMapper.java
@@ -60,6 +60,7 @@ private UserInfo systemUserMapper(IamUserInfoDTO iamUserInfoDTO) {
                         .organizationIpaCode(organizationIpaCode)
                         .roles(Collections.singletonList(Constants.ROLE_ADMIN))
                         .build()))
+                .brokerId(iamUserInfoDTO.getBrokerId())
                 .build();
     }
 
@@ -88,6 +89,7 @@ private UserInfo userInfoMapper(IamUserInfoDTO iamUserInfoDTO, String accessToke
                                 .email(r.getEmail())
                                 .build())
                         .toList())
+                .brokerId(iamUserInfoDTO.getBrokerId())
                 .build();
 
         if (iamUserInfoDTO.getOrganizationAccess() != null) {

diff --git a/src/test/java/it/gov/pagopa/payhub/auth/mapper/ClientDTO2UserInfoMapperTest.java b/src/test/java/it/gov/pagopa/payhub/auth/mapper/ClientDTO2UserInfoMapperTest.java
@@ -46,6 +46,6 @@ void givenDTOWhenApplyTheOk() {
 		IamUserInfoDTO result = mapper.apply(clientDTO);
 		//Then
 		Assertions.assertEquals(iamUserInfoDTO,	result);
-		TestUtils.checkNotNullFields(result, "innerUserId");
+		TestUtils.checkNotNullFields(result, "innerUserId", "brokerId");
 	}
 }
diff --git a/src/test/java/it/gov/pagopa/payhub/auth/service/user/IamUserInfoDTO2UserInfoMapperTest.java b/src/test/java/it/gov/pagopa/payhub/auth/service/user/IamUserInfoDTO2UserInfoMapperTest.java
@@ -81,6 +81,7 @@ void givenCompleteDataWhenApplyThenOk() {
                         .organizationIpaCode("ORG")
                         .email("EMAIL")
                         .build())
+                .brokerId(1L)
                 .build();
 
         User user = User.builder()
@@ -109,6 +110,7 @@ void givenCompleteDataWhenApplyThenOk() {
                         .roles(List.of("ROLE"))
                         .email("EMAIL")
                         .build()))
+                .brokerId(1L)
                 .canManageUsers(!organizationAccessMode)
                 .build();
 
@@ -139,6 +141,7 @@ void givenNotOperatorsWhenApplyThenOk() {
                         .organizationIpaCode("ORG")
                         .email("EMAIL")
                         .build())
+                .brokerId(1L)
                 .build();
 
         User user = User.builder()
@@ -155,6 +158,7 @@ void givenNotOperatorsWhenApplyThenOk() {
                 .issuer("ISSUER")
                 .organizationAccess("ORG")
                 .organizations(Collections.emptyList())
+                .brokerId(1L)
                 .canManageUsers(!organizationAccessMode)
                 .build();
 
@@ -179,6 +183,7 @@ void givenNoOrganizationAccessWhenApplyThenOk() {
                 .familyName("FAMILYNAME")
                 .name("NAME")
                 .issuer("ISSUER")
+                .brokerId(1L)
                 .build();
 
         User user = User.builder()
@@ -206,6 +211,7 @@ void givenNoOrganizationAccessWhenApplyThenOk() {
                         .roles(List.of("ROLE"))
                         .email("EMAIL")
                         .build()))
+                .brokerId(1L)
                 .canManageUsers(!organizationAccessMode)
                 .build();
 
@@ -235,6 +241,7 @@ void givenSystemUserWhenApplyThenOk() {
                         .organizationIpaCode("IPA_CODE")
                         .roles(Collections.singletonList(Constants.ROLE_ADMIN))
                         .build())
+                .brokerId(1L)
                 .build();
 
         UserInfo expected = UserInfo.builder()
@@ -248,6 +255,7 @@ void givenSystemUserWhenApplyThenOk() {
                         .organizationIpaCode("IPA_CODE")
                         .roles(List.of(Constants.ROLE_ADMIN))
                         .build()))
+                .brokerId(1L)
                 .build();
 
         // When