HAM/Berufsschule_HAM
1
0
Fork 1
mirror of https://github.com/LD-Reborn/Berufsschule_HAM.git synced 2025-12-20 06:51:55 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Merge pull request #315 from LD-Reborn/233-bug-location-update-does-not-cause-upate-of-assets-and-users

Browse Source 
Fixed location update does not cause update of assets and users, fixe…
This commit is contained in:
LD50
2025-11-16 21:47:46 +01:00
committed by GitHub
parent 465f01f934 95111a6a3d
commit e87e9cb79b
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controllers/LocationsController.cs
View File

@@ -69,6 +69,8 @@ public class LocationsController : Controller
} }
try try
{ {
LocationModel location = await _ldap.GetLocationByCnAsync(cn);
await SynchronizationHelper.SyncLocationName(_ldap, location.Location, "");
await _ldap.DeleteLocationAsync(cn); await _ldap.DeleteLocationAsync(cn);
return new(true); return new(true);
} }
@@ -92,7 +94,7 @@ public class LocationsController : Controller
string location = requestModel.Location; string location = requestModel.Location;
LocationsDescription room = requestModel.Description; LocationsDescription room = requestModel.Description;
string newLocation = StringHelpers.Slugify(room.Location + " " + room.RoomNumber + " " + room.Seat); // TODO: fix DRY violation string newLocation = StringHelpers.Slugify(room.Location + " " + room.RoomNumber + " " + room.Seat); // TODO: fix DRY violation
await SynchronizationHelper.SyncLocationName(_ldap, location, newLocation);
await _ldap.UpdateLocation(location, "description", JsonSerializer.Serialize(room)); await _ldap.UpdateLocation(location, "description", JsonSerializer.Serialize(room));
await _ldap.UpdateLocation(location, "l", newLocation); await _ldap.UpdateLocation(location, "l", newLocation);
return new LocationsUpdateResponseModel { Success = true }; return new LocationsUpdateResponseModel { Success = true };

9
src/Controllers/UsersController.cs
View File

@@ -51,9 +51,8 @@ public class UsersController : Controller
{ {
try try
{ {
var syncAssetOwnership = SynchronizationHelper.SyncAssetOwnership(_ldap, uid, ""); await SynchronizationHelper.SyncAssetOwnership(_ldap, uid, "");
await _ldap.DeleteUserAsync(uid); await _ldap.DeleteUserAsync(uid);
await syncAssetOwnership;
return new UsersDeleteRequestModel(true); return new UsersDeleteRequestModel(true);
} }
catch (Exception ex) catch (Exception ex)
@@ -124,10 +123,9 @@ public class UsersController : Controller
UserModel? user = null; UserModel? user = null;
if (requestModel.NewUid is not null && requestModel.NewUid.Length > 0) if (requestModel.NewUid is not null && requestModel.NewUid.Length > 0)
{ {
var syncAssetOwnership = SynchronizationHelper.SyncAssetOwnership(_ldap, uid, requestModel.NewUid); await SynchronizationHelper.SyncAssetOwnership(_ldap, uid, requestModel.NewUid);
await _ldap.UpdateUser(uid, "uid", requestModel.NewUid); await _ldap.UpdateUser(uid, "uid", requestModel.NewUid);
uid = requestModel.NewUid; uid = requestModel.NewUid;
await syncAssetOwnership;
} }
if (requestModel.Title is not null) if (requestModel.Title is not null)
{ {
@@ -170,10 +168,9 @@ public class UsersController : Controller
} }
if (newUid != uid) if (newUid != uid)
{ {
var syncAssetOwnership = SynchronizationHelper.SyncAssetOwnership(_ldap, uid, newUid); await SynchronizationHelper.SyncAssetOwnership(_ldap, uid, newUid);
await _ldap.UpdateUser(uid, "uid", newUid); await _ldap.UpdateUser(uid, "uid", newUid);
uid = newUid; uid = newUid;
await syncAssetOwnership;
} }
return new() { Success = true, NewUid = uid }; return new() { Success = true, NewUid = uid };
} catch (Exception ex) } catch (Exception ex)

36
src/Helpers/SynchronizationHelper.cs
View File

@@ -1,3 +1,4 @@
using System.Text.Json;
using Berufsschule_HAM.Models; using Berufsschule_HAM.Models;
using Berufsschule_HAM.Services; using Berufsschule_HAM.Services;
@@ -8,8 +9,8 @@ public static class SynchronizationHelper
{ {
bool remove = string.IsNullOrEmpty(newName); bool remove = string.IsNullOrEmpty(newName);
string uidString = $"uid={newName}"; string uidString = $"uid={newName}";
IEnumerable<AssetModel> assets = await ldap.ListDeviceAsync(); IEnumerable<AssetModel> assets = [.. (await ldap.ListDeviceAsync()).Where(asset => asset.Owner == $"uid={oldName}")];
var tasks = assets.Where(asset => asset.Owner == $"uid={oldName}").ToList().Select(async asset => foreach (AssetModel asset in assets)
{ {
if (remove) if (remove)
{ {
@@ -19,7 +20,34 @@ public static class SynchronizationHelper
{ {
await ldap.UpdateAsset(asset.Cn, "owner", uidString); await ldap.UpdateAsset(asset.Cn, "owner", uidString);
} }
}); };
await Task.WhenAll(tasks); }
public static async Task SyncLocationName(LdapService ldap, string oldLocation, string newLocation)
{
bool remove = string.IsNullOrEmpty(newLocation);
// Update asset locations
IEnumerable<AssetModel> assets = [.. (await ldap.ListDeviceAsync()).Where(asset => asset.Location == oldLocation)];
foreach (AssetModel asset in assets)
{
if (remove)
{
await ldap.DeleteAttribute(ldap.AssetsBaseDn, "cn", asset.Cn, "l");
}
else
{
await ldap.UpdateAsset(asset.Cn, "l", newLocation);
}
};
// Update user workplace locations
string newUserLocation = remove ? "" : newLocation;
IEnumerable<UserModel> users = [.. (await ldap.ListUsersAsync()).Where(user => user.Description is not null && user.Description.Workplace == oldLocation)];
foreach (UserModel user in users)
{
if (user.Description is null) return;
user.Description.Workplace = newUserLocation;
await ldap.UpdateUser(user.Uid, "description", JsonSerializer.Serialize(user.Description));
};
} }
} }