From dfd1c59554f8389cccc903b5d417a1f7f901df40 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers" <daniel.summers.2415@gmail.com>
Date: Thu, 23 Apr 2020 10:07:23 -0500
Subject: [PATCH] Fix tryJournalById function (#42)

Also update .NET deps
---
 src/MyPrayerJournal.Api/Data.fs                    |  6 ++++--
 src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj | 14 +++++++-------
 src/app/package.json                               |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/MyPrayerJournal.Api/Data.fs b/src/MyPrayerJournal.Api/Data.fs
index 9d2c112..0c50846 100644
--- a/src/MyPrayerJournal.Api/Data.fs
+++ b/src/MyPrayerJournal.Api/Data.fs
@@ -126,8 +126,8 @@ module Data =
           .ToListAsync()
       return
         jrnl
+        |> Seq.map (fun r -> r.history <- []; r.notes <- []; r)
         |> List.ofSeq
-        |> List.map (fun r -> r.history <- []; r.notes <- []; r)
       }
 
   /// Save changes in the current document session
@@ -166,7 +166,9 @@ module Data =
           .Where(fun x -> x.Id = (RequestId.toString reqId) && x.userId = userId)
           .ProjectInto<JournalRequest>()
           .FirstOrDefaultAsync ()
-      return Option.fromObject req
+      return
+        Option.fromObject req
+        |> Option.map (fun r -> r.history <- []; r.notes <- []; r)
       }
       
   /// Update the recurrence for a request
diff --git a/src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj b/src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj
index b2846d5..f5f20a6 100644
--- a/src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj
+++ b/src/MyPrayerJournal.Api/MyPrayerJournal.Api.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>2.1.2.0</Version>
+    <Version>2.1.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,17 +14,17 @@
 
   <ItemGroup>
     <PackageReference Include="FunctionalCuid" Version="1.0.0" />
-    <PackageReference Include="Giraffe" Version="3.6.0" />
+    <PackageReference Include="Giraffe" Version="4.1.0" />
     <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.FSharpLu" Version="0.10.29" />
-    <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.10.29" />
-    <PackageReference Include="RavenDb.Client" Version="4.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.3" />
+    <PackageReference Include="Microsoft.FSharpLu" Version="0.11.6" />
+    <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
+    <PackageReference Include="RavenDb.Client" Version="4.2.102" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.7.0" />
+    <PackageReference Update="FSharp.Core" Version="4.7.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/app/package.json b/src/app/package.json
index 68d0430..17e6bb7 100644
--- a/src/app/package.json
+++ b/src/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "my-prayer-journal",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "myPrayerJournal - Front End",
   "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
   "private": true,