Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-01 15:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move query parsing to Query class

Browse source
This commit is contained in:
John R. Supplee 2021-03-10 12:39:39 +02:00
parent 097cae1f8c
commit 6def7d6f70
3 changed files with 374 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

26
server/publications/cards.js
View file

@ -1,7 +1,9 @@
import moment from 'moment';
import Users from '../../models/users';
import Boards from '../../models/boards';
import Lists from '../../models/lists';
import Swimlanes from '../../models/swimlanes';
import Cards from '../../models/cards';
import CardComments from '../../models/cardComments';
import Attachments from '../../models/attachments';
import Checklists from '../../models/checklists';
@ -411,26 +413,26 @@ function buildSelector(queryParams) {
const attachments = Attachments.find({ 'original.name': regex });
// const comments = CardComments.find(
// { text: regex },
// { fields: { cardId: 1 } },
// );
const comments = CardComments.find(
{ text: regex },
{ fields: { cardId: 1 } },
);
selector.$and.push({
$or: [
{ title: regex },
{ description: regex },
{ customFields: { $elemMatch: { value: regex } } },
{
_id: {
$in: CardComments.textSearch(userId, [queryParams.text]).map(
com => com.cardId,
),
},
},
// {
// _id: {
// $in: CardComments.textSearch(userId, [queryParams.text]).map(
// com => com.cardId,
// ),
// },
// },
{ _id: { $in: checklists.map(list => list.cardId) } },
{ _id: { $in: attachments.map(attach => attach.cardId) } },
// { _id: { $in: comments.map(com => com.cardId) } },
{ _id: { $in: comments.map(com => com.cardId) } },
],
});
}