checkpoint

Author: Tim Hess

src/funstore.service.cart/Controllers/CartController.fs

@@ -40,5 +40,6 @@ type CartController () =
     // DELETE api/cart/5
     [<HttpDelete("{id}")>]
     member this.Delete(id:Guid) =
-        Carts.Remove(Carts.Find(fun i -> i.GetId() = id))
+        let c = Carts.Find(fun _i -> _i.GetId() = id)
+        c.Clear()
 

src/funstore.service.cart/Program.fs

@@ -6,6 +6,7 @@ open Microsoft.Extensions.Logging
 open Pivotal.Extensions.Configuration.ConfigServer
 open Steeltoe.Extensions.Logging
 open System
+open System.IO
 
 module Program =
     let exitCode = 0
@@ -14,10 +15,11 @@ module Program =
         (new WebHostBuilder())
             .UseKestrel()
             .UseCloudFoundryHosting()
+            .UseContentRoot(Directory.GetCurrentDirectory())
             .ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder>(fun _builder config ->
                 let env = _builder.HostingEnvironment
                 config.SetBasePath(env.ContentRootPath)
-                    .AddJsonFile("appsettings.json", true, true)
+                    .AddJsonFile("appsettings.json", false, true)
                     .AddJsonFile("appsettings.Development.json", true)
                     .AddEnvironmentVariables()
                     .AddConfigServer() |> ignore

src/funstore.service.cart/appsettings.Development.json

@@ -4,7 +4,8 @@
       "Default": "Debug",
       "Funstore": "Trace",
       "System": "Information",
-      "Microsoft": "Information"
+      "Microsoft": "Information",
+      "Steeltoe": "Trace"
     }
   },
   "eureka": {

src/funstore.service.order/Controllers/OrderController.cs

@@ -0,0 +1,49 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Funstore.Service.Order.Controllers
+{
+    [Route("[controller]")]
+    [ApiController]
+    public class OrderController : Controller
+    {
+        private static List<Shared.csharp.Order> Orders = new List<Shared.csharp.Order>();
+
+        // GET api/values
+        [HttpGet("history/{cartId}")]
+        public IEnumerable<Shared.csharp.Order> History(Guid cartId)
+        {
+            return Orders.Where(o => o.CartId == cartId);
+        }
+
+        // GET api/values/5
+        [HttpGet("{id}")]
+        public Shared.csharp.Order Get(int id)
+        {
+            return Orders.Find(o => o.Id == id);
+        }
+
+        // POST api/values
+        [HttpPost]
+        public ActionResult Post([FromBody] Shared.csharp.Order request)
+        {
+            var newOrder = new Shared.csharp.Order { CartId = request.CartId, Items = request.Items, OrderPlaced = DateTime.Now, Id = Orders.Count + 1 };
+            Orders.Add(newOrder);
+            return Json(newOrder);
+        }
+
+        // PUT api/values/5
+        [HttpPut("{id}")]
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/values/5
+        [HttpDelete("{id}")]
+        public void Delete(int id)
+        {
+        }
+    }
+}

src/funstore.service.order/funstore.service.order.csproj

@@ -21,4 +21,9 @@
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.1.0-preview1-final" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\funstore.shared.csharp\funstore.shared.csharp.csproj" />
+    <ProjectReference Include="..\funstore.shared.fsharp\funstore.shared.fsharp.fsproj" />
+  </ItemGroup>
+
 </Project>

src/funstore.shared.csharp/CartItem.cs

@@ -13,5 +13,7 @@ public class CartItem
         public int Count { get; set; } = 1;
 
         public DateTime DateCreated { get; set; }
+
+        public InventoryItem Item { get; set; }
     }
 }

src/funstore.shared.csharp/InventoryItem.cs

@@ -6,6 +6,8 @@ public class InventoryItem
 
         public string Name { get; set; }
 
+        public string FontAwesomeIcon { get; set; }
+
         public string Description { get; set; }
     }
 }

src/funstore.shared.csharp/Order.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace Funstore.Shared.csharp
+{
+    public class Order
+    {
+        public int Id { get; set; }
+
+        public Guid CartId { get; set; }
+
+        public List<CartItem> Items { get; set; }
+
+        public DateTime OrderPlaced { get; set; }
+
+        public string Status { get; set; }
+
+        public DateTime LastUpdate { get; set; }
+    }
+}

src/funstore.shared.csharp/BaseDiscoveryService.cs renamed to src/funstore.shared.csharp/Services/BaseDiscoveryService.cs

@@ -0,0 +1,44 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using Steeltoe.Common.Discovery;
+
+namespace Funstore.Shared.csharp
+{
+    public class OrderProcessingService : BaseDiscoveryService
+    {
+        private const string ORDER_URL = "http://funstore-orders/order";
+
+        public OrderProcessingService(IDiscoveryClient client, ILoggerFactory logFactory) : base(client, logFactory.CreateLogger<OrderProcessingService>())
+        {
+        }
+
+        public async Task<int> AddOrderAsync(Order order)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Post, ORDER_URL);
+            var result = await Invoke<Order>(request, order);
+            return result.Id;
+        }
+
+        public async Task<Order> GetOrderAsync(int id)
+        {
+            var orderUrl = ORDER_URL + "/" + id;
+
+            var request = new HttpRequestMessage(HttpMethod.Get, orderUrl);
+            var result = await Invoke<Order>(request);
+            return result;
+        }
+
+        public async Task<List<Order>> GetOrderHistory(Guid cartId)
+        {
+            var orderUrl = ORDER_URL + "/history/" + cartId;
+
+            var request = new HttpRequestMessage(HttpMethod.Get, orderUrl);
+            var result = await Invoke<List<Order>>(request);
+            return result;
+        }
+    }
+}