From 4afec69c79b2a4e3d59b66207523d08d509e374b Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Sat, 20 Apr 2013 14:23:17 -0700
Subject: [PATCH] fixed series statistics query.

---
 NzbDrone.Core/Datastore/MappingExtensions.cs | 17 ++++++++++++++---
 NzbDrone.Core/Datastore/ResultSet.cs         |  6 ++++++
 NzbDrone.Core/Datastore/TableMapping.cs      |  4 +---
 NzbDrone.Core/NzbDrone.Core.csproj           |  1 +
 NzbDrone.Core/Tv/SeriesRepository.cs         |  2 +-
 NzbDrone.Core/Tv/SeriesStatistics.cs         |  9 +++++++--
 6 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 NzbDrone.Core/Datastore/ResultSet.cs

diff --git a/NzbDrone.Core/Datastore/MappingExtensions.cs b/NzbDrone.Core/Datastore/MappingExtensions.cs
index 468f6bfdf..efd23f909 100644
--- a/NzbDrone.Core/Datastore/MappingExtensions.cs
+++ b/NzbDrone.Core/Datastore/MappingExtensions.cs
@@ -1,16 +1,27 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using Marr.Data;
 using Marr.Data.Mapping;
+using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Datastore
 {
     public static class MappingExtensions
     {
-        public static ColumnMapBuilder<T> RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName) where T : ModelBase
+
+        public static ColumnMapBuilder<T> MapResultSet<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder) where T : ResultSet, new()
+        {
+            return mapBuilder
+                .Columns
+                .AutoMapPropertiesWhere(IsMappableProperty);
+        }
+
+
+        public static ColumnMapBuilder<T> RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName = null) where T : ModelBase, new()
         {
+
+
+
             return mapBuilder.Table.MapTable(tableName)
                              .Columns
                              .AutoMapPropertiesWhere(IsMappableProperty)
diff --git a/NzbDrone.Core/Datastore/ResultSet.cs b/NzbDrone.Core/Datastore/ResultSet.cs
new file mode 100644
index 000000000..2bb2b4169
--- /dev/null
+++ b/NzbDrone.Core/Datastore/ResultSet.cs
@@ -0,0 +1,6 @@
+namespace NzbDrone.Core.Datastore
+{
+    public class ResultSet
+    {
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/TableMapping.cs b/NzbDrone.Core/Datastore/TableMapping.cs
index a133e67f3..c11027d79 100644
--- a/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/NzbDrone.Core/Datastore/TableMapping.cs
@@ -57,9 +57,7 @@ namespace NzbDrone.Core.Datastore
 
             Mapper.Entity<Log>().RegisterModel("Logs");
 
-            Mapper.Entity<SeriesStatistics>()
-                  .Columns
-                  .AutoMapPropertiesWhere(MappingExtensions.IsMappableProperty);
+            Mapper.Entity<SeriesStatistics>().MapResultSet();
         }
 
 
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 0949857c7..33d629786 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -356,6 +356,7 @@
     <Compile Include="Tv\Events\SeriesAddedEvent.cs" />
     <Compile Include="Tv\Events\SeriesDeletedEvent.cs" />
     <Compile Include="Tv\Events\SeriesUpdatedEvent.cs" />
+    <Compile Include="Datastore\ResultSet.cs" />
     <Compile Include="Tv\SeasonRepository.cs" />
     <Compile Include="Tv\SeriesRepository.cs" />
     <Compile Include="Tv\QualityModel.cs" />
diff --git a/NzbDrone.Core/Tv/SeriesRepository.cs b/NzbDrone.Core/Tv/SeriesRepository.cs
index 023365510..624ce030c 100644
--- a/NzbDrone.Core/Tv/SeriesRepository.cs
+++ b/NzbDrone.Core/Tv/SeriesRepository.cs
@@ -65,7 +65,7 @@ namespace NzbDrone.Core.Tv
                               SUM(CASE WHEN Airdate <= @currentDate THEN 1 ELSE 0 END) AS EpisodeCount,
                               SUM(CASE WHEN EpisodeFileId > 0 AND AirDate <= @currentDate THEN 1 ELSE 0 END) as EpisodeFileCount,
                               MAX(SeasonNumber) as NumberOfSeasons,
-                              MIN(CASE WHEN AirDate < @currentDate THEN NULL ELSE AirDate END) as NextAiring
+                              MIN(CASE WHEN AirDate < @currentDate THEN NULL ELSE AirDate END) as NextAiringString
                               FROM Episodes
                               WHERE Ignored = 0
                               GROUP BY SeriesId";
diff --git a/NzbDrone.Core/Tv/SeriesStatistics.cs b/NzbDrone.Core/Tv/SeriesStatistics.cs
index 5e9bfc228..a1d113026 100644
--- a/NzbDrone.Core/Tv/SeriesStatistics.cs
+++ b/NzbDrone.Core/Tv/SeriesStatistics.cs
@@ -1,12 +1,17 @@
 using System;
+using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Core.Tv
 {
-    public class SeriesStatistics
+    public class SeriesStatistics : ResultSet
     {
         public int SeriesId { get; set; }
         public int NumberOfSeasons { get; set; }
-        public DateTime? NextAiring { get; set; }
+        public string NextAiringString { get; set; }
+        public DateTime? NextAiring
+        {
+            get { return Convert.ToDateTime(NextAiringString); }
+        }
         public int EpisodeFileCount { get; set; }
         public int EpisodeCount { get; set; }
     }