nuttycom/aftok - Change RPAJLHMTUJU4AYNBOHVGHGGB4NY2NLY3BVPYN5FMWB3ZIMAUQHCQC

Change to use UUIDs instead of ints for primary keys.

Created by Kris Nuttycombe on May 12, 2015

RPAJLHMTUJU4AYNBOHVGHGGB4NY2NLY3BVPYN5FMWB3ZIMAUQHCQC

Dependencies

In channels

main

Change contents

Insertion in lib/Quixotic/Auction.hs at line 8 [6.5084]
[4.43]
[5.3]
```
import Data.UUID
```

Replacement in lib/Quixotic/Auction.hs at line 13 [6.5084]

B:BD[6.5214] → [7.3:59]

newtype AuctionId = AuctionId Int64 deriving (Show, Eq)

[6.5214]

[5.28]

newtype AuctionId = AuctionId UUID deriving (Show, Eq)

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 23 [5.456]
[5.1077]
[5.1077]
```
import Quixotic.Interval
```

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 112 [5.456]

[5.2484]

newtype PUTCTime = PUTCTime C.UTCTime 
instance ToField PUTCTime where
  toField (PUTCTime t) = toField $ fromThyme t

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 166 [5.456]
B:BD[8.1043] → [8.1043:1073]
```
    , fromThyme $ eventTime e
```
[8.1043]
[8.1073]
```
    , fromThyme $ e ^. eventTime
```

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 171 [5.456]

[5.3406]

[9.1715]

findEvents' :: ProjectId -> UserId -> Interval' -> QDBM [LogEntry]
findEvents' (ProjectId pid) (UserId uid) ival =
  let q (Before e) = pquery
        "SELECT btc_addr, event_type, event_time, event_metadata FROM work_events \
        \WHERE project_id = ? AND user_id = ? AND event_time <= ?" 
        (pid, uid, PUTCTime e)
      q (During s e) = pquery
        "SELECT btc_addr, event_type, event_time, event_metadata FROM work_events \
        \WHERE project_id = ? AND user_id = ? \
        \AND event_time >= ? AND event_time <= ?" 
        (pid, uid, PUTCTime s, PUTCTime e)
      q (After s) = pquery
        "SELECT btc_addr, event_type, event_time, event_metadata FROM work_events \
        \WHERE project_id = ? AND user_id = ? AND event_time >= ?" 
        (pid, uid, PUTCTime s)
  in  fmap pLogEntry <$> q ival

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 207 [5.456]

B:BD[9.2411] → [10.304:405]

    "SELECT btc_addr, event_type, event_time, event_metadata from work_events WHERE project_id = ?"

[9.2411]

[11.740]

    "SELECT btc_addr, event_type, event_time, event_metadata FROM work_events WHERE project_id = ?"

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 296 [5.456]
[9.3066]
[5.5618]
```
  , findEvents = findEvents'
```
Insertion in lib/Quixotic/Database.hs at line 10 [12.4936]
[11.1388]
[12.5020]
```
import Quixotic.Interval
```

Insertion in lib/Quixotic/Database.hs at line 28 [12.4936]

[9.3190]

[13.296]

  , findEvents    :: ProjectId -> UserId -> Interval' -> m [LogEntry]

Insertion in lib/Quixotic/Interval.hs at line 5 [14.1422]
[2.48]
[9.3192]
```
  , Interval'(..), interval', start', end'
```

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

[15.130]

[11.1840]


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

Insertion in lib/Quixotic/Interval.hs at line 29 [14.1422]
[11.1887]
[16.115]
```
makeLenses ''Interval'
```

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

[15.132]

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

Replacement in lib/Quixotic/Json.hs at line 63 [17.19]

B:BD[3.1573] → [3.1573:1630]

  object [ "projectId" .= (qp ^. (projectId._ProjectId))

[3.1573]

[3.1630]

  object [ "projectId" .= (tshow $ qp ^. (projectId._ProjectId))

Replacement in lib/Quixotic/Json.hs at line 71 [17.19]

B:BD[9.5417] → [9.5417:5477]

         , "initiator"      .= (p ^. (initiator._UserId)) ]

[9.5417]

[11.2560]

         , "initiator"      .= (tshow $ p ^. (initiator._UserId)) ]

Insertion in lib/Quixotic/Json.hs at line 86 [17.19]

[3.2133]


logEntryJSON :: LogEntry -> Value
logEntryJSON (LogEntry a ev m) = 
  object [ "btcAddr"   .= (a ^. _BtcAddr)
         , "eventType" .= eventName ev
         , "eventTime" .= (ev ^. eventTime)
         , "eventMeta" .= m
         ]

Replacement in lib/Quixotic/TimeLog.hs at line 8 [18.846]
∅:D[8.1130] → [7.3569:3594]
B:BD[7.3569] → [7.3569:3594]
```
  , eventName, nameEvent
```
[8.1130]
[3.2136]
```
  , eventName, nameEvent, eventTime
```

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

B:BD[18.1225] → [8.1131:1237]

data LogEvent = StartWork { eventTime :: C.UTCTime }
              | StopWork  { eventTime :: C.UTCTime }

[18.1225]

[8.1237]

data LogEvent = StartWork { _eventTime :: C.UTCTime }
              | StopWork  { _eventTime :: C.UTCTime }

Replacement in lib/Quixotic/TimeLog.hs at line 40 [18.846]
B:BD[8.1271] → [8.1271:1293]
```
makePrisms ''LogEvent
```
[8.1271]
[12.5414]
```
makeLenses ''LogEvent
```
Insertion in lib/Quixotic.hs at line 8 [18.2457]
[19.1838]
[11.2691]
```
import Data.UUID
```
Replacement in lib/Quixotic.hs at line 17 [18.2457]
B:BD[18.2764] → [11.2721:2771]
```
newtype UserId = UserId Int64 deriving (Show, Eq)
```
[18.2764]
[11.2771]
```
newtype UserId = UserId UUID deriving (Show, Eq)
```

Replacement in lib/Quixotic.hs at line 30 [18.2457]

B:BD[20.1911] → [11.2985:3041]

newtype ProjectId = ProjectId Int64 deriving (Show, Eq)

[20.1911]

[11.3041]

newtype ProjectId = ProjectId UUID deriving (Show, Eq)

Replacement in payouts/Main.hs at line 38 [22.1503]
∅:D[21.541] → [22.2173:2223]
B:BD[22.2173] → [22.2173:2223]
```
  cfg <- C.load [C.Required (fpToString cfgFile)]
```
[21.541]
[21.542]
```
  cfg <- C.load [C.Required cfgFile]
```

Replacement in quixotic.cabal at line 32 [12.1]

B:BD[4.1607] → [4.1607:1650]

B:BD[4.1667] → [4.1667:1742]

B:BD[4.1742] → [23.1104:1143]

B:BD[23.1143] → [24.1214:1252]

      base                 >= 4     && < 5
    , classy-prelude       >= 0.10.1
    , aeson                >= 0.8.0.2
    , attoparsec           >= 0.12.1.2
    , base64-bytestring    >= 1.0.0.1

[4.1607]

[22.3072]

      base                >= 4     && < 5
    , classy-prelude      >= 0.10.1
    , aeson               >= 0.8.0.2
    , attoparsec          >= 0.12.1.2
    , base64-bytestring   >= 1.0.0.1

Replacement in quixotic.cabal at line 38 [12.1]
B:BD[22.3089] → [24.1253:1281]
```
    , blaze-builder        
```
[22.3089]
[23.1144]
```
    , blaze-builder       
```

Replacement in quixotic.cabal at line 40 [12.1]

∅:D[23.1161] → [4.1780:1818]

∅:D[22.3089] → [4.1780:1818]

B:BD[4.1780] → [4.1780:1818]

B:BD[4.1818] → [21.1014:1047]

∅:D[21.1047] → [4.1818:1854]

B:BD[4.1818] → [4.1818:1854]

B:BD[7.5084] → [7.5084:5120]

B:BD[7.5120] → [24.1282:1474]

    , containers           >= 0.5.5.1
    , configurator              
    , either               >= 4.3.1
    , errors               >= 1.4.7
    , groups               >= 0.4
    , heaps                >= 0.3.1
    , hourglass            >= 0.2.6    && < 0.3
    , lens                 >= 4.4.0.2
    , network-bitcoin      >= 1.7.0

[23.1161]

[4.1892]

    , containers          >= 0.5.5.1
    , configurator             
    , either              >= 4.3.1
    , errors              >= 1.4.7
    , groups              >= 0.4
    , heaps               >= 0.3.1
    , hourglass           >= 0.2.6    && < 0.3
    , lens                >= 4.4.0.2
    , network-bitcoin     >= 1.7.0

Replacement in quixotic.cabal at line 50 [12.1]

B:BD[7.5169] → [5.7275:7323]

B:BD[5.7323] → [24.1475:1511]

    , postgresql-simple    >= 0.4.9    && < 0.5
    , safe                 >= 0.3.8

[4.1909]

[24.1511]

    , postgresql-simple   >= 0.4.9    && < 0.5
    , safe                >= 0.3.8

Replacement in quixotic.cabal at line 53 [12.1]

B:BD[24.1528] → [24.1528:1576]

    , sqlite-simple        >= 0.4.8    && < 0.5

[24.1528]

[24.1576]

    , sqlite-simple       >= 0.4.8    && < 0.5

Replacement in quixotic.cabal at line 55 [12.1]
∅:D[24.1599] → [4.1947:1981]
∅:D[7.5169] → [4.1947:1981]
∅:D[5.7351] → [4.1947:1981]
B:BD[4.1947] → [4.1947:1981]
B:BD[4.1981] → [25.2850:2886]
```
    , text                 >= 1.2
    , thyme                >= 0.3.5
```
[24.1599]
[25.2887]
```
    , text                >= 1.2
    , thyme               >= 0.3.5
    , uuid                >= 1.3.10
```
Insertion in quixotic.cabal at line 105 [12.1]
[26.161]
[26.161]
```
    , iso8601-time
```

Replacement in server/Main.hs at line 50 [27.5188]

B:BD[5.8568] → [5.8568:8653]

           initCookieSessionManager (fpToString authSiteKey) "quookie" cookieTimeout

[5.8568]

[5.8653]

           initCookieSessionManager authSiteKey "quookie" cookieTimeout

Replacement in server/Main.hs at line 58 [27.5188]

B:BD[3.2480] → [3.2480:2569]

      loggedIntervalsRoute = serveJSON workIndexJSON $ method GET loggedIntervalsHandler

[3.2480]

[3.2569]

      logEntriesRoute    = serveJSON (fmap logEntryJSON) $ method GET logEntriesHandler
      logIntervalsRoute  = serveJSON workIndexJSON $ method GET loggedIntervalsHandler
      --amendEventRoute    = void $ method PUT amendEventHandler

Insertion in server/Main.hs at line 70 [27.5188]

[3.2968]

            --, ("events/:eventId/amend", amendEventHandler),

Replacement in server/Main.hs at line 72 [27.5188]

B:BD[3.3049] → [3.3049:3299]

            , ("projects/:projectId/logEnd/:btcAddr", logEventRoute StopWork) 
            , ("projects/:projectId/log/:btcAddr", loggedIntervalsRoute)
            , ("projects/:projectId", projectRoute)
            , ("projects", listProjectsRoute)

[3.3049]

[3.3299]

            , ("projects/:projectId/logEnd/:btcAddr",   logEventRoute StopWork) 
            , ("projects/:projectId/logEntries",        logEntriesRoute)
            , ("projects/:projectId/intervals",         logIntervalsRoute)

Replacement in server/Main.hs at line 76 [27.5188]

B:BD[3.3346] → [3.3346:3397]

            , ("payouts/:projectId", payoutsRoute)

[3.3346]

[5.8999]

            , ("projects", listProjectsRoute)
            , ("projects/:projectId", projectRoute)
            , ("projects/:projectId/payouts", payoutsRoute)

Replacement in server/Main.hs at line 84 [27.5188]
∅:D[28.495] → [29.505:555]
B:BD[30.379] → [29.505:555]
```
  cfg <- C.load [C.Required (fpToString cfgFile)]
```
[28.495]
[28.496]
```
  cfg <- C.load [C.Required cfgFile]
```

Replacement in server/Main.hs at line 91 [27.5188]

B:BD[31.143] → [5.9052:9110]

          <*> (fmap fpFromText $ C.require cfg "siteKey")

[31.143]

[5.9110]

          <*>  C.require cfg "siteKey"

Replacement in server/Quixotic/Snaplet/Auth.hs at line 41 [32.203]

B:BD[32.2162] → [32.2162:2252]

requireProjectAccess :: UserId -> Handler App App ProjectId
requireProjectAccess uid = do

[32.2162]

[23.2062]

requireProjectAccess :: Handler App App (UserId, ProjectId)
requireProjectAccess = do

Insertion in server/Quixotic/Snaplet/Auth.hs at line 48 [32.203]
[23.2120]
[23.2120]
```
      uid <- requireUserId
```
Replacement in server/Quixotic/Snaplet/Auth.hs at line 51 [32.203]
B:BD[23.2233] → [23.2233:2255]
```
        then pure pid
```
[23.2233]
[23.2255]
```
        then pure (uid, pid)
```
Replacement in server/Quixotic/Snaplet/Projects.hs at line 43 [23.2363]
B:BD[3.3507] → [3.3507:3564]
```
  uid <- requireUserId
  pid <- requireProjectAccess uid
```
[3.3507]
[3.3564]
```
  pid <- fmap snd requireProjectAccess
```

File addition: Util.hs (----------)

[32.182]

module Quixotic.Snaplet.Util where
import ClassyPrelude 
import Control.Monad.Trans.Maybe
import Data.ByteString.Char8 as B
import Data.Time.ISO8601
import Data.Thyme.Time
import Data.Thyme.Clock as C
import Snap.Core
timeParam :: MonadSnap m => ByteString -> m (Maybe C.UTCTime)
timeParam k = runMaybeT $ do
  bs <- MaybeT $ getParam k
  t <- MaybeT . pure . parseISO8601 $ B.unpack bs
  pure $ toThyme t

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 12 [33.5424]
[33.5683]
[33.5704]
```
import Quixotic.Interval
```
Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 17 [33.5424]
[32.3340]
[33.5755]
```
import Quixotic.Snaplet.Util
```
Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 26 [33.5424]
B:BD[33.5971] → [32.3370:3427]
```
  uid <- requireUserId
  pid <- requireProjectAccess uid
```
[33.5971]
[33.5971]
```
  (uid, pid) <- requireProjectAccess
```

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 31 [33.5424]

B:BD[8.3324] → [3.3688:3758]

      storeEv addr = runReaderT . createEvent pid uid $ logEntry addr

[8.3324]

[33.6163]

      storeEv addr  = runReaderT . createEvent pid uid $ logEntry addr

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 39 [33.5424]
B:BD[33.6474] → [32.3457:3515]
```
  uid <- requireUserId 
  pid <- requireProjectAccess uid
```
[33.6474]
[34.1619]
```
  pid <- fmap snd requireProjectAccess
```

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 42 [33.5424]

[33.6632]

[34.1662]

logEntriesHandler :: Handler App App [LogEntry]
logEntriesHandler = do
  QDB{..} <- view qdb <$> with qm get
  (uid, pid) <- requireProjectAccess
  endpoints <- (,) <$> timeParam "after" <*> timeParam "before"
  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 at least one of the \"after\" or \"before\" query parameter"
  liftPG . runReaderT $ findEvents pid uid ival

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 57 [33.5424]
B:BD[33.6744] → [32.3672:3730]
```
  uid <- requireUserId 
  pid <- requireProjectAccess uid
```
[33.6744]
[32.3730]
```
  pid <- fmap snd requireProjectAccess
```
Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 62 [33.5424]
[32.3782]
```
-- amendEventHandler :: Handler App App AmendmentId
```

Change to use UUIDs instead of ints for primary keys.

Dependencies

In channels

Change contents

Insertion in lib/Quixotic/Auction.hs at line 8 [6.5084]

Replacement in lib/Quixotic/Auction.hs at line 13 [6.5084]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 23 [5.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 112 [5.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 166 [5.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 171 [5.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 207 [5.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 296 [5.456]

Insertion in lib/Quixotic/Database.hs at line 10 [12.4936]

Insertion in lib/Quixotic/Database.hs at line 28 [12.4936]

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

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

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

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

Replacement in lib/Quixotic/Json.hs at line 63 [17.19]

Replacement in lib/Quixotic/Json.hs at line 71 [17.19]

Insertion in lib/Quixotic/Json.hs at line 86 [17.19]

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

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

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

Insertion in lib/Quixotic.hs at line 8 [18.2457]

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

Replacement in lib/Quixotic.hs at line 30 [18.2457]

Replacement in payouts/Main.hs at line 38 [22.1503]

Replacement in quixotic.cabal at line 32 [12.1]

Replacement in quixotic.cabal at line 38 [12.1]

Replacement in quixotic.cabal at line 40 [12.1]

Replacement in quixotic.cabal at line 50 [12.1]

Replacement in quixotic.cabal at line 53 [12.1]

Replacement in quixotic.cabal at line 55 [12.1]

Insertion in quixotic.cabal at line 105 [12.1]

Replacement in server/Main.hs at line 50 [27.5188]

Replacement in server/Main.hs at line 58 [27.5188]

Insertion in server/Main.hs at line 70 [27.5188]

Replacement in server/Main.hs at line 72 [27.5188]

Replacement in server/Main.hs at line 76 [27.5188]

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

Replacement in server/Main.hs at line 91 [27.5188]

Replacement in server/Quixotic/Snaplet/Auth.hs at line 41 [32.203]

Insertion in server/Quixotic/Snaplet/Auth.hs at line 48 [32.203]

Replacement in server/Quixotic/Snaplet/Auth.hs at line 51 [32.203]

Replacement in server/Quixotic/Snaplet/Projects.hs at line 43 [23.2363]

File addition: Util.hs (----------)

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 12 [33.5424]

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 17 [33.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 26 [33.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 31 [33.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 39 [33.5424]

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 42 [33.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 57 [33.5424]

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 62 [33.5424]