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

check in the file for delete and trim string.

Browse Source
This commit is contained in:
Kham
2021-09-02 13:41:57 +10:00
parent 39a7931a97
commit da0b1337eb
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CarParkValidationAPI/Controllers/ConcessionValidationController.cs
+4 -6
View File
@@ -22,8 +22,7 @@ namespace CarParkValidationAPI.Controllers
public ConcessionValidationController(IConcessionValidation concessionValidation, public ConcessionValidationController(IConcessionValidation concessionValidation,
ConcessionValidationReportRepository concesionReportReport) ConcessionValidationReportRepository concesionReportReport)
{ {
_concessionValidationReport = concesionReportReport; _concessionValidationReport = concesionReportReport;
_concessionValidation = concessionValidation; _concessionValidation = concessionValidation;
} }
@@ -76,13 +75,12 @@ namespace CarParkValidationAPI.Controllers
} }
[HttpDelete("{id:int}")] [HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteConcessionValidation(int id) public async Task<IActionResult> DeleteConcessionValidation(int id)
{ {
// only admins can access other user records // only admins can access other user records
var currentUser = (User)HttpContext.Items["User"]; var currentUser = (User)HttpContext.Items["User"];
//if (id != currentUser.Id && currentUser.Role != Role.Admin) if (null == currentUser)
return Unauthorized(new { message = "Unauthorized" }); return Unauthorized(new { message = "Unauthorized" });
// _concessionValidation.SetCurrentUser(currentUser.Username);
var retval = await _concessionValidation.DeleteConcessionValidationAsync(id); var retval = await _concessionValidation.DeleteConcessionValidationAsync(id);
return Ok(retval); return Ok(retval);
} }
CarParkValidationAPI/Repository/ConcessionTypeRepository.cs
+2 -2
View File
@@ -45,8 +45,8 @@ namespace CarParkValidationAPI.Repository
private ConcessionType FillConcessionType(ConcessionTypeDto dto, ConcessionType model) private ConcessionType FillConcessionType(ConcessionTypeDto dto, ConcessionType model)
{ {
model.Active = dto.Active; model.Active = dto.Active;
model.ConcessionDesc = dto.Description; model.ConcessionDesc = dto.Description.Trim();
model.ConcessionDisplay = dto.Display; model.ConcessionDisplay = dto.Display.Trim();
model.ConcessionTypeID = dto.Id; model.ConcessionTypeID = dto.Id;
return model; return model;
} }
CarParkValidationAPI/Repository/ConcessionValidationRepository.cs
+2 -2
View File
@@ -71,9 +71,9 @@ namespace CarParkValidationAPI.Repository
private ConcessionValidation FillConcessionValidation(ConcessionValidationDto dto, ConcessionValidation model) private ConcessionValidation FillConcessionValidation(ConcessionValidationDto dto, ConcessionValidation model)
{ {
model.Active = dto.Active; model.Active = dto.Active;
model.ConcessionCard = dto.ConcessionCard; model.ConcessionCard = dto.ConcessionCard.Trim();
model.ConcessionExpiry = dto.ConcessionExpiry; model.ConcessionExpiry = dto.ConcessionExpiry;
model.ConcessionHolder = dto.ConcessionHolder; model.ConcessionHolder = dto.ConcessionHolder.Trim();
model.ConcessionTypeID = dto.ConcessionTypeId; model.ConcessionTypeID = dto.ConcessionTypeId;
model.ValidationID = dto.Id; model.ValidationID = dto.Id;
model.StafflinkNo = dto.StafflinkNo; model.StafflinkNo = dto.StafflinkNo;
CarParkValidationAPI/Repository/ValidationPointRepository.cs
+2 -2
View File
@@ -44,8 +44,8 @@ namespace CarParkValidationAPI.Repository
private ValidationPoint FillValidationModel(ValidationPointDto item, ValidationPoint model) { private ValidationPoint FillValidationModel(ValidationPointDto item, ValidationPoint model) {
model.Active = item.Active; model.Active = item.Active;
model.Description = item.Description; model.Description = item.Description.Trim();
model.DisplayName = item.Display; model.DisplayName = item.Display.Trim();
model.ValidationPointID = item.Id; model.ValidationPointID = item.Id;
return model; return model;
} }