From a9024584a5c96c3e1483a8fb4ec00b10c6cb073f Mon Sep 17 00:00:00 2001
From: Smaug123 <patrick+github@patrickstevens.co.uk>
Date: Fri, 29 Dec 2023 23:16:42 +0000
Subject: [PATCH] Extend

---
 ConsumePlugin/RestApiExample.fs      |  8 +++++++-
 MyriadPlugin.Test/TestReturnTypes.fs | 12 ++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ConsumePlugin/RestApiExample.fs b/ConsumePlugin/RestApiExample.fs
index a69638e..7e4344d 100644
--- a/ConsumePlugin/RestApiExample.fs
+++ b/ConsumePlugin/RestApiExample.fs
@@ -17,7 +17,7 @@ type IPureGymApi =
     abstract GetGymAttendance : [<Path "gym_id">] gymId : int * ?ct : CancellationToken -> Task<GymAttendance>
 
     [<RestEase.GetAttribute "v1/member">]
-    abstract GetMember : ?ct : CancellationToken -> Task<Member>
+    abstract GetMember : ?ct : CancellationToken -> Member Task
 
     [<RestEase.Get "v1/gyms/{gym_id}">]
     abstract GetGym : [<Path "gym_id">] gymId : int * ?ct : CancellationToken -> Task<Gym>
@@ -60,6 +60,12 @@ type IPureGymApi =
     [<Get "endpoint">]
     abstract GetResponse' : ?ct : CancellationToken -> Task<RestEase.Response<MemberActivityDto>>
 
+    [<Get "endpoint">]
+    abstract GetResponse'' : ?ct : CancellationToken -> Task<MemberActivityDto Response>
+
+    [<Get "endpoint">]
+    abstract GetResponse''' : ?ct : CancellationToken -> Task<MemberActivityDto RestEase.Response>
+
     [<Get "endpoint">]
     [<AllowAnyStatusCode>]
     abstract GetWithAnyReturnCode : ?ct : CancellationToken -> Task<HttpResponseMessage>
diff --git a/MyriadPlugin.Test/TestReturnTypes.fs b/MyriadPlugin.Test/TestReturnTypes.fs
index d168f6c..2354e74 100644
--- a/MyriadPlugin.Test/TestReturnTypes.fs
+++ b/MyriadPlugin.Test/TestReturnTypes.fs
@@ -87,8 +87,10 @@ module TestReturnTypes =
 
         Object.ReferenceEquals (message, Option.get responseMessage) |> shouldEqual true
 
-    [<TestCase "Response">]
-    [<TestCase "RestEase.Response">]
+    [<TestCase "Task<Response>">]
+    [<TestCase "Task<RestEase.Response>">]
+    [<TestCase "RestEase.Response Task">]
+    [<TestCase "RestEase.Response Task">]
     let ``Response return`` (case : string) =
         for json, memberDto in PureGymDtos.memberActivityDtoCases do
             let mutable responseMessage = None
@@ -108,8 +110,10 @@ module TestReturnTypes =
 
             let response =
                 match case with
-                | "Response" -> api.GetResponse().Result
-                | "RestEase.Response'" -> api.GetResponse'().Result
+                | "Task<Response>" -> api.GetResponse().Result
+                | "Task<RestEase.Response>" -> api.GetResponse'().Result
+                | "Response Task" -> api.GetResponse''().Result
+                | "RestEase.Response Task" -> api.GetResponse'''().Result
                 | _ -> failwith $"unrecognised case: %s{case}"
 
             response.ResponseMessage |> shouldEqual (Option.get responseMessage)