From ef858a9fce279dabdbe0c955836ef77de44f58bd Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 3 Nov 2017 22:28:06 +0000
Subject: [PATCH] Fixed an issue with the caching

---
 src/Ombi.Core/Engine/MovieRequestEngine.cs    |  1 +
 .../Entities/Requests/FullBaseRequest.cs      |  1 +
 .../Repository/SettingsJsonRepository.cs      | 21 ++++++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index af42c08b9..54733d76d 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -72,6 +72,7 @@ namespace Ombi.Core.Engine
                 RequestedDate = DateTime.UtcNow,
                 Approved = false,
                 RequestedUserId = userDetails.Id,
+                Background = movieInfo.BackdropPath
             };
 
             var ruleResults = (await RunRequestRules(requestModel)).ToList();
diff --git a/src/Ombi.Store/Entities/Requests/FullBaseRequest.cs b/src/Ombi.Store/Entities/Requests/FullBaseRequest.cs
index cba280289..95f771c63 100644
--- a/src/Ombi.Store/Entities/Requests/FullBaseRequest.cs
+++ b/src/Ombi.Store/Entities/Requests/FullBaseRequest.cs
@@ -11,6 +11,7 @@ namespace Ombi.Store.Entities.Requests
         public string PosterPath { get; set; }
         public DateTime ReleaseDate { get; set; }
         public string Status { get; set; }
+        public string Background { get; set; }
 
 
         [NotMapped]
diff --git a/src/Ombi.Store/Repository/SettingsJsonRepository.cs b/src/Ombi.Store/Repository/SettingsJsonRepository.cs
index 161c731f3..92ce05337 100644
--- a/src/Ombi.Store/Repository/SettingsJsonRepository.cs
+++ b/src/Ombi.Store/Repository/SettingsJsonRepository.cs
@@ -22,7 +22,7 @@ namespace Ombi.Store.Repository
 
         public GlobalSettings Insert(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             var settings = Db.Settings.Add(entity);
             Db.SaveChanges();
             return settings.Entity;
@@ -30,7 +30,7 @@ namespace Ombi.Store.Repository
 
         public async Task<GlobalSettings> InsertAsync(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             var settings = await Db.Settings.AddAsync(entity).ConfigureAwait(false);
             await Db.SaveChangesAsync().ConfigureAwait(false);
             return settings.Entity;
@@ -39,7 +39,7 @@ namespace Ombi.Store.Repository
 
         public GlobalSettings Get(string pageName)
         {
-            return _cache.GetOrCreate(pageName, entry =>
+            return _cache.GetOrCreate(GetName(pageName), entry =>
             {
                 entry.AbsoluteExpiration = DateTimeOffset.Now.AddHours(1);
                 var entity = Db.Settings.AsNoTracking().FirstOrDefault(x => x.SettingsName == pageName);
@@ -49,7 +49,7 @@ namespace Ombi.Store.Repository
 
         public async Task<GlobalSettings> GetAsync(string settingsName)
         {
-            return await _cache.GetOrCreateAsync(settingsName, async entry =>
+            return await _cache.GetOrCreateAsync(GetName(settingsName), async entry =>
             {
                 entry.AbsoluteExpiration = DateTimeOffset.Now.AddHours(1);
                 var obj = await Db.Settings.AsNoTracking().FirstOrDefaultAsync(x => x.SettingsName == settingsName);
@@ -59,29 +59,34 @@ namespace Ombi.Store.Repository
 
         public async Task DeleteAsync(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             Db.Settings.Remove(entity);
             await Db.SaveChangesAsync();
         }
 
         public async Task UpdateAsync(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             Db.Update(entity);
             await Db.SaveChangesAsync();
         }
 
         public void Delete(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             Db.Settings.Remove(entity);
             Db.SaveChanges();
         }
 
         public void Update(GlobalSettings entity)
         {
-            _cache.Remove(entity.SettingsName);
+            _cache.Remove(GetName(entity.SettingsName));
             Db.SaveChanges();
         }
+
+        private string GetName(string entity)
+        {
+            return $"{entity}Json";
+        }
     }
 }
\ No newline at end of file