Merge pull request #2792 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Enrolment-dateTime-issue

TD-4436- Converted utc date to local date time using NodaTime package

Author: rshrirohit

DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj

@@ -81,6 +81,7 @@
         <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
         <PackageReference Include="NHSUKViewComponents.Web" Version="1.0.24" />
+        <PackageReference Include="NodaTime" Version="3.1.11" />
         <PackageReference Include="Npm" Version="3.5.2" />
         <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />

DigitalLearningSolutions.Web/Helpers/DateHelper.cs

@@ -2,6 +2,7 @@
 {
     using DigitalLearningSolutions.Data.Enums;
     using Microsoft.AspNetCore.Http;
+    using NodaTime;
     using System;
 
     public static class DateHelper
@@ -36,21 +37,28 @@ public static string GetFormatStringForDateInTable(ReportInterval interval)
             };
         }
 
-        public static DateTime? GetLocalDateTime(DateTime? dateUtc)
+        public static DateTime? GetLocalDateTime(DateTime? utcDateTime)
         {
-            if (dateUtc == null)
+            if (utcDateTime == null)
                 return null;
+            try
+            {
+                var accessor = new HttpContextAccessor();
+                var ianaTimeZoneId = accessor.HttpContext.User.GetUserTimeZone(CustomClaimTypes.UserTimeZone);
 
-            var accessor = new HttpContextAccessor();
-            var timeZone = accessor.HttpContext.User.GetUserTimeZone(CustomClaimTypes.UserTimeZone);
-
-            if (string.IsNullOrEmpty(timeZone))
-                timeZone = DefaultTimeZone;
-
-            TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(timeZone);
-            DateTime localDateTime = TimeZoneInfo.ConvertTimeFromUtc((DateTime)dateUtc, timeZoneInfo);
+                var timeZoneProvider = DateTimeZoneProviders.Tzdb;
+                var dateTimeZone = timeZoneProvider.GetZoneOrNull(ianaTimeZoneId);
+                var instant = Instant.FromDateTimeUtc(DateTime.SpecifyKind((DateTime)utcDateTime, DateTimeKind.Utc));
+                var userZonedDateTime = instant.InZone(dateTimeZone);
+                var userLocalDateTime = userZonedDateTime.ToDateTimeUnspecified();
 
-            return localDateTime;
+                return userLocalDateTime;
+            }
+            catch (Exception)
+            {
+                return utcDateTime;
+            }
+           
         }
     }
 }