From ed4bb64ca5c188e039a7d9ea53b053cd33840a91 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sat, 8 Jan 2022 12:05:10 -0500 Subject: [PATCH] Finish recurrent model change Also fix IDE warnings, update to htmx 1.6.1 --- src/MyPrayerJournal/Data.fs | 70 +++---------------- src/MyPrayerJournal/Domain.fs | 24 +++---- src/MyPrayerJournal/Handlers.fs | 44 ++++++------ src/MyPrayerJournal/MyPrayerJournal.fsproj | 5 +- src/MyPrayerJournal/Program.fs | 15 ++-- src/MyPrayerJournal/Views/Layout.fs | 6 +- src/MyPrayerJournal/Views/Request.fs | 25 ++++--- .../wwwroot/script/htmx-1.5.0.min.js | 1 - .../wwwroot/script/htmx-1.6.1.min.js | 1 + 9 files changed, 68 insertions(+), 123 deletions(-) delete mode 100644 src/MyPrayerJournal/wwwroot/script/htmx-1.5.0.min.js create mode 100644 src/MyPrayerJournal/wwwroot/script/htmx-1.6.1.min.js diff --git a/src/MyPrayerJournal/Data.fs b/src/MyPrayerJournal/Data.fs index f2a9a58..e880dad 100644 --- a/src/MyPrayerJournal/Data.fs +++ b/src/MyPrayerJournal/Data.fs @@ -1,8 +1,8 @@ module MyPrayerJournal.Data open LiteDB +open MyPrayerJournal open NodaTime -open System open System.Threading.Tasks // fsharplint:disable MemberNames @@ -36,7 +36,12 @@ module Mapping = module Option = let stringFromBson (value : BsonValue) = match value.AsString with "" -> None | x -> Some x let stringToBson (value : string option) : BsonValue = match value with Some txt -> txt | None -> "" - + + /// Mapping for Recurrence + module Recurrence = + let fromBson (value : BsonValue) = Recurrence.ofString value + let toBson (value : Recurrence) : BsonValue = Recurrence.toString value + /// Mapping for RequestAction module RequestAction = let fromBson (value : BsonValue) = RequestAction.ofString value.AsString @@ -52,65 +57,10 @@ module Mapping = let fromBson (value : BsonValue) = UserId value.AsString let toBson (value : UserId) : BsonValue = UserId.toString value - /// Map a history entry to BSON - let historyToBson (hist : History) : BsonValue = - let doc = BsonDocument () - doc["asOf"] <- hist.asOf.ToUnixTimeMilliseconds () - doc["status"] <- RequestAction.toString hist.status - doc["text"] <- match hist.text with Some t -> t | None -> "" - upcast doc - - /// Map a BSON document to a history entry - let historyFromBson (doc : BsonValue) = - { asOf = Instant.FromUnixTimeMilliseconds doc["asOf"].AsInt64 - status = RequestAction.ofString doc["status"].AsString - text = match doc["text"].AsString with "" -> None | txt -> Some txt - } - - /// Map a note entry to BSON - let noteToBson (note : Note) : BsonValue = - let doc = BsonDocument () - doc["asOf"] <- note.asOf.ToUnixTimeMilliseconds () - doc["notes"] <- note.notes - upcast doc - - /// Map a BSON document to a note entry - let noteFromBson (doc : BsonValue) = - { asOf = Instant.FromUnixTimeMilliseconds doc["asOf"].AsInt64 - notes = doc["notes"].AsString - } - - /// Map a request to its BSON representation - let requestToBson req : BsonValue = - let doc = BsonDocument () - doc["_id"] <- RequestId.toString req.id - doc["enteredOn"] <- req.enteredOn.ToUnixTimeMilliseconds () - doc["userId"] <- UserId.toString req.userId - doc["snoozedUntil"] <- req.snoozedUntil.ToUnixTimeMilliseconds () - doc["showAfter"] <- req.showAfter.ToUnixTimeMilliseconds () - doc["recurType"] <- Recurrence.toString req.recurType - doc["recurCount"] <- BsonValue req.recurCount - doc["history"] <- BsonArray (req.history |> List.map historyToBson |> Seq.ofList) - doc["notes"] <- BsonArray (req.notes |> List.map noteToBson |> Seq.ofList) - upcast doc - - /// Map a BSON document to a request - let requestFromBson (doc : BsonValue) = - { id = RequestId.ofString doc["_id"].AsString - enteredOn = Instant.FromUnixTimeMilliseconds doc["enteredOn"].AsInt64 - userId = UserId doc["userId"].AsString - snoozedUntil = Instant.FromUnixTimeMilliseconds doc["snoozedUntil"].AsInt64 - showAfter = Instant.FromUnixTimeMilliseconds doc["showAfter"].AsInt64 - recurType = Recurrence.ofString doc["recurType"].AsString - recurCount = int16 doc["recurCount"].AsInt32 - history = doc["history"].AsArray |> Seq.map historyFromBson |> List.ofSeq - notes = doc["notes"].AsArray |> Seq.map noteFromBson |> List.ofSeq - } - /// Set up the mapping let register () = - BsonMapper.Global.RegisterType(requestToBson, requestFromBson) BsonMapper.Global.RegisterType(Instant.toBson, Instant.fromBson) + BsonMapper.Global.RegisterType(Recurrence.toBson, Recurrence.fromBson) BsonMapper.Global.RegisterType(RequestAction.toBson, RequestAction.fromBson) BsonMapper.Global.RegisterType(RequestId.toBson, RequestId.fromBson) BsonMapper.Global.RegisterType(Option.stringToBson, Option.stringFromBson) @@ -217,9 +167,9 @@ let tryJournalById reqId userId (db : LiteDatabase) = backgroundTask { } /// Update the recurrence for a request -let updateRecurrence reqId userId recurType recurCount db = backgroundTask { +let updateRecurrence reqId userId recurType db = backgroundTask { match! tryFullRequestById reqId userId db with - | Some req -> do! doUpdate db { req with recurType = recurType; recurCount = recurCount } + | Some req -> do! doUpdate db { req with recurrence = recurType } | None -> invalidOp $"{RequestId.toString reqId} not found" } diff --git a/src/MyPrayerJournal/Domain.fs b/src/MyPrayerJournal/Domain.fs index eaed55a..85e5faf 100644 --- a/src/MyPrayerJournal/Domain.fs +++ b/src/MyPrayerJournal/Domain.fs @@ -1,5 +1,5 @@ -[] -/// The data model for myPrayerJournal +/// The data model for myPrayerJournal +[] module MyPrayerJournal.Domain // fsharplint:disable RecordFieldNames @@ -34,7 +34,7 @@ module UserId = type Recurrence = | Immediate | Hours of int16 - | Days of int16 + | Days of int16 | Weeks of int16 /// Functions to manipulate recurrences @@ -111,10 +111,8 @@ type Request = { snoozedUntil : Instant /// The time at which this request should reappear in the user's journal by recurrence showAfter : Instant - /// The type of recurrence for this request - recurType : Recurrence - /// How many of the recurrence intervals should occur between appearances in the journal - recurCount : int16 + /// The recurrence for this request + recurrence : Recurrence /// The history entries for this request history : History list /// The notes for this request @@ -128,8 +126,7 @@ with userId = UserId "" snoozedUntil = Instant.MinValue showAfter = Instant.MinValue - recurType = Immediate - recurCount = 0s + recurrence = Immediate history = [] notes = [] } @@ -152,10 +149,8 @@ type JournalRequest = { snoozedUntil : Instant /// The time after which this request should reappear in the user's journal by configured recurrence showAfter : Instant - /// The type of recurrence for this request - recurType : Recurrence - /// How many of the recurrence intervals should occur between appearances in the journal - recurCount : int16 + /// The recurrence for this request + recurrence : Recurrence /// History entries for the request history : History list /// Note entries for the request @@ -180,8 +175,7 @@ module JournalRequest = lastStatus = match hist with Some h -> h.status | None -> Created snoozedUntil = req.snoozedUntil showAfter = req.showAfter - recurType = req.recurType - recurCount = req.recurCount + recurrence = req.recurrence history = [] notes = [] } diff --git a/src/MyPrayerJournal/Handlers.fs b/src/MyPrayerJournal/Handlers.fs index c8520ae..a0bab46 100644 --- a/src/MyPrayerJournal/Handlers.fs +++ b/src/MyPrayerJournal/Handlers.fs @@ -37,10 +37,10 @@ module Error = log.LogError (EventId(), ex, "An unhandled exception has occurred while executing the request.") clearResponse >=> setStatusCode 500 - >=> setHttpHeader "X-Toast" (sprintf "error|||%s: %s" (ex.GetType().Name) ex.Message) + >=> setHttpHeader "X-Toast" $"error|||{ex.GetType().Name}: {ex.Message}" >=> text ex.Message - /// Handle unauthorized actions, redirecting to log on for GETs, otherwise returning a 401 Not Authorized reponse + /// Handle unauthorized actions, redirecting to log on for GETs, otherwise returning a 401 Not Authorized response let notAuthorized : HttpHandler = fun next ctx -> (next, ctx) @@ -97,7 +97,7 @@ module private Helpers = /// Return a 201 CREATED response with the location header set for the created resource let createdAt url : HttpHandler = fun next ctx -> - (sprintf "%s://%s%s" ctx.Request.Scheme ctx.Request.Host.Value url |> setHttpHeader HeaderNames.Location + ($"{ctx.Request.Scheme}://{ctx.Request.Host.Value}{url}" |> setHttpHeader HeaderNames.Location >=> created) next ctx /// Return a 303 SEE OTHER response (forces a GET on the redirected URL) @@ -107,7 +107,7 @@ module private Helpers = /// Render a component result let renderComponent nodes : HttpHandler = noResponseCaching - >=> fun next ctx -> backgroundTask { + >=> fun _ ctx -> backgroundTask { return! ctx.WriteHtmlStringAsync (ViewEngine.RenderView.AsString.htmlNodes nodes) } @@ -131,7 +131,7 @@ module private Helpers = /// Composable handler to write a view to the output let writeView view : HttpHandler = - fun next ctx -> backgroundTask { + fun _ ctx -> backgroundTask { return! ctx.WriteHtmlViewAsync view } @@ -139,7 +139,7 @@ module private Helpers = module Messages = /// The messages being held - let mutable private messages : Map = Map.empty + let mutable private messages : Map = Map.empty /// Locked update to prevent updates by multiple threads let private upd8 = obj () @@ -150,7 +150,7 @@ module private Helpers = /// Add a success message header to the response let pushSuccess ctx message url = - push ctx (sprintf "success|||%s" message) url + push ctx $"success|||{message}" url /// Pop the messages for the given user let pop userId = lock upd8 (fun () -> @@ -289,7 +289,7 @@ module Journal = |> Option.map (fun c -> c.Value) |> Option.defaultValue "Your" let title = usr |> match usr with "Your" -> sprintf "%s" | _ -> sprintf "%s's" - return! partial (sprintf "%s Prayer Journal" title) (Views.Journal.journal usr) next ctx + return! partial $"{title} Prayer Journal" (Views.Journal.journal usr) next ctx } @@ -343,9 +343,9 @@ module Request = let now = now ctx do! Data.addHistory reqId usrId { asOf = now; status = Prayed; text = None } db let nextShow = - match Recurrence.duration req.recurType with + match Recurrence.duration req.recurrence with | 0L -> Instant.MinValue - | duration -> now.Plus (Duration.FromSeconds (duration * int64 req.recurCount)) + | duration -> now.Plus (Duration.FromSeconds duration) do! Data.updateShowAfter reqId usrId nextShow db do! db.saveChanges () return! (withSuccessMessage "Request marked as prayed" >=> Components.journalItems) next ctx @@ -465,27 +465,25 @@ module Request = | None -> return! Error.notFound next ctx } - /// Derive a recurrence and interval from its primitive representation in the form + /// Derive a recurrence from its representation in the form let private parseRecurrence (form : Models.Request) = - (Recurrence.ofString (match form.recurInterval with Some x -> x | _ -> "Immediate"), - defaultArg form.recurCount (int16 0)) + match form.recurInterval with Some x -> $"{defaultArg form.recurCount 0s} {x}" | None -> "Immediate" + |> Recurrence.ofString // POST /request let add : HttpHandler = requiresAuthentication Error.notAuthorized >=> fun next ctx -> backgroundTask { - let! form = ctx.BindModelAsync () - let db = db ctx - let usrId = userId ctx - let now = now ctx - let (recur, interval) = parseRecurrence form + let! form = ctx.BindModelAsync () + let db = db ctx + let usrId = userId ctx + let now = now ctx let req = { Request.empty with userId = usrId enteredOn = now showAfter = Instant.MinValue - recurType = recur - recurCount = interval + recurrence = parseRecurrence form history = [ { asOf = now status = Created @@ -509,11 +507,11 @@ module Request = match! Data.tryJournalById (RequestId.ofString form.requestId) usrId db with | Some req -> // update recurrence if changed - let (recur, interval) = parseRecurrence form - match recur = req.recurType && interval = req.recurCount with + let recur = parseRecurrence form + match recur = req.recurrence with | true -> () | false -> - do! Data.updateRecurrence req.requestId usrId recur interval db + do! Data.updateRecurrence req.requestId usrId recur db match recur with | Immediate -> do! Data.updateShowAfter req.requestId usrId Instant.MinValue db | _ -> () diff --git a/src/MyPrayerJournal/MyPrayerJournal.fsproj b/src/MyPrayerJournal/MyPrayerJournal.fsproj index 31ab982..8fd1fc1 100644 --- a/src/MyPrayerJournal/MyPrayerJournal.fsproj +++ b/src/MyPrayerJournal/MyPrayerJournal.fsproj @@ -2,6 +2,7 @@ net6.0 3.0.0.0 + 3391 @@ -19,8 +20,8 @@ - - + + diff --git a/src/MyPrayerJournal/Program.fs b/src/MyPrayerJournal/Program.fs index 2a0c423..b5ea843 100644 --- a/src/MyPrayerJournal/Program.fs +++ b/src/MyPrayerJournal/Program.fs @@ -84,17 +84,17 @@ module Configure = opts.OnAppendCookie <- fun ctx -> sameSite ctx.CookieOptions opts.OnDeleteCookie <- fun ctx -> sameSite ctx.CookieOptions) .AddAuthentication( - /// Use HTTP "Bearer" authentication with JWTs + // Use HTTP "Bearer" authentication with JWTs fun opts -> opts.DefaultAuthenticateScheme <- CookieAuthenticationDefaults.AuthenticationScheme opts.DefaultSignInScheme <- CookieAuthenticationDefaults.AuthenticationScheme opts.DefaultChallengeScheme <- CookieAuthenticationDefaults.AuthenticationScheme) .AddCookie() .AddOpenIdConnect("Auth0", - /// Configure OIDC with Auth0 options from configuration + // Configure OIDC with Auth0 options from configuration fun opts -> let cfg = bldr.Configuration.GetSection "Auth0" - opts.Authority <- sprintf "https://%s/" cfg["Domain"] + opts.Authority <- $"""https://{cfg["Domain"]}/""" opts.ClientId <- cfg["Id"] opts.ClientSecret <- cfg["Secret"] opts.ResponseType <- OpenIdConnectResponseType.Code @@ -118,11 +118,10 @@ module Configure = | true -> // transform to absolute let request = ctx.Request - sprintf "%s://%s%s%s" request.Scheme request.Host.Value request.PathBase.Value redirUri + $"{request.Scheme}://{request.Host.Value}{request.PathBase.Value}{redirUri}" | false -> redirUri - Uri.EscapeDataString finalRedirUri |> sprintf "&returnTo=%s" - sprintf "https://%s/v2/logout?client_id=%s%s" cfg["Domain"] cfg["Id"] returnTo - |> ctx.Response.Redirect + Uri.EscapeDataString $"&returnTo={finalRedirUri}" + ctx.Response.Redirect $"""https://{cfg["Domain"]}/v2/logout?client_id={cfg["Id"]}{returnTo}""" ctx.HandleResponse () Task.CompletedTask @@ -159,7 +158,7 @@ module Configure = .UseRouting() .UseAuthentication() .UseGiraffeErrorHandler(Handlers.Error.error) - .UseEndpoints (fun e -> e.MapGiraffeEndpoints Handlers.routes |> ignore) + .UseEndpoints (fun e -> e.MapGiraffeEndpoints Handlers.routes) |> ignore app diff --git a/src/MyPrayerJournal/Views/Layout.fs b/src/MyPrayerJournal/Views/Layout.fs index 245e281..849f427 100644 --- a/src/MyPrayerJournal/Views/Layout.fs +++ b/src/MyPrayerJournal/Views/Layout.fs @@ -110,11 +110,7 @@ let htmlFoot = ] ] ] - script [ - _src "https://unpkg.com/htmx.org@1.5.0" - _integrity "sha384-oGA+prIp5Vchu6we2YkI51UtVzN9Jpx2Z7PnR1I78PnZlN8LkrCT4lqqqmDkyrvI" - _crossorigin "anonymous" - ] [] + Htmx.Script.minified script [] [ rawText "if (!htmx) document.write('