Merge pull request #2670 from TechnologyEnhancedLearning/Develop/Fixes/TD-3671-Fewcourseswhichdoesnotallowselfenrolment

rshrirohit · web-flow · commit 0032b3ba39fd · 2024-05-29T15:27:13.000+01:00
TD-3671 few courses which does not allow self enrolment
diff --git a/DigitalLearningSolutions.Data.Migrations/202405031044_AlterGetCurrentCoursesForCandidate_V2.cs b/DigitalLearningSolutions.Data.Migrations/202405031044_AlterGetCurrentCoursesForCandidate_V2.cs
@@ -2,12 +2,12 @@
 {
     using FluentMigrator;
 
-    [Migration(202405161044)]
+    [Migration(202405231044)]
     public class AlterGetCurrentCoursesForCandidate_V2 : Migration
     {
         public override void Up()
         {
-            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc1_up );
+            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_up );
             Execute.Sql(Properties.Resources.TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up );
         }
         public override void Down()
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
@@ -376,16 +376,16 @@
   <data name="TD_4015_Update_GetCompletedCoursesForCandidate_proc_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-4015-GetCompletedCoursesForCandidateFix_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-  <data name="TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc1_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc1_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
   <data name="TD_3671_Alter_CheckDelegateStatusForCustomisation_func_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD_3671_Alter_CheckDelegateStatusForCustomisation_func_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
diff --git a/DigitalLearningSolutions.Data.Migrations/Resources/TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_up.sql b/DigitalLearningSolutions.Data.Migrations/Resources/TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_up.sql
@@ -37,6 +37,8 @@ BEGIN
 FROM  Progress AS p INNER JOIN
                Customisations AS cu ON p.CustomisationID = cu.CustomisationID INNER JOIN
                Applications AS a ON cu.ApplicationID = a.ApplicationID
-WHERE (p.Completed IS NULL) AND (p.RemovedDate IS NULL) AND (p.CandidateID = @CandidateID)AND (cu.CustomisationName <> 'ESR') AND (a.ArchivedDate IS NULL) AND (cu.Active = 1) AND ((p.SubmittedTime > DATEADD(M, -6, getDate()) OR (EnrollmentMethodID <> 1)) OR NOT p.CompleteByDate IS NULL)
+WHERE (p.Completed IS NULL) AND (p.RemovedDate IS NULL) AND (p.CandidateID = @CandidateID)AND (cu.CustomisationName <> 'ESR') AND (a.ArchivedDate IS NULL) AND(cu.Active = 1) AND 
+((p.SubmittedTime > DATEADD(M, -6, getDate()) OR (EnrollmentMethodID <> 1)) OR NOT (p.CompleteByDate IS NULL) AND NOT
+(p.SubmittedTime < DATEADD(MONTH, -6, GETDATE()) AND (p.EnrollmentMethodID = 1) AND (p.CompleteByDate < GETDATE())))
 ORDER BY p.SubmittedTime Desc
 END
diff --git a/DigitalLearningSolutions.Data.Migrations/Resources/TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up.sql b/DigitalLearningSolutions.Data.Migrations/Resources/TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up.sql
@@ -34,7 +34,7 @@ BEGIN
 	-- Check of current:
 	if @CustomisationID IN (SELECT CustomisationID
 FROM  Progress AS p
-WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND ((SubmittedTime > DATEADD(M, - 6, GETDATE()) OR (EnrollmentMethodID <> 1))  OR NOT p.CompleteByDate IS NULL))
+WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND ((SubmittedTime > DATEADD(M, - 6, GETDATE()) OR (EnrollmentMethodID <> 1))  OR NOT (p.CompleteByDate IS NULL) AND NOT (p.SubmittedTime < DATEADD(MONTH, -6, GETDATE()) AND (p.EnrollmentMethodID = 1) AND (p.CompleteByDate < GETDATE()))))
 begin
 Set @ResultVar = 3
 goto onExit
@@ -50,7 +50,7 @@ end
 --Check if Expired:
 if @CustomisationID IN (SELECT CustomisationID
 FROM  Progress AS p
-WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND ((SubmittedTime <= DATEADD(M, - 6, GETDATE())) AND (EnrollmentMethodID = 1)) AND (p.CompleteByDate IS NULL))
+WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND ((SubmittedTime <= DATEADD(M, - 6, GETDATE())) AND (EnrollmentMethodID = 1)) AND (p.CompleteByDate IS NULL) AND (p.SubmittedTime < DATEADD(MONTH, -6, GETDATE()) AND (p.EnrollmentMethodID = 1) AND (p.CompleteByDate < GETDATE())))
 begin
 Set @ResultVar = 1
 goto onExit
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);
+        void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate, int enrollmentMethodID);
 
         int CreateNewDelegateProgress(
             int delegateId,
@@ -143,15 +143,17 @@ FROM Progress
         public void UpdateProgressSupervisorAndCompleteByDate(
             int progressId,
             int supervisorAdminId,
-            DateTime? completeByDate
+            DateTime? completeByDate,
+            int enrollmentMethodID
         )
         {
             connection.Execute(
                 @"UPDATE Progress SET
                         SupervisorAdminID = @supervisorAdminId,
-                        CompleteByDate = @completeByDate
+                        CompleteByDate = @completeByDate,
+                        EnrollmentMethodID = @enrollmentMethodID
                     WHERE ProgressID = @progressId",
-                new { progressId, supervisorAdminId, completeByDate }
+                new { progressId, supervisorAdminId, completeByDate, enrollmentMethodID }
             );
         }
 
diff --git a/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs b/DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs
@@ -348,7 +348,8 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                         A<int>._
                     )
                 ).MustHaveHappened();
             }
@@ -384,7 +385,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         reusableProgressRecord.SupervisorAdminId,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                        A<int>._
                     )
                 ).MustHaveHappened();
             }
@@ -420,7 +422,8 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         supervisorId,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                        A<int>._
                     )
                 ).MustHaveHappened();
             }
@@ -456,7 +459,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        null
+                        null,
+                         A<int>._
                     )
                 ).MustHaveHappened();
             }
@@ -494,7 +498,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        expectedFutureDate
+                        expectedFutureDate,
+                         A<int>._
                     )
                 ).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?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
             ).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?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
             ).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?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
@@ -83,7 +83,8 @@ public void UpdateSupervisor_updates_records_if_new_supervisor_does_not_match_cu
                 () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                     progressId,
                     newSupervisorId,
-                    A<DateTime?>._
+                    A<DateTime?>._,
+                    A<int>._
                 )
             ).MustHaveHappened();
             A.CallTo(
@@ -105,7 +106,7 @@ public void UpdateSupervisor_sets_supervisor_id_to_0_if_new_supervisor_is_null()
 
             // Then
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._, A<int>._)
             ).MustHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(progressId)
@@ -122,7 +123,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?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<int>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
diff --git a/DigitalLearningSolutions.Web/Services/EnrolService.cs b/DigitalLearningSolutions.Web/Services/EnrolService.cs
@@ -102,7 +102,8 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         supervisorAdminId ?? 0,
-                        completeByDate
+                        completeByDate,
+                        2
                     );
                 }
             }
diff --git a/DigitalLearningSolutions.Web/Services/GroupsService.cs b/DigitalLearningSolutions.Web/Services/GroupsService.cs
@@ -743,7 +743,8 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         updatedSupervisorAdminId,
-                        completeByDate
+                        completeByDate,
+                       3
                     );
                 }
             }
diff --git a/DigitalLearningSolutions.Web/Services/ProgressService.cs b/DigitalLearningSolutions.Web/Services/ProgressService.cs
@@ -105,7 +105,8 @@ public void UpdateSupervisor(int progressId, int? newSupervisorId)
             progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                 progressId,
                 supervisorId,
-                courseInfo.CompleteBy
+                courseInfo.CompleteBy,
+                2
             );
 
             progressDataService.ClearAspProgressVerificationRequest(progressId);

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`{`
`3`	`3`	`using FluentMigrator;`
`4`	`4`
`5`		`- [Migration(202405161044)]`
	`5`	`+ [Migration(202405231044)]`
`6`	`6`	`public class AlterGetCurrentCoursesForCandidate_V2 : Migration`
`7`	`7`	`{`
`8`	`8`	`public override void Up()`
`9`	`9`	`{`
`10`		`- Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc1_up );`
	`10`	`+ Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_up );`
`11`	`11`	`Execute.Sql(Properties.Resources.TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up );`
`12`	`12`	`}`
`13`	`13`	`public override void Down()`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,8 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()`
`348`	`348`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`349`	`349`	`reusableProgressRecord.ProgressId,`
`350`	`350`	`A<int>._,`
`351`		`- A<DateTime?>._`
	`351`	`+ A<DateTime?>._,`
	`352`	`+ A<int>._`
`352`	`353`	`)`
`353`	`354`	`).MustHaveHappened();`
`354`	`355`	`}`
`@@ -384,7 +385,8 @@ public void`
`384`	`385`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`385`	`386`	`reusableProgressRecord.ProgressId,`
`386`	`387`	`reusableProgressRecord.SupervisorAdminId,`
`387`		`- A<DateTime?>._`
	`388`	`+ A<DateTime?>._,`
	`389`	`+ A<int>._`
`388`	`390`	`)`
`389`	`391`	`).MustHaveHappened();`
`390`	`392`	`}`
`@@ -420,7 +422,8 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour`
`420`	`422`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`421`	`423`	`reusableProgressRecord.ProgressId,`
`422`	`424`	`supervisorId,`
`423`		`- A<DateTime?>._`
	`425`	`+ A<DateTime?>._,`
	`426`	`+ A<int>._`
`424`	`427`	`)`
`425`	`428`	`).MustHaveHappened();`
`426`	`429`	`}`
`@@ -456,7 +459,8 @@ public void`
`456`	`459`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`457`	`460`	`reusableProgressRecord.ProgressId,`
`458`	`461`	`A<int>._,`
`459`		`- null`
	`462`	`+ null,`
	`463`	`+ A<int>._`
`460`	`464`	`)`
`461`	`465`	`).MustHaveHappened();`
`462`	`466`	`}`
`@@ -494,7 +498,8 @@ public void`
`494`	`498`	`() => progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`495`	`499`	`reusableProgressRecord.ProgressId,`
`496`	`500`	`A<int>._,`
`497`		`- expectedFutureDate`
	`501`	`+ expectedFutureDate,`
	`502`	`+ A<int>._`
`498`	`503`	`)`
`499`	`504`	`).MustHaveHappened();`
`500`	`505`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo`
`102`	`102`	`progressDataService.UpdateProgressSupervisorAndCompleteByDate(`
`103`	`103`	`progressRecord.ProgressId,`
`104`	`104`	`supervisorAdminId ?? 0,`
`105`		`- completeByDate`
	`105`	`+ completeByDate,`
	`106`	`+ 2`
`106`	`107`	`);`
`107`	`108`	`}`
`108`	`109`	`}`