Merge pull request #145 from companieshouse/IDVA6-1559-fix-incorrect-…

…redirection-bug Incorrect Redirects
companieshouse · Sep 9, 2024 · 27465bc · 27465bc
2 parents 3f3df40 + 29d368c
commit 27465bc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListMappers.java b/src/main/java/uk/gov/companieshouse/accounts/association/mapper/AssociationsListMappers.java
@@ -43,7 +43,11 @@ public AssociationsList daoToDto( final Page<AssociationDao> associationsList, f
         final var endpointUrl = computeEndpointUrl( companyDetails );
         final var users = Objects.isNull( userDetails ) ? usersService.fetchUserDetails( associationsList.stream() ) : Map.of( userDetails.getUserId(), userDetails );
         final var companies = Objects.isNull( companyDetails ) ? companyService.fetchCompanyProfiles( associationsList.stream() ) : Map.of( companyDetails.getCompanyNumber(), companyDetails );
-        final var associations = associationsList.map( associationDao -> daoToDto( associationDao, users.getOrDefault( associationDao.getUserId(), null ), companies.get( associationDao.getCompanyNumber() ) ) );
+        final var associations = associationsList.map( associationDao -> {
+            final var user = Objects.isNull( associationDao.getUserId() ) ? null : users.getOrDefault( associationDao.getUserId(), null );
+            final var company = companies.get( associationDao.getCompanyNumber() );
+            return daoToDto( associationDao, user, company );
+        } );
         return enrichWithMetadata( associations, endpointUrl );
     }