nuttycom/aftok - Change Z7KS5XHHC6PAMTVBHXY7KUSS3BWAOU6FSYIITUCFOOJZU4OUJHBAC

Very WIP. Wow.

Created by Kris Nuttycombe on January 26, 2015

Z7KS5XHHC6PAMTVBHXY7KUSS3BWAOU6FSYIITUCFOOJZU4OUJHBAC

Dependencies

In channels

main

Change contents

File deletion: Projects.hs

BF:BFD[6.18] → [5.1500:1535]

BF:BFD[5.1535] → [5.664:664]

B:BD[5.664] → [5.665:1499]

{-# LANGUAGE TemplateHaskell #-}
module Quixotic.Projects where
import ClassyPrelude
import Control.Lens
import Network.Bitcoin
import Quixotic
import Quixotic.Users
newtype ProjectId = ProjectId Int64 deriving (Show, Eq)
makePrisms ''ProjectId
data Project = Project
  { _projectName :: Text
  , _inceptionDate :: UTCTime
  , _initiator :: UserId
  }
makeLenses ''Project
data Invitation = Invitation
  { _projectId :: ProjectId
  , _currentMember :: UserId
  , _sentAt :: UTCTime
  , _toAddr   :: BtcAddr
  , _amount :: BTC
  }
makeLenses ''Invitation
data Acceptance = Acceptance
  { _acceptedInvitation :: Int64
  , _blockHeight :: Integer
  , _observedAt :: UTCTime
  }
makeLenses ''Acceptance
data Cancellation = Cancellation
  { _cancelledInvitation :: Int64
  , _requestedAt :: UTCTime
  }
makeLenses ''Cancellation

File deletion: Users.hs
BF:BFD[6.18] → [7.6160:6192]
BF:BFD[7.6192] → [7.5932:5932]
B:BD[7.6008] → [8.1493:1526]
∅:D[8.1526] → [7.6008:6059]
B:BD[7.6008] → [7.6008:6059]
∅:D[9.1206] → [7.6059:6060]
B:BD[7.6059] → [7.6059:6060]
∅:D[9.1255] → [7.6088:6089]
∅:D[8.1598] → [7.6088:6089]
∅:D[10.7086] → [7.6088:6089]
B:BD[7.6088] → [7.6088:6089]
B:BD[7.6089] → [10.7087:7163]
∅:D[10.7163] → [7.6089:6106]
B:BD[7.6089] → [7.6089:6106]
∅:D[8.1650] → [7.6155:6159]
B:BD[7.6155] → [7.6155:6159]
B:BD[8.1652] → [8.1652:1670]
B:BD[8.1670] → [10.7219:7220]
∅:D[10.7218] → [8.1627:1650]
B:BD[8.1627] → [8.1627:1650]
B:BD[7.6106] → [10.7164:7218]
B:BD[7.6060] → [8.1548:1598]
B:BD[8.1598] → [10.7066:7086]
B:BD[7.6059] → [8.1527:1547]
∅:D[8.1547] → [9.1190:1206]
B:BD[7.6059] → [9.1190:1206]
```
{-# LANGUAGE TemplateHaskell #-}
module Quixotic.Users where
import ClassyPrelude
newtype UserName = UserName Text deriving (Show, Eq)
makePrisms ''UserName
data User = User
  }
makeLenses ''User
  , _userEmail :: Text
  { _username :: UserName
  , _userAddress :: BtcAddr
newtype UserId = UserId Int64 deriving (Show, Eq)
makePrisms ''UserId
import Control.Lens
import Quixotic
```
Replacement in lib/Quixotic/Auction.hs at line 3 [7.5084]
B:BD[7.5161] → [5.73:104]
```
module Quixotic.Auctions where
```
[7.5161]
[7.5191]
```
module Quixotic.Auction where
```
Replacement in lib/Quixotic/Auction.hs at line 10 [7.5084]
∅:D[10.27] → [9.59:81]
B:BD[9.59] → [9.59:81]
```
import Quixotic.Users
```
[10.27]
[7.5213]
```
import Quixotic
```

Replacement in lib/Quixotic/Client.hs at line 27 [11.1]

B:BD[11.444] → [11.444:506]

  pure . runPayoutsResponse $ payoutsResponse ^. responseBody

[11.444]

[11.506]

  pure $ payoutsResponse ^. (responseBody . _PayoutsJ)

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 18 [10.456]
B:BD[10.1028] → [5.107:132]
```
import Quixotic.Auctions
```
[10.1028]
[10.1052]
```
import Quixotic.Auction
```
Deletion in lib/Quixotic/Database/PostgreSQL.hs at line 21 [10.456]
B:BD[10.1101] → [10.1101:1123]
```
import Quixotic.Users
```

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 65 [10.456]

[10.2338]

[12.161]

newtype PPid = PPid ProjectId
instance ToField PPid where
  toField (PPid (ProjectId i)) = toField i

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 96 [10.456]

∅:D[12.314] → [10.3062:3172]

B:BD[10.3062] → [10.3062:3172]

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

[12.314]

[10.3172]

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

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 100 [10.456]

B:BD[10.3216] → [10.3216:3321]

    "INSERT INTO work_events (user_id, btc_addr, event_type, event_time) VALUES (?, ?, ?, ?)" 
    ( uid

[10.3216]

[10.3321]

    "INSERT INTO work_events (project_id, user_id, btc_addr, event_type, event_time) VALUES (?, ?, ?, ?, ?)" 
    ( pid, uid

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 107 [10.456]

B:BD[10.3406] → [10.3406:3476]

readWorkIndex' :: ReaderT Connection IO WorkIndex
readWorkIndex' = do

[10.3406]

[10.3476]

readWorkIndex' :: ProjectId -> ReaderT Connection IO WorkIndex
readWorkIndex' pid = do

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 110 [10.456]

B:BD[10.3490] → [10.3490:3583]

  rows <- lift $ query_ conn
    "SELECT btc_addr, event_type, event_time from work_events"

[10.3490]

[10.3583]

  rows <- lift $ query conn
    "SELECT btc_addr, event_type, event_time from work_events WHERE project_id = ?" 
    (Only $ PPid pid)

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

B:BD[10.3625] → [10.3625:3704]

newAuction' :: Auction -> ReaderT Connection IO AuctionId
newAuction' auc = do

[10.3625]

[10.3704]

newAuction' :: ProjectId -> Auction -> ReaderT Connection IO AuctionId
newAuction' pid auc = do

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 119 [10.456]

B:BD[10.3748] → [10.3748:3881]

    "INSERT INTO auctions (raise_amount, end_time) VALUES (?, ?) RETURNING id"
    (auc ^. (raiseAmount.to PBTC), auc ^. auctionEnd)

[10.3748]

[10.3881]

    "INSERT INTO auctions (project_id, raise_amount, end_time) VALUES (?, ?, ?) RETURNING id"
    (pid ^. (_ProjectId), auc ^. (raiseAmount.to PBTC), auc ^. auctionEnd)

Insertion in lib/Quixotic/Database/SQLite.hs at line 15 [14.3612]
[5.159]
[13.4]
```
import Quixotic.Projects
```

Replacement in lib/Quixotic/Database/SQLite.hs at line 65 [14.3612]

B:BD[10.6134] → [10.6134:6227]

recordEvent' :: UserId -> LogEntry -> ReaderT Connection IO ()
recordEvent' _ logEntry = do

[10.6134]

[15.1580]

recordEvent' :: ProjectId -> UserId -> LogEntry -> ReaderT Connection IO ()
recordEvent' _ _ logEntry = do

Replacement in lib/Quixotic/Database/SQLite.hs at line 72 [14.3612]

B:BD[16.885] → [15.1737:1807]

readWorkIndex' :: ReaderT Connection IO WorkIndex
readWorkIndex' = do

[16.885]

[15.1807]

readWorkIndex' :: ProjectId -> ReaderT Connection IO WorkIndex
readWorkIndex' _ = do

Replacement in lib/Quixotic/Database/SQLite.hs at line 79 [14.3612]

B:BD[17.417] → [15.1970:2049]

newAuction' :: Auction -> ReaderT Connection IO AuctionId
newAuction' auc = do

[17.417]

[15.2049]

newAuction' :: ProjectId -> Auction -> ReaderT Connection IO AuctionId
newAuction' _ auc = do

Replacement in lib/Quixotic/Database.hs at line 8 [14.4936]
B:BD[10.6577] → [5.161:211]
```
import Quixotic.Auctions
import Quixotic.Projects
```
[10.6577]
[14.5020]
```
import Quixotic
import Quixotic.Auction
```
Deletion in lib/Quixotic/Database.hs at line 11 [14.4936]
B:BD[14.5044] → [5.212:234]
```
import Quixotic.Users
```

Insertion in lib/Quixotic/Database.hs at line 17 [14.4936]

[10.6668]


data QDBProject = QDBProject
  { _projectId :: ProjectId
  , _project :: Project
  }
makeLenses ''QDBProject

Replacement in lib/Quixotic/Database.hs at line 28 [14.4936]

B:BD[5.399] → [5.399:578]

  , readAuction   :: ProjectId -> AuctionId -> m (Maybe Auction)
  , recordBid     :: ProjectId -> AuctionId -> Bid -> m ()
  , readBids      :: ProjectId -> AuctionId -> m [Bid]

[5.399]

[5.578]

  , readAuction   :: AuctionId -> m (Maybe Auction)
  , recordBid     :: AuctionId -> Bid -> m ()
  , readBids      :: AuctionId -> m [Bid]

Insertion in lib/Quixotic/Database.hs at line 34 [14.4936]
[12.855]
[14.5159]
```
  , findUserProjects :: UserId -> m [QDBProject]
```
Replacement in lib/Quixotic/Interval.hs at line 1 [18.1422]
B:BD[18.1422] → [19.429:464]
B:BD[19.464] → [20.60:95]
```
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
```
[18.1422]
[19.464]
```
{-# LANGUAGE TemplateHaskell #-}
```
Replacement in lib/Quixotic/Interval.hs at line 8 [18.1422]
B:BD[19.487] → [20.96:114]
```
import Data.Aeson
```
[19.487]
[18.1494]
```
import Control.Lens
```

Replacement in lib/Quixotic/Interval.hs at line 13 [18.1422]

B:BD[18.1545] → [18.1545:1634]

data Interval = Interval { start :: UTCTime
                         , end   :: UTCTime

[18.1545]

[18.1634]

data Interval = Interval { _start :: UTCTime
                         , _end   :: UTCTime

Insertion in lib/Quixotic/Interval.hs at line 16 [18.1422]
[18.1681]
[20.115]
```
makeLenses ''Interval                         
```

Deletion in lib/Quixotic/Interval.hs at line 18 [18.1422]

B:BD[20.116] → [20.116:212]

∅:D[20.212] → [18.1681:1682]

B:BD[18.1681] → [18.1681:1682]

B:BD[18.1682] → [20.213:335]

instance ToJSON Interval where
  toJSON (Interval s e) = 
    object ["start" .= s, "end" .= e]
instance FromJSON Interval where
  parseJSON (Object v) = Interval <$> v .: "start" <*> v .: "end"
  parseJSON _ = mzero

Replacement in lib/Quixotic/Interval.hs at line 22 [18.1422]
B:BD[21.81] → [21.81:120]
```
ilen i = diffUTCTime (end i) (start i)
```
[21.81]
[21.120]
```
ilen i = diffUTCTime (_end i) (_start i)
```

Replacement in lib/Quixotic/Json.hs at line 1 [22.19]

B:BD[22.19] → [22.20:127]

{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}

[22.19]

[22.127]

{-# LANGUAGE TemplateHaskell #-}

Replacement in lib/Quixotic/Json.hs at line 6 [22.19]
B:BD[22.177] → [22.177:197]
```
import Control.Lens
```
[22.177]
[22.197]
```
import Control.Lens hiding ((.=))
```
Insertion in lib/Quixotic/Json.hs at line 12 [22.19]
[22.248]
[22.248]
```
import Quixotic.Interval
```

Replacement in lib/Quixotic/Json.hs at line 15 [22.19]

B:BD[22.273] → [11.545:621]

newtype PayoutsResponse = PayoutsResponse { runPayoutsResponse :: Payouts }

[22.273]

[22.323]

newtype PayoutsJ = PayoutsJ Payouts 
makePrisms ''PayoutsJ

Replacement in lib/Quixotic/Json.hs at line 18 [22.19]

B:BD[22.324] → [22.324:362]

B:BD[22.362] → [11.622:654]

instance ToJSON PayoutsResponse where
  toJSON (PayoutsResponse p) =

[22.324]

[11.654]

instance ToJSON PayoutsJ where
  toJSON (PayoutsJ p) =

Replacement in lib/Quixotic/Json.hs at line 22 [22.19]
B:BD[22.485] → [11.691:731]
```
instance FromJSON PayoutsResponse where
```
[22.485]
[11.731]
```
instance FromJSON PayoutsJ where
```

Replacement in lib/Quixotic/Json.hs at line 24 [22.19]

B:BD[11.748] → [11.748:807]

    fmap (PayoutsResponse . mapKeys BtcAddr) $ parseJSON v

[11.748]

[22.485]

    PayoutsJ . mapKeys BtcAddr <$> parseJSON v
newtype IntervalJ = IntervalJ Interval
makePrisms ''IntervalJ
instance ToJSON IntervalJ where
  toJSON (IntervalJ ival) = 
    object ["start" .= (ival ^. start), "end" .= (ival ^. end)]
instance FromJSON IntervalJ where
  parseJSON (Object v) = 
    fmap IntervalJ $ interval <$> v .: "start" <*> v .: "end"
  parseJSON _ = mzero

Insertion in lib/Quixotic/Json.hs at line 38 [22.19]
[22.486]

Replacement in lib/Quixotic/TimeLog.hs at line 129 [23.846]

B:BD[2.558] → [2.558:683]

      depreciation = depPct $ diffUTCTime ptime (end $ ival)
  in  fromRational $ depreciation * (toRational . ilen $ ival)

[2.558]

      depreciation = depPct $ diffUTCTime ptime (ival ^. end)
  in  fromRational $ depreciation * (toRational $ ilen ival)

Insertion in lib/Quixotic.hs at line 6 [23.2457]
[19.1149]
[24.1818]
Replacement in lib/Quixotic.hs at line 8 [23.2457]
∅:D[24.1838] → [25.1739:1787]
B:BD[23.2548] → [25.1739:1787]
```
import Data.Aeson
import Data.Aeson.Types as JV
```
[24.1838]
[23.2592]
```
import Network.Bitcoin (BTC)
```

Replacement in lib/Quixotic.hs at line 16 [23.2457]

B:BD[23.2764] → [25.1809:1910]

instance FromJSON BtcAddr where
  parseJSON (JV.String t) = return $ BtcAddr t
  parseJSON _ = mzero

[23.2764]

[25.1910]

newtype UserId = UserId Int64 deriving (Show, Eq)
makePrisms ''UserId
newtype UserName = UserName Text deriving (Show, Eq)
makePrisms ''UserName
data User = User
  { _username :: UserName
  , _userAddress :: BtcAddr
  , _userEmail :: Text
  }
makeLenses ''User

Replacement in lib/Quixotic.hs at line 29 [23.2457]

∅:D[25.1911] → [26.2531:2616]

B:BD[23.2764] → [26.2531:2616]

∅:D[26.2616] → [23.2845:2848]

B:BD[23.2845] → [23.2845:2848]

--instance FromField BtcAddr where
--  fromField f m = fmap BtcAddr $ fromField f m

[25.1911]

newtype ProjectId = ProjectId Int64 deriving (Show, Eq)
makePrisms ''ProjectId
data Project = Project
  { _projectName :: Text
  , _inceptionDate :: UTCTime
  , _initiator :: UserId
  }
makeLenses ''Project
data Invitation = Invitation
  { _projectId :: ProjectId
  , _currentMember :: UserId
  , _sentAt :: UTCTime
  , _expiresAt :: UTCTime
  , _toAddr :: BtcAddr
  , _amount :: BTC
  }
makeLenses ''Invitation
newtype InvitationId = InvitationId Int64
data Acceptance = Acceptance
  { _acceptedInvitation :: InvitationId
  , _blockHeight :: Integer
  , _observedAt :: UTCTime
  }
makeLenses ''Acceptance

Insertion in quixotic.cabal at line 23 [14.1]
[14.585]
[11.1009]
```
                      Quixotic.Auction
```
Deletion in quixotic.cabal at line 26 [14.1]
B:BD[14.625] → [14.625:672]
```
                      Quixotic.Database.SQLite
```

Deletion in quixotic.cabal at line 30 [14.1]

B:BD[14.751] → [5.1537:1617]

∅:D[5.1617] → [12.857:894]

B:BD[14.751] → [12.857:894]

                      Quixotic.Auctions
                      Quixotic.Projects
                      Quixotic.Users

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

B:BD[27.867] → [27.867:929]

∅:D[27.929] → [10.8817:8878]

B:BD[10.8817] → [10.8817:8878]

B:BD[10.8878] → [3.107:216]

            , ("logStart/:btcAddr", logWorkHandler StartWork)
            , ("logEnd/:btcAddr",   logWorkHandler StopWork)
            , ("loggedIntervals/:btcAddr", loggedIntervalsHandler)
            , ("payouts", payoutsHandler)

[27.867]

[10.8999]

            , ("logStart/:projectId/:btcAddr", logWorkHandler StartWork)
            , ("logEnd/:projectId/:btcAddr",   logWorkHandler StopWork)
            , ("loggedIntervals/:projectId/:btcAddr", loggedIntervalsHandler)
            , ("projects/:projectId", ok)
            , ("payouts/:projectId", payoutsHandler)

Insertion in server/Quixotic/Api/Types.hs at line 13 [27.1088]
[27.1325]
[27.1325]
```
import Quixotic
```
Deletion in server/Quixotic/Api/Types.hs at line 17 [27.1088]
B:BD[27.1410] → [27.1410:1432]
```
import Quixotic.Users
```

Insertion in server/Quixotic/Api/Types.hs at line 61 [27.1088]

[27.2906]

checkProjectAccess :: ProjectId -> UserId -> Handler App App a
checkProjectAccess =

Deletion in server/Quixotic/Api/Users.hs at line 19 [27.3234]
B:BD[4.207] → [4.207:229]
```
import Quixotic.Users
```
Insertion in server/Quixotic/Api.hs at line 27 [27.5424]
[27.5971]
[27.5971]
```
  pid <- getParam "projectId"
  checkProjectAccess pid uid
```

Replacement in server/Quixotic/Api.hs at line 33 [27.5424]

B:BD[27.6087] → [27.6087:6163]

      storeEv addr = runReaderT . recordEvent uid $ LogEntry addr workEvent

[27.6087]

[27.6163]

      storeEv addr = runReaderT . recordEvent pid uid $ LogEntry addr workEvent

Replacement in server/Quixotic/Api.hs at line 51 [27.5424]

B:BD[27.6886] → [27.6886:6950]

  writeLBS . A.encode . PayoutsResponse $ payouts df ptime widx

[27.6886]

  writeLBS . A.encode . PayoutsJ $ payouts df ptime widx

Very WIP. Wow.

Dependencies

In channels

Change contents

File deletion: Projects.hs

File deletion: Users.hs

Replacement in lib/Quixotic/Auction.hs at line 3 [7.5084]

Replacement in lib/Quixotic/Auction.hs at line 10 [7.5084]

Replacement in lib/Quixotic/Client.hs at line 27 [11.1]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 18 [10.456]

Deletion in lib/Quixotic/Database/PostgreSQL.hs at line 21 [10.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 65 [10.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 96 [10.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 100 [10.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 107 [10.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 110 [10.456]

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

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 119 [10.456]

Insertion in lib/Quixotic/Database/SQLite.hs at line 15 [14.3612]

Replacement in lib/Quixotic/Database/SQLite.hs at line 65 [14.3612]

Replacement in lib/Quixotic/Database/SQLite.hs at line 72 [14.3612]

Replacement in lib/Quixotic/Database/SQLite.hs at line 79 [14.3612]

Replacement in lib/Quixotic/Database.hs at line 8 [14.4936]

Deletion in lib/Quixotic/Database.hs at line 11 [14.4936]

Insertion in lib/Quixotic/Database.hs at line 17 [14.4936]

Replacement in lib/Quixotic/Database.hs at line 28 [14.4936]

Insertion in lib/Quixotic/Database.hs at line 34 [14.4936]

Replacement in lib/Quixotic/Interval.hs at line 1 [18.1422]

Replacement in lib/Quixotic/Interval.hs at line 8 [18.1422]

Replacement in lib/Quixotic/Interval.hs at line 13 [18.1422]

Insertion in lib/Quixotic/Interval.hs at line 16 [18.1422]

Deletion in lib/Quixotic/Interval.hs at line 18 [18.1422]

Replacement in lib/Quixotic/Interval.hs at line 22 [18.1422]

Replacement in lib/Quixotic/Json.hs at line 1 [22.19]

Replacement in lib/Quixotic/Json.hs at line 6 [22.19]

Insertion in lib/Quixotic/Json.hs at line 12 [22.19]

Replacement in lib/Quixotic/Json.hs at line 15 [22.19]

Replacement in lib/Quixotic/Json.hs at line 18 [22.19]

Replacement in lib/Quixotic/Json.hs at line 22 [22.19]

Replacement in lib/Quixotic/Json.hs at line 24 [22.19]

Insertion in lib/Quixotic/Json.hs at line 38 [22.19]

Replacement in lib/Quixotic/TimeLog.hs at line 129 [23.846]

Insertion in lib/Quixotic.hs at line 6 [23.2457]

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

Replacement in lib/Quixotic.hs at line 16 [23.2457]

Replacement in lib/Quixotic.hs at line 29 [23.2457]

Insertion in quixotic.cabal at line 23 [14.1]

Deletion in quixotic.cabal at line 26 [14.1]

Deletion in quixotic.cabal at line 30 [14.1]

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

Insertion in server/Quixotic/Api/Types.hs at line 13 [27.1088]

Deletion in server/Quixotic/Api/Types.hs at line 17 [27.1088]

Insertion in server/Quixotic/Api/Types.hs at line 61 [27.1088]

Deletion in server/Quixotic/Api/Users.hs at line 19 [27.3234]

Insertion in server/Quixotic/Api.hs at line 27 [27.5424]

Replacement in server/Quixotic/Api.hs at line 33 [27.5424]

Replacement in server/Quixotic/Api.hs at line 51 [27.5424]