Только активные персонажи должны показываться в выпадайке про слоты (#…

…2844)
joinrpg · Oct 16, 2024 · 2301709 · 2301709
1 parent fb48a01
commit 2301709
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/JoinRpg.Dal.Impl/Repositories/CharacterRepositoryImpl.cs b/src/JoinRpg.Dal.Impl/Repositories/CharacterRepositoryImpl.cs
@@ -127,10 +127,11 @@ public async Task<IEnumerable<Character>> GetAllCharacters(int projectId)
           .ToListAsync();
     }
 
-    public async Task<IEnumerable<Character>> GetTemplateCharacters(int projectId)
+    public async Task<IEnumerable<Character>> GetActiveTemplateCharacters(int projectId)
     {
         return await Ctx.Set<Character>()
           .Where(c => c.ProjectId == projectId)
+          .Where(c => c.IsActive)
           .Where(c => c.CharacterType == PrimitiveTypes.CharacterType.Slot)
           .OrderBy(c => c.CharacterName)
           .ToListAsync();

diff --git a/src/JoinRpg.Data.Interfaces/ICharacterRepository.cs b/src/JoinRpg.Data.Interfaces/ICharacterRepository.cs
@@ -20,7 +20,7 @@ public interface ICharacterRepository : IDisposable
     Task<CharacterView> GetCharacterViewAsync(int projectId, int characterId);
     Task<IEnumerable<Character>> GetAvailableCharacters(int projectId);
     Task<IEnumerable<Character>> GetAllCharacters(int projectId);
-    Task<IEnumerable<Character>> GetTemplateCharacters(int projectId);
+    Task<IEnumerable<Character>> GetActiveTemplateCharacters(int projectId);
 }
 
 public class CharacterView : IFieldContainter

diff --git a/src/JoinRpg.WebPortal.Managers/CharacterGroupList/CharacterListViewService.cs b/src/JoinRpg.WebPortal.Managers/CharacterGroupList/CharacterListViewService.cs
@@ -17,7 +17,7 @@ public async Task<List<CharacterDto>> GetCharacters(int projectId)
 
     public async Task<List<CharacterDto>> GetTemplateCharacters(int projectId)
     {
-        var characters = await characterRepository.GetTemplateCharacters(projectId);
+        var characters = await characterRepository.GetActiveTemplateCharacters(projectId);
         return await ToFilteredList(characters, projectId);
     }