[BUG] 🐛 Fix searching users from several userstorages should give more results

Signed-off-by: CChemin <cecile.chemin@insee.fr>

Author: CChemin

sugoi-api-core/src/main/java/fr/insee/sugoi/core/service/impl/UserServiceImpl.java

@@ -24,7 +24,6 @@
 import fr.insee.sugoi.core.realm.RealmProvider;
 import fr.insee.sugoi.core.seealso.SeeAlsoService;
 import fr.insee.sugoi.core.service.UserService;
-import fr.insee.sugoi.core.store.ReaderStore;
 import fr.insee.sugoi.core.store.StoreProvider;
 import fr.insee.sugoi.model.Realm;
 import fr.insee.sugoi.model.User;
@@ -298,6 +297,7 @@ public PageResult<User> findByProperties(
     Realm r = realmProvider.load(realm).orElseThrow(() -> new RealmNotFoundException(realm));
     pageable.setSizeWithMax(
         Integer.parseInt(r.getProperties().get(GlobalKeysConfig.USERS_MAX_OUTPUT_SIZE)));
+    result.setPageSize(pageable.getSize());
 
     try {
       if (storage != null) {
@@ -314,10 +314,10 @@ public PageResult<User> findByProperties(
                 });
       } else {
         for (UserStorage us : r.getUserStorages()) {
-          ReaderStore readerStore =
-              storeProvider.getStoreForUserStorage(realm, us.getName()).getReader();
           PageResult<User> temResult =
-              readerStore.searchUsers(userProperties, pageable, typeRecherche.name());
+              storeProvider
+                  .getReaderStore(realm, us.getName())
+                  .searchUsers(userProperties, pageable, typeRecherche.name());
           temResult
               .getResults()
               .forEach(

sugoi-api-core/src/test/java/fr/insee/sugoi/core/service/UserServiceTest.java

@@ -17,6 +17,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import fr.insee.sugoi.core.configuration.GlobalKeysConfig;
+import fr.insee.sugoi.core.event.configuration.EventKeysConfig;
 import fr.insee.sugoi.core.event.publisher.SugoiEventPublisher;
 import fr.insee.sugoi.core.model.ProviderRequest;
 import fr.insee.sugoi.core.model.ProviderResponse;
@@ -33,6 +35,7 @@
 import fr.insee.sugoi.model.exceptions.RealmNotFoundException;
 import fr.insee.sugoi.model.exceptions.UserAlreadyExistException;
 import fr.insee.sugoi.model.exceptions.UserNotFoundException;
+import fr.insee.sugoi.model.paging.PageResult;
 import fr.insee.sugoi.model.paging.PageableResult;
 import fr.insee.sugoi.model.paging.SearchType;
 import java.io.ByteArrayInputStream;
@@ -42,12 +45,15 @@
 import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -109,6 +115,7 @@ public void setup() {
 
     realm = new Realm();
     realm.setName("realm");
+    realm.addProperty(GlobalKeysConfig.USERS_MAX_OUTPUT_SIZE, "100000");
     UserStorage us1 = new UserStorage();
     us1.setName("us1");
     UserStorage us2 = new UserStorage();
@@ -125,6 +132,11 @@ public void setup() {
     Mockito.when(readerStore2.getUser("UserWithCertificate"))
         .thenReturn(Optional.of(userWithCertificate));
 
+    Mockito.when(readerStore1.searchUsers(Mockito.any(), Mockito.any(), Mockito.eq("AND")))
+        .thenAnswer(invocation -> mockPageResultFromNUsersUs(invocation, 20000));
+    Mockito.when(readerStore2.searchUsers(Mockito.any(), Mockito.any(), Mockito.eq("AND")))
+        .thenAnswer(invocation -> mockPageResultFromNUsersUs(invocation, 20000));
+
     Mockito.when(storeProvider.getReaderStore(Mockito.eq("idonotexist"), Mockito.anyString()))
         .thenThrow(RealmNotFoundException.class);
     Mockito.when(storeProvider.getWriterStore(Mockito.eq("idonotexist"), Mockito.anyString()))
@@ -256,4 +268,38 @@ public void defaultConfigTestVerifyUniqueMail() {
         UserAlreadyExistException.class,
         () -> userService.create("realm", "us2", user1, new ProviderRequest()));
   }
+
+  @Test
+  @DisplayName(
+      "Given we ask for 30000 users on a realm with two storages each containing 20000 users, "
+          + "with a limitation of the maximum requested users on the realm of 100000, "
+          + "then we should get 30000 users from both userstorages")
+  public void getUsersWithPageableSizeShouldReturnEnoughUsers() {
+    PageableResult pageable = new PageableResult(30000, 0, null);
+    List<User> results =
+        userService
+            .findByProperties(realm.getName(), null, new User(), pageable, SearchType.AND)
+            .getResults();
+    assertThat("30000 users are retrieved", results.size(), is(30000));
+    assertThat(
+        "Should contain users from userstorage1",
+        results.stream()
+            .anyMatch(u -> u.getMetadatas().get(EventKeysConfig.USERSTORAGE).equals("us1")));
+    assertThat(
+        "Should contain users from userstorage2",
+        results.stream()
+            .anyMatch(u -> u.getMetadatas().get(EventKeysConfig.USERSTORAGE).equals("us2")));
+  }
+
+  private PageResult<User> mockPageResultFromNUsersUs(
+      InvocationOnMock invocation, int nbUsersInUs) {
+    PageResult<User> pageResult = new PageResult<>();
+    int minOfRequestedOrAllUsers =
+        Math.min(((PageableResult) invocation.getArgument(1)).getSize(), nbUsersInUs);
+    pageResult.setResults(
+        Stream.generate(User::new).limit(minOfRequestedOrAllUsers).collect(Collectors.toList()));
+    pageResult.setPageSize(nbUsersInUs);
+    pageResult.setTotalElements(minOfRequestedOrAllUsers);
+    return pageResult;
+  }
 }