[#89] simplified some code by returning early and reducing local variable scopes

tools/search/filter.go

@@ -27,21 +27,16 @@ var parsedFilterData = store.New(make(map[string][]fexpr.ExprGroup, 50))
 // BuildExpr parses the current filter data and returns a new db WHERE expression.
 func (f FilterData) BuildExpr(fieldResolver FieldResolver) (dbx.Expression, error) {
 	raw := string(f)
-	var data []fexpr.ExprGroup
-
 	if parsedFilterData.Has(raw) {
-		data = parsedFilterData.Get(raw)
-	} else {
-		var err error
-		data, err = fexpr.Parse(raw)
-		if err != nil {
-			return nil, err
-		}
-		// store in cache
-		// (the limit size is arbitrary and it is there to prevent the cache growing too big)
-		parsedFilterData.SetIfLessThanLimit(raw, data, 500)
+		return f.build(parsedFilterData.Get(raw), fieldResolver)
 	}
-
+	data, err := fexpr.Parse(raw)
+	if err != nil {
+		return nil, err
+	}
+	// store in cache
+	// (the limit size is arbitrary and it is there to prevent the cache growing too big)
+	parsedFilterData.SetIfLessThanLimit(raw, data, 500)
 	return f.build(data, fieldResolver)
 }
 

tools/search/provider.go

@@ -121,8 +121,7 @@ func (s *Provider) Parse(urlQuery string) error {
 		return err
 	}
 
-	rawPage := params.Get(PageQueryParam)
-	if rawPage != "" {
+	if rawPage := params.Get(PageQueryParam); rawPage != "" {
 		page, err := strconv.Atoi(rawPage)
 		if err != nil {
 			return err
@@ -130,8 +129,7 @@ func (s *Provider) Parse(urlQuery string) error {
 		s.Page(page)
 	}
 
-	rawPerPage := params.Get(PerPageQueryParam)
-	if rawPerPage != "" {
+	if rawPerPage := params.Get(PerPageQueryParam); rawPerPage != "" {
 		perPage, err := strconv.Atoi(rawPerPage)
 		if err != nil {
 			return err
@@ -139,15 +137,13 @@ func (s *Provider) Parse(urlQuery string) error {
 		s.PerPage(perPage)
 	}
 
-	rawSort := params.Get(SortQueryParam)
-	if rawSort != "" {
+	if rawSort := params.Get(SortQueryParam); rawSort != "" {
 		for _, sortField := range ParseSortFromString(rawSort) {
 			s.AddSort(sortField)
 		}
 	}
 
-	rawFilter := params.Get(FilterQueryParam)
-	if rawFilter != "" {
+	if rawFilter := params.Get(FilterQueryParam); rawFilter != "" {
 		s.AddFilter(FilterData(rawFilter))
 	}
 
@@ -165,35 +161,30 @@ func (s *Provider) Exec(items any) (*Result, error) {
 	modelsQuery := *s.query
 
 	// apply filters
-	if len(s.filter) > 0 {
-		for _, f := range s.filter {
-			expr, err := f.BuildExpr(s.fieldResolver)
-			if err != nil {
-				return nil, err
-			}
-			if expr != nil {
-				modelsQuery.AndWhere(expr)
-			}
+	for _, f := range s.filter {
+		expr, err := f.BuildExpr(s.fieldResolver)
+		if err != nil {
+			return nil, err
+		}
+		if expr != nil {
+			modelsQuery.AndWhere(expr)
 		}
 	}
 
 	// apply sorting
-	if len(s.sort) > 0 {
-		for _, sortField := range s.sort {
-			expr, err := sortField.BuildExpr(s.fieldResolver)
-			if err != nil {
-				return nil, err
-			}
-			if expr != "" {
-				modelsQuery.AndOrderBy(expr)
-			}
+	for _, sortField := range s.sort {
+		expr, err := sortField.BuildExpr(s.fieldResolver)
+		if err != nil {
+			return nil, err
+		}
+		if expr != "" {
+			modelsQuery.AndOrderBy(expr)
 		}
 	}
 
 	// apply field resolver query modifications (if any)
-	updateQueryErr := s.fieldResolver.UpdateQuery(&modelsQuery)
-	if updateQueryErr != nil {
-		return nil, updateQueryErr
+	if err := s.fieldResolver.UpdateQuery(&modelsQuery); err != nil {
+		return nil, err
 	}
 
 	// count

tools/search/sort.go

@@ -34,26 +34,18 @@ func (s *SortField) BuildExpr(fieldResolver FieldResolver) (string, error) {
 //
 // Example:
 //	fields := search.ParseSortFromString("-name,+created")
-func ParseSortFromString(str string) []SortField {
-	result := []SortField{}
-
+func ParseSortFromString(str string) (fields []SortField) {
 	data := strings.Split(str, ",")
 
 	for _, field := range data {
 		// trim whitespaces
 		field = strings.TrimSpace(field)
-
-		var dir string
 		if strings.HasPrefix(field, "-") {
-			dir = SortDesc
-			field = strings.TrimPrefix(field, "-")
+			fields = append(fields, SortField{strings.TrimPrefix(field, "-"), SortDesc})
 		} else {
-			dir = SortAsc
-			field = strings.TrimPrefix(field, "+")
+			fields = append(fields, SortField{strings.TrimPrefix(field, "+"), SortAsc})
 		}
-
-		result = append(result, SortField{field, dir})
 	}
 
-	return result
+	return
 }