fix lint error

openinfradev · Jan 24, 2024 · f7b3bab · f7b3bab
1 parent 577cafb
commit f7b3bab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/internal/filter/filter.go b/internal/filter/filter.go
@@ -30,7 +30,7 @@ func (f *Filter) Scope(settings *Settings, sch *schema.Schema) (func(*gorm.DB) *
 		}
 		if joinName != "" {
 			if err := tx.Statement.Parse(tx.Statement.Model); err != nil {
-				tx.AddError(err)
+				_ = tx.AddError(err)
 				return tx
 			}
 			tx = join(tx, joinName, sch)

diff --git a/internal/filter/join.go b/internal/filter/join.go
@@ -93,7 +93,7 @@ func joinScope(relationName string, rel *schema.Relationship, fields []string, b
 
 	return func(tx *gorm.DB) *gorm.DB {
 		if rel.FieldSchema.Table == "" {
-			tx.AddError(fmt.Errorf("Relation %q is anonymous, could not get table name", relationName))
+			_ = tx.AddError(fmt.Errorf("Relation %q is anonymous, could not get table name", relationName))
 			return tx
 		}
 		if columns != nil {
@@ -160,7 +160,7 @@ func join(tx *gorm.DB, joinName string, sch *schema.Schema) *gorm.DB {
 		}
 	}
 	if c, ok := tx.Statement.Clauses["FROM"]; ok {
-		from := c.Expression.(clause.From)
+		from, _ := c.Expression.(clause.From)
 		from.Joins = append(from.Joins, joins...)
 		c.Expression = from
 		tx.Statement.Clauses["FROM"] = c
@@ -171,7 +171,7 @@ func join(tx *gorm.DB, joinName string, sch *schema.Schema) *gorm.DB {
 
 func joinExists(stmt *gorm.Statement, join clause.Join) bool {
 	if c, ok := stmt.Clauses["FROM"]; ok {
-		from := c.Expression.(clause.From)
+		from, _ := c.Expression.(clause.From)
 		c.Expression = from
 		for _, j := range from.Joins {
 			if j.Table == join.Table {

diff --git a/internal/filter/search.go b/internal/filter/search.go
@@ -36,7 +36,7 @@ func (s *Search) Scope(schema *schema.Schema) func(*gorm.DB) *gorm.DB {
 
 			if joinName != "" {
 				if err := tx.Statement.Parse(tx.Statement.Model); err != nil {
-					tx.AddError(err)
+					_ = tx.AddError(err)
 					return tx
 				}
 				tx = join(tx, joinName, schema)

diff --git a/internal/filter/settings.go b/internal/filter/settings.go
@@ -131,7 +131,7 @@ func (s *Settings) scopeFields(db *gorm.DB, request *goyave.Request, schema *sch
 		fields := strings.Split(request.String("fields"), ",")
 		if hasJoins {
 			if len(schema.PrimaryFieldDBNames) == 0 {
-				db.AddError(fmt.Errorf("Could not find primary key. Add `gorm:\"primaryKey\"` to your model"))
+				_ = db.AddError(fmt.Errorf("Could not find primary key. Add `gorm:\"primaryKey\"` to your model"))
 				return nil
 			}
 			fields = addPrimaryKeys(schema, fields)

diff --git a/internal/filter/sort.go b/internal/filter/sort.go
@@ -32,7 +32,7 @@ func (s *Sort) Scope(settings *Settings, schema *schema.Schema) func(*gorm.DB) *
 	return func(tx *gorm.DB) *gorm.DB {
 		if joinName != "" {
 			if err := tx.Statement.Parse(tx.Statement.Model); err != nil {
-				tx.AddError(err)
+				_ = tx.AddError(err)
 				return tx
 			}
 			tx = join(tx, joinName, schema)

diff --git a/internal/pagination/pagination.go b/internal/pagination/pagination.go
@@ -103,8 +103,6 @@ func (p *Pagination) MakePaginationRequest() {
 			Or:       false,
 		}
 
-		log.Info(helper.ModelToJson(f.Values))
-
 		pgFilters = append(pgFilters, &pgFilter)
 	}
 
@@ -202,13 +200,18 @@ func NewPagination(urlParams *url.Values) (*Pagination, error) {
 					column = arrColumns[1]
 				}
 
-				trimmedStr := strings.Trim(arr[2], "[]")
+				trimmedStr := strings.Trim(arr[1], "[]")
 				values := strings.Split(trimmedStr, ",")
 
+				op := "$cont"
+				if len(arr) == 3 {
+					op = arr[2]
+				}
+
 				pg.Filters = append(pg.Filters, Filter{
 					Column:   helper.ToSnakeCase(strings.Replace(column, "[]", "", -1)),
 					Relation: releation,
-					Operator: arr[1],
+					Operator: op,
 					Values:   values,
 				})
 			}