feat(users): filter by brand

close #681
erxes · Jan 13, 2020 · 9dca98e · 9dca98e
1 parent b5f4160
commit 9dca98e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 6 deletions.
diff --git a/src/__tests__/userQueries.test.ts b/src/__tests__/userQueries.test.ts
@@ -11,16 +11,39 @@ describe('userQueries', () => {
     await Conversations.deleteMany({});
   });
 
-  test('Users', async () => {
+  test('Test users()', async () => {
     // Creating test data
-    const user1 = await userFactory({ email: 'example@email.com' });
+    const brand = await brandFactory();
+    const user1 = await userFactory({ email: 'example@email.com', brandIds: [brand._id] });
     const user2 = await userFactory();
     const user3 = await userFactory({ isActive: false });
     await userFactory({ registrationToken: 'token' });
 
+    const paramDefs = `
+      $page: Int,
+      $perPage: Int,
+      $searchValue: String,
+      $requireUsername: Boolean,
+      $isActive: Boolean,
+      $ids: [String],
+      $status: String,
+      $brandIds: [String]
+    `;
+
+    const paramValues = `
+      page: $page,
+      perPage: $perPage,
+      searchValue: $searchValue,
+      requireUsername: $requireUsername,
+      isActive: $isActive,
+      ids: $ids,
+      status: $status,
+      brandIds: $brandIds
+    `;
+
     const qry = `
-      query users($page: Int $perPage: Int $searchValue: String $requireUsername: Boolean $isActive: Boolean $ids: [String] $status: String) {
-        users(page: $page perPage: $perPage searchValue: $searchValue requireUsername: $requireUsername isActive: $isActive ids: $ids status: $status) {
+      query users(${paramDefs}) {
+        users(${paramValues}) {
           _id
         }
       }
@@ -52,6 +75,10 @@ describe('userQueries', () => {
 
     // 6 in graphRequest + above 2
     expect(response.length).toBe(8);
+
+    response = await graphqlRequest(qry, 'users', { brandIds: [brand._id] });
+
+    expect(response.length).toBe(1);
   });
 
   test('All users', async () => {

diff --git a/src/data/resolvers/queries/users.ts b/src/data/resolvers/queries/users.ts
@@ -12,10 +12,11 @@ interface IListArgs {
   ids?: string[];
   email?: string;
   status?: string;
+  brandIds?: string[];
 }
 
 const queryBuilder = async (params: IListArgs) => {
-  const { searchValue, isActive, requireUsername, ids, status } = params;
+  const { searchValue, isActive, requireUsername, ids, status, brandIds } = params;
 
   const selector: any = {
     isActive,
@@ -47,6 +48,10 @@ const queryBuilder = async (params: IListArgs) => {
     selector.registrationToken = { $eq: null };
   }
 
+  if (brandIds && brandIds.length > 0) {
+    selector.brandIds = { $in: brandIds };
+  }
+
   return selector;
 };
 

diff --git a/src/data/schema/user.ts b/src/data/schema/user.ts
@@ -87,7 +87,8 @@ const commonSelector = `
   searchValue: String,
   isActive: Boolean,
   requireUsername: Boolean,
-  ids: [String]
+  ids: [String],
+  brandIds: [String]
 `;
 
 export const queries = `