Evolving builder design

AntonioFalcaoJr · AntonioFalcaoJr · commit 5b8977c47de5 · 2021-04-12T15:06:47.000-03:00
diff --git a/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/Builder.cs b/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/Builder.cs
@@ -1,20 +1,17 @@
-﻿using Dotnet6.GraphQL4.Domain.Abstractions.Entities;
+﻿using System;
+using Dotnet6.GraphQL4.Domain.Abstractions.Entities;
 
 namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders
 {
-    public abstract class Builder<TBuilder, TEntity, TId> : IBuilder<TEntity, TId>
+    public abstract class Builder<TBuilder, TEntity, TId> : IBuilder<TBuilder, TEntity, TId>
         where TBuilder : Builder<TBuilder, TEntity, TId>
         where TEntity : Entity<TId>
         where TId : struct
     {
         protected TId Id;
-
         public abstract TEntity Build();
 
-        public TBuilder WithId(TId id)
-        {
-            Id = id;
-            return (TBuilder) this;
-        }
+        public TBuilder With<TProperty>(Func<TBuilder, TProperty> func)
+            => ((TBuilder) this).With<TBuilder, TProperty>(func);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/BuilderExtensions.cs b/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/BuilderExtensions.cs
@@ -0,0 +1,13 @@
+﻿using System;
+
+namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders
+{
+    internal static class BuilderExtensions
+    {
+        internal static TBuilder With<TBuilder, TProperty>(this TBuilder builder, Func<TBuilder, TProperty> func)
+        {
+            func(builder);
+            return builder;
+        }
+    }
+}
diff --git a/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/IBuilder.cs b/src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/IBuilder.cs
@@ -1,11 +1,14 @@
-﻿using Dotnet6.GraphQL4.Domain.Abstractions.Entities;
+﻿using System;
+using Dotnet6.GraphQL4.Domain.Abstractions.Entities;
 
 namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders
 {
-    public interface IBuilder<out TEntity, TId>
+    public interface IBuilder<out TBuilder, out TEntity, TId>
+        where TBuilder : IBuilder<TBuilder, TEntity, TId>
         where TEntity : Entity<TId>
         where TId : struct
     {
         TEntity Build();
+        TBuilder With<TProperty>(Func<TBuilder, TProperty> func);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Domain.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs b/src/Dotnet6.GraphQL4.Domain.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs
@@ -10,7 +10,7 @@ public static class ServiceCollectionExtensions
         public static IServiceCollection AddBuilders(this IServiceCollection services)
             => services
                 .Scan(selector => selector.FromAssemblies(Application.Assemblies)
-                    .AddClasses(filter => filter.AssignableTo(typeof(IBuilder<,>)))
+                    .AddClasses(filter => filter.AssignableTo(typeof(IBuilder<,,>)))
                     .UsingRegistrationStrategy(RegistrationStrategy.Skip)
                     .AsImplementedInterfaces()
                     .WithScopedLifetime());
diff --git a/src/Dotnet6.GraphQL4.Repositories.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs b/src/Dotnet6.GraphQL4.Repositories.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs
@@ -26,6 +26,6 @@ public static OptionsBuilder<ApplicationTransactionOptions> ConfigureTransaction
             => services
                 .AddOptions<ApplicationTransactionOptions>()
                 .Bind(section)
-                .Validate(options => options.IsolationLevel is IsolationLevel.Unspecified);
+                .Validate(options => options.IsolationLevel is not IsolationLevel.Unspecified);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Backpacks/BackpackBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Backpacks/BackpackBuilder.cs
@@ -3,17 +3,11 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Backpacks
 {
-    public class BackpackBuilder : ProductBuilder<Backpack, Guid>, IBackpackBuilder
+    public class BackpackBuilder : ProductBuilder<BackpackBuilder, Backpack, Guid>, IBackpackBuilder
     {
-        private BackpackType _type;
+        public BackpackType Type { get; set; }
 
         public override Backpack Build()
-            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, _type);
-
-        public IBackpackBuilder WithType(BackpackType type)
-        {
-            _type = type;
-            return this;
-        }
+            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, Type);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Backpacks/IBackpackBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Backpacks/IBackpackBuilder.cs
@@ -3,8 +3,8 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Backpacks
 {
-    public interface IBackpackBuilder : IProductBuilder<Backpack, Guid>
+    public interface IBackpackBuilder : IProductBuilder<BackpackBuilder, Backpack, Guid>
     {
-        IBackpackBuilder WithType(BackpackType type);
+        BackpackType Type { set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Boots/BootBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Boots/BootBuilder.cs
@@ -3,24 +3,12 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Boots
 {
-    public class BootBuilder : ProductBuilder<Boot, Guid>, IBootBuilder
+    public class BootBuilder : ProductBuilder<BootBuilder, Boot, Guid>, IBootBuilder
     {
-        private int _size;
-        private BootType _type;
+        public BootType Type { get; set; }
+        public int Size { get; set; }
 
         public override Boot Build()
-            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, _type, _size);
-
-        public IBootBuilder WithType(BootType type)
-        {
-            _type = type;
-            return this;
-        }
-
-        public IBootBuilder WithSize(int size)
-        {
-            _size = size;
-            return this;
-        }
+            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, Type, Size);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Boots/IBootBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Boots/IBootBuilder.cs
@@ -3,9 +3,9 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Boots
 {
-    public interface IBootBuilder : IProductBuilder<Boot, Guid>
+    public interface IBootBuilder : IProductBuilder<BootBuilder,Boot, Guid>
     {
-        IBootBuilder WithType(BootType type);
-        IBootBuilder WithSize(int size);
+        BootType Type { set; }
+        int Size { set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/IProductBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/IProductBuilder.cs
@@ -6,18 +6,19 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products
 {
-    public interface IProductBuilder<out TProduct, TId> : IBuilder<TProduct, TId>
+    public interface IProductBuilder<out TBuilder, out TProduct, TId> : IBuilder<TBuilder, TProduct, TId>
+        where TBuilder : IBuilder<TBuilder, TProduct, TId>
         where TProduct : Entity<TId>, IProduct
         where TId : struct
     {
-        IProductBuilder<TProduct, TId> WithDescription(string description);
-        IProductBuilder<TProduct, TId> WithIntroduceAt(DateTimeOffset introduceAt);
-        IProductBuilder<TProduct, TId> WithName(string name);
-        IProductBuilder<TProduct, TId> WithOption(Option option);
-        IProductBuilder<TProduct, TId> WithPhotoUrl(string photoUrl);
-        IProductBuilder<TProduct, TId> WithPrice(decimal price);
-        IProductBuilder<TProduct, TId> WithProductType(ProductType productType);
-        IProductBuilder<TProduct, TId> WithRating(int rating);
-        IProductBuilder<TProduct, TId> WithStock(int stock);
+        string Description { set; }
+        DateTimeOffset IntroduceAt { set; }
+        string Name { set; }
+        Option Option { set; }
+        string PhotoUrl { set; }
+        decimal Price { set; }
+        ProductType ProductType { set; }
+        int Rating { set; }
+        int Stock { set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Kayaks/IKayakBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Kayaks/IKayakBuilder.cs
@@ -3,9 +3,9 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Kayaks
 {
-    public interface IKayakBuilder : IProductBuilder<Kayak, Guid>
+    public interface IKayakBuilder : IProductBuilder<KayakBuilder, Kayak, Guid>
     {
-        IKayakBuilder WithAmountOfPerson(int amountOfPerson);
-        IKayakBuilder WithType(KayakType type);
+        int AmountOfPerson { set; }
+        KayakType Type { set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Kayaks/KayakBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/Kayaks/KayakBuilder.cs
@@ -3,24 +3,12 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Kayaks
 {
-    public class KayakBuilder : ProductBuilder<Kayak, Guid>, IKayakBuilder
+    public class KayakBuilder : ProductBuilder<KayakBuilder, Kayak, Guid>, IKayakBuilder
     {
-        private int _amountOfPerson;
-        private KayakType _type;
-
-        public IKayakBuilder WithAmountOfPerson(int amountOfPerson)
-        {
-            _amountOfPerson = amountOfPerson;
-            return this;
-        }
-
-        public IKayakBuilder WithType(KayakType type)
-        {
-            _type = type;
-            return this;
-        }
+        public int AmountOfPerson { get; set; }
+        public KayakType Type { get; set; }
 
         public override Kayak Build()
-            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, _type, _amountOfPerson);
+            => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, Type, AmountOfPerson);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/ProductBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Products/ProductBuilder.cs
@@ -6,72 +6,19 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products
 {
-    public abstract class ProductBuilder<TProduct, TId> : Builder<ProductBuilder<TProduct, TId>, TProduct, TId>, IProductBuilder<TProduct, TId>
+    public abstract class ProductBuilder<TProductBuilder, TProduct, TId> : Builder<TProductBuilder, TProduct, TId>, IProductBuilder<TProductBuilder, TProduct, TId>
+        where TProductBuilder : ProductBuilder<TProductBuilder, TProduct, TId>
         where TProduct : Entity<TId>, IProduct
         where TId : struct
     {
-        protected string Description;
-        protected DateTimeOffset IntroduceAt;
-        protected string Name;
-        protected Option Option;
-        protected string PhotoUrl;
-        protected decimal Price;
-        protected ProductType ProductType;
-        protected int Rating;
-        protected int Stock;
-
-        public IProductBuilder<TProduct, TId> WithDescription(string description)
-        {
-            Description = description;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithIntroduceAt(DateTimeOffset introduceAt)
-        {
-            IntroduceAt = introduceAt;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithName(string name)
-        {
-            Name = name;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithOption(Option option)
-        {
-            Option = option;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithPhotoUrl(string photoUrl)
-        {
-            PhotoUrl = photoUrl;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithPrice(decimal price)
-        {
-            Price = price;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithProductType(ProductType productType)
-        {
-            ProductType = productType;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithRating(int rating)
-        {
-            Rating = rating;
-            return this;
-        }
-
-        public IProductBuilder<TProduct, TId> WithStock(int stock)
-        {
-            Stock = stock;
-            return this;
-        }
+        public string Description { get; set; }
+        public DateTimeOffset IntroduceAt { get; set; }
+        public string Name { get; set; }
+        public Option Option { get; set; }
+        public string PhotoUrl { get; set; }
+        public decimal Price { get; set; }
+        public ProductType ProductType { get; set; }
+        public int Rating { get; set; }
+        public int Stock { get; set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Reviews/IReviewBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Reviews/IReviewBuilder.cs
@@ -3,10 +3,10 @@
 
 namespace Dotnet6.GraphQL4.Store.Domain.Entities.Reviews
 {
-    public interface IReviewBuilder : IBuilder<Review, Guid>
+    public interface IReviewBuilder : IBuilder<ReviewBuilder, Review, Guid>
     {
-        IReviewBuilder WithTitle(string title);
-        IReviewBuilder WithComment(string comment);
-        IReviewBuilder WithProductReference(Guid productId);
+        string Title { set; }
+        string Comment { set; }
+        Guid ProductId { set; }
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Domain/Entities/Reviews/ReviewBuilder.cs b/src/Dotnet6.GraphQL4.Store.Domain/Entities/Reviews/ReviewBuilder.cs
@@ -5,28 +5,11 @@ namespace Dotnet6.GraphQL4.Store.Domain.Entities.Reviews
 {
     public class ReviewBuilder : Builder<ReviewBuilder, Review, Guid>, IReviewBuilder
     {
-        private string _comment;
-        private Guid _productId;
-        private string _title;
+        public string Title { get; set; }
+        public string Comment { get; set; }
+        public Guid ProductId { get; set; }
 
-        public override Review Build() => new(_title, _comment, _productId);
-
-        public IReviewBuilder WithTitle(string title)
-        {
-            _title = title;
-            return this;
-        }
-
-        public IReviewBuilder WithComment(string comment)
-        {
-            _comment = comment;
-            return this;
-        }
-
-        public IReviewBuilder WithProductReference(Guid productId)
-        {
-            _productId = productId;
-            return this;
-        }
+        public override Review Build()
+            => new(Title, Comment, ProductId);
     }
 }
diff --git a/src/Dotnet6.GraphQL4.Store.Repositories/Configurations/Products/ProductConfiguration.cs b/src/Dotnet6.GraphQL4.Store.Repositories/Configurations/Products/ProductConfiguration.cs
@@ -60,8 +60,8 @@ public void Configure(EntityTypeBuilder<Product> builder)
             builder
                 .HasDiscriminator()
                 .HasValue<Boot>(nameof(Boot))
-                ?.HasValue<Kayak>(nameof(Kayak))
-                ?.HasValue<Backpack>(nameof(Backpack));
+                .HasValue<Kayak>(nameof(Kayak))
+                .HasValue<Backpack>(nameof(Backpack));
 
             builder
                 .Property(DiscriminatorDefaultName)
diff --git a/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BackpackModelToDomainConverter.cs b/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BackpackModelToDomainConverter.cs
diff --git a/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BootModelToDomainConverter.cs b/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BootModelToDomainConverter.cs
diff --git a/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/KayakModelToDomainConverter.cs b/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/KayakModelToDomainConverter.cs
diff --git a/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/ReviewModelToDomainConverter.cs b/src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/ReviewModelToDomainConverter.cs
diff --git a/src/Dotnet6.GraphQL4.Store.WebAPI/DependencyInjection/Extensions/ExceptionHandlerExtensions.cs b/src/Dotnet6.GraphQL4.Store.WebAPI/DependencyInjection/Extensions/ExceptionHandlerExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,17 @@`
`1`		`-using Dotnet6.GraphQL4.Domain.Abstractions.Entities;`
	`1`	`+using System;`
	`2`	`+using Dotnet6.GraphQL4.Domain.Abstractions.Entities;`
`2`	`3`
`3`	`4`	`namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders`
`4`	`5`	`{`
`5`		`- public abstract class Builder<TBuilder, TEntity, TId> : IBuilder<TEntity, TId>`
	`6`	`+ public abstract class Builder<TBuilder, TEntity, TId> : IBuilder<TBuilder, TEntity, TId>`
`6`	`7`	`where TBuilder : Builder<TBuilder, TEntity, TId>`
`7`	`8`	`where TEntity : Entity<TId>`
`8`	`9`	`where TId : struct`
`9`	`10`	`{`
`10`	`11`	`protected TId Id;`
`11`		`-`
`12`	`12`	`public abstract TEntity Build();`
`13`	`13`
`14`		`- public TBuilder WithId(TId id)`
`15`		`- {`
`16`		`- Id = id;`
`17`		`- return (TBuilder) this;`
`18`		`- }`
	`14`	`+ public TBuilder With<TProperty>(Func<TBuilder, TProperty> func)`
	`15`	`+ => ((TBuilder) this).With<TBuilder, TProperty>(func);`
`19`	`16`	`}`
`20`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,14 @@`
`1`		`-using Dotnet6.GraphQL4.Domain.Abstractions.Entities;`
	`1`	`+using System;`
	`2`	`+using Dotnet6.GraphQL4.Domain.Abstractions.Entities;`
`2`	`3`
`3`	`4`	`namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders`
`4`	`5`	`{`
`5`		`- public interface IBuilder<out TEntity, TId>`
	`6`	`+ public interface IBuilder<out TBuilder, out TEntity, TId>`
	`7`	`+ where TBuilder : IBuilder<TBuilder, TEntity, TId>`
`6`	`8`	`where TEntity : Entity<TId>`
`7`	`9`	`where TId : struct`
`8`	`10`	`{`
`9`	`11`	`TEntity Build();`
	`12`	`+ TBuilder With<TProperty>(Func<TBuilder, TProperty> func);`
`10`	`13`	`}`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public static OptionsBuilder<ApplicationTransactionOptions> ConfigureTransaction`
`26`	`26`	`=> services`
`27`	`27`	`.AddOptions<ApplicationTransactionOptions>()`
`28`	`28`	`.Bind(section)`
`29`		`- .Validate(options => options.IsolationLevel is IsolationLevel.Unspecified);`
	`29`	`+ .Validate(options => options.IsolationLevel is not IsolationLevel.Unspecified);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,11 @@`
`3`	`3`
`4`	`4`	`namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Backpacks`
`5`	`5`	`{`
`6`		`- public class BackpackBuilder : ProductBuilder<Backpack, Guid>, IBackpackBuilder`
	`6`	`+ public class BackpackBuilder : ProductBuilder<BackpackBuilder, Backpack, Guid>, IBackpackBuilder`
`7`	`7`	`{`
`8`		`- private BackpackType _type;`
	`8`	`+ public BackpackType Type { get; set; }`
`9`	`9`
`10`	`10`	`public override Backpack Build()`
`11`		`- => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, _type);`
`12`		`-`
`13`		`- public IBackpackBuilder WithType(BackpackType type)`
`14`		`- {`
`15`		`- _type = type;`
`16`		`- return this;`
`17`		`- }`
	`11`	`+ => new(Id, Description, IntroduceAt, Name, PhotoUrl, Price, ProductType, Rating, Stock, Option, Type);`
`18`	`12`	`}`
`19`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Backpacks`
`5`	`5`	`{`
`6`		`- public interface IBackpackBuilder : IProductBuilder<Backpack, Guid>`
	`6`	`+ public interface IBackpackBuilder : IProductBuilder<BackpackBuilder, Backpack, Guid>`
`7`	`7`	`{`
`8`		`- IBackpackBuilder WithType(BackpackType type);`
	`8`	`+ BackpackType Type { set; }`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`
`4`	`4`	`namespace Dotnet6.GraphQL4.Store.Domain.Entities.Products.Boots`
`5`	`5`	`{`
`6`		`- public interface IBootBuilder : IProductBuilder<Boot, Guid>`
	`6`	`+ public interface IBootBuilder : IProductBuilder<BootBuilder,Boot, Guid>`
`7`	`7`	`{`
`8`		`- IBootBuilder WithType(BootType type);`
`9`		`- IBootBuilder WithSize(int size);`
	`8`	`+ BootType Type { set; }`
	`9`	`+ int Size { set; }`
`10`	`10`	`}`
`11`	`11`	`}`