From be297f507f5bc63320417cda619a36857a240267 Mon Sep 17 00:00:00 2001
From: Naeem Ullah <enaeemullah@gmail.com>
Date: Thu, 22 Jan 2026 17:03:50 +0500
Subject: [PATCH] Improve userId extraction in LoggingFilter

Updated LoggingFilter to first check for 'userId' header, then fallback to 'X-USER-ID' if not present. Default userId is now set to 'NA' instead of 'ANONYMOUS' when no header is found.
---
 .../mfsys/common/configuration/filter/LoggingFilter.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java b/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
index fd2e2f8..eb21635 100644
--- a/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
+++ b/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
@@ -59,10 +59,15 @@ public class LoggingFilter extends OncePerRequestFilter {
             log.setResponseCode(response.getStatus());
 
             // Try to extract userId from header or session
-            String userId = request.getHeader("X-USER-ID");
+            String userId = request.getHeader("userId");
+            if ((userId == null || userId.isEmpty()) && request.getHeader("X-USER-ID") != null) {
+                userId = request.getHeader("X-USER-ID");
+            }
+
             if (userId == null || userId.isEmpty()) {
-                userId = "ANONYMOUS";
+                userId = "NA";
             }
+
             log.setUserId(userId);
 
             loggerRepo.save(log);