From 62393c761f0c9c6f6942acbcc4a4616cd5b6ee4d Mon Sep 17 00:00:00 2001
From: Mazdak Gibran <141390141+mazdakgibran@users.noreply.github.com>
Date: Mon, 26 Jan 2026 10:18:04 +0500
Subject: [PATCH] Filter inactive users from getAllUsers result

Updated the getAllUsers method to exclude users who are not active, in addition to excluding admin users. This ensures only active, non-admin users are returned.
---
 .../com/mfsys/aconnect/usermanagement/service/UserService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aconnect/src/main/java/com/mfsys/aconnect/usermanagement/service/UserService.java b/aconnect/src/main/java/com/mfsys/aconnect/usermanagement/service/UserService.java
index 9c69ca1..2c939eb 100644
--- a/aconnect/src/main/java/com/mfsys/aconnect/usermanagement/service/UserService.java
+++ b/aconnect/src/main/java/com/mfsys/aconnect/usermanagement/service/UserService.java
@@ -88,7 +88,8 @@ public class UserService {
 
     public List<UserDTOs.UserResponse> getAllUsers() {
         return userRepository.findAll().stream()
-                .filter(user -> user.getRole() != Role.ADMIN)
+                .filter(user -> user.getRole() != Role.ADMIN &&
+                        user.isActive())
                 .map(this::mapToResponseDTO)
                 .collect(Collectors.toList());
     }