Merge pull request #14 from Kitzanos/user-get-endpoint
Created endpoint to get user details
This commit is contained in:
@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -30,7 +32,7 @@ public class RoleDao {
|
||||
|
||||
@Autowired
|
||||
private RegionDao regionDao;
|
||||
|
||||
private RoleEntity roleEntity;
|
||||
public RoleResponseBean createRole(RoleReq roleReq) {
|
||||
log.info("Creating new role with details: {}", roleReq);
|
||||
RoleEntity roleEntity = convertRoleRequestToRoleEntity(roleReq);
|
||||
@@ -43,7 +45,7 @@ public class RoleDao {
|
||||
RoleEntity roleEntity = new RoleEntity();
|
||||
roleEntity.setRoleName(roleReq.getRoleName());
|
||||
roleEntity.setRoleType(roleReq.getRoleType());
|
||||
roleEntity.setPermissions(roleReq.getPermissions());
|
||||
roleEntity.setPermissions(String.join(",", roleReq.getPermissions()));
|
||||
roleEntity.setDescription(roleReq.getDescription());
|
||||
RegionEntity regionEntity =regionDao.validateRegion(roleReq.getRegionId());
|
||||
roleEntity.setRegion(regionEntity);
|
||||
@@ -51,6 +53,7 @@ public class RoleDao {
|
||||
}
|
||||
|
||||
public RoleResponseBean convertRoleEntityToRoleResponse(RoleEntity roleEntity) {
|
||||
this.roleEntity = roleEntity;
|
||||
RoleResponseBean roleResponseBean = new RoleResponseBean();
|
||||
roleResponseBean.setId(roleEntity.getId());
|
||||
roleResponseBean.setCreatedDate(roleEntity.getCreatedDate());
|
||||
@@ -58,7 +61,11 @@ public class RoleDao {
|
||||
roleResponseBean.setRoleName(roleEntity.getRoleName());
|
||||
roleResponseBean.setRoleType(roleEntity.getRoleType());
|
||||
roleResponseBean.setDescription(roleEntity.getDescription());
|
||||
roleResponseBean.setPermissions(roleEntity.getPermissions());
|
||||
String permissionsString = roleEntity.getPermissions();
|
||||
List<String> permissionsList = permissionsString != null && !permissionsString.isEmpty()
|
||||
? Arrays.asList(permissionsString.split(","))
|
||||
: new ArrayList<>();
|
||||
roleResponseBean.setPermissions(permissionsList);
|
||||
RegionResponseBean regionResponseBean = regionDao.convertRegionEntityToRegionResponse(roleEntity.getRegion());
|
||||
roleResponseBean.setRegion(regionResponseBean);
|
||||
return roleResponseBean;
|
||||
@@ -75,7 +82,7 @@ public class RoleDao {
|
||||
setIfUpdated(existingRole::getRoleName, existingRole::setRoleName, roleReq.getRoleName());
|
||||
setIfUpdated(existingRole::getRoleType, existingRole::setRoleType, roleReq.getRoleType());
|
||||
setIfUpdated(existingRole::getDescription, existingRole::setDescription, roleReq.getDescription());
|
||||
setIfUpdated(existingRole::getPermissions, existingRole::setPermissions, roleReq.getPermissions());
|
||||
setIfUpdated(existingRole::getPermissions, existingRole::setPermissions, String.join(",", roleReq.getPermissions()));
|
||||
|
||||
existingRole = roleRepository.save(existingRole);
|
||||
|
||||
@@ -109,7 +116,7 @@ public class RoleDao {
|
||||
log.info("Fetching all roles");
|
||||
List<RoleResponseBean> roles = roleRepository.findAll()
|
||||
.stream()
|
||||
.map(roleEntity -> Utils.convertObject(roleEntity, RoleResponseBean.class))
|
||||
.map(this::convertRoleEntityToRoleResponse)
|
||||
.collect(Collectors.toList());
|
||||
log.info("Total roles found: {}", roles.size());
|
||||
return roles;
|
||||
|
||||
Reference in New Issue
Block a user