TD-937 Groups data returned from DB by date to reduce number of rows retrieved

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Tests/DataServices/ActivityDataServiceTests.cs

@@ -33,8 +33,8 @@ public void GetFilteredActivity_gets_expected_activity()
             // when
             var result = service.GetFilteredActivity(
                     101,
-                    DateTime.Parse("2014-01-01 00:00:00.000"),
-                    DateTime.Parse("2014-01-31 23:59:59.999"),
+                    DateTime.Parse("2014-01-01"),
+                    DateTime.Parse("2014-01-31"),
                     null,
                     null,
                     null
@@ -48,22 +48,22 @@ public void GetFilteredActivity_gets_expected_activity()
                 result.Count().Should().Be(9);
 
                 var first = result.First();
-                first.LogDate.Should().Be(DateTime.Parse("2014-01-08 11:04:35.753"));
+                first.LogDate.Should().Be(DateTime.Parse("2014-01-08"));
                 first.LogYear.Should().Be(2014);
                 first.LogQuarter.Should().Be(1);
                 first.LogMonth.Should().Be(1);
-                first.Completed.Should().BeFalse();
-                first.Evaluated.Should().BeFalse();
-                first.Registered.Should().BeTrue();
+                first.Completed.Should().Equals(0);
+                first.Evaluated.Should().Equals(0);
+                first.Registered.Should().Equals(1);
 
                 var last = result.Last();
-                last.LogDate.Should().Be(DateTime.Parse("2014-01-31 09:43:28.840"));
+                last.LogDate.Should().Be(DateTime.Parse("2014-01-31"));
                 last.LogYear.Should().Be(2014);
                 last.LogQuarter.Should().Be(1);
                 last.LogMonth.Should().Be(1);
-                last.Completed.Should().BeFalse();
-                last.Evaluated.Should().BeFalse();
-                last.Registered.Should().BeTrue();
+                last.Completed.Should().Equals(0);
+                last.Evaluated.Should().Equals(0);
+                last.Registered.Should().Equals(1);
             }
         }
 

DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs

@@ -40,13 +40,13 @@ public IEnumerable<ActivityLog> GetFilteredActivity(
         {
             return connection.Query<ActivityLog>(
                 @"SELECT
-                        LogDate,
+                        Cast(LogDate As Date) As LogDate,
                         LogYear,
                         LogQuarter,
                         LogMonth,
-                        Registered,
-                        Completed,
-                        Evaluated
+                        SUM(CAST(Registered AS Int)) AS Registered,
+						SUM(CAST(Completed AS Int)) AS Completed,
+						SUM(CAST(Evaluated AS Int)) AS Evaluated
                     FROM tActivityLog AS al
                     WHERE (LogDate >= @startDate
                         AND (@endDate IS NULL OR LogDate <= @endDate)
@@ -59,7 +59,10 @@ AND EXISTS (
                             SELECT ap.ApplicationID
                             FROM Applications ap
                             WHERE ap.ApplicationID = al.ApplicationID
-                            AND ap.DefaultContentTypeID <> 4)",
+                            AND ap.DefaultContentTypeID <> 4)
+                    GROUP BY  Cast(LogDate As Date), LogYear,
+                        LogQuarter,
+                        LogMonth",
                 new
                 {
                     centreId,

DigitalLearningSolutions.Data/DataServices/PlatformReportsDataService.cs

@@ -157,13 +157,13 @@ public IEnumerable<ActivityLog> GetFilteredCourseActivity(
         {
             return connection.Query<ActivityLog>(
                 @"SELECT
-                        LogDate,
-                        LogYear,
+                        Cast(LogDate As Date) As LogDate,
+						LogYear,
                         LogQuarter,
                         LogMonth,
-                        Registered,
-                        Completed,
-                        Evaluated
+                        SUM(CAST(Registered AS Int)) AS Registered,
+						SUM(CAST(Completed AS Int)) AS Completed,
+						SUM(CAST(Evaluated AS Int)) AS Evaluated
                     FROM tActivityLog AS al WITH(NOLOCK) INNER JOIN
                          Applications AS ap WITH(NOLOCK) ON ap.ApplicationID = al.ApplicationID INNER JOIN
                          Centres AS ce  WITH(NOLOCK) ON al.CentreID = ce.CentreID
@@ -178,7 +178,10 @@ Centres AS ce  WITH(NOLOCK) ON al.CentreID = ce.CentreID
                         AND (@centreTypeID IS NULL OR ce.CentreTypeID = @centreTypeID)
                         AND (@brandId IS NULL OR al.BrandID = @brandId)
                         AND (al.Registered = 1 OR al.Completed = 1 OR al.Evaluated = 1)
-                        AND (@coreContent IS NULL OR ap.CoreContent = @coreContent)",
+                        AND (@coreContent IS NULL OR ap.CoreContent = @coreContent)
+					GROUP BY  Cast(LogDate As Date), LogYear,
+                        LogQuarter,
+                        LogMonth",
                 new
                 {
                     centreId,

DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLog.cs

@@ -8,8 +8,8 @@ public class ActivityLog
         public int LogYear { get; set; }
         public int LogQuarter { get; set; }
         public int LogMonth { get; set; }
-        public bool Registered { get; set; }
-        public bool Completed { get; set; }
-        public bool Evaluated { get; set; }
+        public int Registered { get; set; }
+        public int Completed { get; set; }
+        public int Evaluated { get; set; }
     }
 }

DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs

@@ -82,9 +82,9 @@ string expectedLogDateForCompletion
             {
                 new ActivityLog
                 {
-                    Completed = true,
-                    Evaluated = false,
-                    Registered = false,
+                    Completed = 1,
+                    Evaluated = 0,
+                    Registered = 0,
                     LogDate = DateTime.Parse("2015-12-22"),
                     LogYear = 2015,
                     LogQuarter = 4,
@@ -575,9 +575,9 @@ private void GivenActivityDataServiceReturnsDataInExampleSheet()
             {
                 new ActivityLog
                 {
-                    Completed = true,
-                    Evaluated = false,
-                    Registered = false,
+                    Completed = 1,
+                    Evaluated = 0,
+                    Registered = 0,
                     LogDate = DateTime.Parse("2020-12-22"),
                     LogYear = 2020,
                     LogQuarter = 4,

DigitalLearningSolutions.Web/Services/ActivityService.cs

@@ -201,9 +201,9 @@ ReportInterval interval
                         new DateTime(groupingOfLogs.Key),
                         interval
                     ),
-                    groupingOfLogs.Count(activityLog => activityLog.Registered),
-                    groupingOfLogs.Count(activityLog => activityLog.Completed),
-                    groupingOfLogs.Count(activityLog => activityLog.Evaluated)
+                    groupingOfLogs.Sum(activityLog => activityLog.Registered),
+                    groupingOfLogs.Sum(activityLog => activityLog.Completed),
+                    groupingOfLogs.Sum(activityLog => activityLog.Evaluated)
                 )
             );
         }

DigitalLearningSolutions.Web/Services/PlatformReportService.cs

@@ -172,9 +172,9 @@ ReportInterval interval
                         new DateTime(groupingOfLogs.Key),
                         interval
                     ),
-                    groupingOfLogs.Count(activityLog => activityLog.Registered),
-                    groupingOfLogs.Count(activityLog => activityLog.Completed),
-                    groupingOfLogs.Count(activityLog => activityLog.Evaluated)
+                    groupingOfLogs.Sum(activityLog => activityLog.Registered),
+                    groupingOfLogs.Sum(activityLog => activityLog.Completed),
+                    groupingOfLogs.Sum(activityLog => activityLog.Evaluated)
                 )
             );
         }