From e62796107cf214930609ebbd2b09af654f0b684f Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Thu, 28 Dec 2023 20:18:29 +0000
Subject: [PATCH] Add version test (#23)

---
 ConsumePlugin/GeneratedRestClient.fs          | 24 ++++---------------
 MyriadPlugin.Test/TestSurface.fs              |  4 ++++
 .../WoofWare.Myriad.Plugins.fsproj            |  2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ConsumePlugin/GeneratedRestClient.fs b/ConsumePlugin/GeneratedRestClient.fs
index a6ef677..2325ade 100644
--- a/ConsumePlugin/GeneratedRestClient.fs
+++ b/ConsumePlugin/GeneratedRestClient.fs
@@ -25,10 +25,7 @@ module PureGymApi =
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
-                                System.Uri (
-                                    client.BaseAddress.ToString () + "/v1/gyms/" |> System.Web.HttpUtility.UrlEncode
-                                )
+                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/gyms/")
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -54,7 +51,6 @@ module PureGymApi =
                                 System.Uri (
                                     client.BaseAddress.ToString ()
                                     + "/v1/gyms/{gym_id}/attendance".Replace ("{gym_id}", gymId.ToString ())
-                                    |> System.Web.HttpUtility.UrlEncode
                                 )
                         )
 
@@ -77,11 +73,7 @@ module PureGymApi =
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
-                                System.Uri (
-                                    client.BaseAddress.ToString () + "/v1/member"
-                                    |> System.Web.HttpUtility.UrlEncode
-                                )
+                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/member")
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -107,7 +99,6 @@ module PureGymApi =
                                 System.Uri (
                                     client.BaseAddress.ToString ()
                                     + "/v1/gyms/{gym_id}".Replace ("{gym_id}", gymId.ToString ())
-                                    |> System.Web.HttpUtility.UrlEncode
                                 )
                         )
 
@@ -130,11 +121,7 @@ module PureGymApi =
                     let httpMessage =
                         new System.Net.Http.HttpRequestMessage (
                             Method = System.Net.Http.HttpMethod.Get,
-                            RequestUri =
-                                System.Uri (
-                                    client.BaseAddress.ToString () + "/v1/member/activity"
-                                    |> System.Web.HttpUtility.UrlEncode
-                                )
+                            RequestUri = System.Uri (client.BaseAddress.ToString () + "/v1/member/activity")
                         )
 
                     let! response = client.SendAsync (httpMessage, ct) |> Async.AwaitTask
@@ -161,10 +148,9 @@ module PureGymApi =
                                     client.BaseAddress.ToString ()
                                     + ("/v2/gymSessions/member"
                                        + "?fromDate="
-                                       + fromDate.ToString ()
+                                       + ((fromDate.ToString "yyyy-MM-ddTHH:mm:ss") |> System.Web.HttpUtility.UrlEncode)
                                        + "&toDate="
-                                       + toDate.ToString ())
-                                    |> System.Web.HttpUtility.UrlEncode
+                                       + ((toDate.ToString "yyyy-MM-ddTHH:mm:ss") |> System.Web.HttpUtility.UrlEncode))
                                 )
                         )
 
diff --git a/MyriadPlugin.Test/TestSurface.fs b/MyriadPlugin.Test/TestSurface.fs
index a526321..ed6ed37 100644
--- a/MyriadPlugin.Test/TestSurface.fs
+++ b/MyriadPlugin.Test/TestSurface.fs
@@ -11,6 +11,10 @@ module TestSurface =
     [<Test>]
     let ``Ensure API surface has not been modified`` () = ApiSurface.assertIdentical assembly
 
+    [<Test>]
+    let ``Check version against remote`` () =
+        MonotonicVersion.validate assembly "WoofWare.Myriad.Plugins"
+
     [<Test ; Explicit>]
     let ``Update API surface`` () =
         ApiSurface.writeAssemblyBaseline assembly
diff --git a/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj b/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
index af09f6e..0fd1062 100644
--- a/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
+++ b/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj
@@ -30,7 +30,7 @@
     <Compile Include="RemoveOptionsGenerator.fs" />
     <Compile Include="JsonParseGenerator.fs" />
     <Compile Include="HttpClientGenerator.fs" />
-    <None Include="version.json" />
+    <EmbeddedResource Include="version.json" />
     <EmbeddedResource Include="SurfaceBaseline.txt" />
     <None Include="..\README.md">
       <Pack>True</Pack>