RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter users by role

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-03-14 21:38:42 -06:00
parent 4b4f4b087e
commit 5b3a91ada0
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/petshop/backend/controller/UserController.java
View File

@@ -3,6 +3,7 @@ package com.petshop.backend.controller;
import com.petshop.backend.dto.common.BulkDeleteRequest; import com.petshop.backend.dto.common.BulkDeleteRequest;
import com.petshop.backend.dto.user.UserRequest; import com.petshop.backend.dto.user.UserRequest;
import com.petshop.backend.dto.user.UserResponse; import com.petshop.backend.dto.user.UserResponse;
import com.petshop.backend.entity.User;
import com.petshop.backend.service.UserService; import com.petshop.backend.service.UserService;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@@ -26,8 +27,9 @@ public class UserController {
@GetMapping @GetMapping
public ResponseEntity<Page<UserResponse>> getAllUsers( public ResponseEntity<Page<UserResponse>> getAllUsers(
@RequestParam(required = false) String q, @RequestParam(required = false) String q,
@RequestParam(required = false) User.Role role,
Pageable pageable) { Pageable pageable) {
return ResponseEntity.ok(userService.getAllUsers(q, pageable)); return ResponseEntity.ok(userService.getAllUsers(q, role, pageable));
} }
@GetMapping("/{id}") @GetMapping("/{id}")

8
src/main/java/com/petshop/backend/repository/UserRepository.java
View File

@@ -16,6 +16,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByEmail(String email); Optional<User> findByEmail(String email);
Optional<User> findByPhone(String phone); Optional<User> findByPhone(String phone);
boolean existsByUsername(String username); boolean existsByUsername(String username);
Page<User> findByRole(User.Role role, Pageable pageable);
@Query("SELECT u FROM User u WHERE " + @Query("SELECT u FROM User u WHERE " +
"LOWER(u.username) LIKE LOWER(CONCAT('%', :q, '%')) OR " + "LOWER(u.username) LIKE LOWER(CONCAT('%', :q, '%')) OR " +
@@ -23,4 +24,11 @@ public interface UserRepository extends JpaRepository<User, Long> {
"LOWER(COALESCE(u.email, '')) LIKE LOWER(CONCAT('%', :q, '%')) OR " + "LOWER(COALESCE(u.email, '')) LIKE LOWER(CONCAT('%', :q, '%')) OR " +
"LOWER(COALESCE(u.phone, '')) LIKE LOWER(CONCAT('%', :q, '%'))") "LOWER(COALESCE(u.phone, '')) LIKE LOWER(CONCAT('%', :q, '%'))")
Page<User> searchUsers(@Param("q") String query, Pageable pageable); Page<User> searchUsers(@Param("q") String query, Pageable pageable);
@Query("SELECT u FROM User u WHERE u.role = :role AND (" +
"LOWER(u.username) LIKE LOWER(CONCAT('%', :q, '%')) OR " +
"LOWER(COALESCE(u.fullName, '')) LIKE LOWER(CONCAT('%', :q, '%')) OR " +
"LOWER(COALESCE(u.email, '')) LIKE LOWER(CONCAT('%', :q, '%')) OR " +
"LOWER(COALESCE(u.phone, '')) LIKE LOWER(CONCAT('%', :q, '%')))")
Page<User> searchUsersByRole(@Param("q") String query, @Param("role") User.Role role, Pageable pageable);
} }

9
src/main/java/com/petshop/backend/service/UserService.java
View File

@@ -28,10 +28,15 @@ public class UserService {
this.userBusinessLinkageService = userBusinessLinkageService; this.userBusinessLinkageService = userBusinessLinkageService;
} }
public Page<UserResponse> getAllUsers(String query, Pageable pageable) { public Page<UserResponse> getAllUsers(String query, User.Role role, Pageable pageable) {
Page<User> users; Page<User> users;
if (query != null && !query.trim().isEmpty()) { boolean hasQuery = query != null && !query.trim().isEmpty();
if (hasQuery && role != null) {
users = userRepository.searchUsersByRole(query, role, pageable);
} else if (hasQuery) {
users = userRepository.searchUsers(query, pageable); users = userRepository.searchUsers(query, pageable);
} else if (role != null) {
users = userRepository.findByRole(role, pageable);
} else { } else {
users = userRepository.findAll(pageable); users = userRepository.findAll(pageable);
} }