nuttycom/aftok - Change 2J37EVJMX255K3XEJHTZGRPEIRMAQ62JQWOA7JU3YTZUB6PUPWVQC

Check for an open interval on project switch.

Created by Kris Nuttycombe on August 26, 2020

2J37EVJMX255K3XEJHTZGRPEIRMAQ62JQWOA7JU3YTZUB6PUPWVQC

Dependencies

In channels

main

Change contents

Insertion in client/src/Aftok/Api/Timeline.purs at line 9 [4.18]
[4.202]
[4.202]
```
import Data.Array (head)
```

Replacement in client/src/Aftok/Api/Timeline.purs at line 187 [4.18]

B:BD[4.6040] → [4.6040:6186]

        Before t -> ["before=" <> t]
        During (Interval x) -> ["after=" <> x.start, "before=" <> x.end]
        After  t -> ["after=" <> t]

[4.6040]

[4.6186]

        Before t -> ["before=" <> t, "limit=100"]
        During (Interval x) -> ["after=" <> x.start, "before=" <> x.end, "limit=100"]
        After  t -> ["after=" <> t, "limit=100"]

Insertion in client/src/Aftok/Api/Timeline.purs at line 198 [4.18]

[4.6499]

apiLatestEvent :: ProjectId -> Aff (Either TimelineError (Maybe Event))
apiLatestEvent pid = do
  response <- get RF.json ("/api/user/projects/" <> pidStr pid <> "/events")
  liftEffect 
    <<< runExceptT 
    <<< map head
    <<< map decompose
    <<< withExceptT LogFailure 
      $ parseDatedResponse response

Replacement in client/src/Aftok/Timeline.purs at line 54 [6.2287]

B:BD[5.2907] → [2.925:989]

import Aftok.Project (Project, Project'(..), ProjectId, pidStr)

[5.2907]

[4.6844]

import Aftok.Project (Project, Project'(..), ProjectId) --, pidStr)

Insertion in client/src/Aftok/Timeline.purs at line 96 [6.2287]

[7.4296]

[8.254]

  , getLatestEvent :: ProjectId -> m (Either TimelineError (Maybe TL.Event))

Replacement in client/src/Aftok/Timeline.purs at line 164 [6.2287]

B:BD[2.1571] → [2.1571:1620]

          active <- isJust <$> H.gets (_.active)

[2.1571]

[2.1620]

          oldActive <- isJust <$> H.gets (_.active)

Replacement in client/src/Aftok/Timeline.purs at line 166 [6.2287]

B:BD[2.1675] → [2.1675:1776]

          when (active && any (\p' -> (unwrap p').projectId /= (unwrap p).projectId) currentProject)

[2.1675]

[2.1776]

          
          -- End any active intervals when switching projects.
          when (oldActive && any (\p' -> (unwrap p').projectId /= (unwrap p).projectId) currentProject)

Insertion in client/src/Aftok/Timeline.purs at line 170 [6.2287]
[2.1825]
[2.1825]

Replacement in client/src/Aftok/Timeline.purs at line 175 [6.2287]

B:BD[2.2085] → [2.2085:2156]

                  (system.log $ "Error occurred listing intervals") *>

[2.2085]

[2.2156]

                  (system.log $ "Error occurred listing intervals" <> show err ) *>

Replacement in client/src/Aftok/Timeline.purs at line 178 [6.2287]

B:BD[2.2215] → [2.2215:2348]

                  (system.log $ "Got " <> show (length ivals :: Int) <> " intervals for project " <> pidStr (unwrap p).projectId) *>

[2.2215]

[2.2348]

                  --(system.log $ "Got " <> show (length ivals :: Int) <> " intervals for project " <> pidStr (unwrap p).projectId) *>

Insertion in client/src/Aftok/Timeline.purs at line 180 [6.2287]
[2.2377]
[2.2377]

Replacement in client/src/Aftok/Timeline.purs at line 185 [6.2287]

B:BD[2.2601] → [2.2601:2670]

          H.modify_ (_ { selectedProject = Just p, history = hist })

[2.2601]

[5.5264]


          latestEventResponse <- lift $ caps.getLatestEvent (unwrap p).projectId
          now <- lift $ system.now
          active <- lift $ case latestEventResponse of
              Left err -> 
                (system.log $ "Error occurred retrieving the latest event: " <> show err) *>
                pure Nothing
              Right latestEvent -> do
                let activeInterval :: TL.Event -> m (Maybe Interval)
                    activeInterval ev = case ev of
                      TL.StartEvent i -> 
                        (system.log $ "Project has an open active interval starting " <> show i) *>
                        (Just <<< interval i <$> system.now)
                      TL.StopEvent _  -> 
                        pure Nothing
                join <$> traverse activeInterval latestEvent

Insertion in client/src/Aftok/Timeline.purs at line 202 [6.2287]

[5.5265]

[2.2671]

          H.modify_ (_ { selectedProject = Just p, history = hist, active = active })

Insertion in client/src/Aftok/Timeline.purs at line 342 [6.2287]
[4.7427]
[7.10402]
```
  , getLatestEvent: TL.apiLatestEvent
```
Insertion in client/src/Aftok/Timeline.purs at line 351 [6.2287]
[7.10515]
[8.1540]
```
  , getLatestEvent: \_ -> Right <$> pure Nothing
```

Replacement in client/src/Aftok/Timeline.purs at line 385 [6.2287]

B:BD[2.6013] → [2.6013:6069]

  lift <<< system.log $ "Splitting interval " <> show i

[2.6013]

[2.6069]

  --lift <<< system.log $ "Splitting interval " <> show i

Replacement in client/src/Aftok/Timeline.purs at line 395 [6.2287]

B:BD[2.6523] → [2.6523:6578]

  lift <<< system.log $ "Split result: " <> show split

[2.6523]

[2.6578]

  --lift <<< system.log $ "Split result: " <> show split

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 378 [11.456]

B:BD[9.1084] → [10.11131:11190]

pgEval (FindEvents (ProjectId pid) (UserId uid) ival) = do

[9.1084]

[10.11190]

pgEval (FindEvents (ProjectId pid) (UserId uid) rquery limit) = do

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 380 [11.456]
B:BD[10.11215] → [12.19829:19861]
```
  let
    q (Before e) = pquery
```
[10.11215]
[12.19861]
```
  case rquery of
    (Before e) -> pquery
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 388 [11.456]

∅:D[10.11474] → [13.15631:15705]

B:BD[13.15631] → [13.15631:15705]

B:BD[13.15705] → [12.19985:20043]

              WHERE project_id = ? AND user_id = ? AND event_time <= ? |]
      (pid, uid, fromThyme e)
    q (During s e) = pquery

[10.11474]

[12.20043]

              WHERE project_id = ? AND user_id = ? AND event_time <= ?
              ORDER BY event_time DESC
              LIMIT ?
              |]
      (pid, uid, fromThyme e, limit)
    (During s e) -> pquery

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 400 [11.456]

∅:D[10.11766] → [13.15995:16052]

B:BD[13.15995] → [13.15995:16052]

B:BD[13.16052] → [12.20167:20235]

              AND event_time >= ? AND event_time <= ? |]
      (pid, uid, fromThyme s, fromThyme e)
    q (After s) = pquery

[10.11766]

[12.20235]

              AND event_time >= ? AND event_time <= ?
              ORDER BY event_time DESC
              LIMIT ?
              |]
      (pid, uid, fromThyme s, fromThyme e, limit)
    (After s) -> pquery

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 411 [11.456]

B:BD[4.7617] → [4.7617:7689]

∅:D[4.7689] → [12.20359:20389]

B:BD[13.16361] → [12.20359:20389]

∅:D[12.20389] → [10.12005:12014]

B:BD[14.6342] → [10.12005:12014]

B:BD[10.12014] → [4.7690:8155]

            WHERE project_id = ? AND user_id = ? AND event_time >= ? |]
      (pid, uid, fromThyme s)
  q ival
pgEval (FindLatestEvents (ProjectId pid) (UserId uid) i) = do
  mode <- askNetworkMode
  pquery
    (logEntryParser mode)
    [sql| SELECT credit_to_type,
                 credit_to_network, credit_to_address, credit_to_user_id, credit_to_project_id,
                 event_type, event_time, event_metadata
          FROM work_events
          WHERE project_id = ?
          AND user_id = ?
          ORDER BY event_time DESC
          LIMIT ?|]
    (pid, uid, i)

[4.7617]

[15.1951]

            WHERE project_id = ? AND user_id = ? AND event_time >= ?
            ORDER BY event_time DESC
            LIMIT ?
            |]
      (pid, uid, fromThyme s, limit)
    (Always) -> pquery
      (logEntryParser mode)
      [sql| SELECT credit_to_type,
                     credit_to_network, credit_to_address, credit_to_user_id, credit_to_project_id,
                     event_type, event_time,
                     event_metadata
              FROM work_events
              WHERE project_id = ? AND user_id = ?
              ORDER BY event_time DESC
              LIMIT ?
              |]
      (pid, uid, limit)

Insertion in lib/Aftok/Database.hs at line 21 [16.4936]
[12.25908]
[12.25908]
```
import           Data.Word                      ( Word32 )
```

Replacement in lib/Aftok/Database.hs at line 61 [16.4936]

B:BD[12.27224] → [12.27224:27304]

B:BD[12.27304] → [4.8157:8231]

  FindEvents       ::ProjectId -> UserId -> Interval' -> DBOp [LogEntry BTCNet]
  FindLatestEvents ::ProjectId -> UserId -> Int -> DBOp [LogEntry BTCNet]

[12.27224]

[12.27304]

  FindEvents       ::ProjectId -> UserId -> RangeQuery -> Word32 -> DBOp [LogEntry BTCNet]

Replacement in lib/Aftok/Database.hs at line 222 [16.4936]

B:BD[12.29294] → [12.29294:29370]

∅:D[10.20200] → [17.8854:8899]

∅:D[12.29370] → [17.8854:8899]

B:BD[17.8854] → [17.8854:8899]

  :: (MonadDB m) => ProjectId -> UserId -> Interval' -> m [LogEntry BTCNet]
findEvents p u i = liftdb $ FindEvents p u i

[12.29294]

[4.8232]

  :: (MonadDB m) => ProjectId -> UserId -> RangeQuery -> Word32 -> m [LogEntry BTCNet]
findEvents p u i l = liftdb $ FindEvents p u i l

Deletion in lib/Aftok/Database.hs at line 225 [16.4936]
B:BD[4.8233] → [4.8233:8375]
∅:D[4.8375] → [18.1303:1304]
∅:D[17.8899] → [18.1303:1304]
∅:D[19.9207] → [18.1303:1304]
B:BD[20.1640] → [18.1303:1304]
```
findLatestEvents :: (MonadDB m) => ProjectId -> UserId -> Int -> m [LogEntry BTCNet]
findLatestEvents p u i = liftdb $ FindLatestEvents p u i
```
Replacement in lib/Aftok/Interval.hs at line 9 [21.1422]
B:BD[12.30426] → [12.30426:30458]
```
  , Interval'(..)
  , interval'
```
[12.30426]
[12.30458]
```
  , RangeQuery(..)
  , rangeQuery
```
Insertion in lib/Aftok/Interval.hs at line 34 [21.1422]
[22.130]
[9.1360]
```
makeLenses ''Interval
```

Replacement in lib/Aftok/Interval.hs at line 36 [21.1422]

B:BD[9.1361] → [23.4029:4076]

∅:D[23.4076] → [9.1410:1529]

B:BD[9.1410] → [9.1410:1529]

B:BD[9.1529] → [23.4077:4099]

∅:D[23.4099] → [9.1530:1553]

B:BD[20.1887] → [9.1530:1553]

data Interval' = Before { _end' :: C.UTCTime }
               | During { _start' :: C.UTCTime, _end' :: C.UTCTime }
               | After  { _start' :: C.UTCTime }
makeLenses ''Interval
makeLenses ''Interval'

[9.1361]

[24.115]

data RangeQuery
  = Before { _end' :: C.UTCTime }
  | During { _start' :: C.UTCTime, _end' :: C.UTCTime }
  | After  { _start' :: C.UTCTime }
  | Always
makeLenses ''RangeQuery

Replacement in lib/Aftok/Interval.hs at line 46 [21.1422]

B:BD[22.132] → [9.1554:1660]

interval' :: C.UTCTime -> C.UTCTime -> Interval'
interval' s e = if s < e then During s e else During e s

[22.132]

[9.1660]

rangeQuery :: C.UTCTime -> C.UTCTime -> RangeQuery
rangeQuery s e = if s < e then During s e else During e s

File move: list_entries.sh → latest_events.sh
BF:BFD[25.1220] → [3.392:431]
BF:BF[3.431] → [3.2:2]
[25.1220]
[3.2]

Replacement in scripts/latest_events.sh at line 23 [3.2]

B:BD[3.311] → [3.311:391]

  "https://$AFTOK_HOST/api/projects/$PID/logEntries?after=2020-01-01T00:00:00Z"

[3.311]

  "https://$AFTOK_HOST/api/projects/$PID/events?after=2020-01-01T00:00:00Z"

File addition: list_events.sh (---x------)

[25.1220]

#!/bin/bash
if [ -f ".env" ]; then
  source .env
fi
if [ -z "${AFTOK_HOST}" ]; then 
  AFTOK_HOST="aftok.com"
fi
if [ -z "${USER}" ]; then 
  read -p "Username: " USER
  echo
fi
if [ -z "${PID}" ]; then
  read -p "Project UUID: " PID
  echo
fi
curl --verbose --insecure --user $USER \
  --request GET \
  "https://$AFTOK_HOST/api/projects/$PID/events?after=2020-01-01T00:00:00Z"

Replacement in server/Aftok/Snaplet/WorkLog.hs at line 87 [26.5424]

B:BD[26.6632] → [7.14875:14963]

userLogEntries :: S.Handler App App [LogEntry (NetworkId, Address)]
userLogEntries = do

[26.6632]

[12.59080]

userEvents :: S.Handler App App [LogEntry (NetworkId, Address)]
userEvents = do

Replacement in server/Aftok/Snaplet/WorkLog.hs at line 92 [26.5424]

B:BD[9.5069] → [12.59142:59348]

B:BD[12.59348] → [7.14964:15050]

∅:D[7.15050] → [19.12987:13024]

∅:D[12.59425] → [19.12987:13024]

B:BD[27.8589] → [19.12987:13024]

∅:D[19.13024] → [9.5385:5386]

B:BD[9.5385] → [9.5385:5386]

B:BD[9.5386] → [4.8707:8862]

  ival      <- case endpoints of
    (Just s , Just e ) -> pure $ During s e
    (Nothing, Just e ) -> pure $ Before e
    (Just s , Nothing) -> pure $ After s
    (Nothing, Nothing) -> snapError
      400
      "You must specify at least one of the \"after\" or \"before\" query parameters"
  snapEval $ findEvents pid uid ival
userLatestEntries :: S.Handler App App [LogEntry (NetworkId, Address)]
userLatestEntries = do
  uid       <- requireUserId
  pid       <- requireProjectId

[9.5069]

[4.8862]

  let ival = case endpoints of
        (Just s , Just e ) -> During s e
        (Nothing, Just e ) -> Before e
        (Just s , Nothing) -> After s
        (Nothing, Nothing) -> Always

Replacement in server/Aftok/Snaplet/WorkLog.hs at line 98 [26.5424]
B:BD[4.8914] → [4.8914:8958]
```
  snapEval $ findLatestEvents pid uid limit
```
[4.8914]
[4.8958]
```
  snapEval $ findEvents pid uid ival limit
```
Replacement in server/Aftok/Snaplet/WorkLog.hs at line 102 [26.5424]
B:BD[7.15135] → [7.15135:15166]
```
  workIndex <$> userLogEntries
```
[7.15135]
[7.15166]
```
  workIndex <$> userEvents
```

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

B:BD[7.15275] → [7.15275:15343]

      serveJSON (workIndexJSON nmode) $ method GET projectWorkIndex

[7.15275]

[4.8961]

      serveJSON (workIndexJSON nmode) (method GET projectWorkIndex)

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

B:BD[7.15608] → [7.15608:15706]

    userLogEntriesRoute =
      serveJSON (fmap $ logEntryJSON nmode) $ method GET userLogEntries

[7.15608]

[7.15706]

    userEventsRoute =
      serveJSON (fmap $ logEntryJSON nmode) $ method GET userEvents

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

B:BD[7.16099] → [7.16099:16169]

    , ("user/projects/:projectId/logEntries"   , userLogEntriesRoute)

[7.16099]

[7.16169]

    , ("user/projects/:projectId/events"       , userEventsRoute)