Update CustomerService.csproj to nullable.

Anthony Sneed · Anthony Sneed · commit 1d06ae9d90d6 · 2022-02-26T14:55:06.000-06:00
diff --git a/reference-architecture/CustomerService/Configuration/CustomerDatabaseSettings.cs b/reference-architecture/CustomerService/Configuration/CustomerDatabaseSettings.cs
@@ -4,8 +4,8 @@ namespace CustomerService.Configuration
 {
     public class CustomerDatabaseSettings : IMongoDbSettings
     {
-        public string ConnectionString { get; set; }
-        public string DatabaseName { get; set; }
-        public string CollectionName { get; set; }
+        public string ConnectionString { get; set; } = null!;
+        public string DatabaseName { get; set; } = null!;
+        public string CollectionName { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/CustomerService/Controllers/CustomerCommandController.cs b/reference-architecture/CustomerService/Controllers/CustomerCommandController.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-using AutoMapper;
+﻿using AutoMapper;
 using CustomerService.Domain.CustomerAggregate;
 using CustomerService.Domain.CustomerAggregate.CommandHandlers;
 using CustomerService.Domain.CustomerAggregate.Commands;
diff --git a/reference-architecture/CustomerService/Controllers/CustomerQueryController.cs b/reference-architecture/CustomerService/Controllers/CustomerQueryController.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using AutoMapper;
+﻿using AutoMapper;
 using CustomerService.DTO.Read;
 using CustomerService.Repositories;
 using Microsoft.AspNetCore.Mvc;
diff --git a/reference-architecture/CustomerService/CustomerService.csproj b/reference-architecture/CustomerService/CustomerService.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/reference-architecture/CustomerService/DTO/Read/CustomerView.cs b/reference-architecture/CustomerService/DTO/Read/CustomerView.cs
@@ -1,17 +1,15 @@
-using System;
-
 namespace CustomerService.DTO.Read
 {
     public class CustomerView
     {
         public Guid Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public string Street { get; set; }
-        public string City { get; set; }
-        public string State { get; set; }
-        public string Country { get; set; }
-        public string PostalCode { get; set; }
-        public string ETag { get; set; }
+        public string FirstName { get; set; } = null!;
+        public string LastName { get; set; } = null!;
+        public string Street { get; set; } = null!;
+        public string City { get; set; } = null!;
+        public string State { get; set; } = null!;
+        public string Country { get; set; } = null!;
+        public string PostalCode { get; set; } = null!;
+        public string ETag { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/CustomerService/DTO/Write/Address.cs b/reference-architecture/CustomerService/DTO/Write/Address.cs
@@ -2,10 +2,10 @@ namespace CustomerService.DTO.Write
 {
     public class Address
     {
-        public string Street { get; set; }
-        public string City { get; set; }
-        public string State { get; set; }
-        public string Country { get; set; }
-        public string PostalCode { get; set; }
+        public string Street { get; set; } = null!;
+        public string City { get; set; } = null!;
+        public string State { get; set; } = null!;
+        public string Country { get; set; } = null!;
+        public string PostalCode { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/CustomerService/DTO/Write/Customer.cs b/reference-architecture/CustomerService/DTO/Write/Customer.cs
@@ -1,13 +1,11 @@
-using System;
-
 namespace CustomerService.DTO.Write
 {
     public class Customer
     {
         public Guid Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public Address ShippingAddress { get; set; }
-        public string ETag { get; set; }
+        public string FirstName { get; set; } = null!;
+        public string LastName { get; set; } = null!;
+        public Address ShippingAddress { get; set; } = null!;
+        public string ETag { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/CustomerCommandHandler.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/CommandHandlers/CustomerCommandHandler.cs
@@ -1,11 +1,10 @@
-using System.Threading.Tasks;
 using AutoMapper;
 using Common.Integration.Events;
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Repositories;
 using EventDriven.DDD.Abstractions.Commands;
+using EventDriven.DDD.Abstractions.Repositories;
 using EventDriven.EventBus.Abstractions;
-using Microsoft.Extensions.Logging;
 using Integration = Common.Integration;
 
 namespace CustomerService.Domain.CustomerAggregate.CommandHandlers
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/RemoveCustomer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Commands/RemoveCustomer.cs
@@ -1,4 +1,3 @@
-using System;
 using EventDriven.DDD.Abstractions.Commands;
 
 namespace CustomerService.Domain.CustomerAggregate.Commands
diff --git a/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs b/reference-architecture/CustomerService/Domain/CustomerAggregate/Customer.cs
@@ -1,4 +1,3 @@
-using System;
 using CustomerService.Domain.CustomerAggregate.Commands;
 using CustomerService.Domain.CustomerAggregate.Events;
 using EventDriven.DDD.Abstractions.Commands;
@@ -12,9 +11,9 @@ public class Customer :
         ICommandProcessor<CreateCustomer, CustomerCreated>,
         IEventApplier<CustomerCreated>
     {
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public Address ShippingAddress { get; set; }
+        public string FirstName { get; set; } = null!;
+        public string LastName { get; set; } = null!;
+        public Address ShippingAddress { get; set; } = null!;
 
         public CustomerCreated Process(CreateCustomer command)
             // To process command, return one or more domain events
diff --git a/reference-architecture/CustomerService/Helpers/CommandResultExtensions.cs b/reference-architecture/CustomerService/Helpers/CommandResultExtensions.cs
@@ -1,12 +1,11 @@
 using EventDriven.DDD.Abstractions.Commands;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CustomerService.Helpers
 {
     public static class CommandResultExtensions
     {
-        public static ActionResult ToActionResult(this CommandResult result, object entity = null)
+        public static ActionResult ToActionResult(this CommandResult result, object? entity = null)
         {
             switch (result.Outcome)
             {
diff --git a/reference-architecture/CustomerService/Program.cs b/reference-architecture/CustomerService/Program.cs
@@ -1,20 +1,39 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using CustomerService.Configuration;
+using CustomerService.Domain.CustomerAggregate;
+using CustomerService.Domain.CustomerAggregate.CommandHandlers;
+using CustomerService.Repositories;
+using EventDriven.DependencyInjection.URF.Mongo;
 
-namespace CustomerService
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddControllers();
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+// Add automapper
+builder.Services.AddAutoMapper(typeof(Program));
+
+// Add database settings
+builder.Services.AddSingleton<CustomerCommandHandler>();
+builder.Services.AddSingleton<ICustomerRepository, CustomerRepository>();
+builder.Services.AddMongoDbSettings<CustomerDatabaseSettings, Customer>(builder.Configuration);
+
+// Add Dapr event bus
+builder.Services.AddDaprEventBus(builder.Configuration, true);
+builder.Services.AddDaprMongoEventCache(builder.Configuration);
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+    app.UseSwagger();
+    app.UseSwaggerUI();
 }
+
+app.UseRouting();
+app.UseAuthorization();
+app.MapControllers();
+
+app.Run();
diff --git a/reference-architecture/CustomerService/Repositories/ConcurrencyException.cs b/reference-architecture/CustomerService/Repositories/ConcurrencyException.cs
diff --git a/reference-architecture/CustomerService/Repositories/CustomerRepository.cs b/reference-architecture/CustomerService/Repositories/CustomerRepository.cs
@@ -1,7 +1,5 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using CustomerService.Domain.CustomerAggregate;
+﻿using CustomerService.Domain.CustomerAggregate;
+using EventDriven.DDD.Abstractions.Repositories;
 using MongoDB.Driver;
 using URF.Core.Mongo;
 
@@ -16,18 +14,18 @@ public CustomerRepository(IMongoCollection<Customer> collection) : base(collecti
         public async Task<IEnumerable<Customer>> GetAsync() =>
             await FindManyAsync();
 
-        public async Task<Customer> GetAsync(Guid id) =>
+        public async Task<Customer?> GetAsync(Guid id) =>
             await FindOneAsync(e => e.Id == id);
 
-        public async Task<Customer> AddAsync(Customer entity)
+        public async Task<Customer?> AddAsync(Customer entity)
         {
             var existing = await FindOneAsync(e => e.Id == entity.Id);
             if (existing != null) return null;
             entity.ETag = Guid.NewGuid().ToString();
             return await InsertOneAsync(entity);
         }
 
-        public async Task<Customer> UpdateAsync(Customer entity)
+        public async Task<Customer?> UpdateAsync(Customer entity)
         {
             var existing = await GetAsync(entity.Id);
             if (existing == null) return null;
diff --git a/reference-architecture/CustomerService/Repositories/ICustomerRepository.cs b/reference-architecture/CustomerService/Repositories/ICustomerRepository.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using CustomerService.Domain.CustomerAggregate;
 
 namespace CustomerService.Repositories
 {
     public interface ICustomerRepository
     {
         Task<IEnumerable<Customer>> GetAsync();
-        Task<Customer> GetAsync(Guid id);
-        Task<Customer> AddAsync(Customer entity);
-        Task<Customer> UpdateAsync(Customer entity);
+        Task<Customer?> GetAsync(Guid id);
+        Task<Customer?> AddAsync(Customer entity);
+        Task<Customer?> UpdateAsync(Customer entity);
         Task<int> RemoveAsync(Guid id);
     }
 }
diff --git a/reference-architecture/CustomerService/Startup.cs b/reference-architecture/CustomerService/Startup.cs
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeCustomerRepository.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeCustomerRepository.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using CustomerService.Domain.CustomerAggregate;
 using CustomerService.Repositories;
+using EventDriven.DDD.Abstractions.Repositories;
 
 namespace EventDriven.CQRS.Tests.Fakes
 {
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using OrderService.Domain.OrderAggregate;
 using OrderService.Repositories;
-using ConcurrencyException = CustomerService.Repositories.ConcurrencyException;
 
 namespace EventDriven.CQRS.Tests.Fakes
 {

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace CustomerService.Configuration`
`4`	`4`	`{`
`5`	`5`	`public class CustomerDatabaseSettings : IMongoDbSettings`
`6`	`6`	`{`
`7`		`- public string ConnectionString { get; set; }`
`8`		`- public string DatabaseName { get; set; }`
`9`		`- public string CollectionName { get; set; }`
	`7`	`+ public string ConnectionString { get; set; } = null!;`
	`8`	`+ public string DatabaseName { get; set; } = null!;`
	`9`	`+ public string CollectionName { get; set; } = null!;`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ namespace CustomerService.DTO.Write`
`2`	`2`	`{`
`3`	`3`	`public class Address`
`4`	`4`	`{`
`5`		`- public string Street { get; set; }`
`6`		`- public string City { get; set; }`
`7`		`- public string State { get; set; }`
`8`		`- public string Country { get; set; }`
`9`		`- public string PostalCode { get; set; }`
	`5`	`+ public string Street { get; set; } = null!;`
	`6`	`+ public string City { get; set; } = null!;`
	`7`	`+ public string State { get; set; } = null!;`
	`8`	`+ public string Country { get; set; } = null!;`
	`9`	`+ public string PostalCode { get; set; } = null!;`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`		`-using System;`
`2`		`-`
`3`	`1`	`namespace CustomerService.DTO.Write`
`4`	`2`	`{`
`5`	`3`	`public class Customer`
`6`	`4`	`{`
`7`	`5`	`public Guid Id { get; set; }`
`8`		`- public string FirstName { get; set; }`
`9`		`- public string LastName { get; set; }`
`10`		`- public Address ShippingAddress { get; set; }`
`11`		`- public string ETag { get; set; }`
	`6`	`+ public string FirstName { get; set; } = null!;`
	`7`	`+ public string LastName { get; set; } = null!;`
	`8`	`+ public Address ShippingAddress { get; set; } = null!;`
	`9`	`+ public string ETag { get; set; } = null!;`
`12`	`10`	`}`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using EventDriven.DDD.Abstractions.Commands;`
`3`	`2`
`4`	`3`	`namespace CustomerService.Domain.CustomerAggregate.Commands`