simon987/task_tracker
1
0
Fork 0
mirror of https://github.com/simon987/task_tracker.git synced 2025-12-14 07:19:02 +00:00
Code Issues Projects Releases Wiki Activity

revert accidental search&replace fail

Browse Source
This commit is contained in:
simon987
2019-02-16 09:56:44 -05:00
parent 6ca92bc0a7
commit 03153c4d39
20 changed files with 108 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
storage/monitoring.go
View File

@@ -22,19 +22,19 @@ func (database *Database) MakeProjectSnapshots() {
insertRes, err := db.Exec(`
INSERT INTO project_monitoring_snapshot
(projectChange, new_task_count, failed_task_count, closed_task_count, worker_access_count,
(project, new_task_count, failed_task_count, closed_task_count, worker_access_count,
awaiting_verification_task_count, timestamp)
SELECT id,
(SELECT COUNT(*) FROM task
LEFT JOIN worker_verifies_task wvt on task.id = wvt.task
WHERE task.projectChange = projectChange.id AND status = 1 AND wvt.task IS NULL),
(SELECT COUNT(*) FROM task WHERE task.projectChange = projectChange.id AND status = 2),
WHERE task.project = project.id AND status = 1 AND wvt.task IS NULL),
(SELECT COUNT(*) FROM task WHERE task.project = project.id AND status = 2),
closed_task_count,
(SELECT COUNT(*) FROM worker_has_access_to_project wa WHERE wa.projectChange = projectChange.id),
(SELECT COUNT(*) FROM worker_has_access_to_project wa WHERE wa.project = project.id),
(SELECT COUNT(*) FROM worker_verifies_task INNER JOIN task t on worker_verifies_task.task = t.id
WHERE t.projectChange = projectChange.id),
WHERE t.project = project.id),
extract(epoch from now() at time zone 'utc')
FROM projectChange`)
FROM project`)
handleErr(err)
inserted, _ := insertRes.RowsAffected()
@@ -47,7 +47,7 @@ func (database *Database) MakeProjectSnapshots() {
"took": time.Now().Sub(startTime),
"add": inserted,
"remove": deleted,
}).Trace("Took projectChange monitoring snapshot")
}).Trace("Took project monitoring snapshot")
}
func (database *Database) GetMonitoringSnapshotsBetween(pid int64, from int, to int) (ss *[]ProjectMonitoringSnapshot) {
@@ -58,7 +58,7 @@ func (database *Database) GetMonitoringSnapshotsBetween(pid int64, from int, to
rows, err := db.Query(`SELECT new_task_count, failed_task_count, closed_task_count,
worker_access_count, awaiting_verification_task_count, timestamp FROM project_monitoring_snapshot
WHERE projectChange=$1 AND timestamp BETWEEN $2 AND $3 ORDER BY TIMESTAMP DESC `, pid, from, to)
WHERE project=$1 AND timestamp BETWEEN $2 AND $3 ORDER BY TIMESTAMP DESC `, pid, from, to)
handleErr(err)
for rows.Next() {
@@ -89,7 +89,7 @@ func (database *Database) GetNMonitoringSnapshots(pid int64, count int) (ss *[]P
rows, err := db.Query(`SELECT new_task_count, failed_task_count, closed_task_count,
worker_access_count, awaiting_verification_task_count, timestamp FROM project_monitoring_snapshot
WHERE projectChange=$1 ORDER BY TIMESTAMP DESC LIMIT $2`, pid, count)
WHERE project=$1 ORDER BY TIMESTAMP DESC LIMIT $2`, pid, count)
handleErr(err)
for rows.Next() {