Revize f3c42457

Ordering of tags in GetTagTree

Backend/Core/Services/TagService/TagServiceEF.cs

@@ -26 +26 @@
         public TagTreeResponse GetTagTree()
         {
             // Prefetch from DB
-            var tagCategories = databaseContext.TagCategories.Select(tc => tc).ToList();
-            var tags = databaseContext.Tags.Select(tc => tc).ToList();
-            var subTags = databaseContext.SubTags.Select(tc => tc).ToList();
+            var tagCategories = databaseContext.TagCategories
+                .Select(tc => tc)
+                .OrderBy(tc => tc.Name)
+                .ToList();
+
+            var tags = databaseContext.Tags
+                .Select(tc => tc)
+                .ToList();
+
+            var subTags = databaseContext.SubTags
+                .Select(tc => tc)
+                .ToList();
 
             var tagCategoriesDTOs = new List<TagCategoryInfo>();
             foreach (var tagCategory in tagCategories)
             {
                 var tagCategoryDTO = mapper.Map<TagCategoryInfo>(tagCategory);
-                var categoryTags = tags.Where(t => t.Category == tagCategory);
+                var categoryTags = tags
+                    .Where(t => t.Category == tagCategory)
+                    .OrderBy(t => t.Name);
+
                 var tagDTOs = new List<TagInfo>();
 
                 foreach (var tag in categoryTags)
                 {
                     var tagDTO = mapper.Map<TagInfo>(tag);
-                    var tagSubTags = subTags.Where(st => st.Tag == tag).ToList();
+                    var tagSubTags = subTags
+                        .Where(st => st.Tag == tag)
+                        .OrderBy(st => st.Name)
+                        .ToList();
+
                     var subTagDTOs = new List<SubTagInfo>();
 
                     if (tagSubTags.Count() != 0)