From 0da2047ca55499c1fc2e82f0fc0c936dab9d3097 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 30 Apr 2013 17:25:33 -0700
Subject: [PATCH] Missing uses EpisodeResource now

---
 NzbDrone.Api/AutomapperBootstraper.cs   |  5 -----
 NzbDrone.Api/Missing/MissingModule.cs   |  5 ++++-
 NzbDrone.Api/Missing/MissingResource.cs | 17 -----------------
 NzbDrone.Api/NzbDrone.Api.csproj        |  1 -
 UI/Missing/MissingCollection.js         |  4 ++--
 UI/Missing/MissingItemTemplate.html     |  2 +-
 UI/Missing/MissingModel.js              | 13 -------------
 UI/Series/EpisodeModel.js               |  7 ++++++-
 8 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 NzbDrone.Api/Missing/MissingResource.cs
 delete mode 100644 UI/Missing/MissingModel.js

diff --git a/NzbDrone.Api/AutomapperBootstraper.cs b/NzbDrone.Api/AutomapperBootstraper.cs
index 10a1219f0..3031bdcaf 100644
--- a/NzbDrone.Api/AutomapperBootstraper.cs
+++ b/NzbDrone.Api/AutomapperBootstraper.cs
@@ -46,11 +46,6 @@ namespace NzbDrone.Api
 
             //Episode
             Mapper.CreateMap<Episode, EpisodeResource>();
-
-            //Missing
-            Mapper.CreateMap<Episode, MissingResource>()
-                  .ForMember(dest => dest.SeriesTitle, opt => opt.MapFrom(src => src.Series.Title))
-                  .ForMember(dest => dest.EpisodeTitle, opt => opt.MapFrom(src => src.Title));
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Api/Missing/MissingModule.cs b/NzbDrone.Api/Missing/MissingModule.cs
index 026b9b4ed..c0e81f05a 100644
--- a/NzbDrone.Api/Missing/MissingModule.cs
+++ b/NzbDrone.Api/Missing/MissingModule.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
 using Nancy;
+using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Tv;
 
@@ -25,7 +26,9 @@ namespace NzbDrone.Api.Missing
             Boolean.TryParse(PrimitiveExtensions.ToNullSafeString(Request.Query.IncludeSpecials), out includeSpecials);
 
             var episodes = _episodeService.EpisodesWithoutFiles(includeSpecials);
-            return Mapper.Map<List<Episode>, List<MissingResource>>(episodes).AsResponse();
+
+            //TODO: Include the Series Title
+            return Mapper.Map<List<Episode>, List<EpisodeResource>>(episodes).AsResponse();
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Api/Missing/MissingResource.cs b/NzbDrone.Api/Missing/MissingResource.cs
deleted file mode 100644
index 00a65dd96..000000000
--- a/NzbDrone.Api/Missing/MissingResource.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Linq;
-
-namespace NzbDrone.Api.Missing
-{
-    public class MissingResource
-    {
-        public Int32 SeriesId { get; set; }
-        public String SeriesTitle { get; set; }
-        public Int32 EpisodeId { get; set; }
-        public String EpisodeTitle { get; set; }
-        public Int32 SeasonNumber { get; set; }
-        public Int32 EpisodeNumber { get; set; }
-        public DateTime? AirDate { get; set; }
-        public String Overview { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 576967a02..c410dc1a9 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -101,7 +101,6 @@
     <Compile Include="Mapping\MappingValidation.cs" />
     <Compile Include="Mapping\ResourceMappingException.cs" />
     <Compile Include="Mapping\ValueInjectorExtensions.cs" />
-    <Compile Include="Missing\MissingResource.cs" />
     <Compile Include="Missing\MissingModule.cs" />
     <Compile Include="NzbDroneRestModule.cs" />
     <Compile Include="Resolvers\EndTimeResolver.cs" />
diff --git a/UI/Missing/MissingCollection.js b/UI/Missing/MissingCollection.js
index e42ca97b9..d8db13da4 100644
--- a/UI/Missing/MissingCollection.js
+++ b/UI/Missing/MissingCollection.js
@@ -1,8 +1,8 @@
 "use strict";
-define(['app', 'Missing/MissingModel'], function () {
+define(['app', 'Series/EpisodeModel'], function () {
     NzbDrone.Missing.MissingCollection = Backbone.Collection.extend({
         url       : NzbDrone.Constants.ApiRoot + '/missing',
-        model     : NzbDrone.Missing.MissingModel,
+        model     : NzbDrone.Series.EpisodeModel,
         comparator: function (model) {
             return model.get('airDate');
         }
diff --git a/UI/Missing/MissingItemTemplate.html b/UI/Missing/MissingItemTemplate.html
index 779ffee63..4ef1004b9 100644
--- a/UI/Missing/MissingItemTemplate.html
+++ b/UI/Missing/MissingItemTemplate.html
@@ -1,5 +1,5 @@
 <td><a href="/series/details/{{seriesId}}">{{seriesTitle}}</a></td>
 <td>{{seasonNumber}}x{{paddedEpisodeNumber}}</td>
-<td name="episodeTitle"></td>
+<td name="title"></td>
 <td><span title="{{formatedDateString}}" data-date="{{airDate}}">{{bestDateString}}</span></td>
 <td><i class="icon-search x-search" title="Search for Episode"></i></td>
\ No newline at end of file
diff --git a/UI/Missing/MissingModel.js b/UI/Missing/MissingModel.js
deleted file mode 100644
index da6c4466b..000000000
--- a/UI/Missing/MissingModel.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-define(['app'], function () {
-    NzbDrone.Missing.MissingModel = Backbone.Model.extend({
-        mutators: {
-            bestDateString     : function () {
-                return bestDateString(this.get('airDate'));
-            },
-            paddedEpisodeNumber: function () {
-                return this.get('episodeNumber');
-            }
-        }
-    });
-});
diff --git a/UI/Series/EpisodeModel.js b/UI/Series/EpisodeModel.js
index 5e8f8b7a7..46b6aab66 100644
--- a/UI/Series/EpisodeModel.js
+++ b/UI/Series/EpisodeModel.js
@@ -3,7 +3,12 @@ define(['app'], function () {
     NzbDrone.Series.EpisodeModel = Backbone.Model.extend({
 
         mutators: {
-
+            bestDateString     : function () {
+                return bestDateString(this.get('airDate'));
+            },
+            paddedEpisodeNumber: function () {
+                return this.get('episodeNumber');
+            }
         },
 
         defaults: {