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

use nil declaration for slices

This commit is contained in:
Dawid Wysokiński 2021-05-04 20:37:06 +02:00
parent d38e675c9e
commit db31c0fb12
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/models/question.go
View File

@ -244,9 +244,12 @@ func (f *QuestionFilter) WhereWithAlias(q *orm.Query, alias string) (*orm.Query,
q = q.Where(gopgutil.BuildConditionNotInArray("?"), gopgutil.AddAliasToColumnName("qualification_id", alias), pg.Array(f.QualificationIDNEQ))
}
var err error
if f.QualificationFilter != nil {
q = q.Relation("Qualification._")
q, _ = f.QualificationFilter.WhereWithAlias(q, "qualification")
q, err = f.QualificationFilter.WhereWithAlias(q.Relation("Qualification._"), "qualification")
if err != nil {
return q, err
}
}
if !isZero(f.CreatedAt) {

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

@ -62,7 +62,7 @@ func (repo *pgRepository) UpdateMany(ctx context.Context, f *models.ProfessionFi
}
func (repo *pgRepository) Delete(ctx context.Context, f *models.ProfessionFilter) ([]*models.Profession, error) {
items := []*models.Profession{}
var items []*models.Profession
if _, err := repo.
Model(&items).
Context(ctx).
@ -76,7 +76,7 @@ func (repo *pgRepository) Delete(ctx context.Context, f *models.ProfessionFilter
func (repo *pgRepository) Fetch(ctx context.Context, cfg *profession.FetchConfig) ([]*models.Profession, int, error) {
var err error
items := []*models.Profession{}
var items []*models.Profession
total := 0
query := repo.
Model(&items).
@ -107,7 +107,7 @@ func (repo *pgRepository) GetAssociatedQualifications(
for _, id := range ids {
m[id] = []*models.Qualification{}
}
qualificationToProfession := []*models.QualificationToProfession{}
var qualificationToProfession []*models.QualificationToProfession
if err := repo.
Model(&qualificationToProfession).
Context(ctx).

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

@ -57,7 +57,7 @@ func (repo *pgRepository) UpdateMany(
f *models.QualificationFilter,
input *models.QualificationInput,
) ([]*models.Qualification, error) {
items := []*models.Qualification{}
var items []*models.Qualification
err := repo.RunInTransaction(ctx, func(tx *pg.Tx) error {
if input.HasBasicDataToUpdate() {
if _, err := tx.
@ -108,7 +108,7 @@ func (repo *pgRepository) UpdateMany(
}
func (repo *pgRepository) Delete(ctx context.Context, f *models.QualificationFilter) ([]*models.Qualification, error) {
items := []*models.Qualification{}
var items []*models.Qualification
if _, err := repo.
Model(&items).
Context(ctx).
@ -122,7 +122,7 @@ func (repo *pgRepository) Delete(ctx context.Context, f *models.QualificationFil
func (repo *pgRepository) Fetch(ctx context.Context, cfg *qualification.FetchConfig) ([]*models.Qualification, int, error) {
var err error
items := []*models.Qualification{}
var items []*models.Qualification
total := 0
query := repo.
Model(&items).
@ -152,7 +152,7 @@ func (repo *pgRepository) GetSimilar(ctx context.Context, cfg *qualification.Get
Context(ctx).
Where(gopgutil.BuildConditionEquals("qualification_id"), cfg.QualificationID).
Column("profession_id")
qualificationIDs := []int{}
var qualificationIDs []int
err = repo.
Model(&models.QualificationToProfession{}).
Context(ctx).
@ -181,7 +181,7 @@ func (repo *pgRepository) GetSimilar(ctx context.Context, cfg *qualification.Get
}
func (repo *pgRepository) associateQualificationWithProfession(tx *pg.Tx, qualificationIDs, professionIDs []int) error {
toInsert := []*models.QualificationToProfession{}
var toInsert []*models.QualificationToProfession
for _, professionID := range professionIDs {
for _, qualificationID := range qualificationIDs {
toInsert = append(toInsert, &models.QualificationToProfession{

8
internal/question/repository/pg_repository.go
View File

@ -98,7 +98,7 @@ func (repo *pgRepository) UpdateOneByID(ctx context.Context, id int, input *mode
}
func (repo *pgRepository) Delete(ctx context.Context, f *models.QuestionFilter) ([]*models.Question, error) {
items := []*models.Question{}
var items []*models.Question
if _, err := repo.
Model(&items).
Context(ctx).
@ -122,10 +122,10 @@ func (repo *pgRepository) Fetch(ctx context.Context, cfg *question.FetchConfig)
Context(ctx).
Limit(cfg.Limit).
Offset(cfg.Offset).
Apply(cfg.Filter.Where).
Apply(gopgutil.OrderAppender{
Orders: cfg.Sort,
}.Apply).
Apply(cfg.Filter.Where)
}.Apply)
if cfg.Count {
total, err = query.SelectAndCount()
@ -145,7 +145,7 @@ func (repo *pgRepository) GenerateTest(ctx context.Context, cfg *question.Genera
Where(gopgutil.BuildConditionArray("qualification_id"), pg.Array(cfg.Qualifications)).
OrderExpr("random()").
Limit(cfg.Limit)
items := []*models.Question{}
var items []*models.Question
if err := repo.
Model(&items).
Context(ctx).

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

@ -62,7 +62,7 @@ func (repo *pgRepository) UpdateMany(ctx context.Context, f *models.UserFilter,
}
func (repo *pgRepository) Delete(ctx context.Context, f *models.UserFilter) ([]*models.User, error) {
items := []*models.User{}
var items []*models.User
if _, err := repo.
Model(&items).
Context(ctx).
@ -76,7 +76,7 @@ func (repo *pgRepository) Delete(ctx context.Context, f *models.UserFilter) ([]*
func (repo *pgRepository) Fetch(ctx context.Context, cfg *user.FetchConfig) ([]*models.User, int, error) {
var err error
items := []*models.User{}
var items []*models.User
total := 0
query := repo.
Model(&items).