zdam-egzamin-zawodowy
/
backend
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

profession, qualification, user: fix sorting

This commit is contained in:
Dawid Wysokiński 2021-03-11 20:23:53 +01:00
parent 5dd92c0665
commit 81900132ea
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/profession/repository/pg_repository.go
View File

@ -88,7 +88,8 @@ func (repo *pgRepository) Fetch(ctx context.Context, cfg *profession.FetchConfig
Context(ctx).
Limit(cfg.Limit).
Offset(cfg.Offset).
Apply(cfg.Filter.Where)
Apply(cfg.Filter.Where).
Order(cfg.Sort...)
if cfg.Count {
total, err = query.SelectAndCount()

10
internal/qualification/repository/pg_repository.go
View File

@ -5,8 +5,6 @@ import (
"fmt"
"strings"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
sqlutils "github.com/zdam-egzamin-zawodowy/backend/pkg/utils/sql"
errorutils "github.com/zdam-egzamin-zawodowy/backend/pkg/utils/error"
@ -118,10 +116,7 @@ func (repo *pgRepository) UpdateMany(
})
}
}
_, err := tx.Model(&toInsert).Insert()
if err != nil {
logrus.Debug(errors.Wrap(err, "Couldn't insert []*models.QualificationToProfession{}"))
}
tx.Model(&toInsert).Insert()
}
}
@ -152,7 +147,8 @@ func (repo *pgRepository) Fetch(ctx context.Context, cfg *qualification.FetchCon
Context(ctx).
Limit(cfg.Limit).
Offset(cfg.Offset).
Apply(cfg.Filter.Where)
Apply(cfg.Filter.Where).
Order(cfg.Sort...)
if cfg.Count {
total, err = query.SelectAndCount()

3
internal/user/repository/pg_repository.go
View File

@ -88,7 +88,8 @@ func (repo *pgRepository) Fetch(ctx context.Context, cfg *user.FetchConfig) ([]*
Context(ctx).
Limit(cfg.Limit).
Offset(cfg.Offset).
Apply(cfg.Filter.Where)
Apply(cfg.Filter.Where).
Order(cfg.Sort...)
if cfg.Count {
total, err = query.SelectAndCount()