kham/carparkvalidation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new RoleType and validationPoint to AdminUser

Browse Source
This commit is contained in:
Kham
2021-09-06 16:43:20 +10:00
parent 28f627a36e
commit cd38e7a644
9 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CarParkValidationAPI/Repository/AdminUserRepository.cs
+30 -6
View File
@@ -20,6 +20,7 @@ namespace CarParkValidationAPI.Repository
private DataContext _context;
private string _currentUser = "";
private readonly AppSettings _appSettings;
private Dictionary<int, string> _ValidationPointDic = null;
public AdminUserRepository(
@@ -34,6 +35,26 @@ namespace CarParkValidationAPI.Repository
{
_currentUser = username;
}
private string GetValidtionPointDesc(int id)
{
string result = "";
if (_ValidationPointDic != null && _ValidationPointDic.ContainsKey(id))
result = _ValidationPointDic[id];
return result;
}
private AdminUserViewDto FillAdminUserViewDto(AdminUser model)
{
AdminUserViewDto dto = new AdminUserViewDto();
dto.Id = model.UserID;
dto.Name = model.Name;
dto.RoleType = model.RoleType.ToString();
dto.StafflinkNo = model.StafflinkNo;
dto.Active = model.Active;
dto.AddedBy = model.AddedBy;
dto.AddedOn = model.AddedOn;
dto.ValidationPoint = GetValidtionPointDesc(model.ValidationPointID??0);
return dto;
}
private AdminUserDto FillAdminUserDto(AdminUser model)
{
AdminUserDto dto = new AdminUserDto();
@@ -44,12 +65,12 @@ namespace CarParkValidationAPI.Repository
dto.Active = model.Active;
dto.AddedBy = model.AddedBy;
dto.AddedOn = model.AddedOn;
dto.ValidationPointId = model.ValidationPointID ?? 0;
return dto;
}
private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
{
model.UserID = dto.Id;
model.Name = dto.Name;
model.RoleType = dto.RoleType;
@@ -57,25 +78,28 @@ namespace CarParkValidationAPI.Repository
model.Active = dto.Active;
model.AddedBy = dto.AddedBy;
model.AddedOn = dto.AddedOn;
model.ValidationPointID = dto.ValidationPointId;
return model;
}
public async Task<ResultModel<List<AdminUserDto>>> LoadAdminUserAsync(bool onlyActive)
public async Task<ResultModel<List<AdminUserViewDto>>> LoadAdminUserAsync(bool onlyActive)
{
List<AdminUserDto> resultList = new List<AdminUserDto>();
List<AdminUserViewDto> resultList = new List<AdminUserViewDto>();
int statuscode = 0;
string error = "";
try
{
_ValidationPointDic = await _context.Validations.Where(x => x.Active == true).ToDictionaryAsync((x) => x.ValidationPointID, y => y.Description);
//var list = await _context.AdminUsers.Where(x => x.Active == onlyActive).ToListAsync();
var list = await _context.AdminUsers.AsQueryable().ToListAsync();
AdminUserDto dto;
AdminUserViewDto dto;
AdminUser user;
for (int i = 0; i < list.Count; i++)
{
user = list[i];
dto = FillAdminUserDto(user);
dto = FillAdminUserViewDto(user);
resultList.Add(dto);
}
@@ -88,7 +112,7 @@ namespace CarParkValidationAPI.Repository
throw ex;
}
return new ResultModel<List<AdminUserDto>>()
return new ResultModel<List<AdminUserViewDto>>()
{
Data = resultList,
StatusCode = statuscode,