From 9ffee160d31c6476ab0ba7670a82faa6036a117f Mon Sep 17 00:00:00 2001
From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com>
Date: Thu, 25 Sep 2025 11:38:31 +0530
Subject: [PATCH 1/2] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0ae3d0b9..a2e6e019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.iemr.common-API</groupId>
 	<artifactId>common-api</artifactId>
-	<version>3.4.0</version>
+	<version>3.5.0</version>
 	<packaging>war</packaging>
 
 	<name>Common-API</name>

From 435fb88b80e216437f713b9fc4e8fc1380664137 Mon Sep 17 00:00:00 2001
From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Date: Fri, 26 Sep 2025 19:51:44 +0530
Subject: [PATCH 2/2] finding userId baserd on createdBy (#299)

---
 .../controller/users/IEMRAdminController.java     | 15 +++++++++++++++
 .../service/users/IEMRAdminUserService.java       |  2 ++
 .../service/users/IEMRAdminUserServiceImpl.java   |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
index 28c7e4b9..e6f9d4cd 100644
--- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
+++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
@@ -1212,4 +1212,19 @@ private JSONObject prepareAuthenticationResponse(User mUser, String remoteAddres
 		return iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress, remoteHost);
 	}
 
+	@Operation(summary = "Get UserId based on userName")
+	@GetMapping(value = "/userName/{userName}", produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	public ResponseEntity<?> getUserDetails(@PathVariable("userName") String userName) {
+		try {
+			List<User> users = iemrAdminUserServiceImpl.getUserIdbyUserName(userName);
+			if (users.isEmpty()) {
+				return new ResponseEntity<>(Map.of("error", "UserName Not Found"), HttpStatus.NOT_FOUND);
+			}
+			User user = users.get(0);
+			return new ResponseEntity<>(Map.of("userName", user.getUserName(), "userId", user.getUserID()), HttpStatus.OK);
+		} catch (Exception e) {
+			return new ResponseEntity<>(Map.of("error", "Internal server error"), HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+	}
 }
diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
index 89e238c0..d7dc6e2e 100644
--- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
+++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java
@@ -121,6 +121,8 @@ public List<ServiceRoleScreenMapping> getUserServiceRoleMappingForProvider(Integ
 
 	List<UserServiceRoleMapping> getUserServiceRoleMapping(Long userID) throws IEMRException;
 
+	List<User> getUserIdbyUserName(String userName) throws IEMRException;
+
 
 	
 }
diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
index 05854843..44bd2247 100644
--- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
+++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java
@@ -1218,4 +1218,10 @@ public User getUserById(Long userId) throws IEMRException {
 	        throw new IEMRException("Error fetching user with ID: " + userId, e);
 	    }
 	}
+
+	@Override
+	public List<User> getUserIdbyUserName(String userName) {
+
+		return iEMRUserRepositoryCustom.findByUserName(userName);
+	}
 }