nuttycom/aftok - Change HALRDT2F22DAQ54M334YSKD2XJCAXDXEZPDKGMOWKH7XELBAS6MAC

Added initial auction create route.

Created by Kris Nuttycombe on March 6, 2016

HALRDT2F22DAQ54M334YSKD2XJCAXDXEZPDKGMOWKH7XELBAS6MAC

Dependencies

In channels

main

Change contents

Insertion in aftok.cabal at line 29 [4.1]
[3.393]
[3.393]
```
                      Aftok.Project
```
Deletion in aftok.cabal at line 54 [4.1]
B:BD[5.206] → [6.77:77]

Replacement in lib/Aftok/Auction.hs at line 20 [8.5084]

B:BD[7.239] → [2.129:158]

  { _raiseAmount  :: Satoshi

[7.239]

[2.158]

  { _initiator    :: UserId
  --, _createdAt    :: C.UTCTime
  , _raiseAmount  :: Satoshi
  --, _auctionStart :: C.UTCTime

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 21 [9.456]
B:BD[7.1583] → [7.1583:1614]
```
import           Aftok.Auction
```
[7.1583]
[7.1614]
```
import           Aftok.Auction as A
```
Insertion in lib/Aftok/Database/PostgreSQL.hs at line 24 [9.456]
[7.1678]
[7.1678]
```
import           Aftok.Project as P
```
Replacement in lib/Aftok/Database/PostgreSQL.hs at line 94 [9.456]
∅:D[7.2039] → [5.628:662]
B:BD[10.669] → [5.628:662]
```
  Auction <$> fieldWith btcParser
```
[7.2039]
[11.2144]
```
  Auction <$> fieldWith uidParser
          <*> fieldWith btcParser
```

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 215 [9.456]

B:BD[12.3057] → [12.3057:3162]

B:BD[12.3162] → [13.157:254]

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

[12.3057]

[9.5182]

      "INSERT INTO auctions (project_id, user_id, raise_amount, end_time) \
      \VALUES (?, ?, ?, ?) RETURNING id"
      ( pid ^. _ProjectId
      , auc ^. (A.initiator . _UserId)
      , auc ^. (raiseAmount.to fromSatoshi)
      , auc ^. (auctionEnd.to fromThyme)
      )

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 288 [9.456]

B:BD[12.4751] → [11.4292:4398]

      (p ^. projectName, p ^. (inceptionDate.to fromThyme), p ^. (initiator._UserId), toJSON $ p ^. depf)

[12.4751]

[14.946]

      (p ^. projectName, p ^. (inceptionDate.to fromThyme), p ^. (P.initiator . _UserId), toJSON $ p ^. depf)

Replacement in lib/Aftok/Database.hs at line 13 [4.4936]

B:BD[15.270] → [2.1119:1183]

import           Aftok.Auction (Auction, AuctionId, Bid, BidId)

[15.270]

[15.301]

import           Aftok.Project as P
import           Aftok.Auction as A

Replacement in lib/Aftok/Database.hs at line 90 [4.4936]

B:BD[12.7739] → [12.7739:7796]

  addUserToProject pid (p ^. initiator) (p ^. initiator)

[12.7739]

[12.7796]

  addUserToProject pid (p ^. P.initiator) (p ^. P.initiator)

Insertion in lib/Aftok/Database.hs at line 155 [4.4936]
[12.9333]
[14.1305]
```
-- Auction ops
```

Insertion in lib/Aftok/Database.hs at line 158 [4.4936]

[14.1306]

createAuction :: ProjectId -> Auction -> DBProg AuctionId
createAuction pid a = do
  withProjectAuth pid (a ^. A.initiator) $ CreateAuction pid a

Insertion in lib/Aftok/Json.hs at line 20 [16.19]
[15.1358]
[15.1358]
```
import           Aftok.Project
```

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

[3.679]

{-# LANGUAGE TemplateHaskell    #-}
module Aftok.Project where
import           ClassyPrelude
import           Control.Lens               (makeLenses, makePrisms)
import           Data.ByteString.Base64.URL as B64
import           Data.Thyme.Clock           as C
import           Data.UUID
import           OpenSSL.Random
import           Aftok
newtype ProjectId = ProjectId UUID deriving (Show, Eq)
makePrisms ''ProjectId
type ProjectName = Text
data Project = Project
  { _projectName   :: ProjectName
  , _inceptionDate :: C.UTCTime
  , _initiator     :: UserId
  , _depf          :: DepreciationFunction
  }
makeLenses ''Project
newtype InvitationCode = InvitationCode ByteString deriving (Eq)
makePrisms ''InvitationCode
randomInvCode :: IO InvitationCode
randomInvCode = InvitationCode <$> randBytes 32
parseInvCode :: Text -> Either String InvitationCode
parseInvCode t = do
  code <- B64.decode . encodeUtf8 $ t
  if length code == 32
    then Right $ InvitationCode code
    else Left "Invitation code appears to be invalid."
renderInvCode :: InvitationCode -> Text
renderInvCode (InvitationCode bs) = decodeUtf8 $ B64.encode bs
data Invitation = Invitation
  { _projectId      :: ProjectId
  , _invitingUser   :: UserId
  , _invitedEmail   :: Email
  , _invitationTime :: C.UTCTime
  , _acceptanceTime :: Maybe C.UTCTime
  }
makeLenses ''Invitation

Deletion in lib/Aftok.hs at line 12 [17.2457]
B:BD[7.5968] → [7.5968:6019]
```
import           Data.ByteString.Base64.URL as B64
```
Deletion in lib/Aftok.hs at line 13 [17.2457]
B:BD[7.6046] → [7.6046:6095]
```
import           Data.Thyme.Clock           as C
```
Deletion in lib/Aftok.hs at line 14 [17.2457]
B:BD[7.6122] → [7.6122:6154]
```
import           OpenSSL.Random
```
Deletion in lib/Aftok.hs at line 42 [17.2457]
∅:D[18.2984] → [19.1910:1911]
B:BD[19.1910] → [19.1910:1911]
B:BD[19.1911] → [20.2271:2326]
∅:D[20.2326] → [18.3041:3065]
B:BD[18.3041] → [18.3041:3065]
B:BD[18.3065] → [11.6911:6935]
∅:D[11.6935] → [18.3065:3088]
B:BD[18.3065] → [18.3065:3088]
B:BD[18.3088] → [7.6245:6279]
∅:D[7.6279] → [11.6968:7000]
B:BD[11.6968] → [11.6968:7000]
B:BD[11.7000] → [7.6280:6352]
∅:D[7.6352] → [18.3168:3194]
∅:D[12.10913] → [18.3168:3194]
B:BD[18.3168] → [18.3168:3194]
B:BD[18.3194] → [11.7001:7130]
B:BD[11.7130] → [21.189:237]
∅:D[21.237] → [18.3399:3400]
∅:D[11.7179] → [18.3399:3400]
B:BD[18.3399] → [18.3399:3400]
B:BD[18.3400] → [11.7180:7291]
B:BD[11.7291] → [21.238:261]
∅:D[21.261] → [11.7315:7407]
B:BD[11.7315] → [11.7315:7407]
∅:D[10.7025] → [18.3442:3443]
∅:D[11.7407] → [18.3442:3443]
B:BD[18.3442] → [18.3442:3443]
B:BD[18.3443] → [11.7408:7512]
B:BD[11.7512] → [7.6353:6474]
∅:D[7.6474] → [11.7625:7697]
B:BD[11.7625] → [11.7625:7697]
∅:D[11.7697] → [18.3567:3571]
B:BD[18.3567] → [18.3567:3571]
B:BD[18.3571] → [11.7698:7722]
```
newtype ProjectId = ProjectId UUID deriving (Show, Eq)
makePrisms ''ProjectId
type ProjectName = Text
data Project = Project
  { _projectName   :: ProjectName
  , _inceptionDate :: C.UTCTime
  , _initiator     :: UserId
  , _depf          :: DepreciationFunction
  }
makeLenses ''Project
newtype InvitationCode = InvitationCode ByteString deriving (Eq)
makePrisms ''InvitationCode
randomInvCode :: IO InvitationCode
randomInvCode = InvitationCode <$> randBytes 32
parseInvCode :: Text -> Either String InvitationCode
parseInvCode t = do
  code <- B64.decode . encodeUtf8 $ t
  if length code == 32
    then Right $ InvitationCode code
    else Left "Invitation code appears to be invalid."
renderInvCode :: InvitationCode -> Text
renderInvCode (InvitationCode bs) = decodeUtf8 $ B64.encode bs
data Invitation = Invitation
  { _projectId      :: ProjectId
  , _invitingUser   :: UserId
  , _invitedEmail   :: Email
  , _invitationTime :: C.UTCTime
  , _acceptanceTime :: Maybe C.UTCTime
  }
makeLenses ''Invitation
```

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

[3.2082]

{-# LANGUAGE TemplateHaskell #-}
module Aftok.Snaplet.Auctions
  ( auctionCreateHandler
  ) where
import           ClassyPrelude
import           Data.Aeson
import           Data.Aeson.Types
import           Data.Thyme.Clock   as C
--import           Data.Thyme.Format.Aeson ()
import           Aftok.Database     (createAuction)
import           Aftok.Auction      (AuctionId, Auction(..))
import           Aftok.Json
import           Aftok.Types
import           Aftok.Snaplet
import           Aftok.Snaplet.Auth
import           Snap.Snaplet
data AuctionCreateRequest = CA { raiseAmount :: Word64, auctionEnd :: C.UTCTime }
auctionCreateParser :: Value -> Parser AuctionCreateRequest
auctionCreateParser = unv1 "auctions" $ \v ->
  case v of
    (Object o) -> CA <$> o .: "raiseAmount"
                     <*> o .: "auctionEnd"
    _          -> mzero
auctionCreateHandler :: Handler App App AuctionId
auctionCreateHandler = do
  uid <- requireUserId
  pid <- requireProjectId
  requestBody <- readRequestJSON 4096
  req <- either (snapError 400 . tshow) pure $ parseEither auctionCreateParser requestBody
  --t <- liftIO C.getCurrentTime
  snapEval . createAuction pid $ Auction uid (Satoshi . raiseAmount $ req) (auctionEnd req)

Insertion in server/Aftok/Snaplet/Auth.hs at line 13 [22.203]
[7.7887]
[7.7887]
```
import           Aftok.Project
```

Replacement in server/Aftok/Snaplet/Projects.hs at line 4 [23.2363]

B:BD[23.2398] → [3.2378:2414]

module Aftok.Snaplet.Projects where

[23.2398]

[23.2462]

module Aftok.Snaplet.Projects 
  ( projectCreateHandler
  , projectListHandler
  , projectGetHandler
  , projectInviteHandler
  ) where

Insertion in server/Aftok/Snaplet/Projects.hs at line 24 [23.2363]
[15.2498]
[15.2498]
```
import           Aftok.Project
```

Replacement in server/Aftok/Snaplet/Projects.hs at line 32 [23.2363]

B:BD[23.2726] → [12.11999:12066]

data CProject = CP { cpn :: Text, cpdepf :: DepreciationFunction }

[23.2726]

[23.2791]

data ProjectCreateRequest = CP { cpn :: Text, cpdepf :: DepreciationFunction }

Replacement in server/Aftok/Snaplet/Projects.hs at line 34 [23.2363]
B:BD[23.2792] → [12.12067:12100]
```
instance FromJSON CProject where
```
[23.2792]
[12.12100]
```
instance FromJSON ProjectCreateRequest where
```
Insertion in server/Aftok/Snaplet/Users.hs at line 17 [24.3234]
[7.8846]
[7.8846]
```
import           Aftok.Project
```
Insertion in server/Aftok/Snaplet/WorkLog.hs at line 15 [24.5424]
[7.9928]
[7.9928]
```
import           Aftok.Project
```
Insertion in server/Main.hs at line 14 [25.5188]
[7.11489]
[7.11489]
```
import           Aftok.Snaplet.Auctions
```

Insertion in server/Main.hs at line 53 [25.5188]

[11.12971]

[10.7876]

      auctionCreateRoute = void $ method POST auctionCreateHandler

Insertion in server/Main.hs at line 72 [25.5188]

[26.322]

[11.13275]

            , ("projects/:projectId/auctions", auctionCreateRoute)

Added initial auction create route.

Dependencies

In channels

Change contents

Insertion in aftok.cabal at line 29 [4.1]

Deletion in aftok.cabal at line 54 [4.1]

Replacement in lib/Aftok/Auction.hs at line 20 [8.5084]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 21 [9.456]

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 24 [9.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 94 [9.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 215 [9.456]

Replacement in lib/Aftok/Database/PostgreSQL.hs at line 288 [9.456]

Replacement in lib/Aftok/Database.hs at line 13 [4.4936]

Replacement in lib/Aftok/Database.hs at line 90 [4.4936]

Insertion in lib/Aftok/Database.hs at line 155 [4.4936]

Insertion in lib/Aftok/Database.hs at line 158 [4.4936]

Insertion in lib/Aftok/Json.hs at line 20 [16.19]

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

Deletion in lib/Aftok.hs at line 12 [17.2457]

Deletion in lib/Aftok.hs at line 13 [17.2457]

Deletion in lib/Aftok.hs at line 14 [17.2457]

Deletion in lib/Aftok.hs at line 42 [17.2457]

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

Insertion in server/Aftok/Snaplet/Auth.hs at line 13 [22.203]

Replacement in server/Aftok/Snaplet/Projects.hs at line 4 [23.2363]

Insertion in server/Aftok/Snaplet/Projects.hs at line 24 [23.2363]

Replacement in server/Aftok/Snaplet/Projects.hs at line 32 [23.2363]

Replacement in server/Aftok/Snaplet/Projects.hs at line 34 [23.2363]

Insertion in server/Aftok/Snaplet/Users.hs at line 17 [24.3234]

Insertion in server/Aftok/Snaplet/WorkLog.hs at line 15 [24.5424]

Insertion in server/Main.hs at line 14 [25.5188]

Insertion in server/Main.hs at line 53 [25.5188]

Insertion in server/Main.hs at line 72 [25.5188]