Merge pull request #7 from wintoncode/class-valueobjects

Remove struct constraint on value objects.

Author: iscottb122

src/Winton.DomainModelling.DocumentDb/IValueObjectFacade.cs

@@ -19,7 +19,7 @@ public interface IValueObjectFacade
         /// <param name="valueObject">The Value Object to persist.</param>
         /// <returns>A Task.</returns>
         Task Create<TValueObject>(TValueObject valueObject)
-            where TValueObject : struct, IEquatable<TValueObject>;
+            where TValueObject : IEquatable<TValueObject>;
 
         /// <summary>
         ///     Delete a Value Object of a specified type.
@@ -28,14 +28,14 @@ Task Create<TValueObject>(TValueObject valueObject)
         /// <param name="valueObject">The Value Object to delete.</param>
         /// <returns>A Task.</returns>
         Task Delete<TValueObject>(TValueObject valueObject)
-            where TValueObject : struct, IEquatable<TValueObject>;
+            where TValueObject : IEquatable<TValueObject>;
 
         /// <summary>
         ///     Query Value Objects of a specified type.
         /// </summary>
         /// <typeparam name="TValueObject">The type of the Value Objects.</typeparam>
         /// <returns>An <see cref="IQueryable{TValueObject}" />.</returns>
         IQueryable<TValueObject> Query<TValueObject>()
-            where TValueObject : struct, IEquatable<TValueObject>;
+            where TValueObject : IEquatable<TValueObject>;
     }
 }

src/Winton.DomainModelling.DocumentDb/ValueObjectDocument.cs

@@ -7,7 +7,7 @@
 namespace Winton.DomainModelling.DocumentDb
 {
     internal sealed class ValueObjectDocument<TValueObject>
-        where TValueObject : struct, IEquatable<TValueObject>
+        where TValueObject : IEquatable<TValueObject>
     {
         [JsonConstructor]
         private ValueObjectDocument(TValueObject valueObject, string id)

src/Winton.DomainModelling.DocumentDb/ValueObjectFacade.cs

@@ -49,7 +49,7 @@ public ValueObjectFacade(
         /// <param name="valueObject">The Value Object to persist.</param>
         /// <returns>A Task.</returns>
         public async Task Create<TValueObject>(TValueObject valueObject)
-            where TValueObject : struct, IEquatable<TValueObject>
+            where TValueObject : IEquatable<TValueObject>
         {
             ValueObjectDocument<TValueObject> document = Get(valueObject);
 
@@ -69,7 +69,7 @@ public async Task Create<TValueObject>(TValueObject valueObject)
         /// <param name="valueObject">The Value Object to delete.</param>
         /// <returns>A Task.</returns>
         public async Task Delete<TValueObject>(TValueObject valueObject)
-            where TValueObject : struct, IEquatable<TValueObject>
+            where TValueObject : IEquatable<TValueObject>
         {
             ValueObjectDocument<TValueObject> document = Get(valueObject);
 
@@ -86,13 +86,13 @@ public async Task Delete<TValueObject>(TValueObject valueObject)
         /// <typeparam name="TValueObject">The type of the Value Objects.</typeparam>
         /// <returns>An <see cref="T:System.Linq.IQueryable`1" />.</returns>
         public IQueryable<TValueObject> Query<TValueObject>()
-            where TValueObject : struct, IEquatable<TValueObject>
+            where TValueObject : IEquatable<TValueObject>
         {
             return CreateValueObjectDocumentQuery<TValueObject>().Select(x => x.ValueObject);
         }
 
         private IQueryable<ValueObjectDocument<TValueObject>> CreateValueObjectDocumentQuery<TValueObject>()
-            where TValueObject : struct, IEquatable<TValueObject>
+            where TValueObject : IEquatable<TValueObject>
         {
             string valueObjectType = ValueObjectDocument<TValueObject>.GetDocumentType();
 
@@ -101,7 +101,7 @@ private IQueryable<ValueObjectDocument<TValueObject>> CreateValueObjectDocumentQ
         }
 
         private ValueObjectDocument<TValueObject> Get<TValueObject>(TValueObject valueObject)
-            where TValueObject : struct, IEquatable<TValueObject>
+            where TValueObject : IEquatable<TValueObject>
         {
             return CreateValueObjectDocumentQuery<TValueObject>()
                 .AsEnumerable()

test/Winton.DomainModelling.DocumentDb.IntegrationTests/ValueObjectFacadeTests.cs

@@ -44,38 +44,6 @@ public void Dispose()
             _documentClient.DeleteDatabaseAsync(_database.SelfLink).Wait();
         }
 
-        private struct OtherTestValueObject : IEquatable<OtherTestValueObject>
-        {
-            [JsonConstructor]
-            public OtherTestValueObject(int value)
-            {
-                Value = value;
-            }
-
-            // ReSharper disable once MemberCanBePrivate.Local
-            public int Value { get; }
-
-            public bool Equals(OtherTestValueObject other)
-            {
-                return Value == other.Value;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is null)
-                {
-                    return false;
-                }
-
-                return obj is OtherTestValueObject o && Equals(o);
-            }
-
-            public override int GetHashCode()
-            {
-                return Value;
-            }
-        }
-
         private struct TestValueObject : IEquatable<TestValueObject>
         {
             [JsonConstructor]
@@ -190,5 +158,52 @@ private async Task ShouldQueryValueObjectsOfCorrectType()
                     });
             }
         }
+
+        private class OtherTestValueObject : IEquatable<OtherTestValueObject>
+        {
+            [JsonConstructor]
+            public OtherTestValueObject(int value)
+            {
+                Value = value;
+            }
+
+            // ReSharper disable once MemberCanBePrivate.Local
+            public int Value { get; }
+
+            public bool Equals(OtherTestValueObject other)
+            {
+                if (other is null)
+                {
+                    return false;
+                }
+
+                if (ReferenceEquals(this, other))
+                {
+                    return true;
+                }
+
+                return Value == other.Value;
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (obj is null)
+                {
+                    return false;
+                }
+
+                if (ReferenceEquals(this, obj))
+                {
+                    return true;
+                }
+
+                return obj.GetType() == GetType() && Equals((OtherTestValueObject)obj);
+            }
+
+            public override int GetHashCode()
+            {
+                return Value;
+            }
+        }
     }
 }