nuttycom/aftok - Change A6HKMINBNGQLLX4QJMYWKQ4JAEHVJ4HIRVDKPPDI3FJUO2AAB7OQC

Attempting to improve JSON handling.

Created by Kris Nuttycombe on April 17, 2015

A6HKMINBNGQLLX4QJMYWKQ4JAEHVJ4HIRVDKPPDI3FJUO2AAB7OQC

Dependencies

In channels

main

Change contents

Replacement in TASKS.md at line 11 [3.1]
B:BD[3.504] → [3.504:518]
```
Design Goals:
```
[3.504]
[3.518]
```
Design Guidelines:
```
Replacement in TASKS.md at line 20 [3.1]
B:BD[3.874] → [3.874:883]
```
Library:
```
[3.874]
[3.883]
```
Required for launch
===================
Library
-------
```

Replacement in TASKS.md at line 31 [3.1]

B:BD[3.1224] → [3.1224:1518]

        the invitation
  * Timeline
    * Amend Event
      * Amend operations targeting events older than <commit_delay hours> fail.
      * MAYBE garnish/reimburse based approach? 
    * Secure the transaction log via inclusion of periodic hashes of the log
      into the public blockchain?

[3.1224]

[3.1518]

        the invitation + script
#  * Timeline
#    * Amend Event
#      * Amend operations targeting events older than <commit_delay hours> fail.

Deletion in TASKS.md at line 37 [3.1]

B:BD[3.1527] → [3.1527:1675]

    * Add public keys that can be used to sign requests. How does this interact
      with certificate-based auth from browsers? Require openpgpjs?

Deletion in TASKS.md at line 43 [3.1]
B:BD[3.2005] → [3.2005:2054]
```
    * History of payouts (read from blockchain?)
```

Replacement in TASKS.md at line 55 [3.1]

B:BD[3.2512] → [3.2512:2726]

Webserver:
  * Login
    * Evaluate OpenID options
  * Companion Creation
    * Require user to provide the PGP public key that will be used to authenticate requests
  * Authentication
    * Require bodies of all

[3.2512]

[3.2726]

Webserver
---------

Replacement in TASKS.md at line 60 [3.1]
B:BD[3.2758] → [3.2758:2775]
```
Payouts Service:
```
[3.2758]
[3.2775]
```
Payouts Service
---------------
```

Insertion in TASKS.md at line 76 [3.1]

[3.3394]


Future Work
===========
Library
-------
  * Timeline
    * Amend Event
      * MAYBE garnish/reimburse based approach? 
    * Secure the transaction log via inclusion of periodic hashes of the log
      into the public blockchain?
  * User
    * Add public keys that can be used to sign requests. How does this interact
      with certificate-based auth from browsers? Require openpgpjs?
  * Payouts
    * History of payouts (read from blockchain?)
Webserver
---------
  * Login
    * Evaluate OpenID options
  * Companion Creation
    * Require user to provide the PGP public key that will be used to authenticate requests
  * Authentication
    * Require bodies of all requests to be PGP-signed; this will take the place of
      other authentication.
Payouts Service
---------------

Deletion in lib/Quixotic/Client.hs at line 12 [4.1]
B:BD[4.172] → [4.172:193]
```
import Quixotic.Json
```

Replacement in lib/Quixotic/Client.hs at line 26 [4.1]

B:BD[4.444] → [5.87:142]

  pure $ payoutsResponse ^. (responseBody . _PayoutsJ)

[4.444]

[4.506]

  pure $ payoutsResponse ^. responseBody

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 21 [6.456]
[6.1101]
[6.1123]
```
type QDBM = ReaderT Connection IO
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 115 [6.456]

∅:D[7.621] → [5.273:412]

B:BD[8.314] → [5.273:412]

recordEvent' :: ProjectId -> UserId -> LogEntry -> ReaderT Connection IO ()
recordEvent' (ProjectId pid) (UserId uid) (LogEntry a e) = do

[7.621]

[6.3172]

pquery :: (ToRow d, FromRow r) => Query -> d -> QDBM [r]
pquery q d = do

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 118 [6.456]

B:BD[6.3186] → [6.3186:3216]

B:BD[6.3216] → [3.3512:3644]

  void . lift $ execute conn 
    "INSERT INTO work_events (project_id, user_id, btc_addr, event_type, event_time, event_meta) \
    \VALUES (?, ?, ?, ?, ?, ?)"

[6.3186]

[5.523]

  lift $ query conn q d
pexec :: (ToRow d) => Query -> d -> QDBM Int64
pexec q d = do
  conn <- ask
  lift $ execute conn q d 
recordEvent' :: ProjectId -> UserId -> LogEntry -> QDBM EventId
recordEvent' (ProjectId pid) (UserId uid) (LogEntry a e) = do 
  eventIds <- pquery
    "INSERT INTO work_events (project_id, user_id, btc_addr, event_type, event_time, event_metadata) \
    \VALUES (?, ?, ?, ?, ?, ?) \
    \RETURNING id"

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 137 [6.456]
[6.3405]
[6.3405]
```
  pure . EventId . fromOnly $ DL.head eventIds
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 139 [6.456]

B:BD[6.3406] → [5.539:602]

readWorkIndex' :: ProjectId -> ReaderT Connection IO WorkIndex

[6.3406]

[5.602]

amendEvent' :: EventId -> LogModification -> QDBM ()
amendEvent' (EventId eid) (TimeChange mt t) = 
  void $ pexec
    "INSERT INTO event_time_amendments (event_id, mod_time, event_time) VALUES (?, ?, ?)"
    ( eid, mt ^. _ModTime, t )
amendEvent' (EventId eid) (AddressChange mt addr) = 
  void $ pexec
    "INSERT INTO event_addr_amendments (event_id, mod_time, btc_addr) VALUES (?, ?, ?)"
    ( eid, mt ^. _ModTime, addr ^. _BtcAddr )
  
amendEvent' (EventId eid) (MetadataChange mt v) = 
  void $ pexec
    "INSERT INTO event_metadata_amendments (event_id, mod_time, btc_addr) VALUES (?, ?, ?)"
    ( eid, mt ^. _ModTime, v )
readWorkIndex' :: ProjectId -> QDBM WorkIndex

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 157 [6.456]
∅:D[5.626] → [6.3476:3490]
B:BD[6.3476] → [6.3476:3490]
B:BD[6.3490] → [5.627:655]
```
  conn <- ask
  rows <- lift $ query conn
```
[5.626]
[5.655]
```
  rows <- pquery
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 162 [6.456]

B:BD[6.3625] → [5.763:834]

newAuction' :: ProjectId -> Auction -> ReaderT Connection IO AuctionId

[6.3625]

[5.834]

newAuction' :: ProjectId -> Auction -> QDBM AuctionId

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 164 [6.456]
∅:D[5.859] → [6.3704:3748]
B:BD[6.3704] → [6.3704:3748]
```
  conn <- ask
  aucIds <- lift $ query conn
```
[5.859]
[5.860]
```
  aucIds <- pquery
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 169 [6.456]

B:BD[6.3929] → [6.3929:3996]

readAuction' :: AuctionId -> ReaderT Connection IO (Maybe Auction)

[6.3929]

[6.3996]

readAuction' :: AuctionId -> QDBM (Maybe Auction)

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 171 [6.456]
B:BD[6.4020] → [6.4020:4062]
```
  conn <- ask
  rows <- lift $ query conn
```
[6.4020]
[6.4062]
```
  rows <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 176 [6.456]
B:BD[6.4201] → [6.4201:4260]
```
recordBid' :: AuctionId -> Bid -> ReaderT Connection IO ()
```
[6.4201]
[6.4260]
```
recordBid' :: AuctionId -> Bid -> QDBM ()
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 178 [6.456]
B:BD[6.4298] → [6.4298:4341]
```
  conn <- ask
  void . lift $ execute conn
```
[6.4298]
[9.54]
```
  void $ pexec
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 187 [6.456]
B:BD[6.4598] → [6.4598:4652]
```
readBids' :: AuctionId -> ReaderT Connection IO [Bid]
```
[6.4598]
[6.4652]
```
readBids' :: AuctionId -> QDBM [Bid]
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 189 [6.456]
B:BD[6.4673] → [6.4673:4715]
```
  conn <- ask
  rows <- lift $ query conn
```
[6.4673]
[6.4715]
```
  rows <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 194 [6.456]
B:BD[6.4862] → [6.4862:4914]
```
createUser' :: User -> ReaderT Connection IO UserId
```
[6.4862]
[8.315]
```
createUser' :: User -> QDBM UserId
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 196 [6.456]
∅:D[8.338] → [6.4936:4978]
B:BD[6.4936] → [6.4936:4978]
```
  conn <- ask
  uids <- lift $ query conn
```
[8.338]
[9.160]
```
  uids <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 201 [6.456]
B:BD[6.5183] → [6.5183:5241]
```
findUser' :: UserId -> ReaderT Connection IO (Maybe User)
```
[6.5183]
[6.5241]
```
findUser' :: UserId -> QDBM (Maybe User)
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 203 [6.456]
B:BD[6.5269] → [6.5269:5312]
```
  conn <- ask
  users <- lift $ query conn
```
[6.5269]
[6.5312]
```
  users <- pquery
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 208 [6.456]

B:BD[6.5425] → [8.428:501]

findUserByUserName' :: UserName -> ReaderT Connection IO (Maybe QDBUser)

[6.5425]

[8.501]

findUserByUserName' :: UserName -> QDBM (Maybe QDBUser)

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 210 [6.456]
B:BD[8.539] → [8.539:582]
```
  conn <- ask
  users <- lift $ query conn
```
[8.539]
[8.582]
```
  users <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 215 [6.456]
B:BD[6.5525] → [7.622:683]
```
createProject' :: Project -> ReaderT Connection IO ProjectId
```
[6.5525]
[7.683]
```
createProject' :: Project -> QDBM ProjectId
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 218 [6.456]
∅:D[10.41] → [7.705:747]
B:BD[7.705] → [7.705:747]
```
  conn <- ask
  pids <- lift $ query conn
```
[10.41]
[7.747]
```
  pids <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 222 [6.456]
B:BD[10.126] → [10.126:155]
```
  void . lift $ execute conn
```
[10.126]
[10.155]
```
  void $ pexec
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 227 [6.456]

B:BD[8.705] → [7.964:1030]

findUserProjects' :: UserId -> ReaderT Connection IO [QDBProject]

[8.705]

[7.1030]

findUserProjects' :: UserId -> QDBM [QDBProject]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 229 [6.456]
B:BD[7.1066] → [7.1066:1111]
```
  conn <- ask
  results <- lift $ query conn
```
[7.1066]
[7.1111]
```
  results <- pquery
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 236 [6.456]
∅:D[8.705] → [6.5525:5568]
∅:D[7.1370] → [6.5525:5568]
B:BD[6.5525] → [6.5525:5568]
```
postgresQDB :: QDB (ReaderT Connection IO)
```
[7.1369]
[6.5568]
```
postgresQDB :: QDB QDBM
```
Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 239 [6.456]
[6.5618]
[6.5618]
```
  , amendEvent = amendEvent'
```

Replacement in lib/Quixotic/Database.hs at line 25 [12.4936]

B:BD[6.6687] → [11.235:296]

  { recordEvent   :: ProjectId -> UserId -> LogEntry -> m ()

[6.6687]

[11.296]

  { recordEvent   :: ProjectId -> UserId -> LogEntry -> m EventId
  , amendEvent    :: EventId -> LogModification -> m ()

Insertion in lib/Quixotic/Interval.hs at line 5 [14.1422]
[13.44]
[14.1483]
```
  , intervalJSON, parseIntervalJSON
```
Replacement in lib/Quixotic/Interval.hs at line 10 [14.1422]
B:BD[5.1727] → [5.1727:1747]
```
import Control.Lens
```
[5.1727]
[14.1494]
```
import Control.Lens(makeLenses, (^.))
import Data.Aeson
import Data.Aeson.Types
```

Insertion in lib/Quixotic/Interval.hs at line 27 [14.1422]

[13.121]

intervalJSON :: Interval -> Value
intervalJSON ival = object ["start" .= (ival ^. start), "end" .= (ival ^. end)]
parseIntervalJSON :: Value -> Parser Interval
parseIntervalJSON (Object v) = interval <$> v .: "start" <*> v .: "end"
parseIntervalJSON _ = mzero

Insertion in lib/Quixotic/Json.hs at line 2 [15.19]
[5.1964]
[15.127]
```
{-# LANGUAGE DeriveDataTypeable #-}
```

Replacement in lib/Quixotic/Json.hs at line 9 [15.19]

∅:D[5.2000] → [15.197:215]

B:BD[15.197] → [15.197:215]

B:BD[15.215] → [2.5:36]

import Data.Aeson
import qualified Data.Map as M

[5.2000]

[15.231]

import Data.Aeson 
import Data.Aeson.Types
import Data.Data
import qualified Data.Attoparsec.ByteString.Char8 as P
import qualified Data.ByteString.Char8 as C

Deletion in lib/Quixotic/Json.hs at line 16 [15.19]
B:BD[15.248] → [5.2001:2026]
∅:D[5.2026] → [15.248:272]
B:BD[15.248] → [15.248:272]
```
import Quixotic.Interval
import Quixotic.TimeLog
```

Replacement in lib/Quixotic/Json.hs at line 17 [15.19]

B:BD[15.273] → [5.2027:2086]

newtype PayoutsJ = PayoutsJ Payouts 
makePrisms ''PayoutsJ

[15.273]

[15.323]

import qualified Language.Haskell.TH as TH
import Language.Haskell.TH.Quote

Replacement in lib/Quixotic/Json.hs at line 20 [15.19]

B:BD[15.324] → [5.2087:2143]

B:BD[5.2143] → [2.37:76]

instance ToJSON PayoutsJ where
  toJSON (PayoutsJ p) = 
    toJSON $ M.mapKeys (^. _BtcAddr) p

[15.324]

[15.484]

data Version = Version { majorVersion :: Word8
                       , minorVersion :: Word8
                       , trivialVersion :: Word8 
                       } deriving (Typeable, Data)

Replacement in lib/Quixotic/Json.hs at line 25 [15.19]

B:BD[15.485] → [5.2144:2177]

∅:D[5.2177] → [4.731:748]

B:BD[4.731] → [4.731:748]

B:BD[4.748] → [2.77:126]

instance FromJSON PayoutsJ where
  parseJSON v = 
    PayoutsJ . M.mapKeys BtcAddr <$> parseJSON v

[15.485]

[5.2225]

printVersion :: Version -> Text
printVersion Version{..} = intercalate "." (fmap tshow [majorVersion, minorVersion, trivialVersion])

Replacement in lib/Quixotic/Json.hs at line 28 [15.19]

B:BD[5.2226] → [5.2226:2288]

newtype IntervalJ = IntervalJ Interval
makePrisms ''IntervalJ

[5.2226]

[5.2288]

versionParser :: P.Parser Version
versionParser = Version <$> P.decimal <*> (P.char '.' >> P.decimal) <*> (P.char '.' >> P.decimal)
versioned :: Version -> Value -> Value
versioned ver v = object [ "schemaVersion" .= printVersion ver
                         , "value" .= v ]

Replacement in lib/Quixotic/Json.hs at line 35 [15.19]

B:BD[5.2289] → [5.2289:2414]

instance ToJSON IntervalJ where
  toJSON (IntervalJ ival) = 
    object ["start" .= (ival ^. start), "end" .= (ival ^. end)]

[5.2289]

[5.2414]

version :: QuasiQuoter 
version = QuasiQuoter { quoteExp = quoteVersionExp
                      , quotePat = error "Pattern quasiquotation of versions not supported."
                      , quoteType = error "Type quasiquotation of versions not supported."
                      , quoteDec = error "Dec quasiquotation of versions not supported."
                      }

Deletion in lib/Quixotic/Json.hs at line 42 [15.19]

B:BD[5.2415] → [5.2415:2559]

instance FromJSON IntervalJ where
  parseJSON (Object v) = 
    fmap IntervalJ $ interval <$> v .: "start" <*> v .: "end"
  parseJSON _ = mzero

Replacement in lib/Quixotic/Json.hs at line 43 [15.19]

B:BD[2.128] → [2.128:186]

newtype ProjectJ = ProjectJ Project
makePrisms ''ProjectJ

[2.128]

[2.186]

quoteVersionExp :: String -> TH.Q TH.Exp
quoteVersionExp s = do
  v <- either (fail . show) pure $ P.parseOnly versionParser (C.pack s)
  dataToExpQ (const Nothing) v

Replacement in lib/Quixotic/Json.hs at line 48 [15.19]

B:BD[2.187] → [2.187:411]

instance ToJSON ProjectJ where
  toJSON (ProjectJ p) = 
    object [ "projectName"    .= (p ^. projectName)
           , "inceptionDate"  .= (p ^. inceptionDate)
           , "initiator"      .= (p ^. (initiator._UserId)) ]

[2.187]

[15.485]

unversion :: (Version -> Value -> Parser a) -> Value -> Parser a
unversion f (Object v) = do
  vers <- v .: "schemaVersion"
  vers' <- either (\_ -> mzero) pure $ P.parseOnly versionParser (encodeUtf8 vers)
  value <- v .: "value"
  f vers' value
unversion _ _ = mzero

Replacement in lib/Quixotic/Json.hs at line 56 [15.19]

B:BD[15.486] → [2.412:463]

newtype WidxJ = WidxJ WorkIndex
makePrisms ''WidxJ

[15.486]

[5.2560]

projectJSON :: Project -> Value
projectJSON p = 
  object [ "projectName"    .= (p ^. projectName)
         , "inceptionDate"  .= (p ^. inceptionDate)
         , "initiator"      .= (p ^. (initiator._UserId)) ]

Deletion in lib/Quixotic/Json.hs at line 62 [15.19]

B:BD[5.2561] → [2.464:590]

instance ToJSON WidxJ where
  toJSON (WidxJ widx) = 
    toJSON $ (fmap IntervalJ) <$> (M.mapKeysWith (++) (^._BtcAddr) widx)

Replacement in lib/Quixotic/TimeLog.hs at line 12 [18.846]
B:BD[16.107] → [17.3621:3635]
```
  , workIndex
```
[16.107]
[19.3]
```
  , workIndex, workIndexJSON
```

Insertion in lib/Quixotic/TimeLog.hs at line 14 [18.846]

[19.12]

[12.5326]

  , EventId(EventId), _EventId, eventIdJSON
  , ModTime(ModTime), _ModTime
  , LogModification(..)

Replacement in lib/Quixotic/TimeLog.hs at line 18 [18.846]
B:BD[12.5345] → [12.5345:5357]
```
  , Payouts
```
[12.5345]
[18.961]
```
  , Payouts(..), _Payouts
```
Insertion in lib/Quixotic/TimeLog.hs at line 27 [18.846]
[3.3878]
[20.65]
```
import Data.Aeson.Types
```
Insertion in lib/Quixotic/TimeLog.hs at line 34 [18.846]
[21.635]
[21.635]
```
import Quixotic.Json
```

Insertion in lib/Quixotic/TimeLog.hs at line 63 [18.846]

[18.1725]

[22.824]

newtype EventId = EventId Int64 deriving (Show, Eq)
makePrisms ''EventId
newtype ModTime = ModTime UTCTime
makePrisms ''ModTime
data LogModification = TimeChange ModTime UTCTime
                     | AddressChange ModTime BtcAddr
                     | MetadataChange ModTime A.Value

Replacement in lib/Quixotic/TimeLog.hs at line 78 [18.846]

B:BD[18.2287] → [19.13:49]

type Payouts = Map BtcAddr Rational

[18.2287]

[23.337]

newtype Payouts = Payouts (Map BtcAddr Rational)
makePrisms ''Payouts
payoutsJSON :: Payouts -> Value
payoutsJSON (Payouts m) = toJSON $ MS.mapKeys (^. _BtcAddr) m
parsePayoutsJSON :: Value -> Parser Payouts
parsePayoutsJSON v = 
  Payouts . MS.mapKeys BtcAddr <$> parseJSON v 
instance A.ToJSON Payouts where
  toJSON = versioned (Version 1 0 0) . payoutsJSON
instance A.FromJSON Payouts where
  parseJSON v = let parsePayouts (Version 1 0 0) = parsePayoutsJSON 
                    parsePayouts v' = \_ -> fail . show $ printVersion v'
                in  unversion parsePayouts $ v

Insertion in lib/Quixotic/TimeLog.hs at line 100 [18.846]

[20.351]

[24.89]

workIndexJSON :: WorkIndex -> Value
workIndexJSON widx = toJSON $ (fmap intervalJSON) <$> (MS.mapKeysWith (++) (^._BtcAddr) widx)
eventIdJSON :: EventId -> Value
eventIdJSON (EventId eid) = toJSON eid

Replacement in lib/Quixotic/TimeLog.hs at line 123 [18.846]

B:BD[23.516] → [23.516:573]

  in  fmap (\kt -> toRational $ kt / totalTime) keyTimes

[23.516]

[24.1011]

  in  Payouts $ fmap (\kt -> toRational $ kt / totalTime) keyTimes

Insertion in payouts/Main.hs at line 14 [25.1503]
[4.834]
[25.1745]
```
import Quixotic.TimeLog
```
Replacement in payouts/Main.hs at line 59 [25.1503]
B:BD[25.2798] → [26.914:957]
```
  payouts <- currentPayouts (qcConfig cfg)
```
[25.2798]
[25.2798]
```
  (Payouts p) <- currentPayouts (qcConfig cfg)
```

Replacement in payouts/Main.hs at line 61 [25.1503]

B:BD[25.2850] → [26.958:1012]

  putStrLn (tshow unspent)
  putStrLn (tshow payouts)

[25.2850]

  putStrLn . tshow $ unspent
  putStrLn . tshow $ p

Insertion in quixotic.cabal at line 36 [12.1]
[9.1143]
[25.3072]
```
    , template-haskell
```

Replacement in server/Main.hs at line 53 [28.5188]

B:BD[6.8755] → [27.118:179]

  addRoutes [ ("login", requireLogin >> (redirect "/home"))

[6.8755]

[10.851]

  addRoutes [ ("login",    requireLogin >> (redirect "/home"))

Replacement in server/Main.hs at line 55 [28.5188]

B:BD[10.914] → [10.914:1105]

B:BD[10.1105] → [2.649:847]

            , ("projects/:projectId/logStart/:btcAddr", method POST $ logWorkHandler StartWork)
            , ("projects/:projectId/logEnd/:btcAddr",   method POST $ logWorkHandler StopWork)
            , ("projects/:projectId/log/:btcAddr",      serveJSON WidxJ $ method GET loggedIntervalsHandler)
            , ("projects/:projectId", serveJSON ProjectJ $ method GET projectGetHandler)

[10.914]

[2.847]

            , ("projects/:projectId/logStart/:btcAddr", serveJSON eventIdJSON . method POST $ logWorkHandler StartWork)
            , ("projects/:projectId/logEnd/:btcAddr",   serveJSON eventIdJSON . method POST $ logWorkHandler StopWork)
            , ("projects/:projectId/log/:btcAddr",      serveJSON workIndexJSON $ method GET loggedIntervalsHandler)
            , ("projects/:projectId", serveJSON projectJSON $ method GET projectGetHandler)

Replacement in server/Main.hs at line 60 [28.5188]

B:BD[2.926] → [2.926:1120]

            , ("projects",            serveJSON (fmap (ProjectJ._project)) $ method GET projectListHandler)
            , ("payouts/:projectId",  serveJSON PayoutsJ $ method GET payoutsHandler)

[2.926]

[6.8999]

            , ("payouts/:projectId",  serveJSON id $ method GET payoutsHandler)

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 20 [29.5424]
B:BD[29.5831] → [29.5831:5881]
```
logWorkHandler :: EventType -> Handler App App ()
```
[29.5831]
[27.3341]
```
logWorkHandler :: EventType -> Handler App App EventId
```

Attempting to improve JSON handling.

Dependencies

In channels

Change contents

Replacement in TASKS.md at line 11 [3.1]

Replacement in TASKS.md at line 20 [3.1]

Replacement in TASKS.md at line 31 [3.1]

Deletion in TASKS.md at line 37 [3.1]

Deletion in TASKS.md at line 43 [3.1]

Replacement in TASKS.md at line 55 [3.1]

Replacement in TASKS.md at line 60 [3.1]

Insertion in TASKS.md at line 76 [3.1]

Deletion in lib/Quixotic/Client.hs at line 12 [4.1]

Replacement in lib/Quixotic/Client.hs at line 26 [4.1]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 21 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 115 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 118 [6.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 137 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 139 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 157 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 162 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 164 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 169 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 171 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 176 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 178 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 187 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 189 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 194 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 196 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 201 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 203 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 208 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 210 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 215 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 218 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 222 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 227 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 229 [6.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 236 [6.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 239 [6.456]

Replacement in lib/Quixotic/Database.hs at line 25 [12.4936]

Insertion in lib/Quixotic/Interval.hs at line 5 [14.1422]

Replacement in lib/Quixotic/Interval.hs at line 10 [14.1422]

Insertion in lib/Quixotic/Interval.hs at line 27 [14.1422]

Insertion in lib/Quixotic/Json.hs at line 2 [15.19]

Replacement in lib/Quixotic/Json.hs at line 9 [15.19]

Deletion in lib/Quixotic/Json.hs at line 16 [15.19]