feat(filter-operators): eq and ne operators support array (#1658)

This commit is contained in:
chenos 2023-04-07 13:34:39 +08:00 committed by GitHub
parent 0ecbd715a6
commit cefe678348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 122 additions and 8 deletions

View File

@ -0,0 +1,76 @@
import Database from '../../database';
import { mockDatabase } from '../index';
describe('eq operator', () => {
let db: Database;
let Test;
beforeEach(async () => {
db = mockDatabase({});
Test = db.collection({
name: 'tests',
fields: [{ type: 'string', name: 'name' }],
});
await db.sync();
});
afterEach(async () => {
await db.close();
});
it('should eq with array', async () => {
await db.getRepository('tests').create({
values: [
{ name: '123' },
{ name: '234' },
{ name: '345' },
]
});
const results = await db.getRepository('tests').count({
filter: {
'name.$eq': ['123', '234'],
},
});
expect(results).toEqual(2);
});
it('should eq with array', async () => {
await db.getRepository('tests').create({
values: [
{ name: '123' },
{ name: '234' },
{ name: '345' },
]
});
const results = await db.getRepository('tests').count({
filter: {
'name.$eq': '123',
},
});
expect(results).toEqual(1);
});
it('should eq with array', async () => {
await db.getRepository('tests').create({
values: [
{ name: '123' },
{ name: '234' },
{ name: '345' },
]
});
const results = await db.getRepository('tests').count({
filter: {
'name.$eq': '456',
},
});
expect(results).toEqual(0);
});
});

View File

@ -1,5 +1,5 @@
import { mockDatabase } from '../index';
import Database from '../../database';
import { mockDatabase } from '../index';
describe('ne operator', () => {
let db: Database;
@ -42,4 +42,22 @@ describe('ne operator', () => {
expect(results).toBe(0);
});
it('should ne with array', async () => {
await db.getRepository('tests').create({
values: [
{ name: '123' },
{ name: '234' },
{ name: '345' },
]
});
const results = await db.getRepository('tests').count({
filter: {
'name.$ne': ['123', '234'],
},
});
expect(results).toEqual(1);
});
});

View File

@ -0,0 +1,14 @@
import { Op } from 'sequelize';
export default {
$eq(val: any) {
if (Array.isArray(val)) {
return {
[Op.in]: val,
};
}
return {
[Op.eq]: val,
};
},
} as Record<string, any>;

View File

@ -4,6 +4,7 @@ export default {
...require('./array').default,
...require('./empty').default,
...require('./string').default,
...require('./eq').default,
...require('./ne').default,
...require('./notIn').default,
...require('./boolean').default,

View File

@ -2,15 +2,20 @@ import { Op } from 'sequelize';
export default {
$ne(val, ctx) {
if (Array.isArray(val)) {
return {
[Op.notIn]: val,
};
}
return val === null
? {
[Op.ne]: null,
}
[Op.ne]: null,
}
: {
[Op.or]: {
[Op.ne]: val,
[Op.is]: null,
},
};
[Op.or]: {
[Op.ne]: val,
[Op.is]: null,
},
};
},
} as Record<string, any>;