Merge branch 'main' of github.com:NitroDevs/FShopOnWeb

NitroDevs · Nov 7, 2022 · 7b57fa7 · 7b57fa7
2 parents c1af249 + 8a9c598
commit 7b57fa7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/Microsoft.eShopWeb.Web/Basket/Basket.Domain.fs b/src/Microsoft.eShopWeb.Web/Basket/Basket.Domain.fs
@@ -65,6 +65,3 @@ module BasketDomain =
             i)
 
       { basket with Items = items }
-
-// TODO:
-// let getCatalogItemById =
diff --git a/src/Microsoft.eShopWeb.Web/Basket/Basket.Page.fs b/src/Microsoft.eShopWeb.Web/Basket/Basket.Page.fs
@@ -8,6 +8,7 @@ open Microsoft.eShopWeb.Web
 open System.Linq
 
 module BasketPage =
+
   module private Template =
 
     let metadata: PublicLayout.HeadMetadata = { Title = "Basket"; Description = "" }
@@ -19,11 +20,28 @@ module BasketPage =
 
     let page basket = PublicLayout.layout head (body basket)
 
+  let private getIdFromForm (form: FormCollectionReader) =
+    form.TryGetString "id" |> Option.map int
+
   let handler: HttpHandler =
     Services.inject<ShopContext> (fun context ->
-      let dbItems = context.CatalogItems.ToList()
+      Request.mapForm
+        (fun form ->
+          let dbItems = context.CatalogItems.ToList()
+
+          let items = List.ofSeq (dbItems)
+          let basket = BasketDomain.basketFromCatalog List.empty
+
+          let id = getIdFromForm form
+
+          let basketToRender =
+            match id with
+            | None -> basket
+            | Some id ->
+              let catalogItem = items[id]
 
-      let items = List.ofSeq (dbItems)
-      let basket = BasketDomain.basketFromCatalog items
+              let updatedBasket = BasketDomain.addItemToBasket basket catalogItem
+              updatedBasket
 
-      Response.ofHtml (Template.page basket))
+          Template.page basketToRender)
+        Response.ofHtml)