Fixed #5 and also added some tests to the availability checker

PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs

@@ -0,0 +1,102 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: PlexAvailabilityCheckerTests.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using System;
+using System.Collections.Generic;
+
+using Moq;
+
+using NUnit.Framework;
+
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models;
+using PlexRequests.Core;
+using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers.Exceptions;
+using PlexRequests.Services.Interfaces;
+
+namespace PlexRequests.Services.Tests
+{
+    [TestFixture]
+    public class PlexAvailabilityCheckerTests
+    {
+        public IAvailabilityChecker Checker { get; set; }
+
+        [Test]
+        public void IsAvailableWithEmptySettingsTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Assert.Throws<ApplicationSettingsException>(() => Checker.IsAvailable("title"), "We should be throwing an exception since we cannot talk to the services.");
+        }
+
+        [Test]
+        public void IsAvailableTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch {Video = new List<Video> {new Video {Title = "title" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title");
+
+            Assert.That(result, Is.True);
+        }
+
+        [Test]
+        public void IsNotAvailableTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title");
+
+            Assert.That(result, Is.False);
+        }
+    }
+}

PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PlexRequests.Services.Tests</RootNamespace>
+    <AssemblyName>PlexRequests.Services.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise />
+  </Choose>
+  <ItemGroup>
+    <Compile Include="PlexAvailabilityCheckerTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj">
+      <Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
+      <Name>PlexRequests.Api.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Core\PlexRequests.Core.csproj">
+      <Project>{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}</Project>
+      <Name>PlexRequests.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
+      <Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
+      <Name>PlexRequests.Helpers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Services\PlexRequests.Services.csproj">
+      <Project>{566EFA49-68F8-4716-9693-A6B3F2624DEA}</Project>
+      <Name>PlexRequests.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

PlexRequests.Services.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PlexRequests.Services.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PlexRequests.Services.Tests")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("eaadb4ac-064f-4d3a-aff9-64a33131a9a7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

PlexRequests.Services.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net46" />
+  <package id="NUnit" version="3.2.0" targetFramework="net46" />
+</packages>

PlexRequests.Services/AvailabilityUpdateService.cs

@@ -36,6 +36,7 @@ using Mono.Data.Sqlite;
 
 using NLog;
 
+using PlexRequests.Api;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
@@ -51,7 +52,7 @@ namespace PlexRequests.Services
         {
             ConfigurationReader = new ConfigurationReader();
             var repo = new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider());
-            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new RequestService(new GenericRepository<RequestedModel>(new DbConfiguration(new SqliteFactory())))  );
+            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new RequestService(new GenericRepository<RequestedModel>(new DbConfiguration(new SqliteFactory()))), new PlexApi());
             HostingEnvironment.RegisterObject(this);
         }
 

PlexRequests.Services/Interfaces/IAvailabilityChecker.cs

@@ -29,5 +29,6 @@ namespace PlexRequests.Services.Interfaces
     public interface IAvailabilityChecker
     {
         void CheckAndUpdateAll(long check);
+        bool IsAvailable(string title);
     }
 }

PlexRequests.Services/PlexAvailabilityChecker.cs

@@ -29,9 +29,10 @@ using System.Linq;
 
 using NLog;
 
-using PlexRequests.Api;
+using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers.Exceptions;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Store;
 
@@ -39,17 +40,19 @@ namespace PlexRequests.Services
 {
     public class PlexAvailabilityChecker : IAvailabilityChecker
     {
-        public PlexAvailabilityChecker(ISettingsService<PlexSettings> plexSettings, ISettingsService<AuthenticationSettings> auth, IRequestService request)
+        public PlexAvailabilityChecker(ISettingsService<PlexSettings> plexSettings, ISettingsService<AuthenticationSettings> auth, IRequestService request, IPlexApi plex)
         {
             Plex = plexSettings;
             Auth = auth;
             RequestService = request;
+            PlexApi = plex;
         }
 
         private ISettingsService<PlexSettings> Plex { get; }
         private ISettingsService<AuthenticationSettings> Auth { get; }
         private IRequestService RequestService { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
+        private IPlexApi PlexApi { get; set; }
 
 
         public void CheckAndUpdateAll(long check)
@@ -58,23 +61,16 @@ namespace PlexRequests.Services
             var authSettings = Auth.GetSettings();
             var requests = RequestService.GetAll();
 
-            if (plexSettings.Ip == null || authSettings.PlexAuthToken == null || requests == null)
+            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            if (!ValidateSettings(plexSettings, authSettings, requestedModels))
             {
-                Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
-                return;
-            }
-            if (!requests.Any())
-            {
-                Log.Info("We have no requests to check if they are available on Plex.");
                 return;
             }
 
-            var api = new PlexApi();
-
             var modifiedModel = new List<RequestedModel>();
-            foreach (var r in requests)
+            foreach (var r in requestedModels)
             {
-                var results = api.SearchContent(authSettings.PlexAuthToken, r.Title, plexSettings.FullUri);
+                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, r.Title, plexSettings.FullUri);
                 var result = results.Video.FirstOrDefault(x => x.Title == r.Title);
                 var originalRequest = RequestService.Get(r.Id);
 
@@ -84,5 +80,51 @@ namespace PlexRequests.Services
 
             RequestService.BatchUpdate(modifiedModel);
         }
+
+        /// <summary>
+        /// Determines whether the specified search term is available.
+        /// </summary>
+        /// <param name="title">The search term.</param>
+        /// <returns></returns>
+        /// <exception cref="ApplicationSettingsException">The settings are not configured for Plex or Authentication</exception>
+        public bool IsAvailable(string title)
+        {
+            var plexSettings = Plex.GetSettings();
+            var authSettings = Auth.GetSettings();
+
+            if (!ValidateSettings(plexSettings, authSettings))
+            {
+                throw new ApplicationSettingsException("The settings are not configured for Plex or Authentication");
+            }
+
+            var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
+            var result = results.Video.FirstOrDefault(x => x.Title == title);
+            return result?.Title != null;
+        }
+
+        private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth, IEnumerable<RequestedModel> requests)
+        {
+            if (plex.Ip == null || auth.PlexAuthToken == null || requests == null)
+            {
+                Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
+                return false;
+            }
+            if (!requests.Any())
+            {
+                Log.Info("We have no requests to check if they are available on Plex.");
+                return false;
+            }
+            return true;
+        }
+
+        private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth)
+        {
+            if (plex?.Ip == null || auth?.PlexAuthToken == null)
+            {
+                Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
+                return false;
+            }
+            return true;
+        }
     }
 }

PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj

@@ -66,8 +66,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Ploeh.AutoFixture, Version=3.40.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">

PlexRequests.UI.Tests/packages.config

@@ -9,5 +9,5 @@
   <package id="Nancy.Testing" version="1.4.1" targetFramework="net46" />
   <package id="Nancy.Viewengines.Razor" version="1.4.3" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net46" />
-  <package id="NUnit" version="3.0.1" targetFramework="net452" />
+  <package id="NUnit" version="3.2.0" targetFramework="net46" />
 </packages>

PlexRequests.UI/Modules/SearchModule.cs

@@ -38,7 +38,6 @@ using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Store;
-using PlexRequests.UI.Jobs;
 using PlexRequests.UI.Models;
 
 namespace PlexRequests.UI.Modules
@@ -47,7 +46,8 @@ namespace PlexRequests.UI.Modules
     {
         public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings> cpSettings,
             ISettingsService<PlexRequestSettings> prSettings, IAvailabilityChecker checker,
-            IRequestService request, ISonarrApi sonarrApi, ISettingsService<SonarrSettings> sonarrSettings) : base("search")
+            IRequestService request, ISonarrApi sonarrApi, ISettingsService<SonarrSettings> sonarrSettings,
+            ICouchPotatoApi cpApi) : base("search")
         {
             CpService = cpSettings;
             PrService = prSettings;
@@ -58,6 +58,7 @@ namespace PlexRequests.UI.Modules
             RequestService = request;
             SonarrApi = sonarrApi;
             SonarrService = sonarrSettings;
+            CouchPotatoApi = cpApi;
 
             Get["/"] = parameters => RequestLoad();
 
@@ -71,6 +72,7 @@ namespace PlexRequests.UI.Modules
             Post["request/tv"] = parameters => RequestTvShow((int)Request.Form.tvId, (bool)Request.Form.latest);
         }
         private TheMovieDbApi MovieApi { get; }
+        private ICouchPotatoApi CouchPotatoApi { get; }
         private ISonarrApi SonarrApi { get; }
         private TheTvDbApi TvApi { get; }
         private IRequestService RequestService { get; }
@@ -168,15 +170,17 @@ namespace PlexRequests.UI.Modules
             if (RequestService.CheckRequest(movieId))
             {
                 Log.Trace("movie with id {0} exists", movieId);
-                return Response.AsJson(new { Result = false, Message = "Movie has already been requested!" });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Movie has already been requested!" });
             }
+
             Log.Debug("movie with id {0} doesnt exists", movieId);
             var cpSettings = CpService.GetSettings();
             if (cpSettings.ApiKey == null)
             {
                 Log.Warn("CP apiKey is null");
-                return Response.AsJson(new { Result = false, Message = "CouchPotato is not yet configured, If you are the Admin, please log in." });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "CouchPotato is not yet configured, If you are the Admin, please log in." });
             }
+
             Log.Trace("Settings: ");
             Log.Trace(cpSettings.DumpJson);
 
@@ -185,6 +189,11 @@ namespace PlexRequests.UI.Modules
             Log.Trace("Getting movie info from TheMovieDb");
             Log.Trace(movieInfo.DumpJson);
 
+            if (CheckIfTitleExistsInPlex(movieInfo.Title))
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{movieInfo.Title} is already in Plex!" });
+            }
+
             var model = new RequestedModel
             {
                 ProviderId = movieInfo.Id,
@@ -206,9 +215,8 @@ namespace PlexRequests.UI.Modules
             Log.Trace(settings.DumpJson());
             if (!settings.RequireApproval)
             {
-                var cp = new CouchPotatoApi();
                 Log.Info("Adding movie to CP (No approval required)");
-                var result = cp.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri);
+                var result = CouchPotatoApi.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri);
                 Log.Debug("Adding movie to CP result {0}", result);
                 if (result)
                 {
@@ -216,9 +224,9 @@ namespace PlexRequests.UI.Modules
                     Log.Debug("Adding movie to database requests (No approval required)");
                     RequestService.AddRequest(movieId, model);
 
-                    return Response.AsJson(new { Result = true });
+                    return Response.AsJson(new JsonResponseModel { Result = true });
                 }
-                return Response.AsJson(new { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
             }
 
             try
@@ -227,13 +235,13 @@ namespace PlexRequests.UI.Modules
                 var id = RequestService.AddRequest(movieId, model);
                 //BackgroundJob.Enqueue(() => Checker.CheckAndUpdate(model.Title, (int)id));
 
-                return Response.AsJson(new { Result = true });
+                return Response.AsJson(new JsonResponseModel { Result = true });
             }
             catch (Exception e)
             {
                 Log.Fatal(e);
 
-                return Response.AsJson(new { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
             }
         }
 
@@ -247,14 +255,19 @@ namespace PlexRequests.UI.Modules
         {
             if (RequestService.CheckRequest(showId))
             {
-                return Response.AsJson(new { Result = false, Message = "TV Show has already been requested!" });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "TV Show has already been requested!" });
             }
 
             var tvApi = new TheTvDbApi();
-            var token = GetAuthToken(tvApi);
+            var token = GetTvDbAuthToken(tvApi);
 
             var showInfo = tvApi.GetInformation(showId, token).data;
 
+            if (CheckIfTitleExistsInPlex(showInfo.seriesName))
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.seriesName} is already in Plex!" });
+            }
+
             DateTime firstAir;
             DateTime.TryParse(showInfo.firstAired, out firstAir);
 
@@ -271,7 +284,7 @@ namespace PlexRequests.UI.Modules
                 Approved = false,
                 RequestedBy = Session[SessionKeys.UsernameKey].ToString(),
                 Issues = IssueState.None,
-                LatestTv =  latest
+                LatestTv = latest
             };
 
             RequestService.AddRequest(showId, model);
@@ -292,9 +305,15 @@ namespace PlexRequests.UI.Modules
 
             return Response.AsJson(new { Result = true });
         }
-        private string GetAuthToken(TheTvDbApi api)
+        private string GetTvDbAuthToken(TheTvDbApi api)
         {
             return Cache.GetOrSet(CacheKeys.TvDbToken, api.Authenticate, 50);
         }
+
+        private bool CheckIfTitleExistsInPlex(string title)
+        {
+            var result = Checker.IsAvailable(title);
+            return result;
+        }
     }
 }

PlexRequests.sln

@@ -31,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Services", "Pl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api.Models", "PlexRequests.Api.Models\PlexRequests.Api.Models.csproj", "{CB37A5F8-6DFC-4554-99D3-A42B502E4591}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Services.Tests", "PlexRequests.Services.Tests\PlexRequests.Services.Tests.csproj", "{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -77,6 +79,10 @@ Global
 		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE