Merge pull request #198 from AntonioFalcao/release

v3.4

Author: AntonioFalcaoJr

CONTRIBUTING.md

@@ -0,0 +1,92 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. 
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+   build.
+2. Update the README.md with details of changes to the interface, this includes new environment 
+   variables, exposed ports, useful file locations and container parameters.
+3. Increase the version numbers in any examples files and the README.md to the new version that this
+   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+   do not have permission to do that, you may request the second reviewer to merge it for you.
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at arfj@edu.univali.br. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

Directory.Build.props

@@ -18,7 +18,7 @@
         <!--GraphQL-->
         <GraphQL_Server_Version>5.0.1</GraphQL_Server_Version>
         <GraphQL_Client_Version>3.2.3</GraphQL_Client_Version>
-        <GraphQL_Version>4.2.0</GraphQL_Version>
+        <GraphQL_Version>4.3.0</GraphQL_Version>
 
         <!--AutoMapper-->
         <AutoMapper_DependencyInjection_Version>8.1.1</AutoMapper_DependencyInjection_Version>
@@ -31,7 +31,7 @@
         <HealthChecks_Version>5.0.1</HealthChecks_Version>
 
         <!--Others-->
-        <FluentValidation_Version>10.0.2</FluentValidation_Version>
+        <FluentValidation_Version>10.0.4</FluentValidation_Version>
         <Scrutor_Version>3.3.0</Scrutor_Version>
 
     </PropertyGroup>

README.md

@@ -744,7 +744,7 @@ ___
 
 ## Contributing
 
-Available soon!
+All contributions are welcome. Please take a look at [contributing](./CONTRIBUTING.md) guide.
 
 ## Versioning
 

src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/Builder.cs

@@ -1,20 +1,18 @@
-using Dotnet6.GraphQL4.Domain.Abstractions.Entities;
+using System;
+using Dotnet6.GraphQL4.Domain.Abstractions.Builders.Extensions;
+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);
     }
 }

src/Dotnet6.GraphQL4.Domain.Abstractions/Builders/Extensions/BuilderExtensions.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Dotnet6.GraphQL4.Domain.Abstractions.Builders.Extensions
+{
+    internal static class BuilderExtensions
+    {
+        internal static TBuilder With<TBuilder, TProperty>(this TBuilder builder, Func<TBuilder, TProperty> func)
+        {
+            func(builder);
+            return builder;
+        }
+    }
+}

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);
     }
 }

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());

src/Dotnet6.GraphQL4.Domain.Abstractions/ValueObjects/ValueObject.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Dotnet6.GraphQL4.Domain.Abstractions.ValueObjects
+{
+    public abstract class ValueObject
+    {
+        protected static bool EqualOperator(ValueObject left, ValueObject right)
+            => (ReferenceEquals(left, null) ^ ReferenceEquals(right, null)) is false && 
+               (ReferenceEquals(left, null) || left.Equals(right));
+
+        protected static bool NotEqualOperator(ValueObject left, ValueObject right)
+            => EqualOperator(left, right) is false;
+
+        protected abstract IEnumerable<object> GetEqualityComponents();
+
+        public override bool Equals(object obj)
+            => obj is not null && obj.GetType() == GetType() && 
+               GetEqualityComponents().SequenceEqual(((ValueObject) obj).GetEqualityComponents());
+
+        public override int GetHashCode()
+            => GetEqualityComponents()
+                .Select(x => x != null ? x.GetHashCode() : 0)
+                .Aggregate((x, y) => x ^ y);
+    }
+}

src/Dotnet6.GraphQL4.Repositories.Abstractions/Transactions/TransactionScopeExecutor.cs

@@ -58,6 +58,12 @@ public TransactionScopeExecutor<T> WithConditionAsync(Func<CancellationToken, Ta
             return this;
         }
 
+        public T Execute()
+            => Execute(_operation);
+
+        public Task<T> ExecuteAsync(CancellationToken cancellationToken)
+            => ExecuteAsync(_operationAsync, cancellationToken);
+
         public T Execute(Func<T> operation)
         {
             using var scope = CreateScope();
@@ -66,12 +72,6 @@ public T Execute(Func<T> operation)
             return result;
         }
 
-        public T Execute()
-            => Execute(_operation);
-
-        public Task<T> ExecuteAsync(CancellationToken cancellationToken)
-            => ExecuteAsync(_operationAsync, cancellationToken);
-
         public async Task<T> ExecuteAsync(Func<CancellationToken, Task<T>> operationAsync, CancellationToken cancellationToken)
         {
             using var scope = CreateScope();

src/Dotnet6.GraphQL4.Repositories.Abstractions/UnitsOfWork/IUnitOfWork.cs

@@ -6,8 +6,8 @@ namespace Dotnet6.GraphQL4.Repositories.Abstractions.UnitsOfWork
 {
     public interface IUnitOfWork
     {
-        TResult ExecuteInTransaction<TResult>(Func<TResult> operation, Func<bool> condition);
-        Task<TResult> ExecuteInTransactionAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken);
+        TResult ExecuteInTransactionScope<TResult>(Func<TResult> operation, Func<bool> condition);
+        Task<TResult> ExecuteInTransactionScopeAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken);
 
         bool SaveChanges();
         Task<bool> SaveChangesAsync(CancellationToken cancellationToken);

src/Dotnet6.GraphQL4.Repositories.Abstractions/UnitsOfWork/UnitOfWork.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Transactions;
 using Dotnet6.GraphQL4.CrossCutting.Notifications;
 using Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection.Options;
 using Dotnet6.GraphQL4.Repositories.Abstractions.Transactions.Extensions;
@@ -21,46 +20,46 @@ public class UnitOfWork : IUnitOfWork
 
         public UnitOfWork(
             DbContext dbContext, 
-            IOptionsMonitor<ApplicationTransactionOptions> optionsMonitor, 
+            IOptionsSnapshot<ApplicationTransactionOptions> optionsMonitor, 
             INotificationContext notificationContext)
         {
             _dbContext = dbContext;
-            _options = optionsMonitor.CurrentValue;
+            _options = optionsMonitor.Value;
             _database = _dbContext.Database;
             _notificationContext = notificationContext;
         }
 
-        public TResult ExecuteInTransaction<TResult>(Func<TResult> operation, Func<bool> condition)
-            => CreateExecutionStrategy().Execute(() => ExecuteWithScope(operation, condition));
+        public TResult ExecuteInTransactionScope<TResult>(Func<TResult> operation, Func<bool> condition)
+            => CreateExecutionStrategy().Execute(() => ExecuteInScope(operation, condition));
 
-        public Task<TResult> ExecuteInTransactionAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken)
-            => CreateExecutionStrategy().ExecuteAsync(ct => ExecuteWithScopeAsync(operationAsync, condition, ct), cancellationToken);
+        public Task<TResult> ExecuteInTransactionScopeAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken)
+            => CreateExecutionStrategy().ExecuteAsync(ct => ExecuteInScopeAsync(operationAsync, condition, ct), cancellationToken);
 
-        private Task<TResult> ExecuteWithScopeAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken)
+        private Task<TResult> ExecuteInScopeAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken)
             => operationAsync
                 .BeginTransactionScope()
-                .WithScopeOption(TransactionScopeOption.Required)
+                .WithScopeOption()
                 .WithOptions(options => options.IsolationLevel = _options.IsolationLevel)
-                .WithScopeAsyncFlowOption(TransactionScopeAsyncFlowOption.Enabled)
+                .WithScopeAsyncFlowOption()
                 .WithConditionAsync(condition ?? (_ => _notificationContext.AllValidAsync))
                 .ExecuteAsync(cancellationToken);
 
-        private TResult ExecuteWithScope<TResult>(Func<TResult> operation, Func<bool> condition)
+        private TResult ExecuteInScope<TResult>(Func<TResult> operation, Func<bool> condition)
             => operation
                 .BeginTransactionScope()
-                .WithScopeOption(TransactionScopeOption.Required)
+                .WithScopeOption()
                 .WithOptions(options => options.IsolationLevel = _options.IsolationLevel)
-                .WithScopeAsyncFlowOption(TransactionScopeAsyncFlowOption.Enabled)
+                .WithScopeAsyncFlowOption()
                 .WithCondition(condition ?? (() => _notificationContext.AllValid))
                 .Execute();
 
         private IExecutionStrategy CreateExecutionStrategy()
             => _database.CreateExecutionStrategy();
 
         public bool SaveChanges()
-            => _dbContext.SaveChanges(false) > default(int);
+            => _dbContext.SaveChanges(false) > 0;
 
         public async Task<bool> SaveChangesAsync(CancellationToken cancellationToken)
-            => await _dbContext.SaveChangesAsync(false, cancellationToken) > default(int);
+            => await _dbContext.SaveChangesAsync(false, cancellationToken) > 0;
     }
 }

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);
     }
 }

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 { get; set; }
     }
 }

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);
     }
 }

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 { get; set; }
+        int Size { get; set; }
     }
 }

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 { get; set; }
+        DateTimeOffset IntroduceAt { get; set; }
+        string Name { get; set; }
+        Option Option { get; set; }
+        string PhotoUrl { get; set; }
+        decimal Price { get; set; }
+        ProductType ProductType { get; set; }
+        int Rating { get; set; }
+        int Stock { get; set; }
     }
 }

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 { get; set; }
+        KayakType Type { get; set; }
     }
 }

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);
     }
 }

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; }
     }
 }

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 { get; set; }
+        string Comment { get; set; }
+        Guid ProductId { get; set; }
     }
 }

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);
     }
 }

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)

src/Dotnet6.GraphQL4.Store.Repositories/Contexts/StoreDbContext.cs

@@ -21,12 +21,12 @@ public StoreDbContext(
             DbContextOptions options, 
             ILoggerFactory loggerFactory, 
             IConfiguration configuration,
-            IOptionsMonitor<SqlServerRetryingOptions> optionsMonitor)
+            IOptionsSnapshot<SqlServerRetryingOptions> optionsMonitor)
             : base(options)
         {
             _loggerFactory = loggerFactory;
             _configuration = configuration;
-            _options = optionsMonitor.CurrentValue;
+            _options = optionsMonitor.Value;
         }
 
         public DbSet<Product> Products { get; set; }
@@ -45,7 +45,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (optionsBuilder.IsConfigured) return;
 
-            optionsBuilder.EnableDetailedErrors()
+            optionsBuilder
+                .EnableDetailedErrors()
                 .EnableSensitiveDataLogging()
                 .UseSqlServer(
                     connectionString:_configuration.GetConnectionString("DefaultConnection"), 

src/Dotnet6.GraphQL4.Store.Services/ProductService.cs

@@ -30,7 +30,7 @@ public Task<Review> AddReviewAsync(ReviewModel reviewModel, CancellationToken ca
                 return default;
             }
 
-            return UnitOfWork.ExecuteInTransactionAsync(
+            return UnitOfWork.ExecuteInTransactionScopeAsync(
                 operationAsync: async ct =>
                 {
                     var product = await Repository.GetByIdAsync(

src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BackpackModelToDomainConverter.cs

@@ -15,15 +15,15 @@ public BackpackModelToDomainConverter(IBackpackBuilder builder)
 
         public Backpack Convert(BackpackModel source, Backpack destination, ResolutionContext context)
             => _builder
-                .WithType(source.Type)
-                .WithDescription(source.Description)
-                .WithName(source.Name)
-                .WithPrice(source.Price)
-                .WithRating(source.Rating)
-                .WithStock(source.Stock)
-                .WithIntroduceAt(source.IntroduceAt)
-                .WithPhotoUrl(source.PhotoUrl)
-                .WithProductType(source.ProductType)
+                .With(builder => builder.Type = source.Type)
+                .With(builder => builder.Description = source.Description)
+                .With(builder => builder.Name = source.Name)
+                .With(builder => builder.Price = source.Price)
+                .With(builder => builder.Rating = source.Rating)
+                .With(builder => builder.Stock = source.Stock)
+                .With(builder => builder.IntroduceAt = source.IntroduceAt)
+                .With(builder => builder.PhotoUrl = source.PhotoUrl)
+                .With(builder => builder.ProductType = source.ProductType)
                 .Build();
     }
 }

src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/BootModelToDomainConverter.cs

@@ -15,16 +15,16 @@ public BootModelToDomainConverter(IBootBuilder builder)
 
         public Boot Convert(BootModel source, Boot destination, ResolutionContext context)
             => _builder
-                .WithType(source.Type)
-                .WithSize(source.Size)
-                .WithDescription(source.Description)
-                .WithName(source.Name)
-                .WithPrice(source.Price)
-                .WithRating(source.Rating)
-                .WithStock(source.Stock)
-                .WithIntroduceAt(source.IntroduceAt)
-                .WithPhotoUrl(source.PhotoUrl)
-                .WithProductType(source.ProductType)
+                .With(builder => builder.Type = source.Type)
+                .With(builder => builder.Size = source.Size)
+                .With(builder => builder.Description = source.Description)
+                .With(builder => builder.Name = source.Name)
+                .With(builder => builder.Price = source.Price)
+                .With(builder => builder.Rating = source.Rating)
+                .With(builder => builder.Stock = source.Stock)
+                .With(builder => builder.IntroduceAt = source.IntroduceAt)
+                .With(builder => builder.PhotoUrl = source.PhotoUrl)
+                .With(builder => builder.ProductType = source.ProductType)
                 .Build();
     }
 }

src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/KayakModelToDomainConverter.cs

@@ -15,16 +15,16 @@ public KayakModelToDomainConverter(IKayakBuilder builder)
 
         public Kayak Convert(KayakModel source, Kayak destination, ResolutionContext context)
             => _builder
-                .WithType(source.Type)
-                .WithAmountOfPerson(source.AmountOfPerson)
-                .WithDescription(source.Description)
-                .WithName(source.Name)
-                .WithPrice(source.Price)
-                .WithRating(source.Rating)
-                .WithStock(source.Stock)
-                .WithIntroduceAt(source.IntroduceAt)
-                .WithPhotoUrl(source.PhotoUrl)
-                .WithProductType(source.ProductType)
+                .With(builder => builder.Type = source.Type)
+                .With(builder => builder.AmountOfPerson = source.AmountOfPerson)
+                .With(builder => builder.Description = source.Description)
+                .With(builder => builder.Name = source.Name)
+                .With(builder => builder.Price = source.Price)
+                .With(builder => builder.Rating = source.Rating)
+                .With(builder => builder.Stock = source.Stock)
+                .With(builder => builder.IntroduceAt = source.IntroduceAt)
+                .With(builder => builder.PhotoUrl = source.PhotoUrl)
+                .With(builder => builder.ProductType = source.ProductType)
                 .Build();
     }
 }

src/Dotnet6.GraphQL4.Store.Services/Profiles/Converters/ReviewModelToDomainConverter.cs

@@ -15,9 +15,9 @@ public ReviewModelToDomainConverter(IReviewBuilder builder)
 
         public Review Convert(ReviewModel source, Review destination, ResolutionContext context)
             => _builder
-                .WithComment(source.Comment)
-                .WithTitle(source.Title)
-                .WithProductReference(source.ProductId)
+                .With(builder => builder.Comment = source.Comment)
+                .With(builder => builder.Title = source.Title)
+                .With(builder => builder.ProductId = source.ProductId)
                 .Build();
     }
 }

src/Dotnet6.GraphQL4.Store.WebAPI/DependencyInjection/Extensions/ExceptionHandlerExtensions.cs

@@ -15,7 +15,7 @@ public static IApplicationBuilder UseApplicationExceptionHandler(this IApplicati
                     {
                         var exception = httpContext.Features.Get<IExceptionHandlerFeature>()?.Error;
 
-                        Log.Logger.Error("[Exception Handler] {Error}", exception?.Message);
+                        Log.Error("[Exception Handler] {Error}", exception?.Message);
 
                         await httpContext.Response.WriteAsJsonAsync(
                             value: new ExecutionResult().AddError(new(exception?.Message)), 

src/Dotnet6.GraphQL4.Store.WebAPI/DependencyInjection/Extensions/ServiceCollectionExtensions.cs

@@ -1,31 +1,27 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Dotnet6.GraphQL4.Store.WebAPI.Graphs;
 using Dotnet6.GraphQL4.Store.WebAPI.Graphs.Executers;
 using GraphQL;
 using GraphQL.Server;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 
 namespace Dotnet6.GraphQL4.Store.WebAPI.DependencyInjection.Extensions
 {
     public static class ServiceCollectionExtensions
     {
-        private static readonly Options Options = new();
-
-        public static IGraphQLBuilder AddApplicationGraphQL(this IServiceCollection services, Action<Options> actionOptions)
-        {
-            actionOptions(Options);
-
-            return services
+        public static IGraphQLBuilder AddApplicationGraphQL(this IServiceCollection services)
+            => services
                 .AddScoped(typeof(IGraphQLExecuter<>), typeof(StoreGraphQLExecuter<>))
                 .AddScoped<IDocumentExecuter, StoreDocumentExecuter>()
                 .AddSingleton<StoreSchema>()
                 .AddGraphQL(
-                    (options, _) =>
+                    (options, serviceProvider) =>
                         {
-                            options.EnableMetrics = Options.IsDevelopment;
+                            options.EnableMetrics = serviceProvider.GetRequiredService<IWebHostEnvironment>().IsDevelopment();
 
                             options.UnhandledExceptionDelegate = exceptionContext 
                                 => Log.Error(
@@ -44,11 +40,5 @@ public static IGraphQLBuilder AddApplicationGraphQL(this IServiceCollection serv
                 .AddWebSockets()
                 .AddDataLoader()
                 .AddGraphTypes(typeof(StoreSchema));
-        }
-    }
-
-    public class Options
-    {
-        public bool IsDevelopment { get; set; }
     }
 }

src/Dotnet6.GraphQL4.Store.WebAPI/Startup.cs

@@ -82,6 +82,9 @@ public void Configure(IApplicationBuilder app , ILoggerFactory loggerFactory)
 
         public void ConfigureServices(IServiceCollection services)
         {
+            services.ConfigureTransactionOptions(_configuration.GetSection("Transactions"));
+            services.ConfigureSqlServerRetryingOptions(_configuration.GetSection("SqlServerRetryingOptions"));
+
             services
                 .AddLogging()
                 .AddBuilders()
@@ -92,15 +95,10 @@ public void ConfigureServices(IServiceCollection services)
                 .AddApplicationMessageServices()
                 .AddApplicationSubjects()
                 .AddApplicationAutoMapper()
+                .AddApplicationDbContext()
                 .AddControllers();
 
-            services.ConfigureTransactionOptions(_configuration.GetSection("Transactions"));
-            services.ConfigureSqlServerRetryingOptions(_configuration.GetSection("SqlServerRetryingOptions"));
-
-            services.AddApplicationDbContext();
-            
-            services.AddApplicationGraphQL(options
-                => options.IsDevelopment = _env.IsDevelopment());
+            services.AddApplicationGraphQL();
 
             services.Configure<KestrelServerOptions>(options
                 => options.AllowSynchronousIO = true);

src/Dotnet6.GraphQL4.Store.WebAPI/appsettings.Development.json

@@ -17,7 +17,7 @@
     "MinimumLevel": {
       "Default": "Debug",
       "Override": {
-        "Microsoft": "Warning",
+        "Microsoft": "Information",
         "Microsoft.Hosting.Lifetime": "Information"
       }
     }