MC-155 spending report

README.md

@@ -262,6 +262,12 @@ MusicCatalogue.LookupTool --lookup "John Coltrane" "Blue Train" catalogue
 - Click on the "Search" button to view the results
 - Records are included from 00:00 on the start date up to and including 23:59 on the end date
 
+#### Monthly Spend Report
+
+- To view a report on spending by year and month, click on the "Reports > Monthly Spend" menu bar item:
+
+<img src="diagrams/reports-monthly-spend.png" alt="Monthly Spend Report" width="600">
+
 [^ top](#musiccatalogue)
 
 ## Web Service

docker/api/Dockerfile

@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/dotnet/core/aspnet:latest
-COPY musiccatalogue.api-1.15.0.0 /opt/musiccatalogue.api-1.15.0.0
-WORKDIR /opt/musiccatalogue.api-1.15.0.0/bin
+COPY musiccatalogue.api-1.16.0.0 /opt/musiccatalogue.api-1.16.0.0
+WORKDIR /opt/musiccatalogue.api-1.16.0.0/bin
 ENTRYPOINT [ "./MusicCatalogue.Api" ]

docker/ui/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20-alpine
-COPY musiccatalogue.ui-1.15.0.0 /opt/musiccatalogue.ui-1.15.0.0
-WORKDIR /opt/musiccatalogue.ui-1.15.0.0
+COPY musiccatalogue.ui-1.16.0.0 /opt/musiccatalogue.ui-1.16.0.0
+WORKDIR /opt/musiccatalogue.ui-1.16.0.0
 RUN npm install
 RUN npm run build
 ENTRYPOINT [ "npm", "start" ]

src/MusicCatalogue.Api/Controllers/ReportsController.cs

@@ -94,5 +94,27 @@ public async Task<ActionResult<List<ArtistStatistics>>> GetArtistStatisticsRepor
             // Convert to a list and return the results
             return results.ToList();
         }
+
+        /// <summary>
+        /// Generate the monthly spending report
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("spend/{wishlist}")]
+        public async Task<ActionResult<List<MonthlySpend>>> GetMonthlySpendingReportAsync(bool wishlist)
+        {
+            // Get the report content
+            var results = await _factory.MonthlySpend.GenerateReportAsync(wishlist, 1, int.MaxValue);
+
+            if (!results.Any())
+            {
+                return NoContent();
+            }
+
+            // Convert to a list and return the results
+            return results.ToList();
+        }
     }
 }

src/MusicCatalogue.Api/MusicCatalogue.Api.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ReleaseVersion>1.15.0.0</ReleaseVersion>
-    <FileVersion>1.15.0.0</FileVersion>
-    <ProductVersion>1.15.0</ProductVersion>
+    <ReleaseVersion>1.16.0.0</ReleaseVersion>
+    <FileVersion>1.16.0.0</FileVersion>
+    <ProductVersion>1.16.0</ProductVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>