From 9e2c976c0d2b43c9c98690db0eece253f557a725 Mon Sep 17 00:00:00 2001
From: Kham <Kham.vilaythong@health.nsw.gov.au>
Date: Tue, 8 Feb 2022 08:04:20 +1100
Subject: [PATCH] check update check string before trim

---
 Repository/ConcessionTypeRepository.cs  | 3 ++-
 Repository/ValidationPointRepository.cs | 3 ++-
 Startup.cs                              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Repository/ConcessionTypeRepository.cs b/Repository/ConcessionTypeRepository.cs
index 88fcfcc..635ec5f 100644
--- a/Repository/ConcessionTypeRepository.cs
+++ b/Repository/ConcessionTypeRepository.cs
@@ -48,7 +48,8 @@ namespace CarParkValidationAPI.Repository
 		{			
 			model.Active = dto.Active;
 		    model.ConcessionDesc = dto.Description.Trim();
-			model.ConcessionDisplay = dto.Display.Trim();
+			if (!string.IsNullOrEmpty(dto.Display))
+				model.ConcessionDisplay = dto.Display.Trim();
 			model.ConcessionTypeID = dto.Id;
 			return model;
 		}
diff --git a/Repository/ValidationPointRepository.cs b/Repository/ValidationPointRepository.cs
index 27d0477..c1e5d2f 100644
--- a/Repository/ValidationPointRepository.cs
+++ b/Repository/ValidationPointRepository.cs
@@ -45,7 +45,8 @@ namespace CarParkValidationAPI.Repository
 
 			model.Active = item.Active;
 			model.Description = item.Description.Trim();
-			model.DisplayName = item.Display.Trim();
+			if (!string.IsNullOrEmpty(item.Display))
+				model.DisplayName = item.Display.Trim();
 			model.ValidationPointID = item.Id;
 			return model;
 		}
diff --git a/Startup.cs b/Startup.cs
index b85d4ed..508f14e 100644
--- a/Startup.cs
+++ b/Startup.cs
@@ -94,6 +94,7 @@ namespace CarParkValidationAPI
             services.AddScoped<IConcessionValidation, ConcessionValidationRepository>();
             services.AddScoped<ILookupCode, LookupCodeRepository>();
             services.AddScoped(typeof(ConcessionValidationReportRepository));
+            services.AddHttpContextAccessor();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.