Merge branch 'aminsharifi-main'

ardalis · ardalis · commit 1d36ce142a2a · 2024-10-02T20:24:39.000-04:00
diff --git a/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Contributor.cs b/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Contributor.cs
@@ -1,19 +1,22 @@
-﻿using Ardalis.GuardClauses;
-using Ardalis.SharedKernel;
-
-namespace NimblePros.SampleToDo.Core.ContributorAggregate;
+﻿namespace NimblePros.SampleToDo.Core.ContributorAggregate;
 
 public class Contributor : EntityBase, IAggregateRoot
 {
-  public string Name { get; private set; }
+  public string Name { get; private set; } = default!;
 
   public Contributor(string name)
   {
-    Name = Guard.Against.NullOrEmpty(name, nameof(name));
+    SetName(name);
   }
 
   public void UpdateName(string newName)
   {
-    Name = Guard.Against.NullOrEmpty(newName, nameof(newName));
+    SetName(newName);
+  }
+
+  public Contributor SetName(string newName)
+  {
+    this.Name = Guard.Against.NullOrEmpty(newName, nameof(newName));
+    return this;
   }
 }
diff --git a/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Events/ContributorDeletedEvent.cs b/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Events/ContributorDeletedEvent.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.SharedKernel;
-
-namespace NimblePros.SampleToDo.Core.ContributorAggregate.Events;
+﻿namespace NimblePros.SampleToDo.Core.ContributorAggregate.Events;
 
 /// <summary>
 /// A domain event that is dispatched whenever a contributor is deleted.
diff --git a/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Handlers/ContributorDeletedHandler.cs b/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Handlers/ContributorDeletedHandler.cs
@@ -1,9 +1,6 @@
-﻿using Ardalis.SharedKernel;
-using NimblePros.SampleToDo.Core.ContributorAggregate.Events;
+﻿using NimblePros.SampleToDo.Core.ContributorAggregate.Events;
 using NimblePros.SampleToDo.Core.ProjectAggregate;
 using NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
-using MediatR;
-using Microsoft.Extensions.Logging;
 
 namespace NimblePros.SampleToDo.Core.ContributorAggregate.Handlers;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Specifications/ContributorByIdSpec.cs b/sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Specifications/ContributorByIdSpec.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Specification;
-
-namespace NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;
+﻿namespace NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;
 
 public class ContributorByIdSpec : Specification<Contributor>
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/CoreServiceExtensions.cs b/sample/src/NimblePros.SampleToDo.Core/CoreServiceExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using NimblePros.SampleToDo.Core.Interfaces;
 using NimblePros.SampleToDo.Core.Services;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/GlobalUsings.cs b/sample/src/NimblePros.SampleToDo.Core/GlobalUsings.cs
@@ -0,0 +1,7 @@
+﻿global using Ardalis.GuardClauses;
+global using Ardalis.Result;
+global using Ardalis.SharedKernel;
+global using Ardalis.SmartEnum;
+global using Ardalis.Specification;
+global using MediatR;
+global using Microsoft.Extensions.Logging;
diff --git a/sample/src/NimblePros.SampleToDo.Core/Interfaces/IDeleteContributorService.cs b/sample/src/NimblePros.SampleToDo.Core/Interfaces/IDeleteContributorService.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Result;
-
-namespace NimblePros.SampleToDo.Core.Interfaces;
+﻿namespace NimblePros.SampleToDo.Core.Interfaces;
 
 public interface IDeleteContributorService
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/Interfaces/IToDoItemSearchService.cs b/sample/src/NimblePros.SampleToDo.Core/Interfaces/IToDoItemSearchService.cs
@@ -1,5 +1,4 @@
-﻿using Ardalis.Result;
-using NimblePros.SampleToDo.Core.ProjectAggregate;
+﻿using NimblePros.SampleToDo.Core.ProjectAggregate;
 
 namespace NimblePros.SampleToDo.Core.Interfaces;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/ContributorAddedToItemEvent.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/ContributorAddedToItemEvent.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.SharedKernel;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
 
 public class ContributorAddedToItemEvent : DomainEventBase
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/NewItemAddedEvent.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/NewItemAddedEvent.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.SharedKernel;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
 
 public class NewItemAddedEvent : DomainEventBase
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/ToDoItemCompletedEvent.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Events/ToDoItemCompletedEvent.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.SharedKernel;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;
 
 public class ToDoItemCompletedEvent : DomainEventBase
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Handlers/ItemCompletedEmailNotificationHandler.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Handlers/ItemCompletedEmailNotificationHandler.cs
@@ -1,7 +1,5 @@
-﻿using Ardalis.GuardClauses;
-using NimblePros.SampleToDo.Core.Interfaces;
+﻿using NimblePros.SampleToDo.Core.Interfaces;
 using NimblePros.SampleToDo.Core.ProjectAggregate.Events;
-using MediatR;
 
 namespace NimblePros.SampleToDo.Core.ProjectAggregate.Handlers;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Project.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Project.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.GuardClauses;
-using NimblePros.SampleToDo.Core.ProjectAggregate.Events;
-using Ardalis.SharedKernel;
+﻿using NimblePros.SampleToDo.Core.ProjectAggregate.Events;
 
 namespace NimblePros.SampleToDo.Core.ProjectAggregate;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/IncompleteItemsSearchSpec.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/IncompleteItemsSearchSpec.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Specification;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
 
 public class IncompleteItemsSearchSpec : Specification<ToDoItem>
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/IncompleteItemsSpec.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/IncompleteItemsSpec.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Specification;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
 
 public class IncompleteItemsSpec : Specification<ToDoItem>
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/ProjectByIdWithItemsSpec.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/ProjectByIdWithItemsSpec.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Specification;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
 
 public class ProjectByIdWithItemsSpec : Specification<Project>
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/ProjectsWithItemsByContributorId.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Specifications/ProjectsWithItemsByContributorId.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.Specification;
-
-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
+﻿namespace NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
 
 public class ProjectsWithItemsByContributorIdSpec : Specification<Project>
 {
diff --git a/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/ToDoItem.cs b/sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/ToDoItem.cs
@@ -1,6 +1,4 @@
-﻿using Ardalis.GuardClauses;
-using NimblePros.SampleToDo.Core.ProjectAggregate.Events;
-using Ardalis.SharedKernel;
+﻿using NimblePros.SampleToDo.Core.ProjectAggregate.Events;
 
 namespace NimblePros.SampleToDo.Core.ProjectAggregate;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/Services/DeleteContributorService.cs b/sample/src/NimblePros.SampleToDo.Core/Services/DeleteContributorService.cs
@@ -1,10 +1,6 @@
-﻿using Ardalis.Result;
-using NimblePros.SampleToDo.Core.ContributorAggregate;
+﻿using NimblePros.SampleToDo.Core.ContributorAggregate;
 using NimblePros.SampleToDo.Core.ContributorAggregate.Events;
 using NimblePros.SampleToDo.Core.Interfaces;
-using Ardalis.SharedKernel;
-using MediatR;
-using Microsoft.Extensions.Logging;
 
 namespace NimblePros.SampleToDo.Core.Services;
 
diff --git a/sample/src/NimblePros.SampleToDo.Core/Services/ToDoItemSearchService.cs b/sample/src/NimblePros.SampleToDo.Core/Services/ToDoItemSearchService.cs
@@ -1,8 +1,6 @@
-﻿using Ardalis.Result;
-using NimblePros.SampleToDo.Core.Interfaces;
+﻿using NimblePros.SampleToDo.Core.Interfaces;
 using NimblePros.SampleToDo.Core.ProjectAggregate;
 using NimblePros.SampleToDo.Core.ProjectAggregate.Specifications;
-using Ardalis.SharedKernel;
 
 namespace NimblePros.SampleToDo.Core.Services;
 
diff --git a/sample/src/NimblePros.SampleToDo.Infrastructure/Data/Queries/FakeListContributorsQueryService.cs b/sample/src/NimblePros.SampleToDo.Infrastructure/Data/Queries/FakeListContributorsQueryService.cs
@@ -1,5 +1,5 @@
 ﻿using NimblePros.SampleToDo.UseCases.Contributors;
-using NimblePros.SampleToDo.UseCases.Contributors.List;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 namespace NimblePros.SampleToDo.Infrastructure.Data.Queries;
 
diff --git a/sample/src/NimblePros.SampleToDo.Infrastructure/Data/Queries/ListContributorsQueryService.cs b/sample/src/NimblePros.SampleToDo.Infrastructure/Data/Queries/ListContributorsQueryService.cs
@@ -1,6 +1,6 @@
 ﻿using NimblePros.SampleToDo.UseCases.Contributors;
-using NimblePros.SampleToDo.UseCases.Contributors.List;
 using Microsoft.EntityFrameworkCore;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 namespace NimblePros.SampleToDo.Infrastructure.Data.Queries;
 
diff --git a/sample/src/NimblePros.SampleToDo.Infrastructure/InfrastructureServiceExtensions.cs b/sample/src/NimblePros.SampleToDo.Infrastructure/InfrastructureServiceExtensions.cs
@@ -5,7 +5,7 @@
 using NimblePros.SampleToDo.Infrastructure.Data;
 using NimblePros.SampleToDo.Infrastructure.Data.Queries;
 using NimblePros.SampleToDo.Infrastructure.Email;
-using NimblePros.SampleToDo.UseCases.Contributors.List;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 using NimblePros.SampleToDo.UseCases.Projects.ListIncompleteItems;
 using NimblePros.SampleToDo.UseCases.Projects.ListShallow;
 
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Create/CreateContributorCommand.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Create/CreateContributorCommand.cs
@@ -1,6 +1,6 @@
 ﻿using Ardalis.Result;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Create;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
 
 /// <summary>
 /// Create a new Contributor.
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Create/CreateContributorHandler.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Create/CreateContributorHandler.cs
@@ -2,7 +2,7 @@
 using Ardalis.SharedKernel;
 using NimblePros.SampleToDo.Core.ContributorAggregate;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Create;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
 
 public class CreateContributorHandler : ICommandHandler<CreateContributorCommand, Result<int>>
 {
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Delete/DeleteContributorCommand.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Delete/DeleteContributorCommand.cs
@@ -1,6 +1,6 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Delete;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Delete;
 
 public record DeleteContributorCommand(int ContributorId) : ICommand<Result>;
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Delete/DeleteContributorHandler.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Delete/DeleteContributorHandler.cs
@@ -2,7 +2,7 @@
 using Ardalis.SharedKernel;
 using NimblePros.SampleToDo.Core.Interfaces;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Delete;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Delete;
 
 public class DeleteContributorHandler : ICommandHandler<DeleteContributorCommand, Result>
 {
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Update/UpdateContributorCommand.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Update/UpdateContributorCommand.cs
@@ -1,6 +1,6 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Update;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Update;
 
 public record UpdateContributorCommand(int ContributorId, string NewName) : ICommand<Result<ContributorDTO>>;
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Update/UpdateContributorHandler.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Commands/Update/UpdateContributorHandler.cs
@@ -2,7 +2,7 @@
 using Ardalis.SharedKernel;
 using NimblePros.SampleToDo.Core.ContributorAggregate;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Update;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Commands.Update;
 
 public class UpdateContributorHandler : ICommandHandler<UpdateContributorCommand, Result<ContributorDTO>>
 {
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/Get/GetContributorHandler.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/Get/GetContributorHandler.cs
@@ -3,7 +3,7 @@
 using NimblePros.SampleToDo.Core.ContributorAggregate;
 using NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Get;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Queries.Get;
 
 /// <summary>
 /// Queries don't necessarily need to use repository methods, but they can if it's convenient
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/Get/GetContributorQuery.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/Get/GetContributorQuery.cs
@@ -1,6 +1,6 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.Get;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Queries.Get;
 
 public record GetContributorQuery(int ContributorId) : IQuery<Result<ContributorDTO>>;
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/IListContributorsQueryService.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/IListContributorsQueryService.cs
@@ -1,4 +1,4 @@
-﻿namespace NimblePros.SampleToDo.UseCases.Contributors.List;
+﻿namespace NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 /// <summary>
 /// Represents a service that will actually fetch the necessary data
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/ListContributorsHandler.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/ListContributorsHandler.cs
@@ -1,7 +1,7 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.List;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 public class ListContributorsHandler : IQueryHandler<ListContributorsQuery, Result<IEnumerable<ContributorDTO>>>
 {
diff --git a/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/ListContributorsQuery.cs b/sample/src/NimblePros.SampleToDo.UseCases/Contributors/Queries/List/ListContributorsQuery.cs
@@ -1,6 +1,6 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
 
-namespace NimblePros.SampleToDo.UseCases.Contributors.List;
+namespace NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 public record ListContributorsQuery(int? Skip, int? Take) : IQuery<Result<IEnumerable<ContributorDTO>>>;
diff --git a/sample/src/NimblePros.SampleToDo.Web/Contributors/Create.cs b/sample/src/NimblePros.SampleToDo.Web/Contributors/Create.cs
@@ -1,6 +1,6 @@
 ﻿using FastEndpoints;
-using NimblePros.SampleToDo.UseCases.Contributors.Create;
 using MediatR;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
 
 namespace NimblePros.SampleToDo.Web.Contributors;
 
diff --git a/sample/src/NimblePros.SampleToDo.Web/Contributors/Delete.cs b/sample/src/NimblePros.SampleToDo.Web/Contributors/Delete.cs
@@ -1,7 +1,7 @@
-﻿using FastEndpoints;
-using Ardalis.Result;
+﻿using Ardalis.Result;
+using FastEndpoints;
 using MediatR;
-using NimblePros.SampleToDo.UseCases.Contributors.Delete;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Delete;
 
 namespace NimblePros.SampleToDo.Web.Contributors;
 
diff --git a/sample/src/NimblePros.SampleToDo.Web/Contributors/GetById.cs b/sample/src/NimblePros.SampleToDo.Web/Contributors/GetById.cs
@@ -1,7 +1,7 @@
 ﻿using Ardalis.Result;
 using FastEndpoints;
 using MediatR;
-using NimblePros.SampleToDo.UseCases.Contributors.Get;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.Get;
 
 namespace NimblePros.SampleToDo.Web.Contributors;
 
diff --git a/sample/src/NimblePros.SampleToDo.Web/Contributors/List.cs b/sample/src/NimblePros.SampleToDo.Web/Contributors/List.cs
@@ -1,6 +1,6 @@
 ﻿using FastEndpoints;
 using MediatR;
-using NimblePros.SampleToDo.UseCases.Contributors.List;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.List;
 
 namespace NimblePros.SampleToDo.Web.Contributors;
 
diff --git a/sample/src/NimblePros.SampleToDo.Web/Contributors/Update.cs b/sample/src/NimblePros.SampleToDo.Web/Contributors/Update.cs
@@ -3,7 +3,7 @@
 using FastEndpoints;
 using MediatR;
 using NimblePros.SampleToDo.Core.ContributorAggregate;
-using NimblePros.SampleToDo.UseCases.Contributors.Update;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Update;
 
 namespace NimblePros.SampleToDo.Web.Contributors;
 
diff --git a/sample/src/NimblePros.SampleToDo.Web/Program.cs b/sample/src/NimblePros.SampleToDo.Web/Program.cs
@@ -12,8 +12,8 @@
 using Serilog;
 using Microsoft.EntityFrameworkCore;
 using NimblePros.SampleToDo.Core.ProjectAggregate;
-using NimblePros.SampleToDo.UseCases.Contributors.Create;
 using Serilog.Extensions.Logging;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
 
 var logger = Log.Logger = new LoggerConfiguration()
   .Enrich.FromLogContext()
diff --git a/sample/tests/NimblePros.SampleToDo.FunctionalTests/CustomWebApplicationFactory.cs b/sample/tests/NimblePros.SampleToDo.FunctionalTests/CustomWebApplicationFactory.cs
@@ -1,12 +1,12 @@
-﻿using NimblePros.SampleToDo.Infrastructure.Data;
-using NimblePros.SampleToDo.Web;
-using Microsoft.AspNetCore.Hosting;
+﻿using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using NimblePros.SampleToDo.UseCases.Contributors.Create;
+using NimblePros.SampleToDo.Infrastructure.Data;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
+using NimblePros.SampleToDo.Web;
 
 namespace NimblePros.SampleToDo.FunctionalTests;
 
diff --git a/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/CreateContributorHandlerHandle.cs b/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/CreateContributorHandlerHandle.cs
@@ -1,7 +1,7 @@
 ﻿using Ardalis.SharedKernel;
 using FluentAssertions;
 using NimblePros.SampleToDo.Core.ContributorAggregate;
-using NimblePros.SampleToDo.UseCases.Contributors.Create;
+using NimblePros.SampleToDo.UseCases.Contributors.Commands.Create;
 using NSubstitute;
 using Xunit;
 
diff --git a/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/GetContributorHandlerHandle.cs b/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/GetContributorHandlerHandle.cs
@@ -1,10 +1,9 @@
 ﻿using Ardalis.Result;
 using Ardalis.SharedKernel;
-using Ardalis.Specification;
 using FluentAssertions;
 using NimblePros.SampleToDo.Core.ContributorAggregate;
 using NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;
-using NimblePros.SampleToDo.UseCases.Contributors.Get;
+using NimblePros.SampleToDo.UseCases.Contributors.Queries.Get;
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
diff --git a/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/UpdateContributorHandlerHandle.cs b/sample/tests/NimblePros.SampleToDo.UnitTests/UseCases/Contributors/UpdateContributorHandlerHandle.cs

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,22 @@`
`1`		`-using Ardalis.GuardClauses;`
`2`		`-using Ardalis.SharedKernel;`
`3`		`-`
`4`		`-namespace NimblePros.SampleToDo.Core.ContributorAggregate;`
	`1`	`+namespace NimblePros.SampleToDo.Core.ContributorAggregate;`
`5`	`2`
`6`	`3`	`public class Contributor : EntityBase, IAggregateRoot`
`7`	`4`	`{`
`8`		`- public string Name { get; private set; }`
	`5`	`+ public string Name { get; private set; } = default!;`
`9`	`6`
`10`	`7`	`public Contributor(string name)`
`11`	`8`	`{`
`12`		`- Name = Guard.Against.NullOrEmpty(name, nameof(name));`
	`9`	`+ SetName(name);`
`13`	`10`	`}`
`14`	`11`
`15`	`12`	`public void UpdateName(string newName)`
`16`	`13`	`{`
`17`		`- Name = Guard.Against.NullOrEmpty(newName, nameof(newName));`
	`14`	`+ SetName(newName);`
	`15`	`+ }`
	`16`	`+`
	`17`	`+ public Contributor SetName(string newName)`
	`18`	`+ {`
	`19`	`+ this.Name = Guard.Against.NullOrEmpty(newName, nameof(newName));`
	`20`	`+ return this;`
`18`	`21`	`}`
`19`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Ardalis.Specification;`
`2`		`-`
`3`		`-namespace NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;`
	`1`	`+namespace NimblePros.SampleToDo.Core.ContributorAggregate.Specifications;`
`4`	`2`
`5`	`3`	`public class ContributorByIdSpec : Specification<Contributor>`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Microsoft.Extensions.DependencyInjection;`
`2`		`-using Microsoft.Extensions.Logging;`
`3`	`2`	`using NimblePros.SampleToDo.Core.Interfaces;`
`4`	`3`	`using NimblePros.SampleToDo.Core.Services;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Ardalis.Result;`
`2`		`-`
`3`		`-namespace NimblePros.SampleToDo.Core.Interfaces;`
	`1`	`+namespace NimblePros.SampleToDo.Core.Interfaces;`
`4`	`2`
`5`	`3`	`public interface IDeleteContributorService`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Ardalis.SharedKernel;`
`2`		`-`
`3`		`-namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;`
	`1`	`+namespace NimblePros.SampleToDo.Core.ProjectAggregate.Events;`
`4`	`2`
`5`	`3`	`public class ContributorAddedToItemEvent : DomainEventBase`
`6`	`4`	`{`