OLMIS-8140: Added endpoint for fetching auth users (needed for user i… (#21)

* OLMIS-8140: Added endpoint for fetching auth users (needed for user import)

* OLMIS-8140: Added endpoint test

* OLMIS-8140: Changed returned list of User to list of UserDto

Author: druchniewicz

src/integration-test/java/org/openlmis/auth/web/UserControllerIntegrationTest.java

@@ -43,6 +43,7 @@
 import com.google.common.collect.ImmutableList;
 import com.jayway.restassured.response.ValidatableResponse;
 import guru.nidi.ramltester.junit.RamlMatchers;
+import io.restassured.mapper.TypeRef;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -92,9 +93,9 @@ public class UserControllerIntegrationTest extends BaseWebIntegrationTest {
   private static final String CHANGE_PASS_URL = RESOURCE_URL + "/changePassword";
   private static final String RESET_TOKEN_PASS_URL = RESOURCE_URL + "/passwordResetToken";
   private static final String LOGOUT_URL = RESOURCE_URL + "/logout";
-
   private static final String TOKEN_URL = "/api/oauth/token";
   private static final String PASS_FIELD = "newPassword";
+  private static final String CONTENT_TYPE_HEADER = "Content-Type";
 
   @Autowired
   private UserRepository userRepository;
@@ -389,7 +390,7 @@ public void shouldSaveUsers() {
     List<UserDto> requestBody = Arrays.asList(user1, user2);
 
     UserAuthDetailsResponseDto response = startRequest(USER_TOKEN)
-        .header("Content-Type", "application/json")
+        .header(CONTENT_TYPE_HEADER, APPLICATION_JSON_VALUE)
         .body(requestBody)
         .given()
         .post(BATCH_RESOURCE_URL)
@@ -424,7 +425,7 @@ public void shouldNotSaveUsersWithEmptyUsername() {
     List<UserDto> requestBody = Arrays.asList(convertToDto(savedUser1), convertToDto(savedUser2));
 
     UserAuthDetailsResponseDto response = startRequest(USER_TOKEN)
-        .header("Content-Type", "application/json")
+        .header(CONTENT_TYPE_HEADER, APPLICATION_JSON_VALUE)
         .body(requestBody)
         .given()
         .post(BATCH_RESOURCE_URL)
@@ -451,7 +452,7 @@ public void shouldDeleteAuthDetails() {
     idsToRemove.add(savedUser.getId());
 
     startRequest(USER_TOKEN)
-        .header("Content-Type", "application/json")
+        .header(CONTENT_TYPE_HEADER, APPLICATION_JSON_VALUE)
         .body(idsToRemove)
         .given()
         .delete(BATCH_RESOURCE_URL);
@@ -460,6 +461,21 @@ public void shouldDeleteAuthDetails() {
     assertNull(userAfterRemoving);
   }
 
+  @Test
+  public void shouldGetAuthUsers() {
+    List<UserDto> actual = startRequest(USER_TOKEN)
+        .header(CONTENT_TYPE_HEADER, APPLICATION_JSON_VALUE)
+        .when()
+        .get(BATCH_RESOURCE_URL)
+        .then()
+        .statusCode(200)
+        .extract()
+        .body()
+        .as(new TypeRef<List<UserDto>>() {}.getTypeAsClass());
+
+    assertEquals(1, actual.size());
+  }
+
   private ValidatableResponse passwordReset(String password, String token) {
     return passwordReset(DummyUserMainDetailsDto.USERNAME, password, token);
   }

src/main/java/org/openlmis/auth/dto/UserDto.java

@@ -36,4 +36,17 @@ public final class UserDto implements User.Importer, User.Exporter {
   private String password;
   private Boolean enabled;
   private boolean lockedOut;
+
+  /**
+   * Creates UserDto object with given params.
+   *
+   * @param id user id
+   * @param username username
+   * @param enabled is user enabled
+   */
+  public UserDto(UUID id, String username, Boolean enabled) {
+    this.id = id;
+    this.username = username;
+    this.enabled = enabled;
+  }
 }

src/main/java/org/openlmis/auth/service/UserService.java

@@ -22,6 +22,8 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
 import org.openlmis.auth.domain.User;
 import org.openlmis.auth.dto.SaveBatchResultDto;
 import org.openlmis.auth.dto.UserAuthDetailsResponseDto;
@@ -100,6 +102,17 @@ public SaveBatchResultDto<UserAuthDetailsResponseDto.UserAuthResponse> saveAuthU
     return new SaveBatchResultDto<>(successfulResults, failedResults);
   }
 
+  /**
+   * Gets user auth details.
+   *
+   * @return user auth details
+   */
+  @Transactional
+  public List<User> findAll() {
+    return StreamSupport.stream(userRepository.findAll().spliterator(), false)
+        .collect(Collectors.toList());
+  }
+
   /**
    * Deletes user auth details.
    *

src/main/java/org/openlmis/auth/web/UserController.java

@@ -27,6 +27,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.openlmis.auth.domain.PasswordResetToken;
 import org.openlmis.auth.domain.User;
@@ -63,6 +64,7 @@
 import org.springframework.validation.Validator;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -297,12 +299,28 @@ public UUID generatePasswordResetToken(
     return token.getId();
   }
 
+  /**
+   * Gets all user auth details.
+   *
+   * @return all auth user details dto objects
+   */
+  @GetMapping(value = "/users/auth/batch")
+  @ResponseStatus(HttpStatus.OK)
+  @ResponseBody
+  public List<UserDto> getAllAuthUsers() {
+    List<User> users = userService.findAll();
+
+    return users.stream()
+        .map(user -> new UserDto(user.getId(), user.getUsername(), user.getEnabled()))
+        .collect(Collectors.toList());
+  }
+
   /**
    * Deletes auth users.
    *
    * @param userIds user ids for which auth users will be deleted
    */
-  @DeleteMapping(value = "users/auth/batch")
+  @DeleteMapping(value = "/users/auth/batch")
   @ResponseStatus(HttpStatus.OK)
   public void deleteAuthUsersByIds(@RequestBody Set<UUID> userIds) {
     userService.deleteByUserIds(userIds);

src/test/java/org/openlmis/auth/service/UserServiceTest.java

@@ -15,12 +15,15 @@
 
 package org.openlmis.auth.service;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import org.junit.Before;
@@ -88,4 +91,13 @@ public void shouldUpdateExistingUser() {
     verify(oldUser).updateFrom(request);
   }
 
+  @Test
+  public void shouldFindAllAuthUsers() {
+    when(userRepository.findAll()).thenReturn(Arrays.asList(new User(), new User()));
+
+    List<User> result = userService.findAll();
+
+    assertEquals(2, result.size());
+    verify(userRepository).findAll();
+  }
 }