TD-4751-Resolving the code comments obtained on the existing PR

Author: ABSinhaa

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -122,7 +122,7 @@ IEnumerable<CourseDelegateForExport> GetCourseDelegatesForExport(string searchSt
             int customisationId, int centreId, bool? isDelegateActive, bool? isProgressLocked, bool? removed, bool? hasCompleted, string? answer1, string? answer2, string? answer3);
 
         int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail,
-            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId);
+            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId);
 
         bool IsCourseCompleted(int candidateId, int customisationId);
         bool IsCourseCompleted(int candidateId, int customisationId, int progressID);
@@ -442,7 +442,7 @@ public void RemoveCurrentCourse(int progressId, int candidateId, RemovalMethod r
         }
 
         public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail,
-            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId)
+            int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId)
         {
             IClockUtility clockUtility = new ClockUtility();
             DateTime startedDate = clockUtility.UtcNow;
@@ -563,7 +563,7 @@ BEGIN TRANSACTION
             if (supervisorId > 0)
             {
 
-                adminUserId = Convert.ToInt32(connection.ExecuteScalar(@"SELECT UserID FROM AdminAccounts WHERE (AdminAccounts.ID = @supervisorId)",
+                var adminUserId = Convert.ToInt32(connection.ExecuteScalar(@"SELECT UserID FROM AdminAccounts WHERE (AdminAccounts.ID = @supervisorId)",
                     new { supervisorId })
                     );
 

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EnrolController.cs

@@ -326,7 +326,7 @@ public IActionResult EnrolDelegateSummary()
                     sessionEnrol.CompleteByDate,
                     (int)sessionEnrol.DelegateUserID,
                     centreId,
-                    GetAdminID(),0
+                    GetAdminID()
                     );
 
             }

DigitalLearningSolutions.Web/Services/EnrolService.cs

@@ -43,8 +43,7 @@ int EnrolOnActivitySelfAssessment(
             DateTime? completeByDate,
             int delegateUserId,
             int centreId,
-            int? enrolledByAdminId,
-            int? adminUserId
+            int? enrolledByAdminId
             );
     }
     public class EnrolService : IEnrolService
@@ -185,9 +184,9 @@ by the system because a previous course completion has expired.</p>
             return new Email(EnrolEmailSubject, body, emailAddress);
         }
 
-        public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail, int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId, int? adminUserId)
+        public int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int supervisorId, string adminEmail, int selfAssessmentSupervisorRoleId, DateTime? completeByDate, int delegateUserId, int centreId, int? enrolledByAdminId)
         {
-            return courseDataService.EnrolOnActivitySelfAssessment(selfAssessmentId, candidateId, supervisorId, adminEmail, selfAssessmentSupervisorRoleId, completeByDate, delegateUserId, centreId, enrolledByAdminId, adminUserId);
+            return courseDataService.EnrolOnActivitySelfAssessment(selfAssessmentId, candidateId, supervisorId, adminEmail, selfAssessmentSupervisorRoleId, completeByDate, delegateUserId, centreId, enrolledByAdminId);
         }
     }
 }