perf(integrations): add brand restriction option to integrations

Close erxes/erxes#2050
erxes · Jun 11, 2020 · ff534a0 · ff534a0
1 parent d98af15
commit ff534a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/apolloClient.ts b/src/apolloClient.ts
@@ -65,6 +65,7 @@ const apolloServer = new ApolloServer({
     if (USE_BRAND_RESTRICTIONS !== 'true') {
       return {
         brandIdSelector: {},
+        singleBrandIdSelector: {},
         userBrandIdsSelector: {},
         docModifier: doc => doc,
         commonQuerySelector: {},
@@ -80,6 +81,7 @@ const apolloServer = new ApolloServer({
     let commonQuerySelector = {};
     let commonQuerySelectorElk;
     let userBrandIdsSelector = {};
+    let singleBrandIdSelector = {};
 
     if (user) {
       brandIds = user.brandIds || [];
@@ -93,11 +95,13 @@ const apolloServer = new ApolloServer({
         commonQuerySelector = { scopeBrandIds: { $in: scopeBrandIds } };
         commonQuerySelectorElk = { terms: { scopeBrandIds } };
         userBrandIdsSelector = { brandIds: { $in: scopeBrandIds } };
+        singleBrandIdSelector = { brandId: { $in: scopeBrandIds } };
       }
     }
 
     return {
       brandIdSelector,
+      singleBrandIdSelector,
       docModifier: doc => ({ ...doc, scopeBrandIds }),
       commonQuerySelector,
       commonQuerySelectorElk,

diff --git a/src/data/resolvers/queries/integrations.ts b/src/data/resolvers/queries/integrations.ts
@@ -55,13 +55,15 @@ const integrationQueries = {
       page: number;
       perPage: number;
       kind: string;
+
       searchValue: string;
       channelId: string;
       brandId: string;
       tag: string;
     },
+    { singleBrandIdSelector }: IContext,
   ) {
-    const query = await generateFilterQuery(args);
+    const query = { ...singleBrandIdSelector, ...(await generateFilterQuery(args)) };
     const integrations = paginate(Integrations.findIntegrations(query), args);
 
     return integrations.sort({ name: 1 });

diff --git a/src/data/types.ts b/src/data/types.ts
@@ -10,6 +10,7 @@ export interface IContext {
   userBrandIdsSelector: {};
   commonQuerySelector: {};
   commonQuerySelectorElk: {};
+  singleBrandIdSelector: {};
   dataSources: {
     EngagesAPI: any;
     IntegrationsAPI: any;