From 7e0b9588fa77c2c02c77596a7f724c613f994280 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Muthukrishnan <ram@leastauthority.com> Date: Wed, 6 Nov 2019 13:38:24 +0530 Subject: [PATCH] flip stripeServer's parameters let more "fixed" parameters come first and then the dynamic ones so that one can do currying with the immutable parameters applied. --- src/PaymentServer/Processors/Stripe.hs | 4 ++-- src/PaymentServer/Server.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PaymentServer/Processors/Stripe.hs b/src/PaymentServer/Processors/Stripe.hs index 3774080..26bd10d 100644 --- a/src/PaymentServer/Processors/Stripe.hs +++ b/src/PaymentServer/Processors/Stripe.hs @@ -101,8 +101,8 @@ getVoucher (MetaData []) = Nothing getVoucher (MetaData (("Voucher", value):xs)) = Just value getVoucher (MetaData (x:xs)) = getVoucher (MetaData xs) -stripeServer :: VoucherDatabase d => d -> StripeSecretKey -> Server StripeAPI -stripeServer d key = webhook d +stripeServer :: VoucherDatabase d => StripeSecretKey -> d -> Server StripeAPI +stripeServer key d = webhook d :<|> charge d key -- | Process charge succeeded events diff --git a/src/PaymentServer/Server.hs b/src/PaymentServer/Server.hs index bfef18b..6158147 100644 --- a/src/PaymentServer/Server.hs +++ b/src/PaymentServer/Server.hs @@ -42,7 +42,7 @@ type PaymentServerAPI -- | Create a server which uses the given database. paymentServer :: VoucherDatabase d => ByteString -> Issuer -> d -> Server PaymentServerAPI paymentServer key issuer database = - stripeServer database key + stripeServer key database :<|> redemptionServer issuer database paymentServerAPI :: Proxy PaymentServerAPI -- GitLab