updated filtering code
This commit is contained in:
@@ -59,11 +59,11 @@ export async function listTasks(params: PageQueryParams, tenantId: string) {
|
||||
const page = params.page || 1;
|
||||
const pageSize = params.pageSize || 10;
|
||||
const sortObj = getSortObject(params, taskFields);
|
||||
const filterObj = getFilterObject(params, taskFields);
|
||||
const filterObj = getFilterObject(params);
|
||||
|
||||
const taskList = await taskModel.aggregate([
|
||||
{
|
||||
$match: { $and: [{ tenantId: tenantId }, ...filterObj] },
|
||||
$match: { $and: [{ tenantId: tenantId }, { ...filterObj }] },
|
||||
},
|
||||
{
|
||||
$lookup: {
|
||||
@@ -145,13 +145,13 @@ export async function searchTasks(params: PageQueryParams, tenantId: string) {
|
||||
const page = params.page || 1;
|
||||
const pageSize = params.pageSize || 10;
|
||||
const sortObj = getSortObject(params, taskFields);
|
||||
const filterObj = getFilterObject(params, taskFields);
|
||||
const filterObj = getFilterObject(params);
|
||||
|
||||
const regex = new RegExp(params.searchToken, 'i');
|
||||
|
||||
const taskList = await taskModel.aggregate([
|
||||
{
|
||||
$match: { $and: [{ tenantId: tenantId }, ...filterObj] },
|
||||
$match: { $and: [{ tenantId: tenantId }, { ...filterObj }] },
|
||||
},
|
||||
{
|
||||
$match: {
|
||||
|
||||
Reference in New Issue
Block a user