Make sure artist stats account for wish list/non wish list album split

davewalker5 · Nov 10, 2023 · 1813977 · 1813977
1 parent eaea1e3
commit 1813977
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git a/src/MusicCatalogue.Api/Controllers/ArtistsController.cs b/src/MusicCatalogue.Api/Controllers/ArtistsController.cs
@@ -50,7 +50,7 @@ public async Task<ActionResult<List<Artist>>> GetArtistsAsync(bool wishlist)
             }
 
             // Populate the artist statistics
-            await _factory.Statistics.PopulateArtistStatistics(artists);
+            await _factory.Statistics.PopulateArtistStatistics(artists, wishlist);
 
             return artists;
         }

diff --git a/src/MusicCatalogue.Data/MusicCatalogue.Data.csproj b/src/MusicCatalogue.Data/MusicCatalogue.Data.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>MusicCatalogue.Data</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/MusicCatalogue</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/MusicCatalogue.Entities/Interfaces/IStatisticsManager.cs b/src/MusicCatalogue.Entities/Interfaces/IStatisticsManager.cs
@@ -4,6 +4,6 @@ namespace MusicCatalogue.Entities.Interfaces
 {
     public interface IStatisticsManager
     {
-        Task PopulateArtistStatistics(IEnumerable<Artist> artists);
+        Task PopulateArtistStatistics(IEnumerable<Artist> artists, bool wishlist);
     }
 }
diff --git a/src/MusicCatalogue.Entities/MusicCatalogue.Entities.csproj b/src/MusicCatalogue.Entities/MusicCatalogue.Entities.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>MusicCatalogue.Entities</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/MusicCatalogue</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/MusicCatalogue.Logic/Database/StatisticsManager.cs b/src/MusicCatalogue.Logic/Database/StatisticsManager.cs
@@ -16,17 +16,23 @@ internal StatisticsManager(IMusicCatalogueFactory factory)
         /// Populate the album and track counts on each artist in the specified collection
         /// </summary>
         /// <param name="artists"></param>
+        /// <param name="wishlist"></param>
         /// <returns></returns>
-        public async Task PopulateArtistStatistics(IEnumerable<Artist> artists)
+        public async Task PopulateArtistStatistics(IEnumerable<Artist> artists, bool wishlist)
         {
             // Iterate over the supplied list
             foreach (var artist in artists)
             {
-                // Get the albums for the current artist
-                var albums = await _factory.Albums.ListAsync(x => x.ArtistId == artist.Id);
+                // If the albums are already attached, use that list to calculate the statistics. Otherwise,
+                // load the albums from the database
+                var albums = artist.Albums;
+                if ((albums?.Count ?? 0) == 0)
+                {
+                    albums = await _factory.Albums.ListAsync(x => x.ArtistId == artist.Id);
+                }
 
                 // Count the albums and tracks
-                artist.AlbumCount = albums.Count;
+                artist.AlbumCount = albums!.Count;
                 artist.TrackCount = (albums.Count > 0) ? albums.Sum(x => x.Tracks.Count) : 0;
             }
         }

diff --git a/src/MusicCatalogue.Logic/MusicCatalogue.Logic.csproj b/src/MusicCatalogue.Logic/MusicCatalogue.Logic.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageId>MusicCatalogue.Logic</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2023</Copyright>
     <Owners>Dave Walker</Owners>
@@ -17,7 +17,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/MusicCatalogue</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/MusicCatalogue.LookupTool/MusicCatalogue.LookupTool.csproj b/src/MusicCatalogue.LookupTool/MusicCatalogue.LookupTool.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
-    <FileVersion>1.8.0.0</FileVersion>
-    <ProductVersion>1.8.0</ProductVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
+    <FileVersion>1.9.0.0</FileVersion>
+    <ProductVersion>1.9.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/src/MusicCatalogue.Tests/StatisticsManagerTest.cs b/src/MusicCatalogue.Tests/StatisticsManagerTest.cs
@@ -39,7 +39,7 @@ public void ArtistStatisticsTest()
             Assert.IsNull(artists[0].AlbumCount);
             Assert.IsNull(artists[0].TrackCount);
 
-            Task.Run(() => _factory!.Statistics.PopulateArtistStatistics(artists)).Wait();
+            Task.Run(() => _factory!.Statistics.PopulateArtistStatistics(artists, false)).Wait();
             Assert.AreEqual(1, artists[0].AlbumCount);
             Assert.AreEqual(1, artists[0].TrackCount);
         }