nuttycom/aftok - Change UILI6PILCRDPZ3XYA54LGIGPSU7ERWNHCE7R3CE64ZEC7ONOEMOQC

The route-based logStart/logStop is nicer.

Created by Kris Nuttycombe on October 19, 2016

UILI6PILCRDPZ3XYA54LGIGPSU7ERWNHCE7R3CE64ZEC7ONOEMOQC

Dependencies

In channels

main

Change contents

Replacement in lib/Aftok/Json.hs at line 250 [4.19]

B:BD[3.4290] → [2.59:164]

parseLogEntry :: Value -> Parser (C.UTCTime -> LogEntry)
parseLogEntry = unversion parseLogEntry' where

[3.4290]

[2.164]

parseLogEntry :: (C.UTCTime -> LogEvent) -> Value -> Parser (C.UTCTime -> LogEntry)
parseLogEntry f = unversion parseLogEntry' where

Deletion in lib/Aftok/Json.hs at line 254 [4.19]
B:BD[2.263] → [2.263:312]
```
    eventCtr   <- x .: "eventType" >>= nameEvent
```

Replacement in lib/Aftok/Json.hs at line 255 [4.19]

B:BD[2.347] → [2.347:407]

    pure $ \t -> LogEntry creditTo' (eventCtr t) eventMeta'

[2.347]

[5.664]

    pure $ \t -> LogEntry creditTo' (f t) eventMeta'

Insertion in server/Aftok/Snaplet/WorkLog.hs at line 27 [8.5424]

[6.10148]

[7.12607]

  uid <- requireUserId
  pid <- requireProjectId
  requestBody <- readRequestBody 4096
  timestamp <- liftIO C.getCurrentTime
  case A.eitherDecode requestBody >>= parseEither (parseLogEntry evCtr) of
    Left err -> snapError 400 $ "Unable to parse log entry " <> (tshow requestBody) <> ": " <> tshow err
    Right entry -> snapEval $ createEvent pid uid (entry timestamp)
logWorkBTCHandler :: (C.UTCTime -> LogEvent) -> Handler App App EventId
logWorkBTCHandler evCtr = do

Deletion in server/Aftok/Snaplet/WorkLog.hs at line 48 [8.5424]

B:BD[5.1223] → [5.1223:1598]

B:BD[5.1598] → [2.412:480]


recordLogEntryHandler :: Handler App App EventId
recordLogEntryHandler = do
  uid <- requireUserId
  pid <- requireProjectId
  requestBody <- readRequestBody 4096
  timestamp <- liftIO C.getCurrentTime
  case A.eitherDecode requestBody >>= parseEither parseLogEntry of
    Left err -> snapError 400 $ "Unable to parse log entry " <> (tshow requestBody) <> ": " <> tshow err
    Right entry -> snapEval $ createEvent pid uid (entry timestamp)

Replacement in server/Main.hs at line 48 [9.5188]

B:BD[5.2229] → [5.2229:2315]

      recordLogEntryRoute = serveJSON eventIdJSON $ method POST recordLogEntryHandler

[5.2229]

[5.2315]

      logWorkBTCRoute f   = serveJSON eventIdJSON $ method POST (logWorkBTCHandler f)

Replacement in server/Main.hs at line 68 [9.5188]

B:BD[10.13135] → [5.2980:3216]

            , ("projects/:projectId/logStart/:btcAddr", logWorkRoute StartWork)
            , ("projects/:projectId/logEnd/:btcAddr",   logWorkRoute StopWork)
            , ("projects/:projectId/logWorkEvent",      recordLogEntryRoute)

[10.13135]

[11.3631]

            , ("projects/:projectId/logStart",          logWorkRoute StartWork)
            , ("projects/:projectId/logEnd",            logWorkRoute StopWork)
            , ("projects/:projectId/logStart/:btcAddr", logWorkBTCRoute StartWork)
            , ("projects/:projectId/logEnd/:btcAddr",   logWorkBTCRoute StopWork)