Merge pull request #442 from jpg0/fix/memories-day-cache

Fix: Memories cache should last one day

Author: JW-CH

ImmichFrame.Core.Tests/Logic/Pool/MemoryAssetsPoolTests.cs

@@ -14,19 +14,17 @@ namespace ImmichFrame.Core.Tests.Logic.Pool;
 [TestFixture]
 public class MemoryAssetsPoolTests
 {
-    private Mock<IApiCache> _mockApiCache;
     private Mock<ImmichApi> _mockImmichApi;
     private Mock<IAccountSettings> _mockAccountSettings;
     private MemoryAssetsPool _memoryAssetsPool;
 
     [SetUp]
     public void Setup()
     {
-        _mockApiCache = new Mock<IApiCache>(); // Base constructor requires ILogger and IOptions, pass null for simplicity in mock
         _mockImmichApi = new Mock<ImmichApi>(null, null); // Base constructor requires ILogger, IHttpClientFactory, IOptions, pass null
         _mockAccountSettings = new Mock<IAccountSettings>();
 
-        _memoryAssetsPool = new MemoryAssetsPool(_mockApiCache.Object, _mockImmichApi.Object, _mockAccountSettings.Object);
+        _memoryAssetsPool = new MemoryAssetsPool(_mockImmichApi.Object, _mockAccountSettings.Object);
     }
 
     private List<AssetResponseDto> CreateSampleAssets(int count, bool withExif, int yearCreated)
@@ -76,10 +74,6 @@ public async Task LoadAssets_CallsSearchMemoriesAsync()
         // Let's simulate this by calling a method that would trigger LoadAssets if cache is empty.
         // Since LoadAssets is protected, we'll test its effects via GetAsset.
         // We need to ensure the cache is empty or expired for LoadAssets to be called.
-        _mockApiCache.Setup(c => c.GetOrAddAsync(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
-
-
         await _memoryAssetsPool.GetAssets(1, CancellationToken.None); // This should trigger LoadAssets
 
         // Assert
@@ -99,9 +93,6 @@ public async Task LoadAssets_FetchesAssetInfo_WhenExifInfoIsNull()
         _mockImmichApi.Setup(x => x.GetAssetInfoAsync(new Guid(assetId), null, It.IsAny<CancellationToken>()))
             .ReturnsAsync(new AssetResponseDto { Id = assetId, ExifInfo = new ExifResponseDto { DateTimeOriginal = new DateTime(memoryYear, 1, 1) }, People = new List<PersonWithFacesResponseDto>() });
 
-        _mockApiCache.Setup(c => c.GetOrAddAsync<IEnumerable<AssetResponseDto>>(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
-
         // Act
         var resultAsset = (await _memoryAssetsPool.GetAssets(1, CancellationToken.None)).First(); // Triggers LoadAssets
 
@@ -122,9 +113,6 @@ public async Task LoadAssets_DoesNotFetchAssetInfo_WhenExifInfoIsPresent()
         _mockImmichApi.Setup(x => x.SearchMemoriesAsync(It.IsAny<DateTimeOffset>(), null, null, null, It.IsAny<CancellationToken>()))
             .ReturnsAsync(memories);
 
-        _mockApiCache.Setup(c => c.GetOrAddAsync<IEnumerable<AssetResponseDto>>(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
-
         // Act
         var resultAsset = (await _memoryAssetsPool.GetAssets(1, CancellationToken.None)).First(); // Triggers LoadAssets
 
@@ -154,11 +142,7 @@ public async Task LoadAssets_CorrectlyFormatsDescription_YearsAgo()
             _mockImmichApi.Setup(x => x.SearchMemoriesAsync(It.IsAny<DateTimeOffset>(), null, null, null, It.IsAny<CancellationToken>()))
                 .ReturnsAsync(memories);
 
-            // Reset and re-setup cache mock for each iteration to ensure factory is called
-            _mockApiCache = new Mock<IApiCache>();
-            _mockApiCache.Setup(c => c.GetOrAddAsync<IEnumerable<AssetResponseDto>>(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-                         .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
-            _memoryAssetsPool = new MemoryAssetsPool(_mockApiCache.Object, _mockImmichApi.Object, _mockAccountSettings.Object);
+         _memoryAssetsPool = new MemoryAssetsPool(_mockImmichApi.Object, _mockAccountSettings.Object);
 
 
             // Act
@@ -180,9 +164,6 @@ public async Task LoadAssets_AggregatesAssetsFromMultipleMemories()
         _mockImmichApi.Setup(x => x.SearchMemoriesAsync(It.IsAny<DateTimeOffset>(), null, null, null, It.IsAny<CancellationToken>()))
             .ReturnsAsync(memories).Verifiable(Times.Once);
 
-        _mockApiCache.Setup(c => c.GetOrAddAsync(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) => await factory());
-
         // Act
         // We will rely on the fact that the factory in GetFromCacheAsync is called, and it returns the list.
         // The count can be indirectly verified if we could access the pool's internal list after LoadAssets.
@@ -191,15 +172,7 @@ public async Task LoadAssets_AggregatesAssetsFromMultipleMemories()
         // We need a way to inspect the result of LoadAssets directly.
         // We can make LoadAssets internal and use InternalsVisibleTo, or use reflection.
         // Or, we can rely on the setup of GetFromCacheAsync to capture the factory's result.
-        IEnumerable<AssetResponseDto> loadedAssets = null;
-        _mockApiCache.Setup(c => c.GetOrAddAsync<IEnumerable<AssetResponseDto>>(It.IsAny<string>(), It.IsAny<Func<Task<IEnumerable<AssetResponseDto>>>>()))
-            .Returns<string, Func<Task<IEnumerable<AssetResponseDto>>>>(async (key, factory) =>
-            {
-                loadedAssets = await factory();
-                return loadedAssets;
-            });
-
-        await _memoryAssetsPool.GetAssets(4, CancellationToken.None); // Trigger load
+        var loadedAssets = await _memoryAssetsPool.GetAssets(4, CancellationToken.None); // Trigger load
 
         // Assert
         Assert.That(loadedAssets, Is.Not.Null);

ImmichFrame.Core/Helpers/ApiCache.cs

@@ -4,19 +4,23 @@ namespace ImmichFrame.Core.Helpers;
 
 public class ApiCache : IApiCache, IDisposable
 {
-    private readonly MemoryCacheEntryOptions _cacheOptions;
+    private readonly Func<MemoryCacheEntryOptions> _cacheOptions;
     private readonly IMemoryCache _cache = new MemoryCache(new MemoryCacheOptions());
 
-    public ApiCache(TimeSpan cacheDuration)
+    public ApiCache(TimeSpan cacheDuration) : this(() => new MemoryCacheEntryOptions()
     {
-        _cacheOptions = new()
-        {
-            AbsoluteExpirationRelativeToNow = cacheDuration
-        };
+        AbsoluteExpirationRelativeToNow = cacheDuration
+    })
+    {
+    }
+
+    public ApiCache(Func<MemoryCacheEntryOptions> entryOptions)
+    {
+        _cacheOptions = entryOptions;
     }
 
     public virtual Task<T> GetOrAddAsync<T>(string key, Func<Task<T>> factory)
-        => _cache.GetOrCreateAsync<T>(key, _ => factory(), _cacheOptions);
+        => _cache.GetOrCreateAsync<T>(key, _ => factory(), _cacheOptions());
 
     public void Dispose()
         => _cache.Dispose();

ImmichFrame.Core/Logic/Pool/MemoryAssetsPool.cs

@@ -1,9 +1,11 @@
 using ImmichFrame.Core.Api;
+using ImmichFrame.Core.Helpers;
 using ImmichFrame.Core.Interfaces;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace ImmichFrame.Core.Logic.Pool;
 
-public class MemoryAssetsPool(IApiCache apiCache, ImmichApi immichApi, IAccountSettings accountSettings) : CachingApiAssetsPool(apiCache, immichApi, accountSettings)
+public class MemoryAssetsPool(ImmichApi immichApi, IAccountSettings accountSettings) : CachingApiAssetsPool(new DailyApiCache(), immichApi, accountSettings)
 {
     protected override async Task<IEnumerable<AssetResponseDto>> LoadAssets(CancellationToken ct = default)
     {
@@ -23,6 +25,7 @@ protected override async Task<IEnumerable<AssetResponseDto>> LoadAssets(Cancella
                     asset.ExifInfo = assetInfo.ExifInfo;
                     asset.People = assetInfo.People;
                 }
+
                 asset.ExifInfo.Description = $"{yearsAgo} {(yearsAgo == 1 ? "year" : "years")} ago";
             }
 
@@ -31,4 +34,15 @@ protected override async Task<IEnumerable<AssetResponseDto>> LoadAssets(Cancella
 
         return memoryAssets;
     }
+}
+
+class DailyApiCache : ApiCache
+{
+    public DailyApiCache() : base(() => new MemoryCacheEntryOptions
+        {
+            AbsoluteExpiration = DateTimeOffset.Now.Date.AddDays(1)
+        }
+    )
+    {
+    }
 }

ImmichFrame.Core/Logic/PooledImmichFrameLogic.cs

@@ -46,7 +46,7 @@ private IAssetPool BuildPool(IAccountSettings accountSettings)
             pools.Add(new FavoriteAssetsPool(_apiCache, _immichApi, accountSettings));
 
         if (accountSettings.ShowMemories)
-            pools.Add(new MemoryAssetsPool(_apiCache, _immichApi, accountSettings));
+            pools.Add(new MemoryAssetsPool(_immichApi, accountSettings));
 
         if (accountSettings.Albums.Any())
             pools.Add(new AlbumAssetsPool(_apiCache, _immichApi, accountSettings));