Update OrderService.csproj to nullable.

Anthony Sneed · Anthony Sneed · commit 80c47350c29b · 2022-02-26T15:03:56.000-06:00
diff --git a/reference-architecture/OrderService/Configuration/OrderDatabaseSettings.cs b/reference-architecture/OrderService/Configuration/OrderDatabaseSettings.cs
@@ -4,8 +4,8 @@ namespace OrderService.Configuration
 {
     public class OrderDatabaseSettings : 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/OrderService/Controllers/OrderCommandController.cs b/reference-architecture/OrderService/Controllers/OrderCommandController.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-using AutoMapper;
+﻿using AutoMapper;
 using EventDriven.DDD.Abstractions.Commands;
 using Microsoft.AspNetCore.Mvc;
 using OrderService.Domain.OrderAggregate;
diff --git a/reference-architecture/OrderService/Controllers/OrderQueryController.cs b/reference-architecture/OrderService/Controllers/OrderQueryController.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+﻿using Microsoft.AspNetCore.Mvc;
 using OrderService.Domain.OrderAggregate;
 using OrderService.DTO.Read;
 using OrderService.Repositories;
@@ -51,10 +47,10 @@ public async Task<IActionResult> GetOrder([FromRoute] Guid id)
             return Ok(result);
         }
 
-        private IEnumerable<OrderView> GetOrderViews(IEnumerable<Order> orders) =>
+        private IEnumerable<OrderView> GetOrderViews(IEnumerable<Order?> orders) =>
             orders.Select(o => new OrderView
             {
-                Id = o.Id,
+                Id = o!.Id,
                 CustomerId = o.CustomerId,
                 OrderDate = o.OrderDate,
                 OrderTotal = o.OrderItems.Sum(i => i.ProductPrice),
diff --git a/reference-architecture/OrderService/DTO/Read/OrderView.cs b/reference-architecture/OrderService/DTO/Read/OrderView.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace OrderService.DTO.Read
 {
     public class OrderView
@@ -8,12 +6,12 @@ public class OrderView
         public Guid CustomerId { get; set; }
         public DateTime OrderDate { get; set; }
         public decimal OrderTotal { 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 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 OrderState OrderState { get; set; }
-        public string ETag { get; set; }
+        public string ETag { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/OrderService/DTO/Write/Address.cs b/reference-architecture/OrderService/DTO/Write/Address.cs
@@ -2,10 +2,10 @@ namespace OrderService.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/OrderService/DTO/Write/Order.cs b/reference-architecture/OrderService/DTO/Write/Order.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Collections.Generic;
-
 namespace OrderService.DTO.Write
 {
     public class Order
     {
         public Guid Id { get; set; }
         public Guid CustomerId { get; set; }
         public DateTime OrderDate { get; set; }
-        public List<OrderItem> OrderItems { get; set; }
-        public Address ShippingAddress { get; set; }
+        public List<OrderItem> OrderItems { get; set; } = null!;
+        public Address ShippingAddress { get; set; } = null!;
         public OrderState OrderState { get; set; }
-        public string ETag { get; set; }
+        public string ETag { get; set; } = null!;
     }
 }
diff --git a/reference-architecture/OrderService/DTO/Write/OrderItem.cs b/reference-architecture/OrderService/DTO/Write/OrderItem.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace OrderService.DTO.Write
 {
     public record OrderItem(Guid ProductId, string ProductName, decimal ProductPrice);
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/CommandHandlers/OrderCommandHandler.cs b/reference-architecture/OrderService/Domain/OrderAggregate/CommandHandlers/OrderCommandHandler.cs
@@ -1,6 +1,5 @@
-using System.Threading.Tasks;
 using EventDriven.DDD.Abstractions.Commands;
-using Microsoft.Extensions.Logging;
+using EventDriven.DDD.Abstractions.Repositories;
 using OrderService.Domain.OrderAggregate.Commands;
 using OrderService.Repositories;
 
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Commands/CancelOrder.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Commands/CancelOrder.cs
@@ -1,4 +1,3 @@
-using System;
 using EventDriven.DDD.Abstractions.Commands;
 
 namespace OrderService.Domain.OrderAggregate.Commands
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Commands/RemoveOrder.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Commands/RemoveOrder.cs
@@ -1,4 +1,3 @@
-using System;
 using EventDriven.DDD.Abstractions.Commands;
 
 namespace OrderService.Domain.OrderAggregate.Commands
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Commands/ShipOrder.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Commands/ShipOrder.cs
@@ -1,4 +1,3 @@
-using System;
 using EventDriven.DDD.Abstractions.Commands;
 
 namespace OrderService.Domain.OrderAggregate.Commands
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Events/OrderCancelled.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Events/OrderCancelled.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using EventDriven.DDD.Abstractions.Events;
+﻿using EventDriven.DDD.Abstractions.Events;
 
 namespace OrderService.Domain.OrderAggregate.Events
 {
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Events/OrderShipped.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Events/OrderShipped.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using EventDriven.DDD.Abstractions.Events;
+﻿using EventDriven.DDD.Abstractions.Events;
 
 namespace OrderService.Domain.OrderAggregate.Events
 {
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/Order.cs b/reference-architecture/OrderService/Domain/OrderAggregate/Order.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using EventDriven.DDD.Abstractions.Commands;
 using EventDriven.DDD.Abstractions.Entities;
 using EventDriven.DDD.Abstractions.Events;
@@ -19,8 +17,8 @@ public class Order :
     {
         public Guid CustomerId { get; set; }
         public DateTime OrderDate { get; set; }
-        public List<OrderItem> OrderItems { get; set; }
-        public Address ShippingAddress { get; set; }
+        public List<OrderItem> OrderItems { get; set; } = null!;
+        public Address ShippingAddress { get; set; } = null!;
         public OrderState OrderState { get; set; }
 
         public OrderCreated Process(CreateOrder command)
diff --git a/reference-architecture/OrderService/Domain/OrderAggregate/OrderItem.cs b/reference-architecture/OrderService/Domain/OrderAggregate/OrderItem.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace OrderService.Domain.OrderAggregate
 {
     public record OrderItem(Guid ProductId, string ProductName, decimal ProductPrice);
diff --git a/reference-architecture/OrderService/Helpers/CommandResultExtensions.cs b/reference-architecture/OrderService/Helpers/CommandResultExtensions.cs
@@ -1,12 +1,11 @@
 using EventDriven.DDD.Abstractions.Commands;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace OrderService.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/OrderService/Integration/EventHandlers/CustomerAddressUpdatedEventHandler.cs b/reference-architecture/OrderService/Integration/EventHandlers/CustomerAddressUpdatedEventHandler.cs
@@ -1,7 +1,5 @@
-using System.Threading.Tasks;
 using AutoMapper;
 using EventDriven.EventBus.Abstractions;
-using Microsoft.Extensions.Logging;
 using Common.Integration.Events;
 using OrderService.Domain.OrderAggregate;
 using OrderService.Repositories;
diff --git a/reference-architecture/OrderService/OrderService.csproj b/reference-architecture/OrderService/OrderService.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/reference-architecture/OrderService/Program.cs b/reference-architecture/OrderService/Program.cs
@@ -1,6 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
 namespace OrderService
 {
     public class Program
diff --git a/reference-architecture/OrderService/Repositories/ConcurrencyException.cs b/reference-architecture/OrderService/Repositories/ConcurrencyException.cs
diff --git a/reference-architecture/OrderService/Repositories/IOrderRepository.cs b/reference-architecture/OrderService/Repositories/IOrderRepository.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using OrderService.Domain.OrderAggregate;
 
 namespace OrderService.Repositories
@@ -9,11 +6,11 @@ public interface IOrderRepository
     {
         Task<IEnumerable<Order>> GetAsync();
         Task<IEnumerable<Order>> GetByCustomerAsync(Guid customerId);
-        Task<Order> GetAsync(Guid id);
-        Task<Order> AddAsync(Order entity);
-        Task<Order> UpdateAsync(Order entity);
-        Task<Order> UpdateAddressAsync(Guid orderId, Address address);
+        Task<Order?> GetAsync(Guid id);
+        Task<Order?> AddAsync(Order entity);
+        Task<Order?> UpdateAsync(Order entity);
+        Task<Order?> UpdateAddressAsync(Guid orderId, Address address);
         Task<int> RemoveAsync(Guid id);
-        Task<Order> UpdateOrderStateAsync(Order entity, OrderState orderState);
+        Task<Order?> UpdateOrderStateAsync(Order entity, OrderState orderState);
     }
 }
diff --git a/reference-architecture/OrderService/Repositories/OrderRepository.cs b/reference-architecture/OrderService/Repositories/OrderRepository.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using EventDriven.DDD.Abstractions.Repositories;
 using MongoDB.Driver;
 using OrderService.Domain.OrderAggregate;
 using URF.Core.Mongo;
@@ -18,18 +16,18 @@ public async Task<IEnumerable<Order>> GetAsync() =>
         public async Task<IEnumerable<Order>> GetByCustomerAsync(Guid customerId) =>
             await FindManyAsync(e => e.CustomerId == customerId);
 
-        public async Task<Order> GetAsync(Guid id) =>
+        public async Task<Order?> GetAsync(Guid id) =>
             await FindOneAsync(e => e.Id == id);
 
-        public async Task<Order> AddAsync(Order entity)
+        public async Task<Order?> AddAsync(Order 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<Order> UpdateAsync(Order entity)
+        public async Task<Order?> UpdateAsync(Order entity)
         {
             var existing = await GetAsync(entity.Id);
             if (existing == null) return null;
@@ -39,7 +37,7 @@ public async Task<Order> UpdateAsync(Order entity)
             return await FindOneAndReplaceAsync(e => e.Id == entity.Id, entity);
         }
 
-        public async Task<Order> UpdateAddressAsync(Guid orderId, Address address)
+        public async Task<Order?> UpdateAddressAsync(Guid orderId, Address address)
         {
             var existing = await GetAsync(orderId);
             if (existing == null) return null;
@@ -50,7 +48,7 @@ public async Task<Order> UpdateAddressAsync(Guid orderId, Address address)
         public async Task<int> RemoveAsync(Guid id) =>
             await DeleteOneAsync(e => e.Id == id);
 
-        public async Task<Order> UpdateOrderStateAsync(Order entity, OrderState orderState)
+        public async Task<Order?> UpdateOrderStateAsync(Order entity, OrderState orderState)
         {
             var existing = await GetAsync(entity.Id);
             if (existing == null) return null;
diff --git a/reference-architecture/OrderService/Startup.cs b/reference-architecture/OrderService/Startup.cs
@@ -1,9 +1,4 @@
 using EventDriven.DependencyInjection.URF.Mongo;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using OrderService.Configuration;
 using OrderService.Domain.OrderAggregate;
diff --git a/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs b/test/EventDriven.CQRS.Tests/Fakes/FakeOrderRepository.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using EventDriven.DDD.Abstractions.Repositories;
 using OrderService.Domain.OrderAggregate;
 using OrderService.Repositories;
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace OrderService.Configuration`
`4`	`4`	`{`
`5`	`5`	`public class OrderDatabaseSettings : 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 OrderService.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,16 +1,13 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-`
`4`	`1`	`namespace OrderService.DTO.Write`
`5`	`2`	`{`
`6`	`3`	`public class Order`
`7`	`4`	`{`
`8`	`5`	`public Guid Id { get; set; }`
`9`	`6`	`public Guid CustomerId { get; set; }`
`10`	`7`	`public DateTime OrderDate { get; set; }`
`11`		`- public List<OrderItem> OrderItems { get; set; }`
`12`		`- public Address ShippingAddress { get; set; }`
	`8`	`+ public List<OrderItem> OrderItems { get; set; } = null!;`
	`9`	`+ public Address ShippingAddress { get; set; } = null!;`
`13`	`10`	`public OrderState OrderState { get; set; }`
`14`		`- public string ETag { get; set; }`
	`11`	`+ public string ETag { get; set; } = null!;`
`15`	`12`	`}`
`16`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System;`
`2`		`-`
`3`	`1`	`namespace OrderService.DTO.Write`
`4`	`2`	`{`
`5`	`3`	`public record OrderItem(Guid ProductId, string ProductName, decimal ProductPrice);`
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 OrderService.Domain.OrderAggregate.Commands`