Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202503121538_Alter_SendExpiredTBCReminders.cs

@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202503121538)]
+    public class Alter_SendExpiredTBCReminders : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Down);
+        }
+    }
+}

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

@@ -469,13 +469,10 @@
   <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="TD_5412_Alter_SendExpiredTBCReminders_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
-  </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  <data name="TD_5412_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
 </root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -103,7 +103,7 @@ public void ApproveAllUnapprovedDelegatesForCentre(int centreId)
 
         public void RejectDelegate(int delegateId, int centreId)
         {
-            var delegateEntity = userDataService.GetDelegateById(delegateId);
+            var delegateEntity = userDataService.GetDelegateById(delegateId);         
 
             if (delegateEntity == null || delegateEntity.DelegateAccount.CentreId != centreId)
             {
@@ -127,6 +127,7 @@ public void RejectDelegate(int delegateId, int centreId)
             else
             {
                 userDataService.RemoveDelegateAccount(delegateId);
+                userDataService.DeleteUserCentreDetail(delegateEntity.UserAccount.Id, centreId);
             }
 
             SendRejectionEmail(delegateEntity);