Now applies item themes to all items sharing a base id

Author: Zorakoraz

src/Application/Items/Commands/AddThemesToItemsCommand.cs

@@ -7,19 +7,20 @@
 namespace Crpg.Application.Items.Commands;
 
 /// <summary>
-/// Adds a set of themes to several items at once. Existing themes on those items are preserved; themes already
-/// present are not duplicated.
+/// Adds a set of themes to several item families at once. The themes are applied to every rank variant sharing one
+/// of the given <see cref="Crpg.Domain.Entities.Items.Item.BaseId"/>s, so upgrades stay in sync. Existing themes on
+/// those items are preserved; themes already present are not duplicated.
 /// </summary>
 public record AddThemesToItemsCommand : IMediatorRequest
 {
-    public IList<string> ItemIds { get; init; } = new List<string>();
+    public IList<string> BaseIds { get; init; } = new List<string>();
     public IList<int> ThemeIds { get; init; } = new List<int>();
 
     public class Validator : AbstractValidator<AddThemesToItemsCommand>
     {
         public Validator()
         {
-            RuleFor(r => r.ItemIds).NotEmpty();
+            RuleFor(r => r.BaseIds).NotEmpty();
             RuleFor(r => r.ThemeIds).NotEmpty();
         }
     }
@@ -28,15 +29,17 @@ internal class Handler(ICrpgDbContext db) : IMediatorRequestHandler<AddThemesToI
     {
         public async ValueTask<Result> Handle(AddThemesToItemsCommand req, CancellationToken cancellationToken)
         {
-            var itemIds = req.ItemIds.Distinct().ToList();
+            var baseIds = req.BaseIds.Distinct().ToList();
             var items = await db.Items
                 .Include(i => i.Themes)
-                .Where(i => itemIds.Contains(i.Id))
+                .Where(i => baseIds.Contains(i.BaseId))
                 .ToListAsync(cancellationToken);
-            if (items.Count != itemIds.Count)
+
+            var foundBaseIds = items.Select(i => i.BaseId).ToHashSet();
+            string? missingBaseId = baseIds.FirstOrDefault(id => !foundBaseIds.Contains(id));
+            if (missingBaseId != null)
             {
-                string missingItemId = itemIds.First(id => items.All(i => i.Id != id));
-                return new(CommonErrors.ItemNotFound(missingItemId));
+                return new(CommonErrors.ItemNotFound(missingBaseId));
             }
 
             var themeIds = req.ThemeIds.Distinct().ToList();

src/Application/Items/Commands/RemoveThemesFromItemsCommand.cs

@@ -7,19 +7,20 @@
 namespace Crpg.Application.Items.Commands;
 
 /// <summary>
-/// Removes a set of themes from several items at once. Any other themes on those items are preserved; themes
-/// that aren't present are ignored.
+/// Removes a set of themes from several item families at once. The themes are removed from every rank variant
+/// sharing one of the given <see cref="Crpg.Domain.Entities.Items.Item.BaseId"/>s, so upgrades stay in sync. Any
+/// other themes on those items are preserved; themes that aren't present are ignored.
 /// </summary>
 public record RemoveThemesFromItemsCommand : IMediatorRequest
 {
-    public IList<string> ItemIds { get; init; } = new List<string>();
+    public IList<string> BaseIds { get; init; } = new List<string>();
     public IList<int> ThemeIds { get; init; } = new List<int>();
 
     public class Validator : AbstractValidator<RemoveThemesFromItemsCommand>
     {
         public Validator()
         {
-            RuleFor(r => r.ItemIds).NotEmpty();
+            RuleFor(r => r.BaseIds).NotEmpty();
             RuleFor(r => r.ThemeIds).NotEmpty();
         }
     }
@@ -28,15 +29,17 @@ internal class Handler(ICrpgDbContext db) : IMediatorRequestHandler<RemoveThemes
     {
         public async ValueTask<Result> Handle(RemoveThemesFromItemsCommand req, CancellationToken cancellationToken)
         {
-            var itemIds = req.ItemIds.Distinct().ToList();
+            var baseIds = req.BaseIds.Distinct().ToList();
             var items = await db.Items
                 .Include(i => i.Themes)
-                .Where(i => itemIds.Contains(i.Id))
+                .Where(i => baseIds.Contains(i.BaseId))
                 .ToListAsync(cancellationToken);
-            if (items.Count != itemIds.Count)
+
+            var foundBaseIds = items.Select(i => i.BaseId).ToHashSet();
+            string? missingBaseId = baseIds.FirstOrDefault(id => !foundBaseIds.Contains(id));
+            if (missingBaseId != null)
             {
-                string missingItemId = itemIds.First(id => items.All(i => i.Id != id));
-                return new(CommonErrors.ItemNotFound(missingItemId));
+                return new(CommonErrors.ItemNotFound(missingBaseId));
             }
 
             var themeIds = req.ThemeIds.Distinct().ToList();

src/Application/Items/Commands/SetItemThemesCommand.cs

@@ -9,24 +9,26 @@
 namespace Crpg.Application.Items.Commands;
 
 /// <summary>
-/// Replaces the set of themes assigned to a single item.
+/// Replaces the set of themes assigned to an item family. The themes are applied to every rank variant sharing the
+/// given <see cref="Crpg.Domain.Entities.Items.Item.BaseId"/>, so upgrades stay in sync.
 /// </summary>
 public record SetItemThemesCommand : IMediatorRequest<ItemViewModel>
 {
     [JsonIgnore]
-    public string ItemId { get; init; } = string.Empty;
+    public string BaseId { get; init; } = string.Empty;
     public IList<int> ThemeIds { get; init; } = new List<int>();
 
     internal class Handler(ICrpgDbContext db, IMapper mapper) : IMediatorRequestHandler<SetItemThemesCommand, ItemViewModel>
     {
         public async ValueTask<Result<ItemViewModel>> Handle(SetItemThemesCommand req, CancellationToken cancellationToken)
         {
-            var item = await db.Items
+            var items = await db.Items
                 .Include(i => i.Themes)
-                .FirstOrDefaultAsync(i => i.Id == req.ItemId, cancellationToken);
-            if (item == null)
+                .Where(i => i.BaseId == req.BaseId)
+                .ToListAsync(cancellationToken);
+            if (items.Count == 0)
             {
-                return new(CommonErrors.ItemNotFound(req.ItemId));
+                return new(CommonErrors.ItemNotFound(req.BaseId));
             }
 
             var themeIds = req.ThemeIds.Distinct().ToList();
@@ -37,12 +39,16 @@ public async ValueTask<Result<ItemViewModel>> Handle(SetItemThemesCommand req, C
                 return new(CommonErrors.ThemeNotFound(missingThemeId));
             }
 
-            item.Themes.Clear();
-            item.Themes.AddRange(themes);
+            foreach (var item in items)
+            {
+                item.Themes.Clear();
+                item.Themes.AddRange(themes);
+            }
 
             await db.SaveChangesAsync(cancellationToken);
 
-            return new(mapper.Map<ItemViewModel>(item));
+            var representative = items.OrderBy(i => i.Rank).First();
+            return new(mapper.Map<ItemViewModel>(representative));
         }
     }
 }

src/WebApi/Controllers/ItemsController.cs

@@ -69,26 +69,27 @@ public Task<ActionResult> RefundItem([FromRoute] string id, [FromBody] RefundIte
     }
 
     /// <summary>
-    /// Replaces the themes assigned to a single item.
+    /// Replaces the themes assigned to an item family (every rank variant sharing the BaseId).
     /// </summary>
-    /// <param name="id">Item id.</param>
+    /// <param name="baseId">Item BaseId.</param>
     /// <param name="req">The themes to assign.</param>
     /// <response code="200">Ok.</response>
     /// <response code="404">Item or theme not found.</response>
     [Authorize(Policy = AdminPolicy)]
-    [HttpPut("{id}/themes")]
-    public async Task<ActionResult<Result<ItemViewModel>>> SetItemThemes([FromRoute] string id, [FromBody] SetItemThemesCommand req)
+    [HttpPut("{baseId}/themes")]
+    public async Task<ActionResult<Result<ItemViewModel>>> SetItemThemes([FromRoute] string baseId, [FromBody] SetItemThemesCommand req)
     {
-        req = req with { ItemId = id };
+        req = req with { BaseId = baseId };
         var result = await ResultToActionAsync(Mediator.Send(req));
         await EvictActiveThemeEventsCacheAsync();
         return result;
     }
 
     /// <summary>
-    /// Adds a set of themes to several items at once, preserving themes they already have.
+    /// Adds a set of themes to several item families at once (each BaseId covers all its rank variants),
+    /// preserving themes they already have.
     /// </summary>
-    /// <param name="req">The items and themes to tag.</param>
+    /// <param name="req">The item BaseIds and themes to tag.</param>
     /// <response code="204">Updated.</response>
     /// <response code="404">An item or theme was not found.</response>
     [Authorize(Policy = AdminPolicy)]
@@ -101,9 +102,10 @@ public async Task<ActionResult> AddThemesToItems([FromBody] AddThemesToItemsComm
     }
 
     /// <summary>
-    /// Removes a set of themes from several items at once, preserving any other themes they have.
+    /// Removes a set of themes from several item families at once (each BaseId covers all its rank variants),
+    /// preserving any other themes they have.
     /// </summary>
-    /// <param name="req">The items and themes to untag.</param>
+    /// <param name="req">The item BaseIds and themes to untag.</param>
     /// <response code="204">Updated.</response>
     /// <response code="404">An item or theme was not found.</response>
     [Authorize(Policy = AdminPolicy)]

src/WebUI/app/pages/shop.vue

@@ -250,13 +250,13 @@ const { execute: submitThemes, isLoading: savingThemes } = useAsyncCallback(asyn
   const chosen: ItemTheme[] = allThemes.value.filter(theme => themeIds.includes(theme.id))
 
   if (themeModalMode.value === 'set' && themeEditTarget.value) {
-    const updated = await setItemThemes(themeEditTarget.value.id, themeIds)
+    const updated = await setItemThemes(themeEditTarget.value.baseId, themeIds)
     themeEditTarget.value.themes = (updated.themes ?? []).map(theme => ({ id: theme.id, name: theme.name }))
     toast.add({ title: t('theme.tag.notify.set'), close: false, color: 'success' })
   }
   else if (themeModalMode.value === 'add') {
     const items = selectedItems.value
-    await addThemesToItems(items.map(item => item.id), themeIds)
+    await addThemesToItems(items.map(item => item.baseId), themeIds)
     for (const item of items) {
       for (const theme of chosen) {
         if (!item.themes.some(t => t.id === theme.id)) {
@@ -269,7 +269,7 @@ const { execute: submitThemes, isLoading: savingThemes } = useAsyncCallback(asyn
   }
   else if (themeModalMode.value === 'remove') {
     const items = selectedItems.value
-    await removeThemesFromItems(items.map(item => item.id), themeIds)
+    await removeThemesFromItems(items.map(item => item.baseId), themeIds)
     for (const item of items) {
       item.themes = item.themes.filter(theme => !themeIds.includes(theme.id))
     }

src/WebUI/app/services/__tests__/theme-service.spec.ts

@@ -25,7 +25,7 @@ const {
   _postThemesEvents,
   _putThemesEvents,
   _deleteThemesEventsById,
-  _putItemsByIdThemes,
+  _putItemsByBaseIdThemes,
   _putItemsThemes,
   _deleteItemsThemes,
 } = vi.hoisted(() => ({
@@ -37,7 +37,7 @@ const {
   _postThemesEvents: vi.fn(),
   _putThemesEvents: vi.fn(),
   _deleteThemesEventsById: vi.fn(),
-  _putItemsByIdThemes: vi.fn(),
+  _putItemsByBaseIdThemes: vi.fn(),
   _putItemsThemes: vi.fn(),
   _deleteItemsThemes: vi.fn(),
 }))
@@ -51,7 +51,7 @@ vi.mock('#api/sdk.gen', () => ({
   postThemesEvents: _postThemesEvents,
   putThemesEvents: _putThemesEvents,
   deleteThemesEventsById: _deleteThemesEventsById,
-  putItemsByIdThemes: _putItemsByIdThemes,
+  putItemsByBaseIdThemes: _putItemsByBaseIdThemes,
   putItemsThemes: _putItemsThemes,
   deleteItemsThemes: _deleteItemsThemes,
 }))
@@ -163,30 +163,30 @@ describe('theme service', () => {
   })
 
   describe('item themes', () => {
-    it('setItemThemes puts the theme ids to the item route and unwraps the item', async () => {
+    it('setItemThemes puts the theme ids to the item family route and unwraps the item', async () => {
       const item = { id: 'sword_1', themes: [{ id: 1, name: 'Viking' }] }
-      _putItemsByIdThemes.mockResolvedValueOnce({ data: item, errors: null })
+      _putItemsByBaseIdThemes.mockResolvedValueOnce({ data: item, errors: null })
 
-      const result = await setItemThemes('sword_1', [1])
+      const result = await setItemThemes('sword', [1])
 
-      expect(_putItemsByIdThemes).toHaveBeenCalledWith({ path: { id: 'sword_1' }, body: { themeIds: [1] } })
+      expect(_putItemsByBaseIdThemes).toHaveBeenCalledWith({ path: { baseId: 'sword' }, body: { themeIds: [1] } })
       expect(result).toEqual(item)
     })
 
-    it('addThemesToItems puts the items and themes in the body', async () => {
+    it('addThemesToItems puts the base ids and themes in the body', async () => {
       _putItemsThemes.mockResolvedValueOnce({ data: undefined, errors: null })
 
-      await addThemesToItems(['sword_1', 'axe_2'], [1, 2])
+      await addThemesToItems(['sword', 'axe'], [1, 2])
 
-      expect(_putItemsThemes).toHaveBeenCalledWith({ body: { itemIds: ['sword_1', 'axe_2'], themeIds: [1, 2] } })
+      expect(_putItemsThemes).toHaveBeenCalledWith({ body: { baseIds: ['sword', 'axe'], themeIds: [1, 2] } })
     })
 
-    it('removeThemesFromItems deletes with the items and themes in the body', async () => {
+    it('removeThemesFromItems deletes with the base ids and themes in the body', async () => {
       _deleteItemsThemes.mockResolvedValueOnce({ data: undefined, errors: null })
 
-      await removeThemesFromItems(['sword_1'], [3])
+      await removeThemesFromItems(['sword'], [3])
 
-      expect(_deleteItemsThemes).toHaveBeenCalledWith({ body: { itemIds: ['sword_1'], themeIds: [3] } })
+      expect(_deleteItemsThemes).toHaveBeenCalledWith({ body: { baseIds: ['sword'], themeIds: [3] } })
     })
   })
 })

src/WebUI/app/services/theme-service.ts

@@ -16,7 +16,7 @@ import {
   deleteThemesEventsById,
   postThemes,
   postThemesEvents,
-  putItemsByIdThemes,
+  putItemsByBaseIdThemes,
   putItemsThemes,
   putThemes,
   putThemesEvents,
@@ -38,12 +38,13 @@ export const updateThemeEvent = (body: UpdateThemeEventCommand) => putThemesEven
 
 export const deleteThemeEvent = (id: number) => deleteThemesEventsById({ path: { id } })
 
-// Item theme tagging (admin). Single = set/replace, bulk = add/remove.
-export const setItemThemes = async (itemId: string, themeIds: number[]): Promise<ItemViewModel> =>
-  (await putItemsByIdThemes({ path: { id: itemId }, body: { themeIds } })).data!
+// Item theme tagging (admin). Themes apply to a whole item family (BaseId = all rank variants).
+// Single = set/replace, bulk = add/remove.
+export const setItemThemes = async (baseId: string, themeIds: number[]): Promise<ItemViewModel> =>
+  (await putItemsByBaseIdThemes({ path: { baseId }, body: { themeIds } })).data!
 
-export const addThemesToItems = (itemIds: string[], themeIds: number[]) =>
-  putItemsThemes({ body: { itemIds, themeIds } })
+export const addThemesToItems = (baseIds: string[], themeIds: number[]) =>
+  putItemsThemes({ body: { baseIds, themeIds } })
 
-export const removeThemesFromItems = (itemIds: string[], themeIds: number[]) =>
-  deleteItemsThemes({ body: { itemIds, themeIds } })
+export const removeThemesFromItems = (baseIds: string[], themeIds: number[]) =>
+  deleteItemsThemes({ body: { baseIds, themeIds } })