holger/UserService
1
0
Fork 0
Code Issues 2 Pull Requests Projects 1 Releases Wiki Activity

fixed update method

Browse Source
This commit is contained in:
Holger Börchers 2020-10-03 22:34:54 +02:00
parent 0aea91a59c
commit bee1d4b1e1
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/.idea.UserService/riderModule.iml generated
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4"> <module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.7.0/build/netcoreapp2.1" /> <content url="file://$USER_HOME$/.nuget/packages/linq2db.mysql/3.1.3/contentFiles/any/any/LinqToDB.Templates" />
<content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.dll" /> <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.7.1/build/netcoreapp2.1" />
<content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.0/build/netcoreapp2.1/x64/testhost.exe" /> <content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.1/build/netcoreapp2.1/x64/testhost.dll" />
<content url="file://$USER_HOME$/.nuget/packages/microsoft.testplatform.testhost/16.7.1/build/netcoreapp2.1/x64/testhost.exe" />
<content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" /> <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.dll" />
<content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" /> <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/NUnit3.TestAdapter.pdb" />
<content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" /> <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.17.0/build/netcoreapp2.1/nunit.engine.api.dll" />

18
UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs
View File

@ -66,15 +66,15 @@ namespace UserService.DatabaseLayer.Repositories
if (entity == null) throw new ArgumentNullException(nameof(entity)); if (entity == null) throw new ArgumentNullException(nameof(entity));
await using var db = new UserService2DB(); await using var db = new UserService2DB();
var managerId = entity.Manager?.Id; var managerId = entity.Manager?.Id;
var changedRows = await db.NodeModels.UpdateAsync(x => new NodeModel var changedRows = await db.NodeModels.UpdateAsync(x => x.Id == entity.Id,
{ x => new NodeModel
Id = entity.Id, {
CommonName = entity.CommonName, CommonName = entity.CommonName,
Description = entity.Description, Description = entity.Description,
Discriminator = nameof(OrganizationUnit), Discriminator = nameof(OrganizationUnit),
ParentId = entity.ParentId, ParentId = entity.ParentId,
ManagerId = managerId, ManagerId = managerId,
}, token).ConfigureAwait(false); }, token).ConfigureAwait(false);
return changedRows > 0; return changedRows > 0;
} }

23
UserService.DatabaseLayer/Repositories/UsersRepository.cs
View File

@ -18,7 +18,6 @@ namespace UserService.DatabaseLayer.Repositories
{ {
await using var db = new UserService2DB(); await using var db = new UserService2DB();
var users = await db.NodeModels var users = await db.NodeModels
.LoadWith(x => x.Parent)
.Where(x => x.Discriminator == nameof(User)) .Where(x => x.Discriminator == nameof(User))
.WhereOrDefault(predicate) .WhereOrDefault(predicate)
.Select(x => new User .Select(x => new User
@ -78,17 +77,17 @@ namespace UserService.DatabaseLayer.Repositories
{ {
await using var db = new UserService2DB(); await using var db = new UserService2DB();
var changedRows = await db.NodeModels.UpdateAsync(x => new NodeModel var changedRows = await db.NodeModels.UpdateAsync(x => x.Id == entity.Id,
{ x => new NodeModel
Id = entity.Id, {
CommonName = entity.CommonName, CommonName = entity.CommonName,
FirstName = entity.FirstName, FirstName = entity.FirstName,
LastName = entity.LastName, LastName = entity.LastName,
Description = entity.Description, Description = entity.Description,
EMail = entity.EMail, EMail = entity.EMail,
IsActive = entity.IsActive, IsActive = entity.IsActive,
Discriminator = nameof(User), Discriminator = nameof(User),
}, token).ConfigureAwait(false); }, token).ConfigureAwait(false);
return changedRows > 0; return changedRows > 0;
} }

2
UserService.Test/UserRepositoryTests.cs
View File

@ -32,7 +32,7 @@ namespace UserService.Test
{ {
CommonName = "holger", CommonName = "holger",
FirstName = "Holger", FirstName = "Holger",
LastName = "Börchers", LastName = "Börchers",
IsActive = true IsActive = true
}; };
await _repository.AddAsync(user).ConfigureAwait(false); await _repository.AddAsync(user).ConfigureAwait(false);

2
UserService/Pages/Directory.razor.cs
View File

@ -39,7 +39,7 @@ namespace UserService.Pages
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
OrganizationUnits = (await OuRepository.GetAllAsync().ConfigureAwait(false)) OrganizationUnits = (await OuRepository.GetAllAsync().ConfigureAwait(false))
.Where(x => x.Parent is null) .Where(x => x.ParentId is null)
.ToList(); .ToList();
} }

4
UserService/Pages/Users.razor.cs
View File

@ -39,7 +39,7 @@ namespace UserService.Pages
if (arg is null) throw new ArgumentNullException(nameof(arg)); if (arg is null) throw new ArgumentNullException(nameof(arg));
var user = arg.Item; var user = arg.Item;
await UsersRepository.AddAsync(user).ConfigureAwait(false); 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<User> arg) protected override async Task RowDeletingCallback(CancellableRowChange<User> arg)
@ -71,7 +71,7 @@ namespace UserService.Pages
if (arg == null) throw new ArgumentNullException(nameof(arg)); if (arg == null) throw new ArgumentNullException(nameof(arg));
var user = arg.Item; var user = arg.Item;
user.MapFields(arg.Values); 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); var result = await UsersRepository.UpdateAsync(user).ConfigureAwait(false);
arg.Cancel = !result; arg.Cancel = !result;
} }