EPMRPP-90309 || Empty content is returned for Admin user via API when…

… searching for users
reportportal · Apr 5, 2024 · b78ea18 · b78ea18
1 parent d328565
commit b78ea18
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java b/src/main/java/com/epam/ta/reportportal/core/project/GetProjectHandler.java
@@ -21,6 +21,7 @@
 import com.epam.ta.reportportal.commons.querygen.Queryable;
 import com.epam.ta.reportportal.entity.jasper.ReportFormat;
 import com.epam.ta.reportportal.entity.project.Project;
+import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.ws.model.project.ProjectResource;
 import com.epam.ta.reportportal.ws.model.user.SearchUserResource;
 import com.epam.ta.reportportal.ws.model.user.UserResource;
@@ -87,7 +88,7 @@ public interface GetProjectHandler {
    * @param pageable       {@link Pageable} Page Details
    * @return List of found user resources
    */
-  Iterable<SearchUserResource> getUserNames(String value,
+  Iterable<SearchUserResource> getUserNames(String value, UserRole userRole,
       ReportPortalUser.ProjectDetails projectDetails, Pageable pageable);
 
   /**

diff --git a/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImpl.java
@@ -29,6 +29,7 @@
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.entity.project.ProjectInfo;
 import com.epam.ta.reportportal.entity.user.User;
+import com.epam.ta.reportportal.entity.user.UserRole;
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.converter.PagedResourcesAssembler;
 import com.epam.ta.reportportal.ws.converter.converters.ProjectConverter;
@@ -151,11 +152,13 @@ private void checkBusinessRuleLessThan1Symbol(String value) {
 	}
 
 	@Override
-	public Iterable<SearchUserResource> getUserNames(String value, ReportPortalUser.ProjectDetails projectDetails, Pageable pageable) {
+	public Iterable<SearchUserResource> getUserNames(String value, UserRole userRole,
+			ReportPortalUser.ProjectDetails projectDetails, Pageable pageable) {
 		checkBusinessRuleLessThan1Symbol(value);
 
 		final CompositeFilterCondition userCondition =
-				isUserSuggestions ? getUserSearchSuggestCondition(value) : getUserSearchCondition(value);
+				(userRole.equals(UserRole.ADMINISTRATOR) || isUserSuggestions)
+						? getUserSearchSuggestCondition(value) : getUserSearchCondition(value);
 
 		final Filter filter = Filter.builder()
 				.withTarget(User.class)

diff --git a/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java b/src/main/java/com/epam/ta/reportportal/ws/controller/ProjectController.java
@@ -276,7 +276,7 @@ public List<String> getProjectUsers(@PathVariable String projectName,
   public Iterable<SearchUserResource> searchForUser(@PathVariable String projectName,
       @RequestParam(value = "term") String term,
       Pageable pageable, @AuthenticationPrincipal ReportPortalUser user) {
-    return getProjectHandler.getUserNames(term,
+    return getProjectHandler.getUserNames(term, user.getUserRole(),
         projectExtractor.extractProjectDetails(user, projectName), pageable);
   }
 

diff --git a/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java b/src/test/java/com/epam/ta/reportportal/core/project/impl/GetProjectHandlerImplTest.java
@@ -125,7 +125,7 @@ void getUserNamesByIncorrectTerm() {
 
 	@Test
 	void getUserNamesNegative() {
-		ReportPortalException exception = assertThrows(ReportPortalException.class, () -> handler.getUserNames("",
+		ReportPortalException exception = assertThrows(ReportPortalException.class, () -> handler.getUserNames("", UserRole.ADMINISTRATOR,
 				new ReportPortalUser.ProjectDetails(1L, "superadmin_personal", ProjectRole.PROJECT_MANAGER),
 				PageRequest.of(0, 10)));
 		assertEquals("Incorrect filtering parameters. Length of the filtering string '' is less than 1 symbol", exception.getMessage());