TD-3671 using the function and store procedure of the UAT DB for the down migration of the PR

Author: sherif-olaboye

DigitalLearningSolutions.Data.Migrations/202405031044_AlterGetCurrentCoursesForCandidate_V2.cs

@@ -12,7 +12,7 @@ public override void Up()
         }
         public override void Down()
         {
-            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc1_down);
+            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_down);
             Execute.Sql(Properties.Resources.TD_3671_Alter_CheckDelegateStatusForCustomisation_func_down);
         }
     }

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -379,13 +379,13 @@
   <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_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_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_GetCurrentCoursesForCandidate_V2_proc1_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc1_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <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>
 </root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -1,9 +1,10 @@
-
-/****** Object:  StoredProcedure [dbo].[GetCurrentCoursesForCandidate_V2]    Script Date: 08/05/2024 10:34:29 ******/
+/****** Object:  StoredProcedure [dbo].[GetCurrentCoursesForCandidate_V2]    Script Date: 16/05/2024 09:37:05 ******/
 SET ANSI_NULLS ON
 GO
+ 
 SET QUOTED_IDENTIFIER ON
 GO
+ 
 -- =============================================
 -- Author:		Kevin Whittaker
 -- Create date: 16/12/2016
@@ -18,7 +19,7 @@ BEGIN
 	-- SET NOCOUNT ON added to prevent extra result sets from
 	-- interfering with SELECT statements.
 	SET NOCOUNT ON;
-
+ 
     -- Insert statements for procedure here
 	SELECT p.ProgressID, (CASE WHEN cu.CustomisationName <> '' THEN a.ApplicationName + ' - ' + cu.CustomisationName ELSE a.ApplicationName END) AS CourseName, p.CustomisationID, p.SubmittedTime AS LastAccessed, 
                p.FirstSubmittedTime AS StartedDate, p.DiagnosticScore, p.PLLocked, cu.IsAssessed, dbo.CheckCustomisationSectionHasDiagnostic(p.CustomisationID, 0) 
@@ -33,10 +34,12 @@ BEGIN
                     FROM   Sections AS s
                     WHERE (ApplicationID = cu.ApplicationID)) AS Sections, p.CompleteByDate, CAST(CASE WHEN p.CompleteByDate IS NULL THEN 0 WHEN p.CompleteByDate < getDate() 
                          THEN 2 WHEN p.CompleteByDate < DATEADD(M, + 1, getDate()) THEN 1 ELSE 0 END AS INT) AS OverDue, p.EnrollmentMethodID, dbo.GetCohortGroupCustomisationID(p.ProgressID) AS GroupCustomisationID, p.SupervisorAdminID
-
+ 
 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 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 NOT p.CompleteByDate IS NULL)
 ORDER BY p.SubmittedTime Desc
-END
+END
+GO
+ 

DigitalLearningSolutions.Data.Migrations/Resources/TD-3671-Alter_GetCurrentCoursesForCandidate_V2_proc_down.sql

@@ -1,8 +1,10 @@
-/****** Object:  UserDefinedFunction [dbo].[CheckDelegateStatusForCustomisation]    Script Date: 08/05/2024 11:27:59 ******/
+/****** Object:  UserDefinedFunction [dbo].[CheckDelegateStatusForCustomisation]    Script Date: 16/05/2024 09:29:31 ******/
 SET ANSI_NULLS ON
 GO
+ 
 SET QUOTED_IDENTIFIER ON
 GO
+ 
 -- =============================================
 -- Author:		Kevin Whittaker
 -- Create date: 22/12/2016
@@ -27,13 +29,12 @@ BEGIN
 	-- Declare the return variable here
 	DECLARE @ResultVar int
 	Set @ResultVar = 0
-
+ 
 	-- Add the T-SQL statements to compute the return value here
-	
 	-- 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 NOT p.CompleteByDate IS NULL))
+WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND (SubmittedTime > DATEADD(M, - 6, GETDATE())  OR NOT p.CompleteByDate IS NULL))
 begin
 Set @ResultVar = 3
 goto onExit
@@ -49,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 (p.CompleteByDate IS NULL))
+WHERE (Completed IS NULL) AND (RemovedDate IS NULL) AND (CandidateID = @CandidateID) AND (SubmittedTime <= DATEADD(M, - 6, GETDATE())) AND (p.CompleteByDate IS NULL))
 begin
 Set @ResultVar = 1
 goto onExit
@@ -65,6 +66,8 @@ end
 	-- Return the result of the function
 	onExit:
 	RETURN @ResultVar
-
+ 
 END
-
+ 
+GO
+