Fix connector filter
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
@@ -63,7 +63,7 @@ func (c *Connectors) LoadByOrganizationID(
|
||||
organizationID gid.GID,
|
||||
cursor *page.Cursor[ConnectorOrderField],
|
||||
encryptionKey cipher.EncryptionKey,
|
||||
filter *ConnectorProviderFilter,
|
||||
filter *ConnectorFilter,
|
||||
) error {
|
||||
if err := c.loadByOrganizationIDWithPagination(ctx, conn, scope, organizationID, cursor, filter); err != nil {
|
||||
return fmt.Errorf("cannot load connectors by organization ID: %w", err)
|
||||
@@ -120,7 +120,7 @@ func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection(
|
||||
scope Scoper,
|
||||
organizationID gid.GID,
|
||||
cursor *page.Cursor[ConnectorOrderField],
|
||||
filter *ConnectorProviderFilter,
|
||||
filter *ConnectorFilter,
|
||||
) error {
|
||||
return c.loadByOrganizationIDWithPagination(ctx, conn, scope, organizationID, cursor, filter)
|
||||
}
|
||||
@@ -246,7 +246,7 @@ func (c *Connectors) loadByOrganizationIDWithPagination(
|
||||
scope Scoper,
|
||||
organizationID gid.GID,
|
||||
cursor *page.Cursor[ConnectorOrderField],
|
||||
filter *ConnectorProviderFilter,
|
||||
filter *ConnectorFilter,
|
||||
) error {
|
||||
q := `
|
||||
SELECT
|
||||
|
||||
@@ -19,28 +19,24 @@ import (
|
||||
)
|
||||
|
||||
type (
|
||||
ConnectorProviderFilter struct {
|
||||
ConnectorFilter struct {
|
||||
provider *ConnectorProvider
|
||||
}
|
||||
)
|
||||
|
||||
func NewConnectorProviderFilter(provider *ConnectorProvider) *ConnectorProviderFilter {
|
||||
return &ConnectorProviderFilter{
|
||||
func NewConnectorProviderFilter(provider *ConnectorProvider) *ConnectorFilter {
|
||||
return &ConnectorFilter{
|
||||
provider: provider,
|
||||
}
|
||||
}
|
||||
|
||||
func (f *ConnectorProviderFilter) SQLArguments() pgx.NamedArgs {
|
||||
args := pgx.NamedArgs{}
|
||||
|
||||
if f.provider != nil {
|
||||
args["provider"] = *f.provider
|
||||
func (f *ConnectorFilter) SQLArguments() pgx.NamedArgs {
|
||||
return pgx.NamedArgs{
|
||||
"provider": f.provider,
|
||||
}
|
||||
|
||||
return args
|
||||
}
|
||||
|
||||
func (f *ConnectorProviderFilter) SQLFragment() string {
|
||||
func (f *ConnectorFilter) SQLFragment() string {
|
||||
return `
|
||||
(
|
||||
CASE
|
||||
@@ -59,7 +59,7 @@ func (s *ConnectorService) ListForOrganizationID(
|
||||
ctx context.Context,
|
||||
organizationID gid.GID,
|
||||
cursor *page.Cursor[coredata.ConnectorOrderField],
|
||||
filter *coredata.ConnectorProviderFilter,
|
||||
filter *coredata.ConnectorFilter,
|
||||
) (*page.Page[*coredata.Connector, coredata.ConnectorOrderField], error) {
|
||||
var connectors coredata.Connectors
|
||||
|
||||
|
||||
Reference in New Issue
Block a user