From da0b1337ebd18bdf37e04ab360b5bdd78775a13a Mon Sep 17 00:00:00 2001 From: Kham Date: Thu, 2 Sep 2021 13:41:57 +1000 Subject: [PATCH] check in the file for delete and trim string. --- .../Controllers/ConcessionValidationController.cs | 10 ++++------ .../Repository/ConcessionTypeRepository.cs | 4 ++-- .../Repository/ConcessionValidationRepository.cs | 4 ++-- .../Repository/ValidationPointRepository.cs | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs index 13bb118..29d22a3 100644 --- a/CarParkValidationAPI/Controllers/ConcessionValidationController.cs +++ b/CarParkValidationAPI/Controllers/ConcessionValidationController.cs @@ -22,8 +22,7 @@ namespace CarParkValidationAPI.Controllers public ConcessionValidationController(IConcessionValidation concessionValidation, ConcessionValidationReportRepository concesionReportReport) - { - + { _concessionValidationReport = concesionReportReport; _concessionValidation = concessionValidation; } @@ -76,13 +75,12 @@ namespace CarParkValidationAPI.Controllers } [HttpDelete("{id:int}")] public async Task DeleteConcessionValidation(int id) - { - + { // only admins can access other user records var currentUser = (User)HttpContext.Items["User"]; - //if (id != currentUser.Id && currentUser.Role != Role.Admin) + if (null == currentUser) return Unauthorized(new { message = "Unauthorized" }); - // + _concessionValidation.SetCurrentUser(currentUser.Username); var retval = await _concessionValidation.DeleteConcessionValidationAsync(id); return Ok(retval); } diff --git a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs b/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs index e37a3cc..efe1f6d 100644 --- a/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionTypeRepository.cs @@ -45,8 +45,8 @@ namespace CarParkValidationAPI.Repository private ConcessionType FillConcessionType(ConcessionTypeDto dto, ConcessionType model) { model.Active = dto.Active; - model.ConcessionDesc = dto.Description; - model.ConcessionDisplay = dto.Display; + model.ConcessionDesc = dto.Description.Trim(); + model.ConcessionDisplay = dto.Display.Trim(); model.ConcessionTypeID = dto.Id; return model; } diff --git a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs index beedd6f..771e7d7 100644 --- a/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs +++ b/CarParkValidationAPI/Repository/ConcessionValidationRepository.cs @@ -71,9 +71,9 @@ namespace CarParkValidationAPI.Repository private ConcessionValidation FillConcessionValidation(ConcessionValidationDto dto, ConcessionValidation model) { model.Active = dto.Active; - model.ConcessionCard = dto.ConcessionCard; + model.ConcessionCard = dto.ConcessionCard.Trim(); model.ConcessionExpiry = dto.ConcessionExpiry; - model.ConcessionHolder = dto.ConcessionHolder; + model.ConcessionHolder = dto.ConcessionHolder.Trim(); model.ConcessionTypeID = dto.ConcessionTypeId; model.ValidationID = dto.Id; model.StafflinkNo = dto.StafflinkNo; diff --git a/CarParkValidationAPI/Repository/ValidationPointRepository.cs b/CarParkValidationAPI/Repository/ValidationPointRepository.cs index 5e7561b..8d30c3c 100644 --- a/CarParkValidationAPI/Repository/ValidationPointRepository.cs +++ b/CarParkValidationAPI/Repository/ValidationPointRepository.cs @@ -44,8 +44,8 @@ namespace CarParkValidationAPI.Repository private ValidationPoint FillValidationModel(ValidationPointDto item, ValidationPoint model) { model.Active = item.Active; - model.Description = item.Description; - model.DisplayName = item.Display; + model.Description = item.Description.Trim(); + model.DisplayName = item.Display.Trim(); model.ValidationPointID = item.Id; return model; }