nuttycom/aftok - Change 2G3GNDDUOVPF45PELJ65ZB2IXEHJJXJILFRVHZXGPXUL4BVNZJFQC

Event logging is now functioning in postgres.

Created by Kris Nuttycombe on February 17, 2015

2G3GNDDUOVPF45PELJ65ZB2IXEHJJXJILFRVHZXGPXUL4BVNZJFQC

Dependencies

In channels

main

Change contents

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 194 [4.456]
[3.705]
[3.705]
```
  let uid = p ^. (initiator._UserId)
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 198 [4.456]

B:BD[3.849] → [3.849:963]

    (p ^. projectName, p ^. inceptionDate, p ^. (initiator._UserId))
  pure . ProjectId . fromOnly $ DL.head pids

[3.849]

[5.704]

    (p ^. projectName, p ^. inceptionDate, uid)
  let pid = fromOnly $ DL.head pids
  void . lift $ execute conn
    "INSERT INTO project_companions (project_id, companion_id) VALUES (?, ?)"
    (pid, uid)
  pure . ProjectId $ pid

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 210 [4.456]

B:BD[3.1180] → [3.1180:1334]

    \FROM projects p LEFT OUTER JOIN project_companions pc ON pc.project_id = p.id \
    \WHERE p.initiator_id = ? OR pc.companion_id = ?"
    (uid, uid)

[3.1180]

[3.1334]

    \FROM projects p JOIN project_companions pc ON pc.project_id = p.id \
    \WHERE pc.companion_id = ?"
    (Only uid)

Replacement in scripts/create_project.sh at line 3 [2.1241]

B:BD[2.1255] → [2.1255:1379]

curl -v -u "nuttycom:kjntest" -H "Content-Type: application/json" -d '{"projectName":"the"}' http://localhost:8000/projects

[2.1255]

[2.1379]

curl -v -u "nuttycom:kjntest" -X POST -H "Content-Type: application/json" -d '{"projectName":"the"}' http://localhost:8000/projects

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

[2.1220]

curl -v -u "nuttycom:kjntest" -X POST -d '' http://localhost:8000/projects/1/logEnd/1KamUn1BaRMd2HwikyQWGTdUvfPScg9QA5

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

[2.1220]

curl -v -u "nuttycom:kjntest" -X POST -d '' http://localhost:8000/projects/1/logStart/1KamUn1BaRMd2HwikyQWGTdUvfPScg9QA5

Replacement in server/Main.hs at line 52 [7.5188]

B:BD[6.179] → [2.1725:1825]

∅:D[2.1825] → [8.3639:3862]

B:BD[9.867] → [8.3639:3862]

            , ("register", method POST registerHandler)
            , ("projects", projectsHandler)
            , ("logStart/:projectId/:btcAddr", logWorkHandler StartWork)
            , ("logEnd/:projectId/:btcAddr",   logWorkHandler StopWork)
            , ("loggedIntervals/:projectId/:btcAddr", loggedIntervalsHandler)

[6.179]

[2.1826]

            , ("register", void $ method POST registerHandler)
            , ("projects/:projectId/logStart/:btcAddr", method POST $ logWorkHandler StartWork)
            , ("projects/:projectId/logEnd/:btcAddr",   method POST $ logWorkHandler StopWork)
            , ("projects/:projectId/log/:btcAddr",      method GET loggedIntervalsHandler)

Replacement in server/Main.hs at line 57 [7.5188]

B:BD[2.1879] → [2.1879:1943]

            , ("payouts/:projectId", method GET payoutsHandler)

[2.1879]

[4.8999]

            , ("projects", void $ method POST projectCreateHandler)
            , ("projects", void $ method GET  projectListHandler)
            , ("payouts/:projectId",  method GET payoutsHandler)

Deletion in server/Quixotic/Snaplet/Auth.hs at line 23 [6.203]
B:BD[6.1323] → [2.2040:2061]
```
  logError rawHeader
```

Replacement in server/Quixotic/Snaplet/Auth.hs at line 35 [6.203]

B:BD[6.1780] → [6.1780:2024]

  currentUser <- requireLogin
  qdbUser <- case UserName . AU.unUid <$> AU.userId currentUser of 
    Nothing -> snapError 403 "User is authenticated, but session lacks user identifier"
    Just n  -> liftPG . runReaderT $ findUserByUserName n

[6.1780]

[6.2024]

  currentUser <- UserName . AU.userLogin <$> requireLogin
  qdbUser <- liftPG . runReaderT $ findUserByUserName currentUser

Replacement in server/Quixotic/Snaplet/Projects.hs at line 3 [2.2363]
B:BD[2.2398] → [2.2398:2462]
```
module Quixotic.Snaplet.Projects 
  ( projectsHandler
  ) where
```
[2.2398]
[2.2462]
```
module Quixotic.Snaplet.Projects where
```

Deletion in server/Quixotic/Snaplet/Projects.hs at line 25 [2.2363]

B:BD[2.2915] → [2.2915:3056]

projectsHandler :: Handler App App ()
projectsHandler = do
  void $ method POST projectCreateHandler
  void $ method GET projectListHandler

Replacement in sql/quixotic-pg.sql at line 11 [10.3144]

B:BD[2.4014] → [2.4014:4069]

  inception_date timestamp without time zone not null,

[2.4014]

[2.4069]

  inception_date timestamp with time zone not null,

Insertion in sql/quixotic-pg.sql at line 13 [10.3144]

[2.4123]

[10.3201]

);
create table project_companions (
  project_id integer references projects(id) not null,
  companion_id integer references users(id) not null

Replacement in sql/quixotic-pg.sql at line 20 [10.3144]

B:BD[10.3205] → [2.4124:4181]

create type event_t as enum ('start_work', 'stop_work');

[10.3205]

[2.4181]

create type event_t as enum ('start', 'stop');

Replacement in sql/quixotic-pg.sql at line 28 [10.3144]
B:BD[2.4371] → [2.4371:4421]
```
  event_time timestamp without time zone not null
```
[2.4371]
[2.4421]
```
  event_time timestamp with time zone not null
```
Replacement in sql/quixotic-pg.sql at line 36 [10.3144]
B:BD[2.4617] → [2.4617:4665]
```
  end_time timestamp without time zone not null
```
[2.4617]
[2.4665]
```
  end_time timestamp with time zone not null
```
Replacement in sql/quixotic-pg.sql at line 45 [10.3144]
B:BD[2.4861] → [2.4861:4909]
```
  bid_time timestamp without time zone not null
```
[2.4861]
[2.4909]
```
  bid_time timestamp with time zone not null
```