Split galley servant definition

changelog.d/5-internal/galley-servant-split

@@ -0,0 +1 @@
+Split galley API routes and handler definitions into several modules

libs/wire-api-federation/src/Wire/API/Federation/API/Galley.hs

@@ -35,7 +35,7 @@ import Wire.API.Error.Galley
 import Wire.API.Federation.API.Common
 import Wire.API.Federation.Endpoint
 import Wire.API.Message
-import Wire.API.Routes.Public.Galley
+import Wire.API.Routes.Public.Galley.Messaging
 import Wire.API.Util.Aeson (CustomEncoded (..))
 import Wire.Arbitrary (Arbitrary, GenericUniform (..))
 

libs/wire-api-federation/test/Test/Wire/API/Federation/Golden/MessageSendResponse.hs

@@ -25,7 +25,7 @@ import GHC.Exts (IsList (fromList))
 import Imports
 import Wire.API.Federation.API.Galley (MessageSendResponse (..))
 import Wire.API.Message
-import Wire.API.Routes.Public.Galley
+import Wire.API.Routes.Public.Galley.Messaging
 import Wire.API.User.Client (QualifiedUserClients (..))
 
 missing :: QualifiedUserClients

libs/wire-api/src/Wire/API/Conversation.hs

@@ -104,9 +104,9 @@ import Data.List.Extra (disjointOrd)
 import Data.List.NonEmpty (NonEmpty)
 import Data.List1
 import Data.Misc
-import Data.Proxy (Proxy (Proxy))
 import Data.Qualified (Qualified (qUnqualified), deprecatedSchema)
 import Data.Range (Range, fromRange, rangedSchema)
+import Data.SOP
 import Data.Schema
 import qualified Data.Set as Set
 import Data.String.Conversions (cs)
@@ -121,6 +121,7 @@ import Wire.API.Conversation.Protocol
 import Wire.API.Conversation.Role (RoleName, roleNameWireAdmin)
 import Wire.API.MLS.Group
 import Wire.API.Routes.MultiTablePaging
+import Wire.API.Routes.MultiVerb
 import Wire.Arbitrary
 
 --------------------------------------------------------------------------------
@@ -949,3 +950,10 @@ namespaceMLSSelfConv :: UUID.UUID
 namespaceMLSSelfConv =
   -- a V5 uuid created with the nil namespace
   fromJust . UUID.fromString $ "3eac2a2c-3850-510b-bd08-8a98e80dd4d9"
+
+--------------------------------------------------------------------------------
+-- MultiVerb instances
+
+instance AsHeaders '[ConvId] Conversation Conversation where
+  toHeaders c = (I (qUnqualified (cnvQualifiedId c)) :* Nil, c)
+  fromHeaders = snd

libs/wire-api/src/Wire/API/Event/Conversation.hs

@@ -73,6 +73,7 @@ import qualified Data.Aeson.KeyMap as KeyMap
 import Data.Id
 import Data.Json.Util
 import Data.Qualified
+import Data.SOP
 import Data.Schema
 import qualified Data.Swagger as S
 import Data.Time
@@ -83,6 +84,7 @@ import Wire.API.Conversation
 import Wire.API.Conversation.Code (ConversationCode (..))
 import Wire.API.Conversation.Role
 import Wire.API.Conversation.Typing (TypingData (..))
+import Wire.API.Routes.MultiVerb
 import Wire.API.User (QualifiedUserIdList (..))
 import Wire.Arbitrary (Arbitrary (arbitrary), GenericUniform (..))
 
@@ -413,3 +415,17 @@ instance ToJSON Event where
 
 instance S.ToSchema Event where
   declareNamedSchema = schemaToSwagger
+
+--------------------------------------------------------------------------------
+-- MultiVerb instances
+
+instance
+  (ResponseType r1 ~ ConversationCode, ResponseType r2 ~ Event) =>
+  AsUnion '[r1, r2] AddCodeResult
+  where
+  toUnion (CodeAlreadyExisted c) = Z (I c)
+  toUnion (CodeAdded e) = S (Z (I e))
+
+  fromUnion (Z (I c)) = CodeAlreadyExisted c
+  fromUnion (S (Z (I e))) = CodeAdded e
+  fromUnion (S (S x)) = case x of {}