EMBCESSMOD-5552: actual agreement date fix (#2344)

bcgov · Jun 12, 2024 · 6d870b7 · 6d870b7
1 parent ae5c266
commit 6d870b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ess/src/API/EMBC.ESS/Resources/Teams/Mappings.cs b/ess/src/API/EMBC.ESS/Resources/Teams/Mappings.cs
@@ -49,7 +49,7 @@ public Mappings()
                 .ForMember(d => d.era_externalsystemtype, opts => opts.MapFrom(s => (int)ExternalSystemOptionSet.Bceid))
                 .ForMember(d => d.era_externalsystemusername, opts => opts.MapFrom(s => s.UserName))
                 .ForMember(d => d.era_electronicaccessagreementaccepteddate, opts => opts.MapFrom(s => s.AgreementSignDate.HasValue ?
-                    s.AgreementSignDate.Value.ToPST().Date
+                new DateTime(s.AgreementSignDate.Value.Year, s.AgreementSignDate.Value.Month, s.AgreementSignDate.Value.Day, 0, 0, 0, 0, DateTimeKind.Utc)
                     : (DateTime?)null))
                 .ForMember(d => d.era_label, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.Label) ? -1 : (int)Enum.Parse<TeamUserLabelOptionSet>(s.Label)))
                 .ForMember(d => d.era_role, opts => opts.MapFrom(s => string.IsNullOrEmpty(s.Role) ? (int?)null : (int)Enum.Parse<TeamUserRoleOptionSet>(s.Role)))

diff --git a/ess/src/API/EMBC.Tests.Integration.ESS/Managers/TeamsManagerTests.cs b/ess/src/API/EMBC.Tests.Integration.ESS/Managers/TeamsManagerTests.cs
@@ -56,7 +56,7 @@ public async Task CanCreateMember()
             existingMember.ExternalUserId.ShouldBe(newMember.ExternalUserId);
             existingMember.IsActive.ShouldBe(newMember.IsActive);
             existingMember.LastSuccessfulLogin.ShouldBe(newMember.LastSuccessfulLogin);
-            existingMember.AgreementSignDate.ShouldBe(now.ToPST().Date);
+            existingMember.AgreementSignDate.ShouldBe(newMember.AgreementSignDate.Value.Date);
             existingMember.Label.ShouldBe(newMember.Label);
             existingMember.Role.ShouldBe(newMember.Role);
         }

diff --git a/responders/src/API/EMBC.Responders.API/Controllers/ProfileController.cs b/responders/src/API/EMBC.Responders.API/Controllers/ProfileController.cs
@@ -6,6 +6,7 @@
 using EMBC.ESS.Shared.Contracts;
 using EMBC.ESS.Shared.Contracts.Teams;
 using EMBC.Responders.API.Services;
+using EMBC.Utilities.Extensions;
 using EMBC.Utilities.Messaging;
 using EMBC.Utilities.Telemetry;
 using Microsoft.AspNetCore.Authorization;
@@ -143,7 +144,7 @@ public async Task<IActionResult> SignAgreement()
             }
 
             // Set the Agreement Sign Date
-            currentMember.AgreementSignDate = DateTime.UtcNow;
+            currentMember.AgreementSignDate = DateTime.UtcNow.ToPST();
 
             // Update current user
             await messagingClient.Send(new SaveTeamMemberCommand