Merge pull request #7124 from Countly/ar2rsawseen/master2

app id validations

Author: ar2rsawseen

api/parts/mgmt/event_groups.js

@@ -64,7 +64,7 @@ const create = (params) => {
 const update = (params) => {
     if (params.qstring.args) {
         params.qstring.args = JSON.parse(params.qstring.args);
-        common.db.collection(COLLECTION_NAME).update({'_id': params.qstring.args._id}, {$set: params.qstring.args}, (error) =>{
+        common.db.collection(COLLECTION_NAME).updateOne({'_id': params.qstring.args._id, app_id: params.qstring.app_id}, {$set: params.qstring.args}, (error) =>{
             if (error) {
                 common.returnMessage(params, 500, `error: ${error}`);
                 return false;
@@ -78,7 +78,7 @@ const update = (params) => {
         params.qstring.event_order.forEach(function(id, index) {
             bulkArray.push({
                 'updateOne': {
-                    'filter': { '_id': id },
+                    'filter': { '_id': id, app_id: params.qstring.app_id },
                     'update': { '$set': { 'order': index } }
                 }
             });
@@ -95,7 +95,7 @@ const update = (params) => {
         params.qstring.update_status = JSON.parse(params.qstring.update_status);
         params.qstring.status = JSON.parse(params.qstring.status);
         var idss = params.qstring.update_status;
-        common.db.collection(COLLECTION_NAME).update({ _id: { $in: params.qstring.update_status } }, { $set: { status: params.qstring.status } }, {multi: true}, function(error) {
+        common.db.collection(COLLECTION_NAME).update({ _id: { $in: params.qstring.update_status }, app_id: params.qstring.app_id }, { $set: { status: params.qstring.status } }, {multi: true}, function(error) {
             if (error) {
                 common.returnMessage(params, 500, `error: ${error}`);
                 return false;
@@ -154,7 +154,7 @@ const update = (params) => {
 const remove = async(params) => {
     params.qstring.args = JSON.parse(params.qstring.args);
     var idss = params.qstring.args;
-    common.db.collection(COLLECTION_NAME).remove({_id: { $in: params.qstring.args }}, (error) =>{
+    common.db.collection(COLLECTION_NAME).remove({_id: { $in: params.qstring.args }, app_id: params.qstring.app_id}, (error) =>{
         if (error) {
             common.returnMessage(params, 500, `error: ${error}`);
             return false;

plugins/data-manager/api/api.js

@@ -162,7 +162,8 @@ plugins.register("/i/data-manager/category/edit", function(ob) {
                 bulkArray.push({
                     'updateOne': {
                         'filter': {
-                            '_id': id
+                            '_id': id,
+                            app: appId
                         },
                         'update': {
                             '$set': {