diff --git a/internal/database/action.go b/internal/database/action.go index 1814e58..7220b3a 100644 --- a/internal/database/action.go +++ b/internal/database/action.go @@ -28,7 +28,6 @@ func NewActionRepo(log logger.Logger, db *DB, clientRepo domain.DownloadClientRe } func (r *ActionRepo) FindByFilterID(ctx context.Context, filterID int) ([]*domain.Action, error) { - tx, err := r.db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelReadCommitted}) if err != nil { return nil, err @@ -51,10 +50,6 @@ func (r *ActionRepo) FindByFilterID(ctx context.Context, filterID int) ([]*domai } } - if err = tx.Commit(); err != nil { - return nil, errors.Wrap(err, "error finding filter by id") - } - return actions, nil } @@ -611,8 +606,7 @@ func (r *ActionRepo) StoreFilterActions(ctx context.Context, actions []*domain.A r.log.Debug().Msgf("action.StoreFilterActions: store '%v' type: '%v' on filter: %v", action.Name, action.Type, filterID) } - err = tx.Commit() - if err != nil { + if err := tx.Commit(); err != nil { return nil, errors.Wrap(err, "error updating filter actions") } diff --git a/internal/database/filter.go b/internal/database/filter.go index 7188ded..b56999a 100644 --- a/internal/database/filter.go +++ b/internal/database/filter.go @@ -52,7 +52,7 @@ func (r *FilterRepo) find(ctx context.Context, tx *Tx, params domain.FilterQuery actionCountQuery := r.db.squirrel. Select("COUNT(*)"). From("action a"). - Where(sq.Eq{"a.filter_id": "f.id"}) + Where("a.filter_id = f.id") queryBuilder := r.db.squirrel. Select( @@ -123,7 +123,7 @@ func (r *FilterRepo) ListFilters(ctx context.Context) ([]domain.Filter, error) { actionCountQuery := r.db.squirrel. Select("COUNT(*)"). From("action a"). - Where(sq.Eq{"a.filter_id": "f.id"}) + Where("a.filter_id = f.id") queryBuilder := r.db.squirrel. Select( diff --git a/internal/database/release.go b/internal/database/release.go index a8719e4..d6eb24e 100644 --- a/internal/database/release.go +++ b/internal/database/release.go @@ -109,10 +109,6 @@ func (repo *ReleaseRepo) Find(ctx context.Context, params domain.ReleaseQueryPar return nil, nextCursor, total, err } - if err = tx.Commit(); err != nil { - return nil, 0, 0, errors.Wrap(err, "error commit transaction find releases") - } - return releases, nextCursor, total, nil } @@ -313,10 +309,6 @@ func (repo *ReleaseRepo) FindRecent(ctx context.Context) ([]*domain.Release, err return nil, err } - if err = tx.Commit(); err != nil { - return nil, errors.Wrap(err, "error transaction commit") - } - return releases, nil } @@ -487,8 +479,7 @@ func (repo *ReleaseRepo) Delete(ctx context.Context) error { return errors.Wrap(err, "error executing query") } - err = tx.Commit() - if err != nil { + if err := tx.Commit(); err != nil { return errors.Wrap(err, "error commit transaction delete") }