Cleanup
This commit is contained in:
@ -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!;
|
||||
}
|
||||
}
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user