Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Supabase Node): Allow for filtering on the same field multiple times #12429

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/nodes-base/nodes/Supabase/Supabase.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ export class Supabase implements INodeType {

if (keys.length !== 0) {
if (matchType === 'allFilters') {
const data = keys.reduce((obj, value) => buildQuery(obj, value), {});
Object.assign(qs, data);
const data = keys.map((key) => buildOrQuery(key));
Object.assign(qs, { and: `(${data.join(',')})` });
}
if (matchType === 'anyFilter') {
const data = keys.map((key) => buildOrQuery(key));
Expand Down
99 changes: 99 additions & 0 deletions packages/nodes-base/nodes/Supabase/tests/Supabase.node.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import { mock } from 'jest-mock-extended';
import { get } from 'lodash';
import {
type IDataObject,
type IExecuteFunctions,
type IGetNodeParameterOptions,
type INodeExecutionData,
type IPairedItemData,
NodeOperationError,
} from 'n8n-workflow';

import * as utils from '../GenericFunctions';
import { Supabase } from '../Supabase.node';

describe('Test Supabase Node', () => {
const node = new Supabase();

const input = [{ json: {} }];

const createMockExecuteFunction = (
nodeParameters: IDataObject,
continueOnFail: boolean = false,
) => {
const fakeExecuteFunction = {
getNodeParameter(
parameterName: string,
itemIndex: number,
fallbackValue?: IDataObject | undefined,
options?: IGetNodeParameterOptions | undefined,
) {
const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;

const parameterValue = get(nodeParameters, parameter, fallbackValue);

if ((parameterValue as IDataObject)?.nodeOperationError) {
throw new NodeOperationError(mock(), 'Get Options Error', { itemIndex });
}

return parameterValue;
},
getNode() {
return node;
},
continueOnFail: () => continueOnFail,
getInputData: () => input,
helpers: {
constructExecutionMetaData: (
_inputData: INodeExecutionData[],
_options: { itemData: IPairedItemData | IPairedItemData[] },
) => [],
returnJsonArray: (_jsonData: IDataObject | IDataObject[]) => [],
},
} as unknown as IExecuteFunctions;
return fakeExecuteFunction;
};

it('should allow filtering on the same field multiple times', async () => {
const supabaseApiRequest = jest
.spyOn(utils, 'supabaseApiRequest')
.mockImplementation(async () => {
return [];
});

const fakeExecuteFunction = createMockExecuteFunction({
resource: 'row',
operation: 'getAll',
returnAll: true,
filterType: 'manual',
matchType: 'allFilters',
tableId: 'my_table',
filters: {
conditions: [
{
condition: 'gt',
keyName: 'created_at',
keyValue: '2025-01-02 08:03:43.952051+00',
},
{
condition: 'lt',
keyName: 'created_at',
keyValue: '2025-01-02 08:07:36.102231+00',
},
],
},
});

await node.execute.call(fakeExecuteFunction);

expect(supabaseApiRequest).toHaveBeenCalledWith(
'GET',
'/my_table',
{},
{
and: '(created_at.gt.2025-01-02 08:03:43.952051+00,created_at.lt.2025-01-02 08:07:36.102231+00)',
offset: 0,
},
);
});
});
Loading