From 92ea05b212dcc469f4fe4f79654f7c6bbfecbd67 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 24 Oct 2020 12:15:17 +0200 Subject: [PATCH] Fixes for equality of structs. --- .../src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs | 2 +- backend/src/Squidex.Infrastructure/DomainId.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs index 41117764f..00faa6442 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs @@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Core.Contents public int CompareTo([AllowNull] Status other) { - return string.Compare(name, other.name, StringComparison.Ordinal); + return string.Compare(Name, other.Name, StringComparison.Ordinal); } public static bool operator ==(Status lhs, Status rhs) diff --git a/backend/src/Squidex.Infrastructure/DomainId.cs b/backend/src/Squidex.Infrastructure/DomainId.cs index d253ed45e..fdc0177d2 100644 --- a/backend/src/Squidex.Infrastructure/DomainId.cs +++ b/backend/src/Squidex.Infrastructure/DomainId.cs @@ -61,12 +61,12 @@ namespace Squidex.Infrastructure public bool Equals(DomainId other) { - return string.Equals(id, other.id); + return string.Equals(ToString(), other.ToString()); } public override int GetHashCode() { - return id?.GetHashCode() ?? 0; + return ToString().GetHashCode(); } public override string ToString() @@ -76,7 +76,7 @@ namespace Squidex.Infrastructure public int CompareTo([AllowNull] DomainId other) { - return string.Compare(id, other.id, StringComparison.Ordinal); + return string.Compare(ToString(), other.ToString(), StringComparison.Ordinal); } public static bool operator ==(DomainId lhs, DomainId rhs)