WIP on update to .NET 8 (#75)

src/MyPrayerJournal/Data.fs

@@ -15,24 +15,24 @@ module Json =
     open System.Text.Json.Serialization
 
     /// Convert a wrapped DU to/from its string representation
-    type WrappedJsonConverter<'T> (wrap : string -> 'T, unwrap : 'T -> string) =
-        inherit JsonConverter<'T> ()
+    type WrappedJsonConverter<'T>(wrap : string -> 'T, unwrap : 'T -> string) =
+        inherit JsonConverter<'T>()
         override _.Read(reader, _, _) =
-            wrap (reader.GetString ()) 
+            wrap (reader.GetString()) 
         override _.Write(writer, value, _) =
-            writer.WriteStringValue (unwrap value)
+            writer.WriteStringValue(unwrap value)
     
     open System.Text.Json
     open NodaTime.Serialization.SystemTextJson
 
     /// JSON serializer options to support the target domain
     let options =
-        let opts = JsonSerializerOptions ()
-        [   WrappedJsonConverter (Recurrence.ofString,    Recurrence.toString) :> JsonConverter
-            WrappedJsonConverter (RequestAction.ofString, RequestAction.toString)
-            WrappedJsonConverter (RequestId.ofString,     RequestId.toString)
-            WrappedJsonConverter (UserId,                 UserId.toString)
-            JsonFSharpConverter  ()
+        let opts = JsonSerializerOptions()
+        [   WrappedJsonConverter(Recurrence.ofString,    Recurrence.toString) :> JsonConverter
+            WrappedJsonConverter(RequestAction.ofString, RequestAction.toString)
+            WrappedJsonConverter(RequestId.ofString,     RequestId.toString)
+            WrappedJsonConverter(UserId,                 UserId.toString)
+            JsonFSharpConverter()
         ]
         |> List.iter opts.Converters.Add
         let _ = opts.ConfigureForNodaTime NodaTime.DateTimeZoneProviders.Tzdb
@@ -62,12 +62,12 @@ module Connection =
     /// Set up the data environment
     let setUp (cfg : IConfiguration) = backgroundTask {
         let builder = NpgsqlDataSourceBuilder (cfg.GetConnectionString "mpj")
-        let _ = builder.UseNodaTime ()
-        Configuration.useDataSource (builder.Build ())
+        let _ = builder.UseNodaTime()
+        Configuration.useDataSource (builder.Build())
         Configuration.useSerializer
             { new IDocumentSerializer with
-                member _.Serialize<'T>   (it : 'T)     = JsonSerializer.Serialize       (it, Json.options)
-                member _.Deserialize<'T> (it : string) = JsonSerializer.Deserialize<'T> (it, Json.options)
+                member _.Serialize<'T>(it : 'T)       = JsonSerializer.Serialize(it, Json.options)
+                member _.Deserialize<'T>(it : string) = JsonSerializer.Deserialize<'T>(it, Json.options)
             }
         do! ensureDb ()
     }
@@ -80,9 +80,8 @@ module Request =
     open NodaTime
 
     /// Add a request
-    let add req = backgroundTask {
-        do! insert Table.Request (RequestId.toString req.Id) req
-    }
+    let add req =
+        insert<Request> Table.Request req
 
     /// Does a request exist for the given request ID and user ID?
     let existsById (reqId : RequestId) (userId : UserId) =
@@ -100,7 +99,7 @@ module Request =
         let dbId = RequestId.toString reqId
         match! existsById reqId userId with
         | true -> do! Update.partialById Table.Request dbId {| Recurrence = recurType |}
-        | false -> invalidOp "Request ID {dbId} not found"
+        | false -> invalidOp $"Request ID {dbId} not found"
     }
 
     /// Update the show-after time for a request
@@ -108,7 +107,7 @@ module Request =
         let dbId = RequestId.toString reqId
         match! existsById reqId userId with
         | true -> do! Update.partialById Table.Request dbId {| ShowAfter = showAfter |}
-        | false -> invalidOp "Request ID {dbId} not found"
+        | false -> invalidOp $"Request ID {dbId} not found"
     }
 
     /// Update the snoozed and show-after values for a request
@@ -116,7 +115,7 @@ module Request =
         let dbId = RequestId.toString reqId
         match! existsById reqId userId with
         | true -> do! Update.partialById Table.Request dbId {| SnoozedUntil = until; ShowAfter = until |}
-        | false -> invalidOp "Request ID {dbId} not found"
+        | false -> invalidOp $"Request ID {dbId} not found"
     }
 
 
@@ -130,7 +129,7 @@ module History =
         match! Request.tryById reqId userId with
         | Some req ->
             do! Update.partialById Table.Request dbId
-                                   {| History = (hist :: req.History) |> List.sortByDescending (fun it -> it.AsOf) |}
+                                   {| History = (hist :: req.History) |> List.sortByDescending (_.AsOf) |}
         | None -> invalidOp $"Request ID {dbId} not found"
     }
 
@@ -152,7 +151,7 @@ module Journal =
             |> Seq.ofList
             |> Seq.map JournalRequest.ofRequestLite
             |> Seq.filter (fun it -> it.LastStatus = Answered)
-            |> Seq.sortByDescending (fun it -> it.AsOf)
+            |> Seq.sortByDescending (_.AsOf)
             |> List.ofSeq
     }
 
@@ -169,7 +168,7 @@ module Journal =
             |> Seq.ofList
             |> Seq.map JournalRequest.ofRequestLite
             |> Seq.filter (fun it -> it.LastStatus <> Answered)
-            |> Seq.sortBy (fun it -> it.AsOf)
+            |> Seq.sortBy (_.AsOf)
             |> List.ofSeq
     }
 
@@ -195,7 +194,7 @@ module Note =
         match! Request.tryById reqId userId with
         | Some req ->
             do! Update.partialById Table.Request dbId
-                                   {| Notes = (note :: req.Notes) |> List.sortByDescending (fun it -> it.AsOf) |}
+                                   {| Notes = (note :: req.Notes) |> List.sortByDescending (_.AsOf) |}
         | None -> invalidOp $"Request ID {dbId} not found"
     }