From 16d74d016cd19b86033b1eb5b0ae0d6c8e659141 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Tue, 10 May 2022 12:30:25 +0200
Subject: [PATCH] Fix PerformGetAll

---
 .../Implement/UserGroupRepository.cs          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
index f2a90933bf..03215f1bc8 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserGroupRepository.cs
@@ -202,7 +202,16 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
             AppendGroupBy(sql);
             sql.OrderBy<UserGroupDto>(x => x.Id); // required for references
 
-            var dtos = Database.FetchOneToMany<UserGroupDto>(x => x.UserGroup2AppDtos, sql);
+            List<UserGroupDto> dtos = Database.FetchOneToMany<UserGroupDto>(x => x.UserGroup2AppDtos, sql);
+
+            IDictionary<int, List<UserGroup2LanguageDto>> dic = GetAllUserGroupLanguageGrouped();
+
+            foreach (UserGroupDto dto in dtos)
+            {
+                dic.TryGetValue(dto.Id, out var userGroup2LanguageDtos);
+                dto.UserGroup2LanguageDtos = userGroup2LanguageDtos ?? new();
+            }
+
             return dtos.Select(x=>UserGroupFactory.BuildEntity(_shortStringHelper, x));
         }
 
@@ -371,6 +380,15 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
             return Database.Fetch<UserGroup2LanguageDto>(query);
         }
 
+        private IDictionary<int, List<UserGroup2LanguageDto>> GetAllUserGroupLanguageGrouped()
+        {
+            Sql<ISqlContext> query = Sql()
+                .Select<UserGroup2LanguageDto>()
+                .From<UserGroup2LanguageDto>();
+            List<UserGroup2LanguageDto> userGroupLanguages = Database.Fetch<UserGroup2LanguageDto>(query);
+            return userGroupLanguages.GroupBy(x => x.UserGroupId).ToDictionary(x => x.Key, x => x.ToList());
+        }
+
         #endregion
 
         /// <summary>