Restructure project

connorwyatt · connorwyatt · commit 19ab7413877a · 2022-09-22T16:37:29.000+01:00
diff --git a/WealthKernel.ShoppingCart.sln b/WealthKernel.ShoppingCart.sln
@@ -1,9 +1,11 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WealthKernel.ShoppingCart", "src\WealthKernel.ShoppingCart.csproj", "{8419B160-5AF8-4F58-ADCC-46A7342B86A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WealthKernel.ShoppingCart", "src\WealthKernel.ShoppingCart\WealthKernel.ShoppingCart.csproj", "{8419B160-5AF8-4F58-ADCC-46A7342B86A3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WealthKernel.ShoppingCart.IntegrationTests", "test\WealthKernel.ShoppingCart.IntegrationTests\WealthKernel.ShoppingCart.IntegrationTests.csproj", "{F18825DF-FB5F-4B27-B8D2-A7322163E069}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WealthKernel.ShoppingCart.Data", "src\WealthKernel.ShoppingCart.Data\WealthKernel.ShoppingCart.Data.csproj", "{646CA955-A5D6-49B5-AB96-7D5837E0E29B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +20,9 @@ Global
 		{F18825DF-FB5F-4B27-B8D2-A7322163E069}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F18825DF-FB5F-4B27-B8D2-A7322163E069}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F18825DF-FB5F-4B27-B8D2-A7322163E069}.Release|Any CPU.Build.0 = Release|Any CPU
+		{646CA955-A5D6-49B5-AB96-7D5837E0E29B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{646CA955-A5D6-49B5-AB96-7D5837E0E29B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{646CA955-A5D6-49B5-AB96-7D5837E0E29B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{646CA955-A5D6-49B5-AB96-7D5837E0E29B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/src/Models/CartItemInternal.cs b/src/Models/CartItemInternal.cs
diff --git a/src/Program.cs b/src/Program.cs
diff --git a/src/WealthKernel.ShoppingCart.Data/InMemoryCartItemsRepository.cs b/src/WealthKernel.ShoppingCart.Data/InMemoryCartItemsRepository.cs
@@ -2,44 +2,39 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using WealthKernel.ShoppingCart.Models;
+using WealthKernel.ShoppingCart.Data.Models;
 
 namespace WealthKernel.ShoppingCart.Data
 {
-    public class ShoppingCartRepository
+    public class InMemoryCartItemsRepository
     {
-        private readonly ConcurrentDictionary<string,CartItemInternal> _items;
+        private readonly ConcurrentDictionary<string, CartItem> _items;
 
-        public ShoppingCartRepository()
+        public InMemoryCartItemsRepository()
         {
-            _items = new ConcurrentDictionary<string, CartItemInternal>();
-        } 
-            
-        public void AddItem(CartItemInternal item)
+            _items = new ConcurrentDictionary<string, CartItem>();
+        }
+
+        public void AddCartItem(CartItem item)
         {
             var added = _items.TryAdd(item.Id, item);
-            
+
             if (!added)
             {
                 throw new InvalidOperationException($"Item {item.Id} already exists!");
             }
         }
 
-        public CartItemInternal? GetItem(string id)
+        public CartItem? GetCartItem(string id)
         {
             _items.TryGetValue(id, out var item);
             return item;
         }
 
-        public IList<CartItemInternal> SearchItems(string? id = null, string? name = null)
+        public IList<CartItem> SearchCartItems(string? name = null)
         {
             var itemsQueryable = _items.Values.AsQueryable();
 
-            if (!string.IsNullOrEmpty(id))
-            {
-                itemsQueryable = itemsQueryable.Where(r => r.Id == id);
-            }
-
             if (!string.IsNullOrEmpty(name))
             {
                 itemsQueryable = itemsQueryable.Where(r => r.Name == name);
diff --git a/src/WealthKernel.ShoppingCart.Data/Models/CartItem.cs b/src/WealthKernel.ShoppingCart.Data/Models/CartItem.cs
@@ -0,0 +1,15 @@
+﻿namespace WealthKernel.ShoppingCart.Data.Models
+{
+    public class CartItem
+    {
+        public string Id { get; }
+
+        public string Name { get; }
+
+        public CartItem(string id, string name)
+        {
+            Id = id;
+            Name = name;
+        }
+    }
+}
diff --git a/src/WealthKernel.ShoppingCart.Data/WealthKernel.ShoppingCart.Data.csproj b/src/WealthKernel.ShoppingCart.Data/WealthKernel.ShoppingCart.Data.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/WealthKernel.ShoppingCart/Program.cs b/src/WealthKernel.ShoppingCart/Program.cs
@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+
+namespace WealthKernel.ShoppingCart
+{
+    public class Program
+    {
+        public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
+
+        private static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+    }
+}
diff --git a/src/WealthKernel.ShoppingCart/Properties/launchSettings.json b/src/WealthKernel.ShoppingCart/Properties/launchSettings.json
@@ -2,7 +2,6 @@
   "profiles": {
     "WealthKernel.ShoppingCart": {
       "commandName": "Project",
-      "launchBrowser": true,
       "applicationUrl": "http://localhost:22222",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/WealthKernel.ShoppingCart/ShoppingCartController.cs b/src/WealthKernel.ShoppingCart/ShoppingCartController.cs
@@ -5,6 +5,5 @@ namespace WealthKernel.ShoppingCart
     [ApiController]
     public class ShoppingCartController : ControllerBase
     {
-
     }
 }
diff --git a/src/WealthKernel.ShoppingCart/Startup.cs b/src/WealthKernel.ShoppingCart/Startup.cs
diff --git a/src/WealthKernel.ShoppingCart/WealthKernel.ShoppingCart.csproj b/src/WealthKernel.ShoppingCart/WealthKernel.ShoppingCart.csproj
@@ -3,6 +3,8 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
         <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
 </Project>
diff --git a/src/WealthKernel.ShoppingCart/appsettings.json b/src/WealthKernel.ShoppingCart/appsettings.json
diff --git a/src/appsettings.Development.json b/src/appsettings.Development.json
diff --git a/test/WealthKernel.ShoppingCart.IntegrationTests/ShoppingCartTests.cs b/test/WealthKernel.ShoppingCart.IntegrationTests/ShoppingCartTests.cs
@@ -1,4 +1,3 @@
-using System.Net.Http;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Xunit;
 
@@ -12,16 +11,5 @@ public ShoppingCartTests(WebApplicationFactory<Startup> factory)
         {
             _factory = factory;
         }
-
-        [Fact]
-        public void First_Test()
-        {
-            var client = _factory.CreateClient();
-
-            // e.g.
-            // client.PostAsJsonAsync("/some/url", new {})
-        }
-
-
     }
 }
diff --git a/test/WealthKernel.ShoppingCart.IntegrationTests/WealthKernel.ShoppingCart.IntegrationTests.csproj b/test/WealthKernel.ShoppingCart.IntegrationTests/WealthKernel.ShoppingCart.IntegrationTests.csproj
@@ -2,7 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -17,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\WealthKernel.ShoppingCart.csproj" />
+      <ProjectReference Include="..\..\src\WealthKernel.ShoppingCart\WealthKernel.ShoppingCart.csproj" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -2,44 +2,39 @@`
`2`	`2`	`using System.Collections.Concurrent;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`		`-using WealthKernel.ShoppingCart.Models;`
	`5`	`+using WealthKernel.ShoppingCart.Data.Models;`
`6`	`6`
`7`	`7`	`namespace WealthKernel.ShoppingCart.Data`
`8`	`8`	`{`
`9`		`- public class ShoppingCartRepository`
	`9`	`+ public class InMemoryCartItemsRepository`
`10`	`10`	`{`
`11`		`- private readonly ConcurrentDictionary<string,CartItemInternal> _items;`
	`11`	`+ private readonly ConcurrentDictionary<string, CartItem> _items;`
`12`	`12`
`13`		`- public ShoppingCartRepository()`
	`13`	`+ public InMemoryCartItemsRepository()`
`14`	`14`	`{`
`15`		`- _items = new ConcurrentDictionary<string, CartItemInternal>();`
`16`		`- }`
`17`		`-`
`18`		`- public void AddItem(CartItemInternal item)`
	`15`	`+ _items = new ConcurrentDictionary<string, CartItem>();`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ public void AddCartItem(CartItem item)`
`19`	`19`	`{`
`20`	`20`	`var added = _items.TryAdd(item.Id, item);`
`21`		`-`
	`21`	`+`
`22`	`22`	`if (!added)`
`23`	`23`	`{`
`24`	`24`	`throw new InvalidOperationException($"Item {item.Id} already exists!");`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- public CartItemInternal? GetItem(string id)`
	`28`	`+ public CartItem? GetCartItem(string id)`
`29`	`29`	`{`
`30`	`30`	`_items.TryGetValue(id, out var item);`
`31`	`31`	`return item;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public IList<CartItemInternal> SearchItems(string? id = null, string? name = null)`
	`34`	`+ public IList<CartItem> SearchCartItems(string? name = null)`
`35`	`35`	`{`
`36`	`36`	`var itemsQueryable = _items.Values.AsQueryable();`
`37`	`37`
`38`		`- if (!string.IsNullOrEmpty(id))`
`39`		`- {`
`40`		`- itemsQueryable = itemsQueryable.Where(r => r.Id == id);`
`41`		`- }`
`42`		`-`
`43`	`38`	`if (!string.IsNullOrEmpty(name))`
`44`	`39`	`{`
`45`	`40`	`itemsQueryable = itemsQueryable.Where(r => r.Name == name);`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,5 @@ namespace WealthKernel.ShoppingCart`
`5`	`5`	`[ApiController]`
`6`	`6`	`public class ShoppingCartController : ControllerBase`
`7`	`7`	`{`
`8`		`-`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Net.Http;`
`2`	`1`	`using Microsoft.AspNetCore.Mvc.Testing;`
`3`	`2`	`using Xunit;`
`4`	`3`
`@@ -12,16 +11,5 @@ public ShoppingCartTests(WebApplicationFactory<Startup> factory)`
`12`	`11`	`{`
`13`	`12`	`_factory = factory;`
`14`	`13`	`}`
`15`		`-`
`16`		`- [Fact]`
`17`		`- public void First_Test()`
`18`		`- {`
`19`		`- var client = _factory.CreateClient();`
`20`		`-`
`21`		`- // e.g.`
`22`		`- // client.PostAsJsonAsync("/some/url", new {})`
`23`		`- }`
`24`		`-`
`25`		`-`
`26`	`14`	`}`
`27`	`15`	`}`