Cleanup

UserService.DatabaseLayer/Repositories/BaseRepository.cs

@@ -37,13 +37,20 @@ namespace UserService.DatabaseLayer.Repositories
         public virtual async Task<IReadOnlyList<T>> GetAllAsync(Expression<Func<T, bool>>? predicate = null, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await Context(db).Include(x => x.Parent).WhereOrDefault(predicate).ToListAsync(token).ConfigureAwait(false);
+            return await Context(db)
+                .Include(x => x.Parent)
+                .WhereOrDefault(predicate)
+                .ToListAsync(token)
+                .ConfigureAwait(false);
         }
 
         public virtual async Task<T?> GetAsync(Expression<Func<T, bool>> predicate, CancellationToken token = default)
         {
             await using var db = new UserServiceDbContext();
-            return await Context(db).Include(x => x.Parent).FirstOrDefaultAsync(predicate, token).ConfigureAwait(false);
+            return await Context(db)
+                .Include(x => x.Parent)
+                .FirstOrDefaultAsync(predicate, token)
+                .ConfigureAwait(false);
         }
         public virtual async Task<bool> UpdateAsync(T entity, CancellationToken token = default)
         {

UserService.DatabaseLayer/Repositories/IRepository.cs

@@ -32,8 +32,10 @@ namespace UserService.DatabaseLayer.Repositories
 
     }
 
-    public interface IMembersRepository : IRepository<Member>
+    public interface IMembersRepository
     {
 
     }
+
+
 }

UserService.DatabaseLayer/Repositories/OrganizationUnitsRepository.cs

@@ -24,7 +24,7 @@ namespace UserService.DatabaseLayer.Repositories
             var rootOus = await Context(db)
                 .Include(x => x.Parent)
                 .WhereOrDefault(predicate)
-                .ToListAsync(cancellationToken: token).ConfigureAwait(false);
+                .ToListAsync(token).ConfigureAwait(false);
 
             IEnumerable<OrganizationUnit> Rec(Node node)
             {

UserService.DatabaseLayer/Repositories/SecurityGroupsRepository.cs

@@ -1,4 +1,6 @@
-using Microsoft.EntityFrameworkCore;
+#nullable enable
+
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,8 +41,11 @@ namespace UserService.DatabaseLayer.Repositories
 
         public override async Task<bool> UpdateAsync(SecurityGroup entity, CancellationToken token = default)
         {
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
+
             await using var db = new UserServiceDbContext();
             Context(db).Update(entity);
+            db.UserMembers.UpdateRange(entity.Members);
             var items = await db.SaveChangesAsync(token).ConfigureAwait(false);
             return items > 0;
         }

UserService.Infrastructure/DataModels/Member.cs

@@ -4,8 +4,8 @@ namespace UserService.Infrastructure.DataModels
 {
     public abstract class Member : Node
     {
-        public ICollection<MembersMember> Members { get; set; } = new List<MembersMember>();
+        public ISet<MembersMember> Members { get; set; } = new HashSet<MembersMember>();
 
-        public ICollection<MembersMember> MemberOf { get; set; } = null!;
+        public ISet<MembersMember> MemberOf { get; set; } = null!;
     }
 }

UserService.Infrastructure/DataModels/MembersMember.cs

@@ -9,5 +9,22 @@ namespace UserService.Infrastructure.DataModels
         public Guid AttachedMemberId { get; set; }
 
         public Member? AttachedMember { get; set; }
+
+        public override bool Equals(object obj) => Equals((MembersMember)obj);
+
+        public bool Equals(MembersMember other)
+        {
+            return MemberId.Equals(other.MemberId) && AttachedMemberId.Equals(other.AttachedMemberId);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = MemberId.GetHashCode();
+                hashCode = (hashCode * 397) ^ AttachedMemberId.GetHashCode();
+                return hashCode;
+            }
+        }
     }
 }

UserService.Infrastructure/DataModels/Node.cs

@@ -5,12 +5,12 @@ using System.ComponentModel.DataAnnotations;
 
 namespace UserService.Infrastructure.DataModels
 {
-    public abstract class Node : ICloneable
+    public abstract class Node : ICloneable, IComparable<Node>
     {
         public Guid Id { get; set; }
         [Required] public string CommonName { get; set; } = null!;
         public string? Description { get; set; }
-        public ICollection<Node> Children { get; set; } = new List<Node>();
+        public ISet<Node> Children { get; set; } = new SortedSet<Node>();
         public Node? Parent { get; set; } //Parent
         public Guid? ParentId { get; set; }
 
@@ -20,5 +20,14 @@ namespace UserService.Infrastructure.DataModels
 
         /// <inheritdoc />
         public virtual object Clone() => MemberwiseClone();
+
+        public int CompareTo(Node? other)
+        {
+            if (ReferenceEquals(this, other)) return 0;
+            if (ReferenceEquals(null, other)) return 1;
+            var commonNameComparison = string.Compare(CommonName, other.CommonName, StringComparison.Ordinal);
+            if (commonNameComparison != 0) return commonNameComparison;
+            return Id.CompareTo(other.Id);
+        }
     }
 }

UserService/Pages/SecurityGroups.razor.cs

@@ -96,13 +96,17 @@ namespace UserService.Pages
         {
             if (SelectedMember is null) return;
             if (SelectedSecurityGroup is null) return;
-            SelectedSecurityGroup.Members.Add(new MembersMember
+            if (!SelectedSecurityGroup.Members.Add(new MembersMember
             {
                 MemberId = SelectedSecurityGroup.Id,
                 Member = SelectedSecurityGroup,
                 AttachedMemberId = SelectedMember.Id,
                 AttachedMember = SelectedMember
-            });
+            }))
+            {
+                await JsRuntime.AlertAsync("User already part of the list.").ConfigureAwait(false);
+            }
+
             SelectedMember = default;
         }