nuttycom/aftok - Change O227CEAV7BTKSE3SSC7XHC5IWEBXZL2AOOKJMBMOOFNTLINBLQMAC

Adds storage of original event JSON for some DBOp constructors.

Created by Kris Nuttycombe on January 21, 2017

O227CEAV7BTKSE3SSC7XHC5IWEBXZL2AOOKJMBMOOFNTLINBLQMAC

Dependencies

In channels

main

Change contents

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 9 [4.456]

B:BD[3.1043] → [3.1043:1106]

import           Data.Aeson                           (toJSON)

[3.1043]

[3.1106]

import           Data.Aeson                           (toJSON, Value)

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 30 [4.456]

[3.1678]

[5.173]

import           Aftok.Json                           (billableJSON, subscriptionJSON)

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 206 [4.456]

B:BD[6.3794] → [6.3794:4029]

storeEvent (CreateBillable _) = error "Not implemented"
storeEvent (CreateSubscription _ _) = error "Not implemented"
storeEvent (CreatePaymentRequest _) = error "Not implemented"
storeEvent (CreatePayment _) = error "Not implemented"

[6.3794]

[6.4029]

storeEvent (CreateBillable uid b) = 
  Just $ storeEventJSON uid "create_billable" (billableJSON b)
storeEvent (CreateSubscription uid bid) = 
  Just $ storeEventJSON uid "create_subscription" (subscriptionJSON uid bid)
storeEvent (CreatePaymentRequest _ _) = error "Not implemented"
storeEvent (CreatePayment _ _) = error "Not implemented"

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 215 [4.456]

[6.4052]

[7.425]


type EventType = Text
storeEventJSON :: UserId -> EventType -> Value -> QDBM EventId
storeEventJSON uid t v = do
  timestamp <- liftIO C.getCurrentTime
  pinsert EventId
    "INSERT INTO aftok_events \
    \(event_time, created_by, event_type, event_json) \
    \VALUES (?, ?, ?, ?) RETURNING id"
    (fromThyme timestamp, uid ^. _UserId, t, v)

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 421 [4.456]
B:BD[8.1043] → [6.11873:11916]
```
updateCache dbop @ (CreateBillable b) = do
```
[8.1043]
[6.11916]
```
updateCache dbop @ (CreateBillable _ b) = do
```
Replacement in lib/Aftok/Database/PostgreSQL.hs at line 453 [4.456]
B:BD[5.812] → [5.812:863]
```
updateCache dbop @ (CreatePaymentRequest req) = do
```
[5.812]
[5.863]
```
updateCache dbop @ (CreatePaymentRequest _ req) = do
```
Replacement in lib/Aftok/Database/PostgreSQL.hs at line 464 [4.456]
B:BD[5.1189] → [2.4:48]
```
updateCache dbop @ (CreatePayment req) = do
```
[5.1189]
[2.48]
```
updateCache dbop @ (CreatePayment _ req) = do
```

Replacement in lib/Aftok/Database.hs at line 53 [10.4936]

B:BD[9.4053] → [6.13274:13324]

  CreateBillable   :: Billable -> DBOp BillableId

[9.4053]

[6.13324]

  CreateBillable   :: UserId -> Billable -> DBOp BillableId

Replacement in lib/Aftok/Database.hs at line 58 [10.4936]

B:BD[9.4200] → [2.347:465]

  CreatePaymentRequest :: PaymentRequest -> DBOp PaymentRequestId
  CreatePayment        :: Payment -> DBOp PaymentId

[9.4200]

[11.7074]

  CreatePaymentRequest :: UserId -> PaymentRequest -> DBOp PaymentRequestId
  CreatePayment        :: UserId -> Payment -> DBOp PaymentId

Replacement in lib/Aftok/Database.hs at line 177 [10.4936]

B:BD[12.834] → [6.13638:13774]

createBillable :: Billable -> DBProg BillableId
createBillable b = withProjectAuth (b ^. B.project) (b ^. B.creator) $ CreateBillable b

[12.834]

[9.4546]

createBillable :: UserId -> Billable -> DBProg BillableId
createBillable uid b = 
  withProjectAuth (b ^. B.project) uid $ CreateBillable uid b

Insertion in lib/Aftok/Json.hs at line 24 [15.19]
[13.115]
[14.1294]
```
import qualified Aftok.Billables                  as B
```

Replacement in lib/Aftok/Json.hs at line 155 [15.19]

B:BD[16.131] → [16.131:254]

logEventJSON :: LogEvent -> Value
logEventJSON ev = object [ eventName ev .= object [ "eventTime" .= (ev ^. eventTime) ] ]

[16.131]

[16.254]

logEventJSON' :: LogEvent -> Value
logEventJSON' ev = object [ eventName ev .= object [ "eventTime" .= (ev ^. eventTime) ] ]

Replacement in lib/Aftok/Json.hs at line 161 [15.19]
B:BD[17.2274] → [17.2274:2309]
```
      , "event" .= logEventJSON ev
```
[17.2274]
[17.2309]
```
      , "event" .= logEventJSON' ev
```

Insertion in lib/Aftok/Json.hs at line 168 [15.19]

[17.2380]

[18.5681]


billableJSON :: B.Billable -> Value
billableJSON b = v1 $
  obj [ "projectId"   .= tshow (b ^. (B.project . _ProjectId))
      , "name"        .= (b ^. B.name)
      , "description" .= (b ^. B.description)
      , "recurrence"  .= recurrenceJSON' (b ^. B.recurrence)
      ]
recurrenceJSON' :: B.Recurrence -> Value
recurrenceJSON' B.Annually    = object [ "annually" .= Null ]
recurrenceJSON' (B.Monthly i) = object [ "monthly " .= object [ "months" .= i ] ]
recurrenceJSON' B.SemiMonthly = object [ "semimonthly" .= Null ]
recurrenceJSON' (B.Weekly i)  = object [ "weekly " .= object [ "weeks" .= i ] ]
recurrenceJSON' B.OneTime     = object [ "onetime" .= Null ]

Insertion in lib/Aftok/Json.hs at line 184 [15.19]

[18.5682]

subscriptionJSON :: UserId -> B.BillableId -> Value
subscriptionJSON uid bid = v1 $ 
  obj [ "userId"     .= tshow (uid ^. _UserId)
      , "billableId" .= tshow (bid ^. B._BillableId)
      ]