Started on #16, nothing is hooked up yet.

PlexRequests.Core/IRequestService.cs

@@ -35,7 +35,7 @@ namespace PlexRequests.Core
         long AddRequest(int providerId, RequestedModel model);
         bool CheckRequest(int providerId);
         void DeleteRequest(int tmdbId);
-        void UpdateRequest(int originalId, RequestedModel model);
+        void UpdateRequest(RequestedModel model);
         RequestedModel Get(int id);
         IEnumerable<RequestedModel> GetAll();
         bool BatchUpdate(List<RequestedModel> model);

PlexRequests.Core/JsonRequestService.cs

@@ -0,0 +1,100 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: JsonRequestService.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.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Newtonsoft.Json;
+
+using PlexRequests.Store;
+using PlexRequests.Store.Models;
+
+namespace PlexRequests.Core
+{
+    public class JsonRequestService : IRequestService
+    {
+        public JsonRequestService(IRequestRepository repo)
+        {
+            Repo = repo;
+        }
+        private IRequestRepository Repo { get; }
+        public long AddRequest(int providerId, RequestedModel model)
+        {
+            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId};
+
+           return Repo.Insert(entity);
+        }
+
+        public bool CheckRequest(int providerId)
+        {
+            var blobs = Repo.GetAll();
+            return blobs.Any(x => x.ProviderId == providerId);
+        }
+
+        public void DeleteRequest(int tmdbId)
+        {
+            var blob = Repo.GetAll().FirstOrDefault(x => x.ProviderId == tmdbId);
+            Repo.Delete(blob);
+        }
+
+        public void UpdateRequest(RequestedModel model)
+        {
+            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id};
+            Repo.Update(entity);
+        }
+
+        public RequestedModel Get(int id)
+        {
+            var blob = Repo.Get(id);
+            var json = Encoding.UTF8.GetString(blob.Content);
+            var model = JsonConvert.DeserializeObject<RequestedModel>(json);
+            return model;
+        }
+
+        public IEnumerable<RequestedModel> GetAll()
+        {
+            var blobs = Repo.GetAll();
+            return blobs.Select(b => Encoding.UTF8.GetString(b.Content))
+                .Select(JsonConvert.DeserializeObject<RequestedModel>)
+                .ToList();
+        }
+
+        public bool BatchUpdate(List<RequestedModel> model)
+        {
+            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId }).ToList();
+            return Repo.UpdateAll(entities);
+        }
+
+        public byte[] ReturnBytes(object obj)
+        {
+            var json = JsonConvert.SerializeObject(obj);
+            var bytes = Encoding.UTF8.GetBytes(json);
+
+            return bytes;
+        }
+    }
+}

PlexRequests.Core/PlexRequests.Core.csproj

@@ -70,6 +70,7 @@
     <Compile Include="CacheKeys.cs" />
     <Compile Include="IRequestService.cs" />
     <Compile Include="ISettingsService.cs" />
+    <Compile Include="JsonRequestService.cs" />
     <Compile Include="Models\StatusModel.cs" />
     <Compile Include="SettingModels\AuthenticationSettings.cs" />
     <Compile Include="SettingModels\PushBulletNotificationSettings.cs" />

PlexRequests.Core/RequestService.cs

@@ -56,9 +56,9 @@ namespace PlexRequests.Core
             Repo.Delete(entity);
         }
 
-        public void UpdateRequest(int originalId, RequestedModel model)
+        public void UpdateRequest(RequestedModel model)
         {
-            model.Id = originalId;
+
             Repo.Update(model);
         }
 

PlexRequests.Core/Setup.cs

@@ -60,7 +60,7 @@ namespace PlexRequests.Core
                 SearchForTvShows = true,
                 WeeklyRequestLimit = 0
             };
-            var s = new SettingsServiceV2<PlexRequestSettings>(new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
+            var s = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
             s.SaveSettings(defaultSettings);
         }
     }

PlexRequests.Services/AvailabilityUpdateService.cs

@@ -49,7 +49,7 @@ namespace PlexRequests.Services
         public AvailabilityUpdateService()
         {
             ConfigurationReader = new ConfigurationReader();
-            var repo = new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider());
+            var repo = new SettingsJsonRepository(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()))), new PlexApi());
             HostingEnvironment.RegisterObject(this);
         }

PlexRequests.Store/IRequestRepository.cs

@@ -0,0 +1,65 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: ISettingsRepository.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.Collections.Generic;
+
+using PlexRequests.Store.Models;
+
+namespace PlexRequests.Store
+{
+    public interface IRequestRepository
+    {
+        /// <summary>
+        /// Inserts the specified entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        long Insert(RequestBlobs entity);
+
+        /// <summary>
+        /// Gets all.
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<RequestBlobs> GetAll();
+
+        RequestBlobs Get(int id);
+
+        /// <summary>
+        /// Deletes the specified entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns></returns>
+        bool Delete(RequestBlobs entity);
+
+        /// <summary>
+        /// Updates the specified entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns></returns>
+        bool Update(RequestBlobs entity);
+
+        bool UpdateAll(IEnumerable<RequestBlobs> entity);
+    }
+}

PlexRequests.Store/Models/RequestBlobs.cs

@@ -0,0 +1,38 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: RequestBlobs.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 Dapper.Contrib.Extensions;
+
+namespace PlexRequests.Store.Models
+{
+    [Table("RequestBlobs")]
+    public class RequestBlobs : Entity
+    {
+        public int ProviderId { get; set; }
+        public byte[] Content { get; set; }
+        public RequestType Type { get; set; }
+    }
+}

PlexRequests.Store/PlexRequests.Store.csproj

@@ -58,13 +58,16 @@
   <ItemGroup>
     <Compile Include="DbConfiguration.cs" />
     <Compile Include="Entity.cs" />
+    <Compile Include="IRequestRepository.cs" />
     <Compile Include="ISettingsRepository.cs" />
     <Compile Include="ISqliteConfiguration.cs" />
     <Compile Include="IRepository.cs" />
     <Compile Include="Models\GlobalSettings.cs" />
     <Compile Include="Models\LogEntity.cs" />
+    <Compile Include="Models\RequestBlobs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Repository\JsonRepository.cs" />
+    <Compile Include="Repository\SettingsJsonRepository.cs" />
+    <Compile Include="Repository\RequestJsonRepository.cs" />
     <Compile Include="SettingsModel.cs" />
     <Compile Include="GenericRepository.cs" />
     <Compile Include="RequestedModel.cs" />

PlexRequests.Store/Repository/RequestJsonRepository.cs

@@ -0,0 +1,127 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SettingsJsonRepository.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.Collections.Generic;
+using System.Linq;
+
+using Dapper.Contrib.Extensions;
+
+using PlexRequests.Helpers;
+using PlexRequests.Store.Models;
+
+namespace PlexRequests.Store.Repository
+{
+    public class RequestJsonRepository : IRequestRepository
+    {
+        private ICacheProvider Cache { get; }
+
+        private string TypeName { get; }
+        public RequestJsonRepository(ISqliteConfiguration config, ICacheProvider cacheProvider)
+        {
+            Db = config;
+            Cache = cacheProvider;
+            TypeName = typeof(RequestJsonRepository).Name;
+        }
+
+        private ISqliteConfiguration Db { get; }
+
+        public long Insert(RequestBlobs entity)
+        {
+            ResetCache();
+            using (var con = Db.DbConnection())
+            {
+                return con.Insert(entity);
+            }
+        }
+
+        public IEnumerable<RequestBlobs> GetAll()
+        {
+            var key = TypeName + "GetAll";
+            var item = Cache.GetOrSet(key, () =>
+            {
+                using (var con = Db.DbConnection())
+                {
+                    var page = con.GetAll<RequestBlobs>();
+                    return page;
+                }
+            }, 5);
+            return item;
+        }
+
+        public RequestBlobs Get(int id)
+        {
+            var key = TypeName + "Get";
+            var item = Cache.GetOrSet(key, () =>
+            {
+                using (var con = Db.DbConnection())
+                {
+                    var page = con.Get<RequestBlobs>(id);
+                    return page;
+                }
+            }, 5);
+            return item;
+        }
+
+        public bool Delete(RequestBlobs entity)
+        {
+            ResetCache();
+            using (var con = Db.DbConnection())
+            {
+                return con.Delete(entity);
+            }
+        }
+
+        public bool Update(RequestBlobs entity)
+        {
+            ResetCache();
+            using (var con = Db.DbConnection())
+            {
+                return con.Update(entity);
+            }
+        }
+
+        private void ResetCache()
+        {
+            Cache.Remove("Get");
+            Cache.Remove(TypeName + "GetAll");
+        }
+
+        public bool UpdateAll(IEnumerable<RequestBlobs> entity)
+        {
+            var result = new HashSet<bool>();
+
+            using (var db = Db.DbConnection())
+            {
+                db.Open();
+                foreach (var e in entity)
+                {
+                    result.Add(db.Update(e));
+                }
+            }
+            return result.All(x => true);
+        }
+    }
+}

PlexRequests.Store/Repository/SettingsJsonRepository.cs

@@ -1,7 +1,7 @@
 #region Copyright
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
-//    File: JsonRepository.cs
+//    File: SettingsJsonRepository.cs
 //    Created By: Jamie Rees
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
@@ -34,16 +34,16 @@ using PlexRequests.Store.Models;
 
 namespace PlexRequests.Store.Repository
 {
-    public class JsonRepository : ISettingsRepository
+    public class SettingsJsonRepository : ISettingsRepository
     {
         private ICacheProvider Cache { get; set; }
 
         private string TypeName { get; set; }
-        public JsonRepository(ISqliteConfiguration config, ICacheProvider cacheProvider)
+        public SettingsJsonRepository(ISqliteConfiguration config, ICacheProvider cacheProvider)
         {
             Db = config;
             Cache = cacheProvider;
-            TypeName = typeof(JsonRepository).Name;
+            TypeName = typeof(SettingsJsonRepository).Name;
         }
 
         private ISqliteConfiguration Db { get; set; }

PlexRequests.Store/SqlTables.sql

@@ -16,6 +16,7 @@ CREATE TABLE IF NOT EXISTS Settings
 	PlexAuthToken						varchar(50)				
 );
 
+
 CREATE TABLE IF NOT EXISTS Requested
 (
 	Id									INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -45,6 +46,14 @@ CREATE TABLE IF NOT EXISTS GlobalSettings
     Content								varchar(100) NOT NULL
 );
 
+CREATE TABLE IF NOT EXISTS RequestBlobs
+(
+    Id									INTEGER PRIMARY KEY AUTOINCREMENT,
+    ProviderId							INTEGER NOT NULL,
+    Type								INTEGER NOT NULL,
+    Content								BLOB NOT NULL
+);
+
 
 CREATE TABLE IF NOT EXISTS Log
 (

PlexRequests.UI/Bootstrapper.cs

@@ -64,7 +64,7 @@ namespace PlexRequests.UI
 
             container.Register<ISqliteConfiguration, DbConfiguration>(new DbConfiguration(new SqliteFactory()));
 
-            container.Register<ISettingsRepository, JsonRepository>();
+            container.Register<ISettingsRepository, SettingsJsonRepository>();
             container.Register<ICacheProvider, MemoryCacheProvider>();
 
             container.Register<ISettingsService<PlexRequestSettings>, SettingsServiceV2<PlexRequestSettings>>();

PlexRequests.UI/Program.cs

@@ -105,7 +105,7 @@ namespace PlexRequests.UI
         {
             Log.Trace("Getting startup URI");
             var uri = "http://*:3579/";
-            var service = new SettingsServiceV2<PlexRequestSettings>(new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
+            var service = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
             var settings = service.GetSettings();
             Log.Trace("Port: {0}", settings.Port);
             if (settings.Port != 0)