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

Task GET

Browse Source
This commit is contained in:
simon987
2019-01-12 19:52:51 -05:00
parent 83276ce8b0
commit a2b5de0e01
10 changed files with 490 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
storage/project.go
View File

@@ -6,10 +6,11 @@ import (
)
type Project struct {
Id int64 `json:"id"`
Name string `json:"name"`
GitUrl string `json:"git_url"`
Version string `json:"version"`
Id int64 `json:"id"`
Priority int64 `json:"priority"`
Name string `json:"name"`
GitUrl string `json:"git_url"`
Version string `json:"version"`
}
func (database *Database) SaveProject(project *Project) (int64, error) {
@@ -23,8 +24,8 @@ func (database *Database) SaveProject(project *Project) (int64, error) {
func saveProject(project *Project, db *sql.DB) (int64, error) {
row := db.QueryRow("INSERT INTO project (name, git_url, version) VALUES ($1,$2,$3) RETURNING id",
project.Name, project.GitUrl, project.Version)
row := db.QueryRow("INSERT INTO project (name, git_url, version, priority) VALUES ($1,$2,$3, $4) RETURNING id",
project.Name, project.GitUrl, project.Version, project.Priority)
var id int64
err := row.Scan(&id)
@@ -37,7 +38,7 @@ func saveProject(project *Project, db *sql.DB) (int64, error) {
}
logrus.WithFields(logrus.Fields{
"id": id,
"id": id,
"project": project,
}).Trace("Database.saveProject INSERT project")
@@ -57,10 +58,10 @@ func getProject(id int64, db *sql.DB) *Project {
project := &Project{}
row := db.QueryRow("SELECT id, name, git_url, version FROM project WHERE id=$1",
row := db.QueryRow("SELECT id, name, git_url, version, priority FROM project WHERE id=$1",
id)
err := row.Scan(&project.Id, &project.Name, &project.GitUrl, &project.Version)
err := row.Scan(&project.Id, &project.Name, &project.GitUrl, &project.Version, &project.Priority)
if err != nil {
logrus.WithFields(logrus.Fields{
"id": id,
@@ -69,7 +70,7 @@ func getProject(id int64, db *sql.DB) *Project {
}
logrus.WithFields(logrus.Fields{
"id": id,
"id": id,
"project": project,
}).Trace("Database.saveProject SELECT project")

148
storage/task.go
View File

@@ -7,30 +7,32 @@ import (
)
type Task struct {
Id int64
Project int64
Assignee uuid.UUID
Retries int64
MaxRetries int64
Status string
Recipe string
Id int64 `json:"id"`
Priority int64 `json:"priority"`
Project *Project `json:"project"`
Assignee uuid.UUID `json:"assignee"`
Retries int64 `json:"retries"`
MaxRetries int64 `json:"max_retries"`
Status string `json:"status"`
Recipe string `json:"recipe"`
}
func (database *Database) SaveTask(task *Task) error {
func (database *Database) SaveTask(task *Task, project int64) error {
db := database.getDB()
taskErr := saveTask(task, db)
taskErr := saveTask(task, project, db)
err := db.Close()
handleErr(err)
return taskErr
}
func saveTask(task *Task, db *sql.DB) error {
func saveTask(task *Task, project int64, db *sql.DB) error {
res, err := db.Exec("INSERT INTO task (project, max_retries, recipe) "+
"VALUES ($1,$2,$3)",
task.Project, task.MaxRetries, task.Recipe)
res, err := db.Exec(`
INSERT INTO task (project, max_retries, recipe, priority)
VALUES ($1,$2,$3,$4)`,
project, task.MaxRetries, task.Recipe, task.Priority)
if err != nil {
logrus.WithError(err).WithFields(logrus.Fields{
"task": task,
@@ -48,3 +50,123 @@ func saveTask(task *Task, db *sql.DB) error {
return nil
}
func (database *Database) GetTask(worker *Worker) *Task {
db := database.getDB()
task := getTask(worker, db)
err := db.Close()
handleErr(err)
return task
}
func getTask(worker *Worker, db *sql.DB) *Task {
row := db.QueryRow(`
UPDATE task
SET assignee=$1
WHERE id IN
(
SELECT task.id
FROM task
INNER JOIN project p on task.project = p.id
WHERE assignee IS NULL
ORDER BY p.priority DESC, task.priority DESC
LIMIT 1
)
RETURNING id`, worker.Id)
var id int64
err := row.Scan(&id)
if err != nil {
logrus.WithFields(logrus.Fields{
"worker": worker,
}).Trace("No task available")
return nil
}
logrus.WithFields(logrus.Fields{
"id": id,
"worker": worker,
}).Trace("Database.getTask UPDATE task")
task := getTaskById(id, db)
return task
}
func getTaskById(id int64, db *sql.DB) *Task {
row := db.QueryRow(`
SELECT * FROM task
INNER JOIN project ON task.project = project.id
WHERE task.id=$1`, id)
task := scanTask(row)
logrus.WithFields(logrus.Fields{
"id": id,
"task": task,
}).Trace("Database.getTaskById SELECT task")
return task
}
func (database *Database) GetTaskFromProject(worker *Worker, project int64) *Task {
db := database.getDB()
task := getTaskFromProject(worker, project, db)
err := db.Close()
handleErr(err)
return task
}
func getTaskFromProject(worker *Worker, projectId int64, db *sql.DB) *Task {
row := db.QueryRow(`
UPDATE task
SET assignee=$1
WHERE id IN
(
SELECT task.id
FROM task
INNER JOIN project p on task.project = p.id
WHERE assignee IS NULL AND p.id=$2
ORDER BY p.priority DESC, task.priority DESC
LIMIT 1
)
RETURNING id`, worker.Id, projectId)
var id int64
err := row.Scan(&id)
if err != nil {
logrus.WithFields(logrus.Fields{
"worker": worker,
}).Trace("No task available")
return nil
}
logrus.WithFields(logrus.Fields{
"id": id,
"worker": worker,
}).Trace("Database.getTask UPDATE task")
task := getTaskById(id, db)
return task
}
func scanTask(row *sql.Row) *Task {
project := &Project{}
task := &Task{}
task.Project = project
err := row.Scan(&task.Id, &task.Priority, &project.Id, &task.Assignee,
&task.Retries, &task.MaxRetries, &task.Status, &task.Recipe, &project.Id,
&project.Priority, &project.Name, &project.GitUrl, &project.Version)
handleErr(err)
return task
}