Fix helper makeTodo function

Author: tachyus-ryan

TodoBackendFSharp/Frank.fs

@@ -27,15 +27,22 @@ open Newtonsoft.Json
 open TodoStorage
 open TodoStorage.InMemory
 
-let private makeTodo (uri: Uri) (todo: NewTodo) =
-    { Url = Uri(uri.AbsoluteUri + todo.Id.ToString()) // TODO: Uri(this.Url.Link("GetTodo", dict ["id", i]))
+let private makeItemUri (request: HttpRequestMessage) index =
+    let uri = request.RequestUri
+    let path = uri.AbsolutePath.Substring(1) // Skip the first '/'
+    if path.[path.Length - 1] = '/' then
+        Uri(uri.AbsoluteUri + string index)
+    else uri
+
+let private makeTodo request (todo: NewTodo) =
+    { Url = makeItemUri request todo.Id
       Title = todo.Title
       Completed = todo.Completed
       Order = todo.Order }
 
 let getTodos (request: HttpRequestMessage) = async {
     let! todos = store.GetAll()
-    let todos' = todos |> Array.map (makeTodo request.RequestUri)
+    let todos' = todos |> Array.map (makeTodo request)
     return request.CreateResponse(todos') }
 
 let postTodo (request: HttpRequestMessage) = async {
@@ -48,9 +55,7 @@ let postTodo (request: HttpRequestMessage) = async {
     let! index = store.Post newTodo
 
     // Return the new todo item
-    // TODO: Debug `this.Url.Link`.
-    //let newUrl = Uri(this.Url.Link("GetTodo", dict ["id", index]))
-    let todo = makeTodo request.RequestUri { newTodo with Id = index }
+    let todo = makeTodo request { newTodo with Id = index }
     let response = request.CreateResponse(HttpStatusCode.Created, todo)
     response.Headers.Location <- todo.Url
     return response }
@@ -67,7 +72,7 @@ let getTodo (request: HttpRequestMessage) = async {
         let! todo = store.Get id
         match todo with
         | Some todo ->
-            let todo' = makeTodo request.RequestUri todo
+            let todo' = makeTodo request todo
             return request.CreateResponse(todo')
         | None -> return request.CreateResponse(HttpStatusCode.NotFound)
     | None -> return request.CreateResponse(HttpStatusCode.NotFound) }
@@ -88,7 +93,7 @@ let patchTodo (request: HttpRequestMessage) = async {
         match newTodo with
         | Some newTodo ->
             // Return the new todo item
-            let todo = makeTodo request.RequestUri newTodo
+            let todo = makeTodo request newTodo
             return request.CreateResponse(todo)
         | None -> return request.CreateResponse(HttpStatusCode.NotFound)
     | None -> return request.CreateResponse(HttpStatusCode.NotFound) }

TodoBackendFSharp/WebApi.fs

@@ -28,8 +28,17 @@ open TodoStorage.InMemory
 
 module private Utils =
 
-    let makeTodo (uri: Uri) (todo: NewTodo) =
-        { Url = Uri(uri.AbsoluteUri + todo.Id.ToString()) // TODO: Uri(this.Url.Link("GetTodo", dict ["id", i]))
+    let makeItemUri (request: HttpRequestMessage) index =
+        // TODO: Get the UrlHelper working
+        //Uri(request.GetUrlHelper().Link("GetTodo", dict ["id", index]))
+        let uri = request.RequestUri
+        let path = uri.AbsolutePath.Substring(1) // Skip the first '/'
+        if path.[path.Length - 1] = '/' then
+            Uri(uri.AbsoluteUri + string index)
+        else uri
+
+    let makeTodo request (todo: NewTodo) =
+        { Url = makeItemUri request todo.Id
           Title = todo.Title
           Completed = todo.Completed
           Order = todo.Order }
@@ -42,7 +51,7 @@ type TodosController() =
     member this.GetTodos() =
         async {
             let! todos = store.GetAll()
-            let todos' = todos |> Array.map (Utils.makeTodo this.Request.RequestUri)
+            let todos' = todos |> Array.map (Utils.makeTodo this.Request)
             return this.Request.CreateResponse(todos') }
         |> Async.StartAsTask
 
@@ -64,7 +73,7 @@ type TodosController() =
             // TODO: Debug `this.Url.Link`.
             //let newUrl = Uri(this.Url.Link("GetTodo", dict ["id", index]))
             let newUrl = Uri(this.Request.RequestUri.AbsoluteUri + index.ToString())
-            let todo = Utils.makeTodo this.Request.RequestUri { newTodo with Id = index }
+            let todo = Utils.makeTodo this.Request { newTodo with Id = index }
             let response = this.Request.CreateResponse(HttpStatusCode.Created, todo)
             response.Headers.Location <- newUrl
             return response }
@@ -85,7 +94,7 @@ type TodoController() =
             let! todo = store.Get id
             match todo with
             | Some todo ->
-                let todo' = Utils.makeTodo this.Request.RequestUri todo
+                let todo' = Utils.makeTodo this.Request todo
                 return this.Request.CreateResponse(todo')
             | None -> return this.Request.CreateResponse(HttpStatusCode.NotFound) }
         |> Async.StartAsTask
@@ -108,7 +117,7 @@ type TodoController() =
             match newTodo with
             | Some newTodo ->
                 // Return the new todo item
-                let todo = Utils.makeTodo this.Request.RequestUri newTodo
+                let todo = Utils.makeTodo this.Request newTodo
                 return this.Request.CreateResponse(todo)
             | None -> return this.Request.CreateResponse(HttpStatusCode.NotFound) }
         |> Async.StartAsTask