gisle/stufflog2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add status tags to tasks and reorganize them to have more familiar names.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2021-01-24 12:39:23 +01:00
parent f22b9b4947
commit 270694e49e
21 changed files with 347 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/postgres/tasks.go
+5 -4
View File
@@ -51,7 +51,7 @@ func (r *taskRepository) List(ctx context.Context, filter models.TaskFilter) ([]
}
sq = sq.InnerJoin("project AS p ON task.project_id = p.project_id")
sq = sq.OrderBy("active DESC", "created_time")
sq = sq.OrderBy("active DESC", "status_tag ASC", "created_time")
query, args, err := sq.ToSql()
if err != nil {
@@ -73,9 +73,9 @@ func (r *taskRepository) List(ctx context.Context, filter models.TaskFilter) ([]
func (r *taskRepository) Insert(ctx context.Context, task models.Task) error {
_, err := r.db.NamedExecContext(ctx, `
INSERT INTO task (
task_id, user_id, item_id, project_id, item_amount, name, description, active, created_time, end_time
task_id, user_id, item_id, project_id, item_amount, name, description, active, created_time, end_time, status_tag
) VALUES (
:task_id, :user_id, :item_id, :project_id, :item_amount, :name, :description, :active, :created_time, :end_time
:task_id, :user_id, :item_id, :project_id, :item_amount, :name, :description, :active, :created_time, :end_time, :status_tag
)
`, &task)
if err != nil {
@@ -93,7 +93,8 @@ func (r *taskRepository) Update(ctx context.Context, task models.Task) error {
name = :name,
description = :description,
active = :active,
end_time = :end_time
end_time = :end_time,
status_tag = :status_tag
WHERE task_id=:task_id
`, &task)
if err != nil {