AdminOptions.TenantId

OneShelf.Admin/OneShelf.Admin.Web/Controllers/HomeController.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 using OneShelf.Admin.Web.Authorization;
 using OneShelf.Admin.Web.Models;
 using OneShelf.Billing.Api.Client;
@@ -21,13 +22,15 @@ public class HomeController : Controller
         private readonly IllustrationsApiClient _illustrationsApiClient;
         private readonly BillingApiClient _billingApiClient;
         private readonly SongsDatabase _songsDatabase;
+        private readonly AdminOptions _adminOptions;
 
-        public HomeController(ILogger<HomeController> logger, IllustrationsApiClient illustrationsApiClient, BillingApiClient billingApiClient, IConfiguration configuration, SongsDatabase songsDatabase)
+        public HomeController(ILogger<HomeController> logger, IllustrationsApiClient illustrationsApiClient, BillingApiClient billingApiClient, IConfiguration configuration, SongsDatabase songsDatabase, IOptions<AdminOptions> adminOptions)
         {
             _logger = logger;
             _illustrationsApiClient = illustrationsApiClient;
             _billingApiClient = billingApiClient;
             _songsDatabase = songsDatabase;
+            _adminOptions = adminOptions.Value;
         }
 
         [AllowAnonymous]
@@ -83,8 +86,12 @@ public async Task<IActionResult> Illustrations(int h = 96, IllustrationsModel.Mo
             all.Responses = all.Responses.Where(x => x.Value.LatestCreatedOn < DateTime.Now.AddHours(-h))
                 .ToDictionary(x => x.Key, x => x.Value);
             hidden -= all.Responses.Count;
-
-            var urlsToTitles = (await _songsDatabase.Versions.Include(x => x.Song).ThenInclude(x => x.Artists).ToListAsync())
+
+            var urlsToTitles = (await _songsDatabase.Versions
+                    .Where(x => x.Song.TenantId == _adminOptions.TenantId)
+                    .Include(x => x.Song)
+                    .ThenInclude(x => x.Artists)
+                    .ToListAsync())
                 .GroupBy(x => x.Uri)
                 .ToDictionary(x => x.Key.ToString(), x =>
                 {

OneShelf.Admin/OneShelf.Admin.Web/Models/AdminOptions.cs

@@ -0,0 +1,6 @@
+namespace OneShelf.Admin.Web.Models;
+
+public record AdminOptions
+{
+    public required int TenantId { get; set; }
+}

OneShelf.Admin/OneShelf.Admin.Web/Program.cs

@@ -1,3 +1,4 @@
+using OneShelf.Admin.Web.Models;
 using OneShelf.Billing.Api.Client;
 using OneShelf.Common.Database.Songs;
 using OneShelf.Illustrations.Api.Client;
@@ -15,7 +16,8 @@
 builder.Services
     .AddSongsDatabase()
     .AddIllustrationsApiClient(builder.Configuration)
-    .AddBillingApiClient(builder.Configuration);
+    .AddBillingApiClient(builder.Configuration)
+    .Configure<AdminOptions>(o => builder.Configuration.GetSection(nameof(AdminOptions)).Bind(o));
 
 var app = builder.Build();
 

OneShelf.Admin/OneShelf.Admin.Web/appsettings.Development.json

@@ -16,5 +16,8 @@
   },
   "CollectivesApiClientOptions": {
     "Endpoint": "http://localhost:7284/api/"
+  },
+  "AdminOptions": {
+    "TenantId": 1,
   }
 }