Merge branch 'main' of https://github.com/ardalis/CleanArchitecture

Author: ardalis

.github/workflows/codeql-analysis.yml

@@ -14,19 +14,19 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout_repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         id: init_codeql
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           queries: security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
         id: analyze_codeql
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
 
 # Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

Directory.Packages.props

@@ -37,7 +37,7 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
     <!--#if (aspire) -->
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.6.0" />

sample/NimblePros.SampleToDo.slnx

@@ -0,0 +1,30 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="CleanArchitecture.nuspec" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/NimblePros.SampleToDo.AspireHost/NimblePros.SampleToDo.AspireHost.csproj" />
+    <Project Path="src/NimblePros.SampleToDo.Core/NimblePros.SampleToDo.Core.csproj" />
+    <Project Path="src/NimblePros.SampleToDo.Infrastructure/NimblePros.SampleToDo.Infrastructure.csproj" />
+    <Project Path="src/NimblePros.SampleToDo.ServiceDefaults/NimblePros.SampleToDo.ServiceDefaults.csproj" />
+    <Project Path="src/NimblePros.SampleToDo.UseCases/NimblePros.SampleToDo.UseCases.csproj" />
+    <Project Path="src/NimblePros.SampleToDo.Web/NimblePros.SampleToDo.Web.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/NimblePros.SampleToDo.FunctionalTests/NimblePros.SampleToDo.FunctionalTests.csproj">
+      <BuildDependency Project="src/NimblePros.SampleToDo.Web/NimblePros.SampleToDo.Web.csproj" />
+    </Project>
+    <Project Path="tests/NimblePros.SampleToDo.IntegrationTests/NimblePros.SampleToDo.IntegrationTests.csproj">
+      <BuildDependency Project="src/NimblePros.SampleToDo.Infrastructure/NimblePros.SampleToDo.Infrastructure.csproj" />
+    </Project>
+    <Project Path="tests/NimblePros.SampleToDo.UnitTests/NimblePros.SampleToDo.UnitTests.csproj" />
+  </Folder>
+</Solution>

sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Contributor.cs

@@ -8,14 +8,15 @@ public class Contributor : EntityBase, IAggregateRoot
 
   public Contributor(ContributorName name)
   {
-    Name = name;
+      Name = name;
   }
 
-  public void UpdateName(ContributorName newName)
+  public Contributor UpdateName(ContributorName newName)
   {
     if (Name.Equals(newName)) return;
     Name = newName;
     this.RegisterDomainEvent(new ContributorNameUpdatedEvent(this));
+    return this;
   }
 }
 

sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/Project.cs

@@ -6,7 +6,7 @@ public class Project : EntityBase<Project, ProjectId>, IAggregateRoot
 {
   public ProjectName Name { get; private set; }
 
-  private readonly List<ToDoItem> _items = new();
+  private readonly List<ToDoItem> _items = [];
   public IEnumerable<ToDoItem> Items => _items.AsReadOnly();
   public ProjectStatus Status => _items.All(i => i.IsDone) ? ProjectStatus.Complete : ProjectStatus.InProgress;
 
@@ -15,17 +15,19 @@ public Project(ProjectName name)
     Name = name;
   }
 
-  public void AddItem(ToDoItem newItem)
+  public Project AddItem(ToDoItem newItem)
   {
     Guard.Against.Null(newItem);
     _items.Add(newItem);
 
     var newItemAddedEvent = new NewItemAddedEvent(this, newItem);
     base.RegisterDomainEvent(newItemAddedEvent);
+    return this;
   }
 
-  public void UpdateName(ProjectName newName)
+  public Project UpdateName(ProjectName newName)
   {
     Name = newName;
+    return this;
   }
 }

sample/src/NimblePros.SampleToDo.Core/ProjectAggregate/ToDoItem.cs

@@ -20,29 +20,31 @@ public ToDoItem(Priority priority)
 
   public Priority Priority { get; private set; }
 
-
-  public void MarkComplete()
+  public ToDoItem MarkComplete()
   {
     if (!IsDone)
     {
       IsDone = true;
 
       RegisterDomainEvent(new ToDoItemCompletedEvent(this));
     }
+    return this;
   }
 
-  public void AddContributor(int contributorId)
+  public ToDoItem AddContributor(int contributorId)
   {
     Guard.Against.Null(contributorId);
     ContributorId = contributorId;
 
     var contributorAddedToItem = new ContributorAddedToItemEvent(this, contributorId);
     base.RegisterDomainEvent(contributorAddedToItem);
+    return this;
   }
 
-  public void RemoveContributor()
+  public ToDoItem RemoveContributor()
   {
     ContributorId = null;
+    return this;
   }
 
   public override string ToString()

src/Clean.Architecture.Core/ContributorAggregate/Contributor.cs

@@ -1,21 +1,28 @@
 namespace Clean.Architecture.Core.ContributorAggregate;
 
-public class Contributor(string name) : EntityBase, IAggregateRoot
+public class Contributor : EntityBase, IAggregateRoot
 {
-  // Example of validating primary constructor inputs
-  // See: https://learn.microsoft.com/en-us/dotnet/csharp/whats-new/tutorials/primary-constructors#initialize-base-class
-  public string Name { get; private set; } = Guard.Against.NullOrEmpty(name, nameof(name));
+  public Contributor(string name)
+  {
+    UpdateName(name); // TODO: Replace with value object and use primary constructor to populate field.
+  }
+  public string Name { get; private set; } = default!;
   public ContributorStatus Status { get; private set; } = ContributorStatus.NotSet;
   public PhoneNumber? PhoneNumber { get; private set; }
+  public Contributor SetPhoneNumber(string phoneNumber)
+  {
+    PhoneNumber = new PhoneNumber(string.Empty, phoneNumber, string.Empty);
+    return this;
+  }
 
-  public void SetPhoneNumber(string phoneNumber) => PhoneNumber = new PhoneNumber(string.Empty, phoneNumber, string.Empty);
-
-  public void UpdateName(string newName) => Name = Guard.Against.NullOrEmpty(newName, nameof(newName));
+  public Contributor UpdateName(string newName)
+  {
+    Name = Guard.Against.NullOrEmpty(newName, nameof(newName));
+    return this;
+  }
 }
 
-public class PhoneNumber(string countryCode,
-  string number,
-  string? extension) : ValueObject
+public class PhoneNumber(string countryCode, string number, string? extension) : ValueObject
 {
   public string CountryCode { get; private set; } = countryCode;
   public string Number { get; private set; } = number;

src/Clean.Architecture.Web/Configurations/MiddlewareConfig.cs

@@ -36,8 +36,8 @@ static async Task SeedDatabase(WebApplication app)
     try
     {
       var context = services.GetRequiredService<AppDbContext>();
-      //          context.Database.Migrate();
-      context.Database.EnsureCreated();
+      //          await context.Database.MigrateAsync();
+      await context.Database.EnsureCreatedAsync();
       await SeedData.InitializeAsync(context);
     }
     catch (Exception ex)