Skip to content

[SER-2015] replaced push with old version #5659

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 17, 2024
Merged

[SER-2015] replaced push with old version #5659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dcfbf9
[push] replaced push with old version
Oct 10, 2024
af199e3
[push] eslint fix
Oct 10, 2024
560c7bb
[push] codacy fix
Oct 10, 2024
437ecb0
Merge branch 'master' into SER-2015-replace-masters-push-with-pre-rec…
ArtursKadikis Oct 17, 2024
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
204 changes: 36 additions & 168 deletions plugins/push/api/api-drill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const common = require('../../../api/utils/common'),
countlyCommon = require('../../../api/lib/countly.common.js'),
log = common.log('push:api:drill'),
{ FIELDS_TITLES } = require('./send/platforms');
log = common.log('push:api:drill');

module.exports.drillAddPushEvents = ({uid, params, events, event}) => {
return new Promise((res, rej) => {
Expand Down Expand Up @@ -95,190 +94,59 @@ function messageQuery(message) {
}
}

/**
* Find messages using particular query and return ids
*
* @param {object} q message collection query
* @returns {String[]} array of message ids
*/
async function find(q) {
let ids = await common.db.collection('messages').find(q, {projection: {_id: 1}}).toArray();
ids = (ids || []).map(id => id._id.toString());
return ids.length ? ids : ['nope'];
}

const toIdsMappers = {
'message.name': (query, app_id) => find({app: common.db.ObjectID(app_id), 'info.title': query}),
'message.title': (query, app_id) => find({app: common.db.ObjectID(app_id), 'contents.title': query}),
'message.message': (query, app_id) => find({app: common.db.ObjectID(app_id), 'contents.message': query}),
};

module.exports.drillPreprocessQuery = async function({query, params}) {
if (query && params && params.qstring && params.qstring.event === '[CLY]_push_action') {
if (query.$or) {
for (let i = 0; i < query.$or.length; i++) {
let q = query.$or[i];
for (let k in q) {
if (toIdsMappers[k]) {
let ids = await toIdsMappers[k](q[k], params.app_id);
log.d(`replaced query.$or[${i}] (%j) with %j`, query.$or[i], {'sg.i': {$in: ids}});
query.$or[i] = {
'sg.i': {$in: ids}
};
}
}
module.exports.drillPreprocessQuery = ({query, params}) => {
if (query) {
if (query.push) {
if (query.push.$nin) {
query.$and = query.push.$nin.map(tk => {
return {$or: [{[tk]: false}, {[tk]: {$exists: false}}]};
});
}
}
for (let k in query) {
if (toIdsMappers[k]) {
let ids = await toIdsMappers[k](query[k], params.app_id);
if (query['sg.i'] && query['sg.i'].$in) {
query['sg.i'].$in = query['sg.i'].$in.filter(id => ids.includes(id));
}
else if (query['sg.i']) {
query['sg.i'].$in = ids;
}
else {
query['sg.i'] = {$in: ids};
}
log.d(`replaced query[${k}] (%j) with %j`, query[k], query['sg.i']);
delete query[k];
if (query.push.$in) {
let q = query.push.$in.map(tk => {
return {[tk]: true};
});
query.$or = q;
}
delete query.push;
}
if (query['sg.i'] && query['sg.i'].$in && !query['sg.i'].$in.length) {
query['sg.i'].$in = ['nope'];
}
// if (query.push) {
// if (query.push.$nin) {
// query.$and = query.push.$nin.map(tk => {
// return {$or: [{[tk]: false}, {[tk]: {$exists: false}}]};
// });
// }
// if (query.push.$in) {
// let q = query.push.$in.map(tk => {
// return {[tk]: true};
// });
// query.$or = q;
// }
// delete query.push;
// }
}
else if (query && params) {

if (query.message) {
let q = messageQuery(query.message);

if (!q) {
return;
return Promise.resolve();
}

log.d(`removing message ${JSON.stringify(query.message)} from queryObject`);
delete query.message;

try {
let ids = await common.db.collection(`push_${params.app_id}`).find(q, {projection: {_id: 1}}).toArray();
ids = (ids || []).map(id => id._id);
query.uid = {$in: ids};
log.d(`filtered by message: uids out of ${ids.length}`);
}
catch (e) {
log.e(e);
}
}
}

if (query.push) {
let q;
if (query.push.$nin) {
q = {
$and: query.push.$nin.map(tk => {
return {[tk]: {$exists: false}};
})
};
}
if (query.push.$in) {
q = {
$or: query.push.$in.map(tk => {
return {[tk]: {$exists: true}};
})
};
}
if (query.push.$regex) {
q = Object.keys(FIELDS_TITLES).filter(k => query.push.$regex.test(FIELDS_TITLES[k])).map(tk => {
return {[tk]: {$exists: true}};
});
}

delete query.push;

if (q) {
if (query.$or) {
query.$and = [query.$or, q];
}
else if (query.$and) {
query.$and = [query.$and, q];
}
else {
for (let k in q) {
query[k] = q[k];
return new Promise((res, rej) => {
try {
common.db.collection(`push_${params.app_id}`).find(q, {projection: {_id: 1}}).toArray((err, ids) => {
if (err) {
rej(err);
}
else {
ids = (ids || []).map(id => id._id);
query.uid = {$in: ids};
log.d(`filtered by message: uids out of ${ids.length}`);
res();
}
});
}
}
catch (e) {
log.e(e);
rej(e);
}
});
}
}
};

// module.exports.drillPreprocessQuery = ({query, params}) => {
// if (query) {
// if (query.push) {
// if (query.push.$nin) {
// query.$and = query.push.$nin.map(tk => {
// return {$or: [{[tk]: false}, {[tk]: {$exists: false}}]};
// });
// }
// if (query.push.$in) {
// let q = query.push.$in.map(tk => {
// return {[tk]: true};
// });
// query.$or = q;
// }
// delete query.push;
// }

// if (query.message) {
// let q = messageQuery(query.message);

// if (!q) {
// return;
// }

// log.d(`removing message ${JSON.stringify(query.message)} from queryObject`);
// delete query.message;

// return new Promise((res, rej) => {
// try {
// common.db.collection(`push_${params.app_id}`).find(q, {projection: {_id: 1}}).toArray((err, ids) => {
// if (err) {
// rej(err);
// }
// else {
// ids = (ids || []).map(id => id._id);
// query.uid = {$in: ids};
// log.d(`filtered by message: uids out of ${ids.length}`);
// res();
// }
// });
// }
// catch (e) {
// log.e(e);
// rej(e);
// }
// });
// }
// }
// };

module.exports.drillPostprocessUids = ({uids, params}) => new Promise((res, rej) => {
let message = params && params.initialQueryObject && params.initialQueryObject.message;
if (uids && uids.length && message) {
let message = params.initialQueryObject && params.initialQueryObject.message;
if (uids.length && message) {
log.d(`filtering ${uids.length} uids by message`);

let q = messageQuery(message);
Expand Down
Loading
Loading