Added missing tests
This commit is contained in:
@ -172,17 +172,16 @@ public class UserService : IUserService {
|
||||
logMsgBuilder.Append($"Attempting to update sub roles for user {userId} ");
|
||||
logMsgBuilder.Append($"to delegated user {delegatedUserId}");
|
||||
_logger.LogInformation(logMsgBuilder.ToString());
|
||||
if (userId <= 0) {
|
||||
if (userId <= 0)
|
||||
throw new ArgumentException($"User Id {userId} is not a valid user Id");
|
||||
} else if (delegatedUserId <= 0) {
|
||||
if (delegatedUserId <= 0)
|
||||
throw new ArgumentException($"Delegated user Id {delegatedUserId} is not a valid user Id");
|
||||
} else {
|
||||
string sql = $"update UserSubRole set UserID = {delegatedUserId}, Delegated = 1 where UserID = {userId}";
|
||||
|
||||
string sql = $"update UserSubRole set UserID = {delegatedUserId}, Delegated = 1 where UserID = {userId}";
|
||||
|
||||
await _dalService.ExecuteAsync(sql);
|
||||
await _dalService.ExecuteAsync(sql);
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
} catch (Exception ex) {
|
||||
StringBuilder errMsgBuilder = new();
|
||||
errMsgBuilder.Append($"An exception occurred when attempting to update sub roles for user {userId} ");
|
||||
@ -196,28 +195,28 @@ public class UserService : IUserService {
|
||||
try {
|
||||
_logger.LogInformation($"Attempting to remove delegated roles for OOO user {userId}");
|
||||
|
||||
if (userId <= 0) {
|
||||
if (userId <= 0)
|
||||
throw new ArgumentException($"User Id {userId} is not a valid user Id");
|
||||
} else {
|
||||
StringBuilder queryBuilder = new StringBuilder();
|
||||
if (delegatedUserId <= 0)
|
||||
throw new ArgumentException($"Delegated user Id {delegatedUserId} is not a valid user Id");
|
||||
|
||||
queryBuilder.Append("select SubRoleID from OOODelegatedRoles O inner join UserSubRole U ");
|
||||
queryBuilder.Append("on O.DelegatedSubRoleID = U.UserSubRoleID ");
|
||||
queryBuilder.Append($"where O.UserID = {userId} and Active = 1");
|
||||
StringBuilder queryBuilder = new StringBuilder();
|
||||
queryBuilder.Append("select SubRoleID from OOODelegatedRoles O inner join UserSubRole U ");
|
||||
queryBuilder.Append("on O.DelegatedSubRoleID = U.UserSubRoleID ");
|
||||
queryBuilder.Append($"where O.UserID = {userId} and Active = 1");
|
||||
|
||||
List<int> userSubRoleIds = (await _dalService.QueryAsync<int>(queryBuilder.ToString())).ToList();
|
||||
List<int> userSubRoleIds = (await _dalService.QueryAsync<int>(queryBuilder.ToString())).ToList();
|
||||
|
||||
foreach (int id in userSubRoleIds) {
|
||||
queryBuilder.Clear();
|
||||
queryBuilder.Append($"update UserSubRole set UserID = {userId}, Delegated = 0 ");
|
||||
queryBuilder.Append($"where UserID = {delegatedUserId} and Delegated = 1 ");
|
||||
queryBuilder.Append($"and SubRoleID in ({string.Join(',', userSubRoleIds)})");
|
||||
foreach (int id in userSubRoleIds) {
|
||||
queryBuilder.Clear();
|
||||
queryBuilder.Append($"update UserSubRole set UserID = {userId}, Delegated = 0 ");
|
||||
queryBuilder.Append($"where UserID = {delegatedUserId} and Delegated = 1 ");
|
||||
queryBuilder.Append($"and SubRoleID in ({string.Join(',', userSubRoleIds)})");
|
||||
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (Exception ex) {
|
||||
StringBuilder errMsgBuilder = new();
|
||||
errMsgBuilder.Append("An exception occurred when attempting to remove delegated roles for ");
|
||||
@ -230,20 +229,19 @@ public class UserService : IUserService {
|
||||
public async Task<bool> DelegateApprovalsForUser(int userId, int delegatedUserId) {
|
||||
try {
|
||||
_logger.LogInformation($"Attempting to delegate approvals for user {userId} to delegated user {delegatedUserId}");
|
||||
if (userId <= 0) {
|
||||
if (userId <= 0)
|
||||
throw new ArgumentException($"User Id {userId} is not a valid user Id");
|
||||
} else if (delegatedUserId <= 0) {
|
||||
if (delegatedUserId <= 0)
|
||||
throw new ArgumentException($"Delegated user Id {delegatedUserId} is not a valid user Id");
|
||||
} else {
|
||||
StringBuilder queryBuilder = new();
|
||||
queryBuilder.Append($"update Approval set UserID = {delegatedUserId}, ");
|
||||
queryBuilder.Append($"Delegated = 1 where UserID = {userId} ");
|
||||
queryBuilder.Append($"and (ItemStatus = {PENDING_ITEM_STATUS} or ItemStatus = {DENITED_ITEM_STATUS})");
|
||||
|
||||
StringBuilder queryBuilder = new();
|
||||
queryBuilder.Append($"update Approval set UserID = {delegatedUserId}, ");
|
||||
queryBuilder.Append($"Delegated = 1 where UserID = {userId} ");
|
||||
queryBuilder.Append($"and (ItemStatus = {PENDING_ITEM_STATUS} or ItemStatus = {DENITED_ITEM_STATUS})");
|
||||
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
} catch (Exception ex) {
|
||||
StringBuilder errMsgBuilder = new();
|
||||
errMsgBuilder.Append($"An exception occurred when attempting to delegate approvals for user {userId} ");
|
||||
@ -257,29 +255,30 @@ public class UserService : IUserService {
|
||||
try {
|
||||
_logger.LogInformation($"Attempting to remove delegated roles for OOO user {userId}");
|
||||
|
||||
if (userId <= 0) {
|
||||
if (userId <= 0)
|
||||
throw new ArgumentException($"User Id {userId} is not a valid user Id");
|
||||
} else {
|
||||
StringBuilder queryBuilder = new StringBuilder();
|
||||
if (delegatedUserId <= 0)
|
||||
throw new ArgumentException($"Delegated user Id {delegatedUserId} is not a valid user Id");
|
||||
|
||||
queryBuilder.Append("select SubRoleID from OOODelegatedRoles O inner join UserSubRole U ");
|
||||
queryBuilder.Append("on O.DelegatedSubRoleID = U.UserSubRoleID ");
|
||||
queryBuilder.Append($"where O.UserID = {userId} and Active = 1");
|
||||
StringBuilder queryBuilder = new StringBuilder();
|
||||
|
||||
List<int> userSubRoleIds = (await _dalService.QueryAsync<int>(queryBuilder.ToString())).ToList();
|
||||
queryBuilder.Append("select SubRoleID from OOODelegatedRoles O inner join UserSubRole U ");
|
||||
queryBuilder.Append("on O.DelegatedSubRoleID = U.UserSubRoleID ");
|
||||
queryBuilder.Append($"where O.UserID = {userId} and Active = 1");
|
||||
|
||||
foreach (int id in userSubRoleIds) {
|
||||
queryBuilder.Clear();
|
||||
queryBuilder.Append($"update Approval set UserID = {userId}, Delegated = 0 ");
|
||||
queryBuilder.Append($"where UserID = {delegatedUserId} and Delegated = 1 and ");
|
||||
queryBuilder.Append($"(ItemStatus = {PENDING_ITEM_STATUS} or ItemStatus = {DENITED_ITEM_STATUS}) ");
|
||||
queryBuilder.Append($"and SubRoleID in ({string.Join(',', userSubRoleIds)})");
|
||||
List<int> userSubRoleIds = (await _dalService.QueryAsync<int>(queryBuilder.ToString())).ToList();
|
||||
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
}
|
||||
foreach (int id in userSubRoleIds) {
|
||||
queryBuilder.Clear();
|
||||
queryBuilder.Append($"update Approval set UserID = {userId}, Delegated = 0 ");
|
||||
queryBuilder.Append($"where UserID = {delegatedUserId} and Delegated = 1 and ");
|
||||
queryBuilder.Append($"(ItemStatus = {PENDING_ITEM_STATUS} or ItemStatus = {DENITED_ITEM_STATUS}) ");
|
||||
queryBuilder.Append($"and SubRoleID in ({string.Join(',', userSubRoleIds)})");
|
||||
|
||||
return true;
|
||||
await _dalService.ExecuteAsync(queryBuilder.ToString());
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (Exception ex) {
|
||||
StringBuilder errMsgBuilder = new();
|
||||
errMsgBuilder.Append("An exception occurred when attempting to remove delegated roles ");
|
||||
|
Reference in New Issue
Block a user