zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-04 21:32:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: unit tests

Browse Source
This commit is contained in:
Andrey Melnikov
2020-09-30 12:54:35 -07:00
parent 1ed3b3e740
commit 49b9bc4f93
5 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/util/request/request.go
View File

@@ -1,6 +1,7 @@
package request
import (
"github.com/Masterminds/squirrel"
"github.com/onepanelio/core/pkg/util/request/pagination"
"github.com/onepanelio/core/pkg/util/request/sort"
)
@@ -14,5 +15,22 @@ type Request struct {
// HasSorting returns true if there are any sorting criteria in the request
func (r *Request) HasSorting() bool {
return r.Sort != nil && len(r.Sort.Properties) > 0
return r != nil &&
r.Sort != nil &&
len(r.Sort.Properties) > 0
}
// HasFilter returns true if there is any filtering criteria in the request
func (r *Request) HasFilter() bool {
return r != nil &&
r.Filter != nil
}
// ApplyPaginationToSelect applies the pagination to the selectBuilder, if there is a pagination.
func (r *Request) ApplyPaginationToSelect(sb *squirrel.SelectBuilder) *squirrel.SelectBuilder {
if r == nil || r.Pagination == nil {
return sb
}
return r.Pagination.ApplyToSelect(sb)
}

5
pkg/workflow_execution.go
View File

@@ -75,7 +75,7 @@ func (wf *WorkflowExecutionFilter) GetLabels() []*Label {
}
func applyWorkflowExecutionFilter(sb sq.SelectBuilder, request *request.Request) (sq.SelectBuilder, error) {
if request.Filter == nil {
if !request.HasFilter() {
return sb, nil
}
@@ -865,8 +865,7 @@ func (c *Client) ListWorkflowExecutions(namespace, workflowTemplateUID, workflow
return nil, err
}
sb = *request.Pagination.ApplyToSelect(&sb)
sb = *request.ApplyPaginationToSelect(&sb)
if err := c.DB.Selectx(&workflows, sb); err != nil {
return nil, err
}

2
pkg/workflow_template.go
View File

@@ -422,7 +422,7 @@ func (c *Client) selectWorkflowTemplatesQuery(namespace string, request *request
OrderBy("wt.created_at DESC")
sb = applyLabelSelectQuery(sb, request)
sb = *request.Pagination.ApplyToSelect(&sb)
sb = *request.ApplyPaginationToSelect(&sb)
return
}

4
pkg/workspace.go
View File

@@ -32,7 +32,7 @@ func (wf *WorkspaceFilter) GetLabels() []*Label {
}
func applyWorkspaceFilter(sb sq.SelectBuilder, request *request.Request) (sq.SelectBuilder, error) {
if request.Filter == nil {
if !request.HasFilter() {
return sb, nil
}
@@ -711,7 +711,7 @@ func (c *Client) ListWorkspaces(namespace string, request *request.Request) (wor
return nil, err
}
sb = *request.Pagination.ApplyToSelect(&sb)
sb = *request.ApplyPaginationToSelect(&sb)
if err := c.DB.Selectx(&workspaces, sb); err != nil {
return nil, err

4
pkg/workspace_template.go
View File

@@ -89,7 +89,7 @@ func (wt *WorkspaceTemplateFilter) GetLabels() []*Label {
}
func applyWorkspaceTemplateFilter(sb sq.SelectBuilder, request *request.Request) (sq.SelectBuilder, error) {
if request.Filter == nil {
if !request.HasFilter() {
return sb, nil
}
@@ -1185,7 +1185,7 @@ func (c *Client) ListWorkspaceTemplates(namespace string, request *request.Reque
return nil, err
}
sb = *request.Pagination.ApplyToSelect(&sb)
sb = *request.ApplyPaginationToSelect(&sb)
err = c.DB.Selectx(&workspaceTemplates, sb)