updated filtering code

This commit is contained in:
2025-05-02 16:27:52 +05:30
parent 4153bd2412
commit c84cd055d4
10 changed files with 160 additions and 211 deletions

View File

@@ -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: {