TD-937 Tweaks self assessment queries to use SQL date grouping

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/PlatformReportsDataService.cs

@@ -41,7 +41,7 @@ public class PlatformReportsDataService : IPlatformReportsDataService
     {
         private readonly IDbConnection connection;
         private readonly ILogger<PlatformReportsDataService> logger;
-        private readonly string selectSelfAssessmentActivity = @"SELECT al.ActivityDate, al.Enrolled, al.Submitted | al.SignedOff AS Completed
+        private readonly string selectSelfAssessmentActivity = @"SELECT Cast(al.ActivityDate As Date) As ActivityDate, SUM(CAST(al.Enrolled AS Int)) AS Enrolled, SUM(CAST((al.Submitted | al.SignedOff) AS Int)) AS Completed
                                                                     FROM   ReportSelfAssessmentActivityLog AS al WITH (NOLOCK) INNER JOIN
                                                                                      Centres AS ce WITH (NOLOCK) ON al.CentreID = ce.CentreID INNER JOIN
                                                                                      SelfAssessments AS sa WITH (NOLOCK) ON sa.ID = al.SelfAssessmentID
@@ -116,7 +116,7 @@ public IEnumerable<SelfAssessmentActivity> GetSelfAssessmentActivity(
         {
             var whereClause = GetSelfAssessmentWhereClause(supervised);
             return connection.Query<SelfAssessmentActivity>(
-                  $@"{selectSelfAssessmentActivity} AND {whereClause}",
+                  $@"{selectSelfAssessmentActivity} AND {whereClause} GROUP BY  Cast(al.ActivityDate As Date)",
                   new
                   {
                       centreId,

DigitalLearningSolutions.Data/Models/PlatformReports/SelfAssessmentActivity.cs

@@ -4,7 +4,7 @@
     public class SelfAssessmentActivity
     {
         public DateTime ActivityDate { get; set; }
-        public bool Enrolled { get; set; }
-        public bool Completed { get; set; }
+        public int Enrolled { get; set; }
+        public int Completed { get; set; }
     }
 }

DigitalLearningSolutions.Web/Services/PlatformReportService.cs

@@ -97,8 +97,8 @@ ReportInterval interval
                         new DateTime(groupingOfLogs.Key),
                         interval
                     ),
-                    groupingOfLogs.Count(activityLog => activityLog.Enrolled),
-                    groupingOfLogs.Count(activityLog => activityLog.Completed)
+                    groupingOfLogs.Sum(activityLog => activityLog.Enrolled),
+                    groupingOfLogs.Sum(activityLog => activityLog.Completed)
                 )
             );
         }