yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up User repository

Browse Source
This commit is contained in:
Zeegaan
2022-07-06 15:05:43 +02:00
parent 7e5fc48a67
commit b2f87f66fd
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
View File

@@ -377,14 +377,30 @@ SELECT 4 AS [Key], COUNT(id) AS [Value] FROM umbracoUser WHERE userDisabled = 0
var groupIds = user2Groups.Select(x => x.UserGroupId).ToList();
// get groups
// We wrap this in a try-catch, as this might throw errors when you try to login before having migrated your database
Dictionary<int, UserGroupDto> groups;
try
{
sql = SqlContext.Sql()
.Select<UserGroupDto>()
.From<UserGroupDto>()
.WhereIn<UserGroupDto>(x => x.Id, groupIds);
sql = SqlContext.Sql()
.Select<UserGroupDto>()
.From<UserGroupDto>()
.WhereIn<UserGroupDto>(x => x.Id, groupIds);
groups = Database.Fetch<UserGroupDto>(sql)
.ToDictionary(x => x.Id, x => x);
}
catch(Exception e)
{
Logger.LogDebug(e, "Couldn't get user groups. This should only happens doing the migration that add new columns to user groups");
var groups = Database.Fetch<UserGroupDto>(sql)
.ToDictionary(x => x.Id, x => x);
sql = SqlContext.Sql()
.Select<UserGroupDto>(x=>x.Id, x=>x.Alias, x=>x.StartContentId, x=>x.StartMediaId)
.From<UserGroupDto>()
.WhereIn<UserGroupDto>(x => x.Id, groupIds);
groups = Database.Fetch<UserGroupDto>(sql)
.ToDictionary(x => x.Id, x => x);
}
// get groups2apps