frx/kurious
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

api fixes for list filters

Browse Source
This commit is contained in:
Gitea
2023-12-14 20:59:58 +03:00
parent e80d5145cf
commit 2f3a6e35e9
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/dev/sravnicli/products.go
View File

@ -9,6 +9,7 @@ import (
"git.loyso.art/frx/kurious/internal/common/client/sravni" "git.loyso.art/frx/kurious/internal/common/client/sravni"
"git.loyso.art/frx/kurious/internal/common/errors" "git.loyso.art/frx/kurious/internal/common/errors"
"git.loyso.art/frx/kurious/internal/common/xslice"
"github.com/teris-io/cli" "github.com/teris-io/cli"
) )
@ -184,7 +185,13 @@ func (a *productsFilterCountAction) parse(args []string, options map[string]stri
return errors.SimpleError(learningTypeOptName + " is empty") return errors.SimpleError(learningTypeOptName + " is empty")
} }
a.params.courseThematic = strings.Split(options[courseThematicOptName], ",") filterNotEmpty := func(value string) bool {
return value != ""
}
a.params.courseThematic = xslice.Filter(
strings.Split(options[courseThematicOptName], ","),
filterNotEmpty,
)
a.params.learningSelectionType = options[learningTypeSelectionOptName] a.params.learningSelectionType = options[learningTypeSelectionOptName]
client, err := makeSravniClient(a.ctx, a.log, options) client, err := makeSravniClient(a.ctx, a.log, options)

4
internal/common/client/sravni/client.go
View File

@ -276,7 +276,7 @@ func (c *client) ListEducationalProductsFilterCount(
ctx context.Context, ctx context.Context,
params ListEducationProductsParams, params ListEducationProductsParams,
) (result ProductsFilterCount, err error) { ) (result ProductsFilterCount, err error) {
const urlPath = "/v2/education/prodicts/fitter/count" const urlPath = "/v2/education/products/filter/count"
if err = c.checkClientInited(); err != nil { if err = c.checkClientInited(); err != nil {
return result, err return result, err
} }
@ -307,7 +307,7 @@ func (c *client) ListEducationalProductsFilterCount(
var respData DataContainer[ProductsFilterCount] var respData DataContainer[ProductsFilterCount]
resp, err := c.http.R(). resp, err := c.http.R().
SetBody(reqParams). SetBody(reqParams).
SetResult(&result). SetResult(&respData).
EnableTrace(). EnableTrace().
Post(c.makeEducationURL(urlPath)) Post(c.makeEducationURL(urlPath))
if err != nil { if err != nil {

2
internal/common/client/sravni/entities.go
View File

@ -130,7 +130,7 @@ type ReduxConfigSorting struct {
type ReduxConfig struct { type ReduxConfig struct {
Default struct { Default struct {
SortingParameters []string `json:"sortingParameters"` SortingParameters []ReduxConfigSorting `json:"sortingParameters"`
} `json:"default"` } `json:"default"`
DataSources map[string]ReduxDataSource `json:"dataSources"` DataSources map[string]ReduxDataSource `json:"dataSources"`
Dictionaries struct { Dictionaries struct {