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

add new fields to logs and goals.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2021-01-17 19:01:13 +01:00
parent 3085b8c025
commit eeba5bc9c8
20 changed files with 342 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/postgres/goals.go
+8 -3
View File
@@ -73,9 +73,11 @@ func (r *goalRepository) List(ctx context.Context, filter models.GoalFilter) ([]
func (r *goalRepository) Insert(ctx context.Context, goal models.Goal) error {
_, err := r.db.NamedExecContext(ctx, `
INSERT INTO goal (
goal_id, user_id, group_id, amount, start_time, end_time, name, description
goal_id, user_id, group_id, amount, start_time, end_time, name, description,
composition_mode, unweighted, item_id
) VALUES (
:goal_id, :user_id, :group_id, :amount, :start_time, :end_time, :name, :description
:goal_id, :user_id, :group_id, :amount, :start_time, :end_time, :name, :description,
:composition_mode, :unweighted, :item_id
)
`, &goal)
if err != nil {
@@ -92,7 +94,10 @@ func (r *goalRepository) Update(ctx context.Context, goal models.Goal) error {
start_time=:start_time,
end_time=:end_time,
name=:name,
description=:description
description=:description,
composition_mode=:composition_mode,
unweighted=:unweighted,
item_id=:item_id
WHERE goal_id=:goal_id
`, &goal)
if err != nil {
database/postgres/logs.go
+10 -4
View File
@@ -34,7 +34,10 @@ func (r *logRepository) List(ctx context.Context, filter models.LogFilter) ([]*m
sq = sq.Where(squirrel.Eq{"task_id": filter.TaskIDs})
}
if len(filter.ItemIDs) > 0 {
sq = sq.Where(squirrel.Eq{"item_id": filter.ItemIDs})
sq = sq.Where(squirrel.Or{
squirrel.Eq{"item_id": filter.ItemIDs},
squirrel.Eq{"secondary_item_id": filter.ItemIDs},
})
}
if filter.MinTime != nil {
sq = sq.Where(squirrel.GtOrEq{
@@ -69,9 +72,9 @@ func (r *logRepository) List(ctx context.Context, filter models.LogFilter) ([]*m
func (r *logRepository) Insert(ctx context.Context, log models.Log) error {
_, err := r.db.NamedExecContext(ctx, `
INSERT INTO log (
log_id, user_id, task_id, item_id, logged_time, description
log_id, user_id, task_id, item_id, logged_time, description, item_amount, secondary_item_id, secondary_item_amount
) VALUES (
:log_id, :user_id, :task_id, :item_id, :logged_time, :description
:log_id, :user_id, :task_id, :item_id, :logged_time, :description, :item_amount, :secondary_item_id, :secondary_item_amount
)
`, &log)
if err != nil {
@@ -85,7 +88,10 @@ func (r *logRepository) Update(ctx context.Context, log models.Log) error {
_, err := r.db.NamedExecContext(ctx, `
UPDATE log SET
logged_time=:logged_time,
description=:description
description=:description,
item_amount=:item_amount,
secondary_item_id=:secondary_item_id,
secondary_item_amount=:secondary_item_amount
WHERE log_id=:log_id
`, &log)
if err != nil {