Add EntityId

Author: elotoja

src/Quizer.Domain/Common/Models/AggregateRootId.cs

@@ -1,6 +1,8 @@
 namespace Quizer.Domain.Common.Models;
 
-public abstract class AggregateRootId<TId> : ValueObject
+public abstract class AggregateRootId<TId> : EntityId<TId>
 {
-    public abstract TId Value { get; protected set; }
+    protected AggregateRootId(TId value) : base(value)
+    {
+    }
 }

src/Quizer.Domain/Common/Models/Entity.cs

@@ -1,6 +1,5 @@
 using ErrorOr;
 using FluentValidation.Results;
-using Quizer.Domain.QuizAggregate.Validation;
 
 namespace Quizer.Domain.Common.Models;
 

src/Quizer.Domain/Common/Models/EntityId.cs

@@ -0,0 +1,24 @@
+namespace Quizer.Domain.Common.Models;
+
+public abstract class EntityId<TId> : ValueObject
+{
+    public TId Value { get; }
+
+    protected EntityId(TId value)
+    {
+        Value = value;
+    }
+
+    public override IEnumerable<object?> GetEqualityComponents()
+    {
+        yield return Value;
+    }
+
+    public override string? ToString() => Value?.ToString() ?? base.ToString();
+
+#pragma warning disable CS8618
+    protected EntityId()
+    {
+    }
+#pragma warning restore CS8618
+}

src/Quizer.Domain/Common/Models/ValueObject.cs

@@ -2,27 +2,29 @@
 
 public abstract class ValueObject : IEquatable<ValueObject>
 {
-    public abstract IEnumerable<object> GetEqualityComponents();
+    public abstract IEnumerable<object?> GetEqualityComponents();
 
     public override bool Equals(object? obj)
     {
         if (obj is null || obj.GetType() != GetType())
+        {
             return false;
+        }
 
         var valueObject = (ValueObject)obj;
 
         return GetEqualityComponents()
             .SequenceEqual(valueObject.GetEqualityComponents());
     }
 
-    public static bool operator ==(ValueObject? a, ValueObject? b)
+    public static bool operator ==(ValueObject left, ValueObject right)
     {
-        return Equals(a, b);
+        return Equals(left, right);
     }
 
-    public static bool operator !=(ValueObject? a, ValueObject? b)
+    public static bool operator !=(ValueObject left, ValueObject right)
     {
-        return !Equals(a, b);
+        return !Equals(left, right);
     }
 
     public override int GetHashCode()
@@ -34,6 +36,6 @@ public override int GetHashCode()
 
     public bool Equals(ValueObject? other)
     {
-        return Equals(other);
+        return Equals((object?)other);
     }
-}
+}

src/Quizer.Domain/QuestionAggregate/Entities/Answer.cs

@@ -29,14 +29,12 @@ public ErrorOr<bool> Update(string answer, bool isCorrect)
     {
         base.Update();
         Text = answer;
-        IsCorrect = true;
+        IsCorrect = isCorrect;
 
         return true;
     }
 
 #pragma warning disable CS8618
-    private Answer()
-    {
-    }
+    private Answer() {}
 #pragma warning restore CS8618
 }

src/Quizer.Domain/QuestionAggregate/Question.cs

@@ -72,8 +72,6 @@ public void Delete()
     }
 
 #pragma warning disable CS8618
-    private Question()
-    {
-    }
+    private Question() {}
 #pragma warning restore CS8618
 }

src/Quizer.Domain/QuestionAggregate/QuestionId.cs

@@ -4,11 +4,9 @@ namespace Quizer.Domain.QuestionAggregate;
 
 public sealed class QuestionId : AggregateRootId<Guid>
 {
-    public override Guid Value { get; protected set; }
 
-    private QuestionId(Guid value)
+    private QuestionId(Guid value) : base(value)
     {
-        Value = value;
     }
 
     public static QuestionId CreateUnique()

src/Quizer.Domain/QuestionAggregate/ValueObjects/AnswerId.cs

@@ -2,13 +2,10 @@
 
 namespace Quizer.Domain.QuestionAggregate.ValueObjects;
 
-public sealed class AnswerId : ValueObject
+public sealed class AnswerId : EntityId<Guid>
 {
-    public Guid Value { get; private set; }
-
-    private AnswerId(Guid value)
+    public AnswerId(Guid value) : base(value)
     {
-        Value = value;
     }
 
     public static AnswerId CreateUnique()

src/Quizer.Domain/QuizAggregate/Quiz.cs

@@ -100,8 +100,6 @@ public void DeleteQuestion(Question question)
     }
 
 #pragma warning disable CS8618
-    private Quiz()
-    {
-    }
+    private Quiz() {}
 #pragma warning restore CS8618
 }

src/Quizer.Domain/QuizAggregate/QuizId.cs

@@ -4,11 +4,8 @@ namespace Quizer.Domain.QuizAggregate;
 
 public sealed class QuizId : AggregateRootId<Guid>
 {
-    public override Guid Value { get; protected set; }
-
-    private QuizId(Guid value)
+    private QuizId(Guid value) : base(value)
     {
-        Value = value;
     }
 
     public static QuizId CreateUnique()