From b68189e52780f833bb1050951fa47844ab9f61fe Mon Sep 17 00:00:00 2001
From: nivetha <nivetha.mariappan@tarento.com>
Date: Wed, 9 Feb 2022 12:35:00 +0530
Subject: [PATCH] Get all role response entity
---
.../retail/controller/RoleActionController.java | 10 ++++++++--
.../java/com/tarento/retail/dao/impl/RoleDaoImpl.java | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/tarento/retail/controller/RoleActionController.java b/src/main/java/com/tarento/retail/controller/RoleActionController.java
index 9d9d26d..69a0c23 100644
--- a/src/main/java/com/tarento/retail/controller/RoleActionController.java
+++ b/src/main/java/com/tarento/retail/controller/RoleActionController.java
@@ -45,13 +45,19 @@ public class RoleActionController {
}
@RequestMapping(value = PathRoutes.RoleActionRoutes.GET_ALL_ROLES, method = RequestMethod.GET)
- public List<Role> listRoles(@RequestHeader(value = Constants.USER_INFO_HEADER, required = false) String xUserInfo) {
+ public String listRoles(@RequestHeader(value = Constants.USER_INFO_HEADER, required = false) String xUserInfo)
+ throws JsonProcessingException {
Long orgId = null;
if (StringUtils.isNotBlank(xUserInfo)) {
User userInfo = new Gson().fromJson(xUserInfo, User.class);
orgId = Long.parseLong(userInfo.getOrgId());
}
- return roleActionService.getAllRoles(orgId);
+ orgId = 1L;
+ List<Role> rolesList = roleActionService.getAllRoles(orgId);
+ if (rolesList != null) {
+ return ResponseGenerator.successResponse(rolesList);
+ }
+ return ResponseGenerator.failureResponse(Constants.PROCESS_FAIL);
}
@RequestMapping(value = PathRoutes.RoleActionRoutes.GET_DEFAULT_ROLES_BY_DOMAIN, method = RequestMethod.GET)
diff --git a/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java b/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
index f86f72a..39c4dd5 100644
--- a/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
+++ b/src/main/java/com/tarento/retail/dao/impl/RoleDaoImpl.java
@@ -145,6 +145,7 @@ public class RoleDaoImpl implements RoleDao {
new SqlDataMapper().new RoleMapper());
} catch (Exception e) {
LOGGER.error("Encountered an exception while fetching all roles" + e);
+ return null;
}
return roleList;
}
--
GitLab