simon987/task_tracker
1
0
Fork 0
mirror of https://github.com/simon987/task_tracker.git synced 2025-12-11 14:08:52 +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

2
storage/auth.go
View File

@@ -131,7 +131,7 @@ func (database *Database) ManagerHasRoleOn(manager *Manager, projectId int64) Ma
db := database.getDB()
row := db.QueryRow(`SELECT role FROM manager_has_role_on_project
WHERE projectChange=$1 AND manager=$2`, projectId, manager.Id)
WHERE project=$1 AND manager=$2`, projectId, manager.Id)
var role ManagerRole
err := row.Scan(&role)

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() {

42
storage/project.go
View File

@@ -27,7 +27,7 @@ type AssignedTasks struct {
func (database *Database) SaveProject(project *Project) (int64, error) {
db := database.getDB()
row := db.QueryRow(`INSERT INTO projectChange (name, git_repo, clone_url, version, priority,
row := db.QueryRow(`INSERT INTO project (name, git_repo, clone_url, version, priority,
motd, public, hidden, chain)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0)) RETURNING id`,
project.Name, project.GitRepo, project.CloneUrl, project.Version, project.Priority, project.Motd,
@@ -38,17 +38,17 @@ func (database *Database) SaveProject(project *Project) (int64, error) {
if err != nil {
logrus.WithError(err).WithFields(logrus.Fields{
"projectChange": project,
}).Warn("Database.saveProject INSERT projectChange ERROR")
"project": project,
}).Warn("Database.saveProject INSERT project ERROR")
return -1, err
}
project.Id = id
logrus.WithFields(logrus.Fields{
"id": id,
"projectChange": project,
}).Trace("Database.saveProject INSERT projectChange")
"id": id,
"project": project,
}).Trace("Database.saveProject INSERT project")
return id, nil
}
@@ -58,20 +58,20 @@ func (database *Database) GetProject(id int64) *Project {
db := database.getDB()
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version,
motd, public, hidden, COALESCE(chain, 0)
FROM projectChange WHERE id=$1`, id)
FROM project WHERE id=$1`, id)
project, err := scanProject(row)
if err != nil {
logrus.WithError(err).WithFields(logrus.Fields{
"id": id,
}).Warn("Database.getProject SELECT projectChange NOT FOUND")
}).Warn("Database.getProject SELECT project NOT FOUND")
return nil
}
logrus.WithFields(logrus.Fields{
"id": id,
"projectChange": project,
}).Trace("Database.saveProject SELECT projectChange")
"id": id,
"project": project,
}).Trace("Database.saveProject SELECT project")
return project
}
@@ -89,14 +89,14 @@ func (database *Database) GetProjectWithRepoName(repoName string) *Project {
db := database.getDB()
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version,
motd, public, hidden, COALESCE(chain, 0) FROM projectChange WHERE LOWER(git_repo)=$1`,
motd, public, hidden, COALESCE(chain, 0) FROM project WHERE LOWER(git_repo)=$1`,
strings.ToLower(repoName))
project, err := scanProject(row)
if err != nil {
logrus.WithError(err).WithFields(logrus.Fields{
"repoName": repoName,
}).Warn("Database.getProjectWithRepoName SELECT projectChange NOT FOUND")
}).Warn("Database.getProjectWithRepoName SELECT project NOT FOUND")
return nil
}
@@ -107,7 +107,7 @@ func (database *Database) UpdateProject(project *Project) error {
db := database.getDB()
res, err := db.Exec(`UPDATE projectChange
res, err := db.Exec(`UPDATE project
SET (priority, name, clone_url, git_repo, version, motd, public, hidden, chain) =
($1,$2,$3,$4,$5,$6,$7,$8,NULLIF($9, 0))
WHERE id=$10`,
@@ -120,9 +120,9 @@ func (database *Database) UpdateProject(project *Project) error {
rowsAffected, _ := res.RowsAffected()
logrus.WithFields(logrus.Fields{
"projectChange": project,
"rowsAffected": rowsAffected,
}).Trace("Database.updateProject UPDATE projectChange")
"project": project,
"rowsAffected": rowsAffected,
}).Trace("Database.updateProject UPDATE project")
return nil
}
@@ -136,14 +136,14 @@ func (database Database) GetAllProjects(workerId int64) *[]Project {
if workerId == 0 {
rows, err = db.Query(`SELECT
Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0)
FROM projectChange
FROM project
WHERE NOT hidden
ORDER BY name`)
} else {
rows, err = db.Query(`SELECT
Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0)
FROM projectChange
LEFT JOIN worker_has_access_to_project whatp ON whatp.projectChange = id
FROM project
LEFT JOIN worker_has_access_to_project whatp ON whatp.project = id
WHERE NOT hidden OR whatp.worker = $1
ORDER BY name`, workerId)
}
@@ -171,7 +171,7 @@ func (database *Database) GetAssigneeStats(pid int64, count int64) *[]AssignedTa
assignees := make([]AssignedTasks, 0)
rows, err := db.Query(`SELECT worker.alias, COUNT(*) as wc FROM TASK
LEFT JOIN worker ON TASK.assignee = worker.id WHERE projectChange=$1
LEFT JOIN worker ON TASK.assignee = worker.id WHERE project=$1
GROUP BY worker.id ORDER BY wc LIMIT $2`, pid, count)
handleErr(err)

16
storage/task.go
View File

@@ -9,7 +9,7 @@ import (
type Task struct {
Id int64 `json:"id"`
Priority int64 `json:"priority"`
Project *Project `json:"projectChange"`
Project *Project `json:"project"`
Assignee int64 `json:"assignee"`
Retries int64 `json:"retries"`
MaxRetries int64 `json:"max_retries"`
@@ -41,7 +41,7 @@ func (database *Database) SaveTask(task *Task, project int64, hash64 int64) erro
//TODO: For some reason it refuses to insert the 64-bit value unless I do that...
res, err := db.Exec(fmt.Sprintf(`
INSERT INTO task (projectChange, max_retries, recipe, priority, max_assign_time, hash64,verification_count)
INSERT INTO task (project, max_retries, recipe, priority, max_assign_time, hash64,verification_count)
VALUES ($1,$2,$3,$4,$5,NULLIF(%d, 0),$6)`, hash64),
project, task.MaxRetries, task.Recipe, task.Priority, task.MaxAssignTime, task.VerificationCount)
if err != nil {
@@ -73,11 +73,11 @@ func (database *Database) GetTask(worker *Worker) *Task {
(
SELECT task.id
FROM task
INNER JOIN projectChange project on task.projectChange = project.id
INNER JOIN project project on task.project = project.id
LEFT JOIN worker_verifies_task wvt on task.id = wvt.task AND wvt.worker=$1
WHERE assignee IS NULL AND task.status=1
AND (project.public OR EXISTS (
SELECT 1 FROM worker_has_access_to_project a WHERE a.worker=$1 AND a.projectChange=project.id
SELECT 1 FROM worker_has_access_to_project a WHERE a.worker=$1 AND a.project=project.id
))
AND wvt.task IS NULL
ORDER BY project.priority DESC, task.priority DESC
@@ -107,10 +107,10 @@ func (database *Database) GetTask(worker *Worker) *Task {
func getTaskById(id int64, db *sql.DB) *Task {
row := db.QueryRow(`
SELECT task.id, task.priority, task.projectChange, assignee, retries, max_retries,
SELECT task.id, task.priority, task.project, assignee, retries, max_retries,
status, recipe, max_assign_time, assign_time, verification_count, project.priority, project.name,
project.clone_url, project.git_repo, project.version, project.motd, project.public, COALESCE(project.chain,0) FROM task
INNER JOIN projectChange project ON task.projectChange = project.id
INNER JOIN project project ON task.project = project.id
WHERE task.id=$1`, id)
project := &Project{}
task := &Task{}
@@ -176,11 +176,11 @@ func (database *Database) GetTaskFromProject(worker *Worker, projectId int64) *T
(
SELECT task.id
FROM task
INNER JOIN projectChange project on task.projectChange = project.id
INNER JOIN project project on task.project = project.id
LEFT JOIN worker_verifies_task wvt on task.id = wvt.task AND wvt.worker=$1
WHERE assignee IS NULL AND project.id=$2 AND status=1
AND (project.public OR EXISTS (
SELECT 1 FROM worker_has_access_to_project a WHERE a.worker=$1 AND a.projectChange=$2
SELECT 1 FROM worker_has_access_to_project a WHERE a.worker=$1 AND a.project=$2
))
AND wvt.task IS NULL
ORDER BY task.priority DESC

16
storage/worker.go
View File

@@ -56,7 +56,7 @@ func (database *Database) GetWorker(id int64) *Worker {
func (database *Database) GrantAccess(workerId int64, projectId int64) bool {
db := database.getDB()
res, err := db.Exec(`INSERT INTO worker_has_access_to_project (worker, projectChange) VALUES ($1,$2)
res, err := db.Exec(`INSERT INTO worker_has_access_to_project (worker, project) VALUES ($1,$2)
ON CONFLICT DO NOTHING`,
workerId, projectId)
if err != nil {
@@ -81,7 +81,7 @@ func (database *Database) GrantAccess(workerId int64, projectId int64) bool {
func (database *Database) RemoveAccess(workerId int64, projectId int64) bool {
db := database.getDB()
res, err := db.Exec(`DELETE FROM worker_has_access_to_project WHERE worker=$1 AND projectChange=$2`,
res, err := db.Exec(`DELETE FROM worker_has_access_to_project WHERE worker=$1 AND project=$2`,
workerId, projectId)
handleErr(err)
@@ -118,8 +118,8 @@ func (database *Database) SaveAccessRequest(worker *Worker, projectId int64) boo
db := database.getDB()
res, err := db.Exec(`INSERT INTO worker_requests_access_to_project
SELECT $1, id FROM projectChange WHERE id=$2 AND NOT projectChange.public
AND NOT EXISTS(SELECT * FROM worker_has_access_to_project WHERE worker=$1 AND projectChange=$2)`,
SELECT $1, id FROM project WHERE id=$2 AND NOT project.public
AND NOT EXISTS(SELECT * FROM worker_has_access_to_project WHERE worker=$1 AND project=$2)`,
worker.Id, projectId)
if err != nil {
return false
@@ -139,13 +139,13 @@ func (database *Database) AcceptAccessRequest(worker *Worker, projectId int64) b
db := database.getDB()
res, err := db.Exec(`DELETE FROM worker_requests_access_to_project
WHERE worker=$1 AND projectChange=$2`)
WHERE worker=$1 AND project=$2`)
handleErr(err)
rowsAffected, _ := res.RowsAffected()
if rowsAffected == 1 {
_, err := db.Exec(`INSERT INTO worker_has_access_to_project
(worker, projectChange) VALUES ($1,$2)`,
(worker, project) VALUES ($1,$2)`,
worker.Id, projectId)
handleErr(err)
}
@@ -162,7 +162,7 @@ func (database *Database) RejectAccessRequest(worker *Worker, projectId int64) b
db := database.getDB()
res, err := db.Exec(`DELETE FROM worker_requests_access_to_project
WHERE worker=$1 AND projectChange=$2`, worker.Id, projectId)
WHERE worker=$1 AND project=$2`, worker.Id, projectId)
handleErr(err)
rowsAffected, _ := res.RowsAffected()
@@ -180,7 +180,7 @@ func (database *Database) GetAllAccessRequests(projectId int64) *[]Worker {
rows, err := db.Query(`SELECT id, alias, created FROM worker_requests_access_to_project
INNER JOIN worker w on worker_requests_access_to_project.worker = w.id
WHERE projectChange=$1`,
WHERE project=$1`,
projectId)
handleErr(err)