TD-3671 Changing of enrolment date when the delegate re-enrol

sherif-olaboye · sherif-olaboye · commit 0998b17819f0 · 2024-05-31T16:59:21.000+01:00
diff --git a/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs b/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs
@@ -15,8 +15,7 @@ public interface IProgressDataService
     {
         IEnumerable<Progress> GetDelegateProgressForCourse(int delegateId, int customisationId);
 
-        void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate, int enrollmentMethodID);
-
+        void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate, int enrollmentMethodID, DateTime? firstSubmittedTime);
         int CreateNewDelegateProgress(
             int delegateId,
             int customisationId,
@@ -144,16 +143,18 @@ public void UpdateProgressSupervisorAndCompleteByDate(
             int progressId,
             int supervisorAdminId,
             DateTime? completeByDate,
-            int enrollmentMethodID
+            int enrollmentMethodID,
+            DateTime? firstSubmittedTime
         )
         {
             connection.Execute(
                 @"UPDATE Progress SET
                         SupervisorAdminID = @supervisorAdminId,
                         CompleteByDate = @completeByDate,
-                        EnrollmentMethodID = @enrollmentMethodID
+                        EnrollmentMethodID = @enrollmentMethodID,
+                        FirstSubmittedTime= @firstSubmittedTime
                     WHERE ProgressID = @progressId",
-                new { progressId, supervisorAdminId, completeByDate, enrollmentMethodID }
+                new { progressId, supervisorAdminId, completeByDate, enrollmentMethodID, @firstSubmittedTime }
             );
         }
 
diff --git a/DigitalLearningSolutions.Data/Utilities/ClockUtility.cs b/DigitalLearningSolutions.Data/Utilities/ClockUtility.cs
@@ -10,7 +10,7 @@ public interface IClockUtility
 
     public class ClockUtility : IClockUtility
     {
-        public DateTime UtcNow => DateTime.UtcNow;
+        public DateTime UtcNow => DateTime.Now;
         public DateTime UtcToday => UtcNow.Date;
     }
 }
diff --git a/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs b/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs
@@ -3,6 +3,7 @@
     using System;
     using Castle.Core.Internal;
     using DigitalLearningSolutions.Data.Models.Email;
+    using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Tests.TestHelpers;
     using FakeItEasy;
     using FluentAssertions.Execution;
@@ -349,7 +350,8 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()
                         reusableProgressRecord.ProgressId,
                         A<int>._,
                         A<DateTime?>._,
-                         A<int>._
+                        A<int>._,
+                        A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -386,7 +388,8 @@ public void
                         reusableProgressRecord.ProgressId,
                         reusableProgressRecord.SupervisorAdminId,
                         A<DateTime?>._,
-                        A<int>._
+                        A<int>._,
+                         A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -423,7 +426,8 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour
                         reusableProgressRecord.ProgressId,
                         supervisorId,
                         A<DateTime?>._,
-                        A<int>._
+                        A<int>._,
+                        A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -460,7 +464,8 @@ public void
                         reusableProgressRecord.ProgressId,
                         A<int>._,
                         null,
-                         A<int>._
+                         A<int>._,
+                          A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -499,7 +504,8 @@ public void
                         reusableProgressRecord.ProgressId,
                         A<int>._,
                         expectedFutureDate,
-                         A<int>._
+                         A<int>._,
+                          A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
diff --git a/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceTests.cs
@@ -721,7 +721,7 @@ private void DelegateMustNotHaveBeenAddedToAGroup()
         private void DelegateProgressRecordMustNotHaveBeenUpdated()
         {
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._, A<DateTime?>._)
             ).MustNotHaveHappened();
         }
 
@@ -764,7 +764,7 @@ private void DatabaseModificationsDoNothing()
             A.CallTo(() => groupsDataService.AddDelegateToGroup(A<int>._, A<int>._, A<DateTime>._, A<int>._))
                 .DoesNothing();
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._, A<DateTime?>._)
             ).DoesNothing();
             A.CallTo(
                 () => progressDataService.CreateNewDelegateProgress(
diff --git a/DigitalLearningSolutions.Web.Tests/Services/ProgressServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/ProgressServiceTests.cs
@@ -58,7 +58,7 @@ public void UpdateSupervisor_does_not_update_records_if_new_supervisor_matches_c
 
             // Then
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._, A<DateTime?>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
@@ -84,7 +84,8 @@ public void UpdateSupervisor_updates_records_if_new_supervisor_does_not_match_cu
                     progressId,
                     newSupervisorId,
                     A<DateTime?>._,
-                    A<int>._
+                    A<int>._,
+                     A<DateTime?>._
                 )
             ).MustHaveHappened();
             A.CallTo(
@@ -106,7 +107,7 @@ public void UpdateSupervisor_sets_supervisor_id_to_0_if_new_supervisor_is_null()
 
             // Then
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._, A<int>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._, A<int>._, A<DateTime?>._)
             ).MustHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(progressId)
@@ -123,7 +124,7 @@ public void UpdateSupervisor_throws_exception_if_no_progress_record_found()
             // Then
             Assert.Throws<ProgressNotFoundException>(() => progressService.UpdateSupervisor(progressId, null));
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._, A<DateTime?>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
diff --git a/DigitalLearningSolutions.Web/Services/EnrolService.cs b/DigitalLearningSolutions.Web/Services/EnrolService.cs
@@ -103,8 +103,9 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                         progressRecord.ProgressId,
                         supervisorAdminId ?? 0,
                         completeByDate,
-                        2
-                    );
+                        2,
+                       clockUtility.UtcNow
+                        );
                 }
             }
             else
@@ -114,7 +115,7 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                     customisationId,
                     customisationVersion,
                     clockUtility.UtcNow,
-                    3,
+                    2,
                     enrolledByAdminId,
                 completeByDate,
                 supervisorAdminId ?? 0
diff --git a/DigitalLearningSolutions.Web/Services/GroupsService.cs b/DigitalLearningSolutions.Web/Services/GroupsService.cs
@@ -744,7 +744,8 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences
                         progressRecord.ProgressId,
                         updatedSupervisorAdminId,
                         completeByDate,
-                       3
+                       3,
+                      clockUtility.UtcNow
                     );
                 }
             }
diff --git a/DigitalLearningSolutions.Web/Services/ProgressService.cs b/DigitalLearningSolutions.Web/Services/ProgressService.cs
@@ -106,7 +106,8 @@ public void UpdateSupervisor(int progressId, int? newSupervisorId)
                 progressId,
                 supervisorId,
                 courseInfo.CompleteBy,
-                2
+                2,
+               clockUtility.UtcNow
             );
 
             progressDataService.ClearAspProgressVerificationRequest(progressId);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public interface IClockUtility`
`10`	`10`
`11`	`11`	`public class ClockUtility : IClockUtility`
`12`	`12`	`{`
`13`		`- public DateTime UtcNow => DateTime.UtcNow;`
	`13`	`+ public DateTime UtcNow => DateTime.Now;`
`14`	`14`	`public DateTime UtcToday => UtcNow.Date;`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using Castle.Core.Internal;`
`5`	`5`	`using DigitalLearningSolutions.Data.Models.Email;`
	`6`	`+ using DigitalLearningSolutions.Web.Helpers;`
`6`	`7`	`using DigitalLearningSolutions.Web.Tests.TestHelpers;`
`7`	`8`	`using FakeItEasy;`
`8`	`9`	`using FluentAssertions.Execution;`
`@@ -349,7 +350,8 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()`
`349`	`350`	`reusableProgressRecord.ProgressId,`
`350`	`351`	`A<int>._,`
`351`	`352`	`A<DateTime?>._,`
`352`		`- A<int>._`
	`353`	`+ A<int>._,`
	`354`	`+ A<DateTime?>._`
`353`	`355`	`)`
`354`	`356`	`).MustHaveHappened();`
`355`	`357`	`}`
`@@ -386,7 +388,8 @@ public void`
`386`	`388`	`reusableProgressRecord.ProgressId,`
`387`	`389`	`reusableProgressRecord.SupervisorAdminId,`
`388`	`390`	`A<DateTime?>._,`
`389`		`- A<int>._`
	`391`	`+ A<int>._,`
	`392`	`+ A<DateTime?>._`
`390`	`393`	`)`
`391`	`394`	`).MustHaveHappened();`
`392`	`395`	`}`
`@@ -423,7 +426,8 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour`
`423`	`426`	`reusableProgressRecord.ProgressId,`
`424`	`427`	`supervisorId,`
`425`	`428`	`A<DateTime?>._,`
`426`		`- A<int>._`
	`429`	`+ A<int>._,`
	`430`	`+ A<DateTime?>._`
`427`	`431`	`)`
`428`	`432`	`).MustHaveHappened();`
`429`	`433`	`}`
`@@ -460,7 +464,8 @@ public void`
`460`	`464`	`reusableProgressRecord.ProgressId,`
`461`	`465`	`A<int>._,`
`462`	`466`	`null,`
`463`		`- A<int>._`
	`467`	`+ A<int>._,`
	`468`	`+ A<DateTime?>._`
`464`	`469`	`)`
`465`	`470`	`).MustHaveHappened();`
`466`	`471`	`}`
`@@ -499,7 +504,8 @@ public void`
`499`	`504`	`reusableProgressRecord.ProgressId,`
`500`	`505`	`A<int>._,`
`501`	`506`	`expectedFutureDate,`
`502`		`- A<int>._`
	`507`	`+ A<int>._,`
	`508`	`+ A<DateTime?>._`
`503`	`509`	`)`
`504`	`510`	`).MustHaveHappened();`
`505`	`511`	`}`
Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,8 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences`
`744`	`744`	`progressRecord.ProgressId,`
`745`	`745`	`updatedSupervisorAdminId,`
`746`	`746`	`completeByDate,`
`747`		`- 3`
	`747`	`+ 3,`
	`748`	`+ clockUtility.UtcNow`
`748`	`749`	`);`
`749`	`750`	`}`
`750`	`751`	`}`