From 0b177af2baa548a9a6d812d3a88931d0166be6c8 Mon Sep 17 00:00:00 2001
From: Ashley Yakeley <ashley@semantic.org>
Date: Sat, 27 Apr 2024 23:16:02 -0700
Subject: [PATCH] OpenAPI (#251): lookup other response codes

---
 .../test/golden/openapi/petstore-expanded.ref     | 10 ++++------
 .../lib/Pinafore/WebAPI/OpenAPI.hs                | 15 +++++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Pinafore/pinafore-docgen/test/golden/openapi/petstore-expanded.ref b/Pinafore/pinafore-docgen/test/golden/openapi/petstore-expanded.ref
index d4bab5f12..212e33b72 100644
--- a/Pinafore/pinafore-docgen/test/golden/openapi/petstore-expanded.ref
+++ b/Pinafore/pinafore-docgen/test/golden/openapi/petstore-expanded.ref
@@ -6,24 +6,22 @@
 
 **<code>paths\.Info\.</code>**<code> : List\. Text\.</code>
 
-**<code>functions\.Info\.</code>**<code> : List\. Text\.</code>
-
-**<code>findPets\.</code>**<code> : List\. Text\. \-\> Integer\. \-\> Action\. Text\.</code>
+**<code>findPets\.</code>**<code> : List\. Text\. \-\> Integer\. \-\> Action\. (List\. (Text\. \*: Text\. \*: Integer\. \*: Unit\.))</code>
 
 > Returns all pets from the system that the user has access to
 Nam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia.
 > 
 Sed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.
 > 
-**<code>addPet\.</code>**<code> : Action\. Text\.</code>
+**<code>addPet\.</code>**<code> : Action\. (Text\. \*: Text\. \*: Integer\. \*: Unit\.)</code>
 
 > Creates a new pet in the store. Duplicates are allowed
 > 
-**<code>find\_\_pet\_\_by\_\_id\.</code>**<code> : Integer\. \-\> Action\. Text\.</code>
+**<code>find\_\_pet\_\_by\_\_id\.</code>**<code> : Integer\. \-\> Action\. (Text\. \*: Text\. \*: Integer\. \*: Unit\.)</code>
 
 > Returns a user based on a single ID, if the user does not have access to the pet
 > 
-**<code>deletePet\.</code>**<code> : Integer\. \-\> Action\. Text\.</code>
+**<code>deletePet\.</code>**<code> : Integer\. \-\> Action\. Unit\.</code>
 
 > deletes a single pet based on the ID supplied
 > 
diff --git a/Pinafore/pinafore-webapi/lib/Pinafore/WebAPI/OpenAPI.hs b/Pinafore/pinafore-webapi/lib/Pinafore/WebAPI/OpenAPI.hs
index 931e8e3d4..d9d1ada66 100644
--- a/Pinafore/pinafore-webapi/lib/Pinafore/WebAPI/OpenAPI.hs
+++ b/Pinafore/pinafore-webapi/lib/Pinafore/WebAPI/OpenAPI.hs
@@ -211,14 +211,17 @@ importOpenAPI t = do
         mkOperationFunction :: (Operation, Text, Text) -> M (LibraryStuff ())
         mkOperationFunction (op, opname, path) = do
             (name, params) <- operationToFunction op
+            let lookupResponse code = InsOrd.lookup code $ _responsesResponses $ _operationResponses op
             responseref <-
-                maybeToM "no default response" $ InsOrd.lookup 200 $ _responsesResponses $ _operationResponses op
+                maybeToM "no default response" $ lookupResponse 200 <|> lookupResponse 201 <|> lookupResponse 204
             response <- getReferenced _componentsResponses responseref
-            mto <-
-                maybeToM "no known response content-type" $ InsOrd.lookup "application/json" $ _responseContent response
-            rschemaref <- maybeToM "no response schema" $ _mediaTypeObjectSchema mto
-            rschema <- getReferenced _componentsSchemas rschemaref
-            rjt <- schemaToJSONType rschema
+            rjt <-
+                case InsOrd.lookup "application/json" $ _responseContent response of
+                    Just mto -> do
+                        rschemaref <- maybeToM "no response schema" $ _mediaTypeObjectSchema mto
+                        rschema <- getReferenced _componentsSchemas rschemaref
+                        schemaToJSONType rschema
+                    Nothing -> return NullJSONType
             MkIOShimWit responseType responseF <- mkResponse rjt
             func <- mkFunc (actionShimWit responseType) params
             let