nuttycom/aftok - Change WZFQDWW4XK6M4A4PQ7WQJUTZUPRGQR7V7ZVZY5ZTL5AMGIFMHB2QC

Add retrieval/storage of current exchange rate data to payment recording.

Created by Kris Nuttycombe on February 25, 2017

WZFQDWW4XK6M4A4PQ7WQJUTZUPRGQR7V7ZVZY5ZTL5AMGIFMHB2QC

Dependencies

In channels

main

Change contents

Replacement in TASKS.md at line 63 [4.1]

B:BD[3.338] → [3.338:350]

B:BD[3.350] → [5.1817:1923]

  * Payouts
    * Use the BIP-70 Bitcoin Payment Protocol to create payment requests.
    * Record requested payments

[3.338]

[4.2757]

  * Migrate to servant-snap? https://github.com/haskell-servant/servant-snap

Replacement in TASKS.md at line 75 [4.1]

B:BD[5.2263] → [5.2263:2343]

      to correctly report capital gains, in much the same fasion as is done for

[5.2263]

[5.2343]

      to correctly report capital gains, in much the same fashion as is done for

Deletion in aftok.cabal at line 26 [8.1]
∅:D[6.156] → [7.203:238]
B:BD[7.203] → [7.203:238]
```
                      Aftok.Client
```
Insertion in aftok.cabal at line 61 [8.1]
[9.387]
[10.1]
```
    , lens-aeson
```
Deletion in aftok.cabal at line 77 [8.1]
B:BD[11.2906] → [9.544:563]
```
    , wreq        
```

Replacement in aftok.cabal at line 155 [8.1]

B:BD[12.3169] → [9.635:664]

    --, HsOpenSSL

[12.3169]

[13.41]

    , HsOpenSSL
    , http-client
    , http-client-openssl

Deletion in aftok.cabal at line 161 [8.1]
B:BD[9.696] → [9.696:730]
```
    --, MonadCatchIO-transformers
```
Deletion in aftok.cabal at line 165 [8.1]
∅:D[14.71] → [9.731:761]
B:BD[15.7376] → [9.731:761]
```
    --, resource-pool-catchio
```
Insertion in aftok.cabal at line 174 [8.1]
[16.1612]
[17.1]
```
    , wreq        
```
File deletion: Client.hs, Client.hs
BFD:BFD[18.18] → [19.508:541]
BF:BFD[19.541] → [19.1:1]
BF:BFD[7.679] → [7.777:810]
BF:BFD[7.810] → [19.1:1]
B:BD[19.1] → [20.440:551]
∅:D[20.551] → [19.77:78]
B:BD[19.77] → [19.77:78]
B:BD[19.78] → [7.811:837]
∅:D[7.837] → [19.107:108]
B:BD[19.107] → [19.107:108]
B:BD[19.108] → [20.552:583]
∅:D[20.583] → [19.130:131]
B:BD[19.130] → [19.130:131]
B:BD[19.131] → [20.584:694]
∅:D[20.694] → [21.43:90]
B:BD[21.43] → [21.43:90]
B:BD[21.90] → [20.695:725]
∅:D[20.725] → [19.171:172]
B:BD[19.171] → [19.171:172]
B:BD[19.172] → [20.726:785]
∅:D[20.785] → [19.217:243]
∅:D[7.877] → [19.217:243]
B:BD[19.217] → [19.217:243]
B:BD[19.243] → [7.878:901]
∅:D[22.29] → [21.91:152]
∅:D[7.901] → [21.91:152]
B:BD[19.294] → [21.91:152]
B:BD[21.152] → [20.786:846]
∅:D[22.74] → [19.298:364]
∅:D[21.262] → [19.298:364]
∅:D[20.846] → [19.298:364]
∅:D[7.943] → [19.298:364]
B:BD[19.298] → [19.298:364]
B:BD[19.364] → [7.944:986]
∅:D[7.986] → [23.50:164]
B:BD[22.120] → [23.50:164]
∅:D[24.142] → [19.506:507]
∅:D[23.164] → [19.506:507]
∅:D[25.1120] → [19.506:507]
B:BD[19.506] → [19.506:507]
B:BD[19.507] → [21.263:264]
```
{-# LANGUAGE NoImplicitPrelude   #-}
{-# LANGUAGE OverloadedStrings   #-}
{-# LANGUAGE ScopedTypeVariables #-}
module Aftok.Client where
import           ClassyPrelude
import           Control.Lens
import           Data.Aeson.Types
import qualified Data.Configurator       as C
import qualified Data.Configurator.Types as CT
import           Network.Wreq
import           Aftok.Json
import           Aftok.TimeLog
data QCConfig = QCConfig
  { aftokUrl :: String
  } deriving Show
parseQCConfig :: CT.Config -> IO QCConfig
parseQCConfig cfg =
  QCConfig <$> C.require cfg "aftokUrl"
currentPayouts :: QCConfig -> IO Payouts
currentPayouts cfg = do
  resp <- get (aftokUrl cfg <> "payouts")
  valueResponse <- asValue resp
  either fail pure (parseEither parsePayoutsJSON $ valueResponse ^. responseBody)
```
Insertion in lib/Aftok/Database/PostgreSQL.hs at line 191 [15.456]
[26.2726]
[23.293]
```
          <*> field
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 538 [15.456]

B:BD[27.129] → [26.4113:4179]

    \(payment_request_id, event_id, payment_data, payment_date) \

[27.129]

[26.4179]

    \(payment_request_id, event_id, payment_data, payment_date, exchange_rates) \

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 544 [15.456]
[26.4351]
[27.339]
```
    , p ^. exchangeRates
```

Replacement in lib/Aftok/Json.hs at line 222 [28.19]

B:BD[14.3694] → [14.3694:4007]

  [ "subscription_id" .= (r ^. (subscription . B._SubscriptionId . to tshow))
  , "payment_request_protobuf_64" .= (r ^. (paymentRequest . to (decodeUtf8 . B64.encode . runPut . encodeMessage)))
  , "payment_request_time" .= (r ^. paymentRequestTime)
  , "billing_date" .= (r ^. (billingDate . to showGregorian))

[14.3694]

[14.4007]

  [ "subscription_id" .=
     view (subscription . B._SubscriptionId . to tshow) r
  , "payment_request_protobuf_64" .=
     view (paymentRequest . to (decodeUtf8 . B64.encode . runPut . encodeMessage)) r
  , "url_key" .= view (paymentKey . _PaymentKey) r
  , "payment_request_time" .= view paymentRequestTime r
  , "billing_date" .= view (billingDate . to showGregorian) r

Insertion in lib/Aftok/Payments/Types.hs at line 13 [9.10545]
[9.10704]
[2.1974]
```
import           Data.Aeson             (Value)
```

Replacement in lib/Aftok/Payments/Types.hs at line 46 [9.10545]

B:BD[9.11301] → [9.11301:11383]

  { _request     :: r
  , _payment     :: P.Payment
  , _paymentDate :: C.UTCTime

[9.11301]

[26.6913]

  { _request       :: r
  , _payment       :: P.Payment
  , _paymentDate   :: C.UTCTime
  , _exchangeRates :: Maybe Value

Replacement in lib/Aftok/Payments.hs at line 113 [6.5686]
B:BD[9.13427] → [2.3097:3114]
```
  -- TODO: maybe
```
[9.13427]
[2.3114]
```
  -- TODO: maybe make pkey a function of subscription, billable, bday
```

Replacement in server/Aftok/QConfig.hs at line 42 [30.4500]

B:BD[17.289] → [29.5199:5232]

∅:D[29.5232] → [17.315:356]

B:BD[17.315] → [17.315:356]

B:BD[17.356] → [29.5233:5274]

  { network        :: BT.Network
  , signingKeyFile :: System.IO.FilePath
  , certsFile      :: System.IO.FilePath

[17.289]

[17.392]

  { network                :: BT.Network
  , signingKeyFile         :: System.IO.FilePath
  , certsFile              :: System.IO.FilePath
  , exchangeRateServiceURI :: String

Insertion in server/Aftok/QConfig.hs at line 78 [30.4500]

[17.670]

                <*> C.require cfg "exchangeRateServiceURI"

Insertion in server/Aftok/Snaplet/Payments.hs at line 1 [6.9762]
[6.9762]
[2.3378]
```
{-# LANGUAGE TypeApplications #-}
```

Replacement in server/Aftok/Snaplet/Payments.hs at line 11 [6.9762]

B:BD[14.5783] → [2.3506:3559]

import           Control.Lens         (view, _1, _2)

[14.5783]

[2.3559]

import           Control.Lens         (view, _1, _2, _Right, _Left, preview, (&), (.~))

Insertion in server/Aftok/Snaplet/Payments.hs at line 16 [6.9762]

[2.3750]

[6.9831]

import           Network.HTTP.Client.OpenSSL
import           Network.HTTP.Client (defaultManagerSettings, managerResponseTimeout, HttpException)
import           Network.Wreq         (asValue, responseBody, defaults, manager, getWith)
import           OpenSSL.Session (context)

Replacement in server/Aftok/Snaplet/Payments.hs at line 21 [6.9762]

B:BD[6.9832] → [2.3751:3807]

import           Snap.Core            (readRequestBody)

[6.9832]

[2.3807]

import           Snap.Core            (readRequestBody, logError)

Insertion in server/Aftok/Snaplet/Payments.hs at line 28 [6.9762]
[6.9901]
[14.6029]
```
import           Aftok.QConfig        as QC
```

Replacement in server/Aftok/Snaplet/Payments.hs at line 43 [6.9762]

B:BD[2.3971] → [2.3971:4053]

paymentResponseHandler :: S.Handler App App PaymentId
paymentResponseHandler = do

[2.3971]

[2.4053]

paymentResponseHandler :: QC.BillingConfig -> S.Handler App App PaymentId
paymentResponseHandler cfg = do

Replacement in server/Aftok/Snaplet/Payments.hs at line 52 [6.9762]

B:BD[2.4331] → [2.4331:4401]

  snapEval . liftdb . CreatePayment $ Payment (view _1 preq) pmnt now

[2.4331]

[2.4401]


  let opts = defaults & manager .~ Left (opensslManagerSettings context)
                      & manager .~ Left (defaultManagerSettings { managerResponseTimeout = Just 10000 } )
  exchResp  <- liftIO . try $ asValue =<< (withOpenSSL $ getWith opts (exchangeRateServiceURI cfg))
  _ <- traverse (logError . encodeUtf8 . tshow @ HttpException) (preview _Left exchResp)
  let newPayment = Payment (view _1 preq) pmnt now (preview (_Right . responseBody) exchResp)
  snapEval . liftdb $ CreatePayment newPayment

Replacement in server/Main.hs at line 63 [31.5188]

B:BD[2.4797] → [2.4797:4874]

                             <|> (void $ method POST paymentResponseHandler)

[2.4797]

[14.8383]

                             <|> (void . method POST . paymentResponseHandler $ billingConfig cfg)

Add retrieval/storage of current exchange rate data to payment recording.

Dependencies

In channels

Change contents

Replacement in TASKS.md at line 63 [4.1]

Replacement in TASKS.md at line 75 [4.1]

Deletion in aftok.cabal at line 26 [8.1]

Insertion in aftok.cabal at line 61 [8.1]

Deletion in aftok.cabal at line 77 [8.1]

Replacement in aftok.cabal at line 155 [8.1]

Deletion in aftok.cabal at line 161 [8.1]

Deletion in aftok.cabal at line 165 [8.1]

Insertion in aftok.cabal at line 174 [8.1]

File deletion: Client.hs, Client.hs

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 191 [15.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 538 [15.456]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 544 [15.456]