From bee1d4b1e1b27656a8174c4d3e0dfd18a8714ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20B=C3=B6rchers?= Date: Sat, 3 Oct 2020 22:34:54 +0200 Subject: [PATCH] fixed update method --- .idea/.idea.UserService/riderModule.iml | 7 +++--- .../OrganizationUnitsRepository.cs | 18 +++++++-------- .../Repositories/UsersRepository.cs | 23 +++++++++---------- UserService.Test/UserRepositoryTests.cs | 2 +- UserService/Pages/Directory.razor.cs | 2 +- UserService/Pages/Users.razor.cs | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.idea/.idea.UserService/riderModule.iml b/.idea/.idea.UserService/riderModule.iml index 882628e..6a58e5e 100644 --- a/.idea/.idea.UserService/riderModule.iml +++ b/.idea/.idea.UserService/riderModule.iml @@ -1,9 +1,10 @@ - - - + + + + diff --git a/UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs b/UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs index 0e4ad45..3bb54b8 100644 --- a/UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs +++ b/UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs @@ -66,15 +66,15 @@ namespace UserService.DatabaseLayer.Repositories if (entity == null) throw new ArgumentNullException(nameof(entity)); await using var db = new UserService2DB(); var managerId = entity.Manager?.Id; - var changedRows = await db.NodeModels.UpdateAsync(x => new NodeModel - { - Id = entity.Id, - CommonName = entity.CommonName, - Description = entity.Description, - Discriminator = nameof(OrganizationUnit), - ParentId = entity.ParentId, - ManagerId = managerId, - }, token).ConfigureAwait(false); + var changedRows = await db.NodeModels.UpdateAsync(x => x.Id == entity.Id, + x => new NodeModel + { + CommonName = entity.CommonName, + Description = entity.Description, + Discriminator = nameof(OrganizationUnit), + ParentId = entity.ParentId, + ManagerId = managerId, + }, token).ConfigureAwait(false); return changedRows > 0; } diff --git a/UserService.DatabaseLayer/Repositories/UsersRepository.cs b/UserService.DatabaseLayer/Repositories/UsersRepository.cs index 0997d19..3ff58c0 100644 --- a/UserService.DatabaseLayer/Repositories/UsersRepository.cs +++ b/UserService.DatabaseLayer/Repositories/UsersRepository.cs @@ -18,7 +18,6 @@ namespace UserService.DatabaseLayer.Repositories { await using var db = new UserService2DB(); var users = await db.NodeModels - .LoadWith(x => x.Parent) .Where(x => x.Discriminator == nameof(User)) .WhereOrDefault(predicate) .Select(x => new User @@ -78,17 +77,17 @@ namespace UserService.DatabaseLayer.Repositories { await using var db = new UserService2DB(); - var changedRows = await db.NodeModels.UpdateAsync(x => new NodeModel - { - Id = entity.Id, - CommonName = entity.CommonName, - FirstName = entity.FirstName, - LastName = entity.LastName, - Description = entity.Description, - EMail = entity.EMail, - IsActive = entity.IsActive, - Discriminator = nameof(User), - }, token).ConfigureAwait(false); + var changedRows = await db.NodeModels.UpdateAsync(x => x.Id == entity.Id, + x => new NodeModel + { + CommonName = entity.CommonName, + FirstName = entity.FirstName, + LastName = entity.LastName, + Description = entity.Description, + EMail = entity.EMail, + IsActive = entity.IsActive, + Discriminator = nameof(User), + }, token).ConfigureAwait(false); return changedRows > 0; } diff --git a/UserService.Test/UserRepositoryTests.cs b/UserService.Test/UserRepositoryTests.cs index 812c111..b9760c9 100644 --- a/UserService.Test/UserRepositoryTests.cs +++ b/UserService.Test/UserRepositoryTests.cs @@ -32,7 +32,7 @@ namespace UserService.Test { CommonName = "holger", FirstName = "Holger", - LastName = "Börchers", + LastName = "Börchers", IsActive = true }; await _repository.AddAsync(user).ConfigureAwait(false); diff --git a/UserService/Pages/Directory.razor.cs b/UserService/Pages/Directory.razor.cs index d5c03f7..0d72341 100644 --- a/UserService/Pages/Directory.razor.cs +++ b/UserService/Pages/Directory.razor.cs @@ -39,7 +39,7 @@ namespace UserService.Pages protected override async Task OnInitializedAsync() { OrganizationUnits = (await OuRepository.GetAllAsync().ConfigureAwait(false)) - .Where(x => x.Parent is null) + .Where(x => x.ParentId is null) .ToList(); } diff --git a/UserService/Pages/Users.razor.cs b/UserService/Pages/Users.razor.cs index fd6cd46..9aa04d7 100644 --- a/UserService/Pages/Users.razor.cs +++ b/UserService/Pages/Users.razor.cs @@ -39,7 +39,7 @@ namespace UserService.Pages if (arg is null) throw new ArgumentNullException(nameof(arg)); var user = arg.Item; await UsersRepository.AddAsync(user).ConfigureAwait(false); - user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == user.ParentId); + //user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == user.ParentId); } protected override async Task RowDeletingCallback(CancellableRowChange arg) @@ -71,7 +71,7 @@ namespace UserService.Pages if (arg == null) throw new ArgumentNullException(nameof(arg)); var user = arg.Item; user.MapFields(arg.Values); - user.Parent = OrganizationUnits?.FirstOrDefault(x => x.Id == (Guid?)arg.Values[nameof(Node.ParentId)]); + user.ParentId = (int?)arg.Values[nameof(Node.ParentId)]; var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false); arg.Cancel = !result; }