Поправить порядок в CharacterTreeBuilder (#2386)

Author: leotsarev

src/JoinRpg.Portal/Controllers/GameGroupsController.cs

@@ -192,7 +192,7 @@ private async Task<ActionResult> AllGroupsJson(int projectId, bool includeSpecia
                       g.FirstCopy,
                       Path = g.Path.Select(gr => gr.Name),
                       PathIds = g.Path.Select(gr => gr.CharacterGroupId),
-                      Characters = g.Characters.Select(ConvertCharacterToJsonSlim),
+                      g.Characters,
                   }),
         });
     }
@@ -228,17 +228,6 @@ private object ConvertCharacterToJson(CharacterViewModel ch)
         };
     }
 
-    private object ConvertCharacterToJsonSlim(CharacterLinkViewModel ch)
-    {
-        return new
-        {
-            ch.CharacterId,
-            ch.IsAvailable,
-            ch.IsFirstCopy,
-            ch.CharacterName,
-        };
-    }
-
     [HttpGet, Authorize]
     [MasterAuthorize(Permission.CanEditRoles)]
     public async Task<ActionResult> Edit(int projectId, int characterGroupId)

src/JoinRpg.Portal/wwwroot/Scripts/multicontrol.js

@@ -1150,10 +1150,12 @@ MultiControl.App.prototype.processData = function (data) {
         }
         if (!!group.Characters) {
             for (j = 0; j < group.Characters.length; j++) {
-                character = group.Characters[j];
-                if (character.IsFirstCopy) {
+              character = group.Characters[j];
+              let id = 'character^' + character.CharacterId;
+              character_model = this.CharacterList[id];
+              if (!character_model) {
                     character_option = {
-                        id: 'character^' + character.CharacterId,
+                        id: id,
                         name: character.CharacterName,
                         checkable: false,
                         checked: false,
@@ -1163,11 +1165,8 @@ MultiControl.App.prototype.processData = function (data) {
                     character_model = new MultiControl.Models.Character(character_option, this.ActionManager,
                         this.Settings.strategy);
                     this.CharacterList[character_model.getId()] = character_model;
-                }
-                else {
-                    character_model = this.CharacterList['character^' + character.CharacterId];
-                }
-                character_model.addParent(group_model);
+              }
+              character_model.addParent(group_model);
             }
         }
     }

src/JoinRpg.WebPortal.Models/Characters/CharacterLinkViewModel.cs

@@ -7,17 +7,8 @@ public class CharacterLinkViewModel : IEquatable<CharacterLinkViewModel>
     public int CharacterId { get; }
     public string CharacterName { get; }
 
-    public bool IsFirstCopy { get; set; }
-
     public bool IsAvailable { get; }
 
-    public bool IsPublic { get; }
-
-    public bool IsActive { get; }
-
-    public bool IsAcceptingClaims { get; set; }
-    public int ProjectId { get; set; }
-
     public bool Equals(CharacterLinkViewModel? other) => other != null && CharacterId == other.CharacterId;
 
     public override bool Equals(object? obj) => Equals(obj as CharacterLinkViewModel);
@@ -31,10 +22,5 @@ public CharacterLinkViewModel(Character arg)
         CharacterId = arg.CharacterId;
         CharacterName = arg.CharacterName;
         IsAvailable = arg.IsAvailable;
-        IsPublic = arg.IsPublic;
-        IsActive = arg.IsActive;
-        ProjectId = arg.ProjectId;
-        IsAcceptingClaims = arg.IsAcceptingClaims;
-
     }
 }

src/JoinRpg.WebPortal.Models/Characters/CharacterTreeBuilder.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using JoinRpg.DataModel;
 using JoinRpg.Domain;
 
@@ -8,7 +7,7 @@ public class CharacterTreeBuilder
 {
     private CharacterGroup Root { get; }
 
-    private IList<int> AlreadyOutputedChars { get; } = new List<int>();
+    private readonly Dictionary<int, CharacterLinkViewModel> alreadyOutputedChars = new();
 
     private IList<CharacterTreeItem> Results { get; } = new List<CharacterTreeItem>();
 
@@ -18,7 +17,6 @@ public CharacterTreeBuilder(CharacterGroup root, int? currentUserId)
         CurrentUserId = currentUserId;
     }
 
-    [MustUseReturnValue]
     public IList<CharacterTreeItem> Generate()
     {
         _ = GenerateFrom(Root, 0, new List<CharacterGroup>());
@@ -36,10 +34,15 @@ private CharacterTreeItem GenerateFrom(CharacterGroup characterGroup, int deepLe
             Characters = characterGroup.GetOrderedCharacters().Where(c => c.IsActive && c.IsVisible(CurrentUserId)).Select(GenerateCharacter).ToList(),
             Path = pathToTop.Select(cg => Results.First(item => item.CharacterGroupId == cg.CharacterGroupId)),
             IsSpecial = characterGroup.IsSpecial,
-            ChildGroups = prevCopy?.ChildGroups ?? CreateChilds().ToList(),
+            ChildGroups = prevCopy?.ChildGroups!, //Will be set later
         };
 
-        Results.Add(vm);
+        Results.Add(vm); // Надо добавить в список перед тем, как добавлять детей, иначе клиент сходит с ума
+
+        if (vm.ChildGroups is null)
+        {
+            vm.ChildGroups = CreateChilds().ToList();
+        }
 
         return vm;
 
@@ -57,14 +60,13 @@ IEnumerable<CharacterTreeItem> CreateChilds()
 
     private CharacterLinkViewModel GenerateCharacter(Character arg)
     {
-        var vm = new CharacterLinkViewModel(arg)
+        if (alreadyOutputedChars.TryGetValue(arg.CharacterId, out var prevCopy))
         {
-            IsFirstCopy = !AlreadyOutputedChars.Contains(arg.CharacterId),
-        };
-        if (vm.IsFirstCopy)
-        {
-            AlreadyOutputedChars.Add(vm.CharacterId);
+            return prevCopy;
         }
+        var vm = new CharacterLinkViewModel(arg);
+        alreadyOutputedChars.Add(arg.CharacterId, vm);
+
         return vm;
     }
 }