TD-3671 Removing the early implementation on the update method

sherif-olaboye · sherif-olaboye · commit a315945a06bf · 2024-05-10T16:17:17.000+01:00
diff --git a/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs b/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs
@@ -15,7 +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 CreateNewDelegateProgress(
             int delegateId,
@@ -143,8 +143,7 @@ FROM Progress
         public void UpdateProgressSupervisorAndCompleteByDate(
             int progressId,
             int supervisorAdminId,
-            DateTime? completeByDate,
-            int enrollmentMethodID
+            DateTime? completeByDate
         )
         {
             connection.Execute(
@@ -153,7 +152,7 @@ int enrollmentMethodID
                         CompleteByDate = @completeByDate,
                         EnrollmentMethodID = @enrollmentMethodID
                     WHERE ProgressID = @progressId",
-                new { progressId, supervisorAdminId, completeByDate, enrollmentMethodID }
+                new { progressId, supervisorAdminId, completeByDate }
             );
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs b/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs
@@ -348,8 +348,7 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        A<DateTime?>._,
-                         A<int>._
+                        A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -385,8 +384,7 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         reusableProgressRecord.SupervisorAdminId,
-                        A<DateTime?>._,
-                          A<int>._
+                        A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -422,8 +420,7 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         supervisorId,
-                        A<DateTime?>._,
-                          A<int>._
+                        A<DateTime?>._
                     )
                 ).MustHaveHappened();
             }
@@ -459,8 +456,7 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        null,
-                          A<int>._
+                        null
                     )
                 ).MustHaveHappened();
             }
@@ -498,8 +494,7 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        expectedFutureDate,
-                          A<int>._
+                        expectedFutureDate
                     )
                 ).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?>._)
             ).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?>._)
             ).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?>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
@@ -83,8 +83,7 @@ public void UpdateSupervisor_updates_records_if_new_supervisor_does_not_match_cu
                 () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                     progressId,
                     newSupervisorId,
-                    A<DateTime?>._,
-                    A<int>._
+                    A<DateTime?>._
                 )
             ).MustHaveHappened();
             A.CallTo(
@@ -106,7 +105,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?>._)
             ).MustHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(progressId)
@@ -123,7 +122,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?>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
diff --git a/DigitalLearningSolutions.Web/Services/EnrolService.cs b/DigitalLearningSolutions.Web/Services/EnrolService.cs
@@ -102,8 +102,7 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         supervisorAdminId ?? 0,
-                        completeByDate,
-                        3
+                        completeByDate
                     );
                 }
             }
diff --git a/DigitalLearningSolutions.Web/Services/GroupsService.cs b/DigitalLearningSolutions.Web/Services/GroupsService.cs
@@ -743,8 +743,7 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         updatedSupervisorAdminId,
-                        completeByDate,
-                        3
+                        completeByDate
                     );
                 }
             }
diff --git a/DigitalLearningSolutions.Web/Services/ProgressService.cs b/DigitalLearningSolutions.Web/Services/ProgressService.cs
@@ -105,8 +105,7 @@ public void UpdateSupervisor(int progressId, int? newSupervisorId)
             progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                 progressId,
                 supervisorId,
-                courseInfo.CompleteBy,
-                    3
+                courseInfo.CompleteBy
             );
 
             progressDataService.ClearAspProgressVerificationRequest(progressId);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public interface IProgressDataService`
`15`	`15`	`{`
`16`	`16`	`IEnumerable<Progress> GetDelegateProgressForCourse(int delegateId, int customisationId);`
`17`	`17`
`18`		`- void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate, int enrollmentMethodID);`
	`18`	`+ void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate);`
`19`	`19`
`20`	`20`	`int CreateNewDelegateProgress(`
`21`	`21`	`int delegateId,`
`@@ -143,8 +143,7 @@ FROM Progress`
`143`	`143`	`public void UpdateProgressSupervisorAndCompleteByDate(`
`144`	`144`	`int progressId,`
`145`	`145`	`int supervisorAdminId,`
`146`		`- DateTime? completeByDate,`
`147`		`- int enrollmentMethodID`
	`146`	`+ DateTime? completeByDate`
`148`	`147`	`)`
`149`	`148`	`{`
`150`	`149`	`connection.Execute(`
`@@ -153,7 +152,7 @@ int enrollmentMethodID`
`153`	`152`	`CompleteByDate = @completeByDate,`
`154`	`153`	`EnrollmentMethodID = @enrollmentMethodID`
`155`	`154`	`WHERE ProgressID = @progressId",`
`156`		`- new { progressId, supervisorAdminId, completeByDate, enrollmentMethodID }`
	`155`	`+ new { progressId, supervisorAdminId, completeByDate }`
`157`	`156`	`);`
`158`	`157`	`}`
`159`	`158`
Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,7 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()`
`348`	`348`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`349`	`349`	`reusableProgressRecord.ProgressId,`
`350`	`350`	`A<int>._,`
`351`		`- A<DateTime?>._,`
`352`		`- A<int>._`
	`351`	`+ A<DateTime?>._`
`353`	`352`	`)`
`354`	`353`	`).MustHaveHappened();`
`355`	`354`	`}`
`@@ -385,8 +384,7 @@ public void`
`385`	`384`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`386`	`385`	`reusableProgressRecord.ProgressId,`
`387`	`386`	`reusableProgressRecord.SupervisorAdminId,`
`388`		`- A<DateTime?>._,`
`389`		`- A<int>._`
	`387`	`+ A<DateTime?>._`
`390`	`388`	`)`
`391`	`389`	`).MustHaveHappened();`
`392`	`390`	`}`
`@@ -422,8 +420,7 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour`
`422`	`420`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`423`	`421`	`reusableProgressRecord.ProgressId,`
`424`	`422`	`supervisorId,`
`425`		`- A<DateTime?>._,`
`426`		`- A<int>._`
	`423`	`+ A<DateTime?>._`
`427`	`424`	`)`
`428`	`425`	`).MustHaveHappened();`
`429`	`426`	`}`
`@@ -459,8 +456,7 @@ public void`
`459`	`456`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`460`	`457`	`reusableProgressRecord.ProgressId,`
`461`	`458`	`A<int>._,`
`462`		`- null,`
`463`		`- A<int>._`
	`459`	`+ null`
`464`	`460`	`)`
`465`	`461`	`).MustHaveHappened();`
`466`	`462`	`}`
`@@ -498,8 +494,7 @@ public void`
`498`	`494`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`499`	`495`	`reusableProgressRecord.ProgressId,`
`500`	`496`	`A<int>._,`
`501`		`- expectedFutureDate,`
`502`		`- A<int>._`
	`497`	`+ expectedFutureDate`
`503`	`498`	`)`
`504`	`499`	`).MustHaveHappened();`
`505`	`500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo`
`102`	`102`	`progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`103`	`103`	`progressRecord.ProgressId,`
`104`	`104`	`supervisorAdminId ?? 0,`
`105`		`- completeByDate,`
`106`		`- 3`
	`105`	`+ completeByDate`
`107`	`106`	`);`
`108`	`107`	`}`
`109`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -743,8 +743,7 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences`
`743`	`743`	`progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`744`	`744`	`progressRecord.ProgressId,`
`745`	`745`	`updatedSupervisorAdminId,`
`746`		`- completeByDate,`
`747`		`- 3`
	`746`	`+ completeByDate`
`748`	`747`	`);`
`749`	`748`	`}`
`750`	`749`	`}`