mirror of
https://github.com/simon987/task_tracker.git
synced 2025-12-14 23:39:04 +00:00
Task chaining + some refactoring
This commit is contained in:
simon987
@@ -16,6 +16,7 @@ type Project struct {
|
||||
Motd string `json:"motd"`
|
||||
Public bool `json:"public"`
|
||||
Hidden bool `json:"hidden"`
|
||||
Chain int64 `json:"chain"`
|
||||
}
|
||||
|
||||
type AssignedTasks struct {
|
||||
@@ -25,34 +26,29 @@ type AssignedTasks struct {
|
||||
|
||||
func (database *Database) SaveProject(project *Project) (int64, error) {
|
||||
db := database.getDB()
|
||||
id, projectErr := saveProject(project, db)
|
||||
|
||||
return id, projectErr
|
||||
}
|
||||
|
||||
func saveProject(project *Project, db *sql.DB) (int64, error) {
|
||||
|
||||
row := db.QueryRow(`INSERT INTO project (name, git_repo, clone_url, version, priority, motd, public, hidden)
|
||||
VALUES ($1,$2,$3,$4,$5,$6,$7,$8) RETURNING id`,
|
||||
row := db.QueryRow(`INSERT INTO projectChange (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,
|
||||
project.Public, project.Hidden)
|
||||
project.Public, project.Hidden, project.Chain)
|
||||
|
||||
var id int64
|
||||
err := row.Scan(&id)
|
||||
|
||||
if err != nil {
|
||||
logrus.WithError(err).WithFields(logrus.Fields{
|
||||
"project": project,
|
||||
}).Warn("Database.saveProject INSERT project ERROR")
|
||||
"projectChange": project,
|
||||
}).Warn("Database.saveProject INSERT projectChange ERROR")
|
||||
return -1, err
|
||||
}
|
||||
|
||||
project.Id = id
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"project": project,
|
||||
}).Trace("Database.saveProject INSERT project")
|
||||
"id": id,
|
||||
"projectChange": project,
|
||||
}).Trace("Database.saveProject INSERT projectChange")
|
||||
|
||||
return id, nil
|
||||
}
|
||||
@@ -60,52 +56,47 @@ func saveProject(project *Project, db *sql.DB) (int64, error) {
|
||||
func (database *Database) GetProject(id int64) *Project {
|
||||
|
||||
db := database.getDB()
|
||||
project := getProject(id, db)
|
||||
return project
|
||||
}
|
||||
|
||||
func getProject(id int64, db *sql.DB) *Project {
|
||||
|
||||
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version, motd, public, hidden
|
||||
FROM project WHERE id=$1`, id)
|
||||
row := db.QueryRow(`SELECT id, priority, name, clone_url, git_repo, version,
|
||||
motd, public, hidden, COALESCE(chain, 0)
|
||||
FROM projectChange WHERE id=$1`, id)
|
||||
|
||||
project, err := scanProject(row)
|
||||
if err != nil {
|
||||
logrus.WithError(err).WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
}).Warn("Database.getProject SELECT project NOT FOUND")
|
||||
}).Warn("Database.getProject SELECT projectChange NOT FOUND")
|
||||
return nil
|
||||
}
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"project": project,
|
||||
}).Trace("Database.saveProject SELECT project")
|
||||
"id": id,
|
||||
"projectChange": project,
|
||||
}).Trace("Database.saveProject SELECT projectChange")
|
||||
|
||||
return project
|
||||
}
|
||||
|
||||
func scanProject(row *sql.Row) (*Project, error) {
|
||||
|
||||
project := &Project{}
|
||||
err := row.Scan(&project.Id, &project.Priority, &project.Name, &project.CloneUrl,
|
||||
&project.GitRepo, &project.Version, &project.Motd, &project.Public, &project.Hidden)
|
||||
p := &Project{}
|
||||
err := row.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl, &p.GitRepo, &p.Version,
|
||||
&p.Motd, &p.Public, &p.Hidden, &p.Chain)
|
||||
|
||||
return project, err
|
||||
return p, err
|
||||
}
|
||||
|
||||
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
|
||||
FROM project WHERE LOWER(git_repo)=$1`,
|
||||
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`,
|
||||
strings.ToLower(repoName))
|
||||
|
||||
project, err := scanProject(row)
|
||||
if err != nil {
|
||||
logrus.WithError(err).WithFields(logrus.Fields{
|
||||
"repoName": repoName,
|
||||
}).Warn("Database.getProjectWithRepoName SELECT project NOT FOUND")
|
||||
}).Warn("Database.getProjectWithRepoName SELECT projectChange NOT FOUND")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -116,10 +107,12 @@ func (database *Database) UpdateProject(project *Project) error {
|
||||
|
||||
db := database.getDB()
|
||||
|
||||
res, err := db.Exec(`UPDATE project
|
||||
SET (priority, name, clone_url, git_repo, version, motd, public, hidden) = ($1,$2,$3,$4,$5,$6,$7,$8) WHERE id=$9`,
|
||||
res, err := db.Exec(`UPDATE projectChange
|
||||
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`,
|
||||
project.Priority, project.Name, project.CloneUrl, project.GitRepo, project.Version, project.Motd,
|
||||
project.Public, project.Hidden, project.Id)
|
||||
project.Public, project.Hidden, project.Chain, project.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -127,9 +120,9 @@ func (database *Database) UpdateProject(project *Project) error {
|
||||
rowsAffected, _ := res.RowsAffected()
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"project": project,
|
||||
"rowsAffected": rowsAffected,
|
||||
}).Trace("Database.updateProject UPDATE project")
|
||||
"projectChange": project,
|
||||
"rowsAffected": rowsAffected,
|
||||
}).Trace("Database.updateProject UPDATE projectChange")
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -142,15 +135,15 @@ func (database Database) GetAllProjects(workerId int64) *[]Project {
|
||||
var err error
|
||||
if workerId == 0 {
|
||||
rows, err = db.Query(`SELECT
|
||||
Id, priority, name, clone_url, git_repo, version, motd, public, hidden
|
||||
FROM project
|
||||
Id, priority, name, clone_url, git_repo, version, motd, public, hidden, COALESCE(chain,0)
|
||||
FROM projectChange
|
||||
WHERE NOT hidden
|
||||
ORDER BY name`)
|
||||
} else {
|
||||
rows, err = db.Query(`SELECT
|
||||
Id, priority, name, clone_url, git_repo, version, motd, public, hidden
|
||||
FROM project
|
||||
LEFT JOIN worker_has_access_to_project whatp ON whatp.project = id
|
||||
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
|
||||
WHERE NOT hidden OR whatp.worker = $1
|
||||
ORDER BY name`, workerId)
|
||||
}
|
||||
@@ -159,13 +152,14 @@ func (database Database) GetAllProjects(workerId int64) *[]Project {
|
||||
for rows.Next() {
|
||||
p := Project{}
|
||||
err := rows.Scan(&p.Id, &p.Priority, &p.Name, &p.CloneUrl,
|
||||
&p.GitRepo, &p.Version, &p.Motd, &p.Public, &p.Hidden)
|
||||
&p.GitRepo, &p.Version, &p.Motd, &p.Public, &p.Hidden,
|
||||
&p.Chain)
|
||||
handleErr(err)
|
||||
projects = append(projects, p)
|
||||
}
|
||||
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"projects": projects,
|
||||
"projects": len(projects),
|
||||
}).Trace("Get all projects stats")
|
||||
|
||||
return &projects
|
||||
@@ -177,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 project=$1
|
||||
LEFT JOIN worker ON TASK.assignee = worker.id WHERE projectChange=$1
|
||||
GROUP BY worker.id ORDER BY wc LIMIT $2`, pid, count)
|
||||
handleErr(err)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user