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/Entities/AdminUserDto.cs
+21
View File
@@ -21,6 +21,27 @@ namespace CarParkValidationAPI.Entities
public bool Active { get; set; } public bool Active { get; set; }
public AdminRole RoleType { get; set; } public AdminRole RoleType { get; set; }
public int ValidationPointId { get; set; }
#endregion
}
public class AdminUserViewDto
{
#region public Member
public int Id { get; set; }
public string StafflinkNo { get; set; }
public string Name { get; set; }
public string AddedBy { get; set; }
public DateTime AddedOn { get; set; }
public bool Active { get; set; }
public string RoleType { get; set; }
public string ValidationPoint { get; set; }
#endregion #endregion
} }
} }
CarParkValidationAPI/Interface/IAdminUser.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace CarParkValidationAPI.Interface
{ {
public interface IAdminUser public interface IAdminUser
{ {
Task<ResultModel<List<AdminUserDto>>> LoadAdminUserAsync(bool OnlyActive); Task<ResultModel<List<AdminUserViewDto>>> LoadAdminUserAsync(bool OnlyActive);
Task<ResultModel<int>> SaveAdminUserAsync(AdminUserDto item); Task<ResultModel<int>> SaveAdminUserAsync(AdminUserDto item);
Task<ResultModel<AdminUserDto>> LoadAdminUserByIdAsync(int id); Task<ResultModel<AdminUserDto>> LoadAdminUserByIdAsync(int id);
Task<ResultModel<bool>> DeleteAdminUserAsync(int id); Task<ResultModel<bool>> DeleteAdminUserAsync(int id);
CarParkValidationAPI/Models/AdminUser.cs
+2
View File
@@ -56,6 +56,8 @@ namespace CarParkValidationAPI.Models
public bool Active { get; set; } public bool Active { get; set; }
public AdminRole RoleType { get; set; } public AdminRole RoleType { get; set; }
public int? ValidationPointID { get; set; }
public DateTime? LastModified { get; set; } public DateTime? LastModified { get; set; }
public string? LastModifiedId { get; set; } public string? LastModifiedId { get; set; }
#endregion #endregion
CarParkValidationAPI/Models/User.cs
+1
View File
@@ -10,6 +10,7 @@ namespace CarParkValidationAPI.Models
public string Email { get; set; } public string Email { get; set; }
public string Username { get; set; } public string Username { get; set; }
public AdminRole Role { get; set; } public AdminRole Role { get; set; }
public int ValidationPointId { get; set; }
[JsonIgnore] [JsonIgnore]
public string PasswordHash { get; set; } public string PasswordHash { get; set; }
CarParkValidationAPI/Models/Users/AuthenticateResponse.cs
+2
View File
@@ -9,6 +9,7 @@ namespace CarParkValidationAPI.Models.Users
public string LastName { get; set; } public string LastName { get; set; }
public string Username { get; set; } public string Username { get; set; }
public AdminRole Role { get; set; } public AdminRole Role { get; set; }
public int ValidationPointId { get; set; }
public string Token { get; set; } public string Token { get; set; }
public string Email { get; set; } public string Email { get; set; }
public AuthenticateResponse(User user, string token) public AuthenticateResponse(User user, string token)
@@ -20,6 +21,7 @@ namespace CarParkValidationAPI.Models.Users
Email = user.Email; Email = user.Email;
Role = user.Role; Role = user.Role;
Token = token; Token = token;
ValidationPointId = user.ValidationPointId;
} }
} }
} }
CarParkValidationAPI/Repository/AdminUserFakeRepository.cs
+6 -10
View File
@@ -19,7 +19,7 @@ namespace CarParkValidationAPI.Repository
{ {
private DataContext _context; private DataContext _context;
private string _currentUser = ""; private string _currentUser = "";
List<AdminUserDto> _resultList = new List<AdminUserDto>(); List<AdminUserViewDto> _resultList = new List<AdminUserViewDto>();
private readonly AppSettings _appSettings; private readonly AppSettings _appSettings;
@@ -61,7 +61,7 @@ namespace CarParkValidationAPI.Repository
return model; 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<AdminUserDto> resultList = new List<AdminUserDto>();
@@ -91,17 +91,17 @@ namespace CarParkValidationAPI.Repository
*/ */
for (int i =0; i < 10; i++) for (int i =0; i < 10; i++)
{ {
AdminUserDto dto = new AdminUserDto(); AdminUserViewDto dto = new AdminUserViewDto();
dto.Id = i; dto.Id = i;
dto.Name = $"Name {i}"; dto.Name = $"Name {i}";
dto.RoleType = AdminRole.Admin; dto.RoleType = AdminRole.Admin.ToString();
dto.StafflinkNo = $"{i+40000}"; dto.StafflinkNo = $"{i+40000}";
dto.Active = true; dto.Active = true;
dto.AddedOn = DateTime.Today.AddDays(i); dto.AddedOn = DateTime.Today.AddDays(i);
dto.AddedBy = "ddfed"; dto.AddedBy = "ddfed";
_resultList.Add(dto); _resultList.Add(dto);
} }
return new ResultModel<List<AdminUserDto>>() return new ResultModel<List<AdminUserViewDto>>()
{ {
Data = _resultList, Data = _resultList,
StatusCode = 1 StatusCode = 1
@@ -125,11 +125,7 @@ namespace CarParkValidationAPI.Repository
throw ex; throw ex;
} }
*/ */
int idx = _resultList.FindIndex(x => x.Id == id);
if (idx > -1)
{
result = _resultList[idx];
}
return new ResultModel<AdminUserDto>() return new ResultModel<AdminUserDto>()
{ {
CarParkValidationAPI/Repository/AdminUserRepository.cs
+30 -6
View File
@@ -20,6 +20,7 @@ namespace CarParkValidationAPI.Repository
private DataContext _context; private DataContext _context;
private string _currentUser = ""; private string _currentUser = "";
private readonly AppSettings _appSettings; private readonly AppSettings _appSettings;
private Dictionary<int, string> _ValidationPointDic = null;
public AdminUserRepository( public AdminUserRepository(
@@ -34,6 +35,26 @@ namespace CarParkValidationAPI.Repository
{ {
_currentUser = username; _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) private AdminUserDto FillAdminUserDto(AdminUser model)
{ {
AdminUserDto dto = new AdminUserDto(); AdminUserDto dto = new AdminUserDto();
@@ -44,12 +65,12 @@ namespace CarParkValidationAPI.Repository
dto.Active = model.Active; dto.Active = model.Active;
dto.AddedBy = model.AddedBy; dto.AddedBy = model.AddedBy;
dto.AddedOn = model.AddedOn; dto.AddedOn = model.AddedOn;
dto.ValidationPointId = model.ValidationPointID ?? 0;
return dto; return dto;
} }
private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model) private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
{ {
model.UserID = dto.Id; model.UserID = dto.Id;
model.Name = dto.Name; model.Name = dto.Name;
model.RoleType = dto.RoleType; model.RoleType = dto.RoleType;
@@ -57,25 +78,28 @@ namespace CarParkValidationAPI.Repository
model.Active = dto.Active; model.Active = dto.Active;
model.AddedBy = dto.AddedBy; model.AddedBy = dto.AddedBy;
model.AddedOn = dto.AddedOn; model.AddedOn = dto.AddedOn;
model.ValidationPointID = dto.ValidationPointId;
return model; 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; int statuscode = 0;
string error = ""; string error = "";
try 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.Where(x => x.Active == onlyActive).ToListAsync();
var list = await _context.AdminUsers.AsQueryable().ToListAsync(); var list = await _context.AdminUsers.AsQueryable().ToListAsync();
AdminUserDto dto; AdminUserViewDto dto;
AdminUser user; AdminUser user;
for (int i = 0; i < list.Count; i++) for (int i = 0; i < list.Count; i++)
{ {
user = list[i]; user = list[i];
dto = FillAdminUserDto(user); dto = FillAdminUserViewDto(user);
resultList.Add(dto); resultList.Add(dto);
} }
@@ -88,7 +112,7 @@ namespace CarParkValidationAPI.Repository
throw ex; throw ex;
} }
return new ResultModel<List<AdminUserDto>>() return new ResultModel<List<AdminUserViewDto>>()
{ {
Data = resultList, Data = resultList,
StatusCode = statuscode, StatusCode = statuscode,
CarParkValidationAPI/Repository/ConcessionValidationReportRepository.cs
+15 -15
View File
@@ -15,7 +15,7 @@ namespace CarParkValidationAPI.Repository
{ {
private readonly DataContext _context; private readonly DataContext _context;
private readonly IOptions<AppSettings> _appSettings; private readonly IOptions<AppSettings> _appSettings;
const string DateFormat = "dd-MM-yyyy"; const string DateFormat = "dd-MM-yyyy HH:mm";
public ConcessionValidationReportRepository( public ConcessionValidationReportRepository(
DataContext context, IOptions<AppSettings> appSettings) DataContext context, IOptions<AppSettings> appSettings)
{ {
@@ -60,10 +60,10 @@ namespace CarParkValidationAPI.Repository
sl.SetCellValue(row, col++, "Expiry date checked"); sl.SetCellValue(row, col++, "Expiry date checked");
sl.SetCellValue(row, col++, "ConcessionType"); sl.SetCellValue(row, col++, "ConcessionType");
sl.SetCellValue(row, col++, "Validation Piont"); sl.SetCellValue(row, col++, "Validation Piont");
sl.SetCellValue(row, col++, "StaffLink No"); // sl.SetCellValue(row, col++, "StaffLink No");
sl.SetCellValue(row, col++, "Staff First name"); sl.SetCellValue(row, col++, "Enter by");
sl.SetCellValue(row, col++, "Staff Last name"); // sl.SetCellValue(row, col++, "Staff Last name");
sl.SetCellValue(row, col++, "Staff Email"); // sl.SetCellValue(row, col++, "Staff Email");
sl.FreezePanes(row, col - 1); //frozen the row. sl.FreezePanes(row, col - 1); //frozen the row.
//wrap text on is concession Expiry //wrap text on is concession Expiry
style = sl.CreateStyle(); style = sl.CreateStyle();
@@ -73,19 +73,19 @@ namespace CarParkValidationAPI.Repository
//format date //format date
style = sl.CreateStyle(); style = sl.CreateStyle();
style.FormatCode = "dd/mm/yyyy"; style.FormatCode = "dd/MM/yyyy HH:MM";
sl.SetColumnStyle(1, style); sl.SetColumnStyle(1, style);
//make column width //make column width
sl.SetColumnWidth(1, 20); sl.SetColumnWidth(1, 20);
sl.SetColumnWidth(2, 18); sl.SetColumnWidth(2, 18);
sl.SetColumnWidth(3, 25); sl.SetColumnWidth(3, 25);
sl.SetColumnWidth(4, 20); sl.SetColumnWidth(4, 20);
sl.SetColumnWidth(5, 30); sl.SetColumnWidth(5, 50);
sl.SetColumnWidth(6, 40); sl.SetColumnWidth(6, 40);
sl.SetColumnWidth(7, 20); sl.SetColumnWidth(7, 40);
sl.SetColumnWidth(8, 20); // sl.SetColumnWidth(8, 20);
sl.SetColumnWidth(9, 20); // sl.SetColumnWidth(9, 20);
sl.SetColumnWidth(10, 20); // sl.SetColumnWidth(10, 20);
int startRowFrom = startTitleRow+1; int startRowFrom = startTitleRow+1;
var list = await _context.SelectConcessionValidationByDate(true, fromDate.ToLocalTime(), toDate.ToLocalTime()); var list = await _context.SelectConcessionValidationByDate(true, fromDate.ToLocalTime(), toDate.ToLocalTime());
for (int i = 0; i < list.Count; i++) for (int i = 0; i < list.Count; i++)
@@ -99,10 +99,10 @@ namespace CarParkValidationAPI.Repository
sl.SetCellValue(row, col++, item.ConcessionExpiry ? "Yes": "No"); sl.SetCellValue(row, col++, item.ConcessionExpiry ? "Yes": "No");
sl.SetCellValue(row, col++, item.ConcessionType); sl.SetCellValue(row, col++, item.ConcessionType);
sl.SetCellValue(row, col++, item.ValidationPoint); sl.SetCellValue(row, col++, item.ValidationPoint);
sl.SetCellValue(row, col++, item.StafflinkNo); // sl.SetCellValue(row, col++, item.StafflinkNo);
sl.SetCellValue(row, col++, item.StaffFirstName); sl.SetCellValue(row, col++, item.StaffFirstName + " " + item.StaffLastName);
sl.SetCellValue(row, col++, item.StaffLastName); // sl.SetCellValue(row, col++, item.StaffLastName);
sl.SetCellValue(row, col++, item.StaffEmail); // sl.SetCellValue(row, col++, item.StaffEmail);
} }
byte[] array; byte[] array;
// sl.SaveAs("C:\\Temp\\Report\\ConcessionValidationDate" + DateTime.Now.ToString("yyyyMMddHHmm") + ".xlsx"); // sl.SaveAs("C:\\Temp\\Report\\ConcessionValidationDate" + DateTime.Now.ToString("yyyyMMddHHmm") + ".xlsx");
CarParkValidationAPI/Repository/UserRepository.cs
+8 -4
View File
@@ -69,18 +69,22 @@ namespace CarParkValidationAPI.Repository
&& x.Active == true); && x.Active == true);
if (user != null) if (user != null)
{ {
myUser.Role = AdminRole.Admin; //user.RoleType; myUser.Role = user.RoleType;
myUser.Id = user.UserID; myUser.Id = user.UserID;
myUser.ValidationPointId = user.ValidationPointID??0;
statuscode = 1;
} }
else else //not allow
{
statuscode = 0;
myUser.Role = AdminRole.Normal; myUser.Role = AdminRole.Normal;
}
// validate // validate
// if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash)) // if (user == null || !BCryptNet.Verify(model.Password, user.PasswordHash))
// authentication successful so generate jwt token // authentication successful so generate jwt token
var jwtToken = _jwtUtils.GenerateJwtToken(myUser); var jwtToken = _jwtUtils.GenerateJwtToken(myUser);
statuscode = 1; //statuscode = 1;
retval = new AuthenticateResponse(myUser, jwtToken); retval = new AuthenticateResponse(myUser, jwtToken);
} }