Bump source gen (#5)

Co-authored-by: Smaug123 <patrick+github@patrickstevens.co.uk>
Reviewed-on: #5

PureGym/GeneratedClient.fs

@@ -23,10 +23,13 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (client.BaseAddress, System.Uri ("v1/gyms/", System.UriKind.Relative))
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/gyms/")
+                            RequestUri = uri
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -45,10 +48,13 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (client.BaseAddress, System.Uri ("v1/member", System.UriKind.Relative))
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/member")
+                            RequestUri = uri
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -67,14 +73,19 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (
+                            client.BaseAddress,
+                            System.Uri (
+                                "v1/gyms/{gym_id}/attendance".Replace ("{gym_id}", gymId.ToString ()),
+                                System.UriKind.Relative
+                            )
+                        )
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
+                            RequestUri = uri
-                                System.Uri (
-                                    client.BaseAddress.ToString ()
-                                    + "/v1/gyms/{gym_id}/attendance".Replace ("{gym_id}", gymId.ToString ())
-                                )
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -93,14 +104,19 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (
+                            client.BaseAddress,
+                            System.Uri (
+                                "v1/gyms/{gym_id}".Replace ("{gym_id}", gymId.ToString ()),
+                                System.UriKind.Relative
+                            )
+                        )
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
+                            RequestUri = uri
-                                System.Uri (
-                                    client.BaseAddress.ToString ()
-                                    + "/v1/gyms/{gym_id}".Replace ("{gym_id}", gymId.ToString ())
-                                )
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -119,10 +135,13 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (client.BaseAddress, System.Uri ("v1/member/activity", System.UriKind.Relative))
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/member/activity")
+                            RequestUri = uri
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -141,18 +160,23 @@ module PureGymApi =
                 async {
                     let! ct = Async.CancellationToken
 
+                    let uri =
+                        System.Uri (
+                            client.BaseAddress,
+                            System.Uri (
+                                ("v2/gymSessions/member"
+                                 + "?fromDate="
+                                 + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
+                                 + "&toDate="
+                                 + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)),
+                                System.UriKind.Relative
+                            )
+                        )
+
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
+                            RequestUri = uri
-                                System.Uri (
-                                    client.BaseAddress.ToString ()
-                                    + ("/v2/gymSessions/member"
-                                       + "?fromDate="
-                                       + ((fromDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode)
-                                       + "&toDate="
-                                       + ((toDate.ToString "yyyy-MM-dd") |> System.Web.HttpUtility.UrlEncode))
-                                )
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask

PureGym/GeneratedDto.fs

@@ -12,11 +12,29 @@ module GymOpeningHours =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymOpeningHours =
         let OpeningHours =
-            node.["openingHours"].AsArray ()
+            (match node.["openingHours"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("openingHours")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
             |> Seq.map (fun elt -> elt.AsValue().GetValue<string> ())
             |> List.ofSeq
 
-        let IsAlwaysOpen = node.["isAlwaysOpen"].AsValue().GetValue<bool> ()
+        let IsAlwaysOpen =
+            (match node.["isAlwaysOpen"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("isAlwaysOpen")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
 
         {
             IsAlwaysOpen = IsAlwaysOpen
@@ -30,8 +48,29 @@ namespace PureGym
 module GymAccessOptions =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAccessOptions =
-        let QrCodeAccess = node.["qrCodeAccess"].AsValue().GetValue<bool> ()
+        let QrCodeAccess =
-        let PinAccess = node.["pinAccess"].AsValue().GetValue<bool> ()
+            (match node.["qrCodeAccess"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("qrCodeAccess")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
+
+        let PinAccess =
+            (match node.["pinAccess"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("pinAccess")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
 
         {
             PinAccess = PinAccess
@@ -47,13 +86,32 @@ module GymLocation =
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymLocation =
         let Latitude =
             try
-                node.["latitude"].AsValue().GetValue<float> ()
+                (match node.["latitude"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("latitude")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<float> ()
             with :? System.InvalidOperationException as exc ->
                 if exc.Message.Contains "cannot be converted to" then
                     if
                         System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
                     then
-                        node.["latitude"].AsValue().GetValue<string> () |> System.Double.Parse
+                        (match node.["latitude"] with
+                         | null ->
+                             raise (
+                                 System.Collections.Generic.KeyNotFoundException (
+                                     sprintf "Required key '%s' not found on JSON object" ("latitude")
+                                 )
+                             )
+                         | v -> v)
+                            .AsValue()
+                            .GetValue<string> ()
+                        |> System.Double.Parse
                     else
                         reraise ()
                 else
@@ -61,13 +119,32 @@ module GymLocation =
 
         let Longitude =
             try
-                node.["longitude"].AsValue().GetValue<float> ()
+                (match node.["longitude"] with
+                 | null ->
+                     raise (
+                         System.Collections.Generic.KeyNotFoundException (
+                             sprintf "Required key '%s' not found on JSON object" ("longitude")
+                         )
+                     )
+                 | v -> v)
+                    .AsValue()
+                    .GetValue<float> ()
             with :? System.InvalidOperationException as exc ->
                 if exc.Message.Contains "cannot be converted to" then
                     if
                         System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
                     then
-                        node.["longitude"].AsValue().GetValue<string> () |> System.Double.Parse
+                        (match node.["longitude"] with
+                         | null ->
+                             raise (
+                                 System.Collections.Generic.KeyNotFoundException (
+                                     sprintf "Required key '%s' not found on JSON object" ("longitude")
+                                 )
+                             )
+                         | v -> v)
+                            .AsValue()
+                            .GetValue<string> ()
+                        |> System.Double.Parse
                     else
                         reraise ()
                 else
@@ -85,14 +162,34 @@ namespace PureGym
 module GymAddress =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAddress =
-        let Postcode = node.["postcode"].AsValue().GetValue<string> ()
+        let Postcode =
+            (match node.["postcode"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("postcode")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         let County =
             match node.["county"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let Town = node.["town"].AsValue().GetValue<string> ()
+        let Town =
+            (match node.["town"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("town")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         let AddressLine3 =
             match node.["addressLine3"] with
@@ -104,7 +201,17 @@ module GymAddress =
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let AddressLine1 = node.["addressLine1"].AsValue().GetValue<string> ()
+        let AddressLine1 =
+            (match node.["addressLine1"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("addressLine1")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         {
             AddressLine1 = AddressLine1
@@ -122,17 +229,95 @@ namespace PureGym
 module Gym =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Gym =
-        let ReopenDate = node.["reopenDate"].AsValue().GetValue<string> ()
+        let ReopenDate =
-        let TimeZone = node.["timeZone"].AsValue().GetValue<string> ()
+            (match node.["reopenDate"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("reopenDate")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let TimeZone =
+            (match node.["timeZone"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("timeZone")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
         let Location = GymLocation.jsonParse node.["location"]
         let AccessOptions = GymAccessOptions.jsonParse node.["accessOptions"]
         let GymOpeningHours = GymOpeningHours.jsonParse node.["gymOpeningHours"]
-        let EmailAddress = node.["emailAddress"].AsValue().GetValue<string> ()
+
-        let PhoneNumber = node.["phoneNumber"].AsValue().GetValue<string> ()
+        let EmailAddress =
+            (match node.["emailAddress"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("emailAddress")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let PhoneNumber =
+            (match node.["phoneNumber"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("phoneNumber")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
         let Address = GymAddress.jsonParse node.["address"]
-        let Status = node.["status"].AsValue().GetValue<int> ()
+
-        let Id = node.["id"].AsValue().GetValue<int> ()
+        let Status =
-        let Name = node.["name"].AsValue().GetValue<string> ()
+            (match node.["status"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("status")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let Id =
+            (match node.["id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let Name =
+            (match node.["name"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("name")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         {
             Name = Name
@@ -155,24 +340,186 @@ namespace PureGym
 module Member =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Member =
-        let MemberStatus = node.["memberStatus"].AsValue().GetValue<int> ()
+        let MemberStatus =
-        let SuspendedReason = node.["suspendedReason"].AsValue().GetValue<int> ()
+            (match node.["memberStatus"] with
-        let MembershipLevel = node.["membershipLevel"].AsValue().GetValue<int> ()
+             | null ->
-        let MembershipName = node.["membershipName"].AsValue().GetValue<string> ()
+                 raise (
-        let Postcode = node.["postCode"].AsValue().GetValue<string> ()
+                     System.Collections.Generic.KeyNotFoundException (
-        let MobileNumber = node.["mobileNumber"].AsValue().GetValue<string> ()
+                         sprintf "Required key '%s' not found on JSON object" ("memberStatus")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let SuspendedReason =
+            (match node.["suspendedReason"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("suspendedReason")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let MembershipLevel =
+            (match node.["membershipLevel"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("membershipLevel")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let MembershipName =
+            (match node.["membershipName"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("membershipName")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let Postcode =
+            (match node.["postCode"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("postCode")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let MobileNumber =
+            (match node.["mobileNumber"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("mobileNumber")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         let DateOfBirth =
-            node.["dateofBirth"].AsValue().GetValue<string> () |> System.DateOnly.Parse
+            (match node.["dateofBirth"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("dateofBirth")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+            |> System.DateOnly.Parse
 
-        let GymAccessPin = node.["gymAccessPin"].AsValue().GetValue<string> ()
+        let GymAccessPin =
-        let EmailAddress = node.["emailAddress"].AsValue().GetValue<string> ()
+            (match node.["gymAccessPin"] with
-        let HomeGymName = node.["homeGymName"].AsValue().GetValue<string> ()
+             | null ->
-        let HomeGymId = node.["homeGymId"].AsValue().GetValue<int> ()
+                 raise (
-        let LastName = node.["lastName"].AsValue().GetValue<string> ()
+                     System.Collections.Generic.KeyNotFoundException (
-        let FirstName = node.["firstName"].AsValue().GetValue<string> ()
+                         sprintf "Required key '%s' not found on JSON object" ("gymAccessPin")
-        let CompoundMemberId = node.["compoundMemberId"].AsValue().GetValue<string> ()
+                     )
-        let Id = node.["id"].AsValue().GetValue<int> ()
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let EmailAddress =
+            (match node.["emailAddress"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("emailAddress")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let HomeGymName =
+            (match node.["homeGymName"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("homeGymName")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let HomeGymId =
+            (match node.["homeGymId"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("homeGymId")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let LastName =
+            (match node.["lastName"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lastName")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let FirstName =
+            (match node.["firstName"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("firstName")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let CompoundMemberId =
+            (match node.["compoundMemberId"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("compoundMemberId")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let Id =
+            (match node.["id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         {
             Id = Id
@@ -199,28 +546,109 @@ namespace PureGym
 module GymAttendance =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : GymAttendance =
-        let MaximumCapacity = node.["maximumCapacity"].AsValue().GetValue<int> ()
+        let MaximumCapacity =
+            (match node.["maximumCapacity"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("maximumCapacity")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         let LastRefreshedPeopleInClasses =
-            node.["lastRefreshedPeopleInClasses"].AsValue().GetValue<string> ()
+            (match node.["lastRefreshedPeopleInClasses"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lastRefreshedPeopleInClasses")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
             |> System.DateTime.Parse
 
         let LastRefreshed =
-            node.["lastRefreshed"].AsValue().GetValue<string> () |> System.DateTime.Parse
+            (match node.["lastRefreshed"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lastRefreshed")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+            |> System.DateTime.Parse
 
         let AttendanceTime =
-            node.["attendanceTime"].AsValue().GetValue<string> () |> System.DateTime.Parse
+            (match node.["attendanceTime"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("attendanceTime")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+            |> System.DateTime.Parse
 
-        let IsApproximate = node.["isApproximate"].AsValue().GetValue<bool> ()
+        let IsApproximate =
+            (match node.["isApproximate"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("isApproximate")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
 
         let TotalPeopleSuffix =
             match node.["totalPeopleSuffix"] with
             | null -> None
             | v -> v.AsValue().GetValue<string> () |> Some
 
-        let TotalPeopleInClasses = node.["totalPeopleInClasses"].AsValue().GetValue<int> ()
+        let TotalPeopleInClasses =
-        let TotalPeopleInGym = node.["totalPeopleInGym"].AsValue().GetValue<int> ()
+            (match node.["totalPeopleInClasses"] with
-        let Description = node.["description"].AsValue().GetValue<string> ()
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("totalPeopleInClasses")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let TotalPeopleInGym =
+            (match node.["totalPeopleInGym"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("totalPeopleInGym")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let Description =
+            (match node.["description"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("description")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
 
         {
             Description = Description
@@ -242,13 +670,77 @@ module MemberActivityDto =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : MemberActivityDto =
         let LastRefreshed =
-            node.["lastRefreshed"].AsValue().GetValue<string> () |> System.DateTime.Parse
+            (match node.["lastRefreshed"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("lastRefreshed")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+            |> System.DateTime.Parse
 
-        let IsEstimated = node.["isEstimated"].AsValue().GetValue<bool> ()
+        let IsEstimated =
-        let TotalClasses = node.["totalClasses"].AsValue().GetValue<int> ()
+            (match node.["isEstimated"] with
-        let TotalVisits = node.["totalVisits"].AsValue().GetValue<int> ()
+             | null ->
-        let AverageDuration = node.["averageDuration"].AsValue().GetValue<int> ()
+                 raise (
-        let TotalDuration = node.["totalDuration"].AsValue().GetValue<int> ()
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("isEstimated")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
+
+        let TotalClasses =
+            (match node.["totalClasses"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("totalClasses")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let TotalVisits =
+            (match node.["totalVisits"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("totalVisits")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let AverageDuration =
+            (match node.["averageDuration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("averageDuration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let TotalDuration =
+            (match node.["totalDuration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("totalDuration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         {
             TotalDuration = TotalDuration
@@ -266,9 +758,41 @@ namespace PureGym
 module SessionsAggregate =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : SessionsAggregate =
-        let Duration = node.["Duration"].AsValue().GetValue<int> ()
+        let Duration =
-        let Visits = node.["Visits"].AsValue().GetValue<int> ()
+            (match node.["Duration"] with
-        let Activities = node.["Activities"].AsValue().GetValue<int> ()
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Duration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let Visits =
+            (match node.["Visits"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Visits")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
+
+        let Activities =
+            (match node.["Activities"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Activities")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         {
             Activities = Activities
@@ -283,9 +807,41 @@ namespace PureGym
 module VisitGym =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : VisitGym =
-        let Status = node.["Status"].AsValue().GetValue<string> ()
+        let Status =
-        let Name = node.["Name"].AsValue().GetValue<string> ()
+            (match node.["Status"] with
-        let Id = node.["Id"].AsValue().GetValue<int> ()
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Status")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let Name =
+            (match node.["Name"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Name")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+
+        let Id =
+            (match node.["Id"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Id")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         {
             Id = Id
@@ -301,12 +857,43 @@ module Visit =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Visit =
         let Gym = VisitGym.jsonParse node.["Gym"]
-        let Duration = node.["Duration"].AsValue().GetValue<int> ()
+
+        let Duration =
+            (match node.["Duration"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Duration")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<int> ()
 
         let StartTime =
-            node.["StartTime"].AsValue().GetValue<string> () |> System.DateTime.Parse
+            (match node.["StartTime"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("StartTime")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<string> ()
+            |> System.DateTime.Parse
 
-        let IsDurationEstimated = node.["IsDurationEstimated"].AsValue().GetValue<bool> ()
+        let IsDurationEstimated =
+            (match node.["IsDurationEstimated"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("IsDurationEstimated")
+                     )
+                 )
+             | v -> v)
+                .AsValue()
+                .GetValue<bool> ()
 
         {
             IsDurationEstimated = IsDurationEstimated
@@ -338,7 +925,15 @@ module Sessions =
     /// Parse from a JSON node.
     let jsonParse (node : System.Text.Json.Nodes.JsonNode) : Sessions =
         let Visits =
-            node.["Visits"].AsArray ()
+            (match node.["Visits"] with
+             | null ->
+                 raise (
+                     System.Collections.Generic.KeyNotFoundException (
+                         sprintf "Required key '%s' not found on JSON object" ("Visits")
+                     )
+                 )
+             | v -> v)
+                .AsArray ()
             |> Seq.map (fun elt -> Visit.jsonParse elt)
             |> List.ofSeq
 

PureGym/PureGym.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
       <TargetFramework>net6.0</TargetFramework>
@@ -6,7 +6,7 @@
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       <WarnOn>FS3559</WarnOn>
 
-      <WoofWareMyriadPluginVersion>1.1.1</WoofWareMyriadPluginVersion>
+      <WoofWareMyriadPluginVersion>1.1.5</WoofWareMyriadPluginVersion>
     </PropertyGroup>
 
     <ItemGroup>

nix/deps.nix

@@ -438,7 +438,7 @@
   })
   (fetchNuGet {
     pname = "WoofWare.Myriad.Plugins";
-    version = "1.1.1";
+    version = "1.1.5";
-    sha256 = "1maj1p93cg8c22l9ldq310n21cbhg5rpjkkrm6cjh7dm4rpvr9mg";
+    sha256 = "05syw1v7yp9pl9gzbf3sc7spjhs7yb4vpx0d34ylr14gkiywgqsg";
   })
 ]