Merge remote-tracking branch 'origin/develop' into release/next

packages/medusa/src/api/routes/admin/customers/list-customers.js

@@ -2,18 +2,32 @@ export default async (req, res) => {
   try {
     const customerService = req.scope.resolve("customerService")
 
-    const limit = parseInt(req.query.limit) || 10
+    const limit = parseInt(req.query.limit) || 50
     const offset = parseInt(req.query.offset) || 0
 
+    const selector = {}
+
+    if ("q" in req.query) {
+      selector.q = req.query.q
+    }
+
+    let expandFields = []
+    if ("expand" in req.query) {
+      expandFields = req.query.expand.split(",")
+    }
+
     const listConfig = {
-      relations: [],
+      relations: expandFields.length ? expandFields : [],
       skip: offset,
       take: limit,
     }
 
-    const customers = await customerService.list({}, listConfig)
+    const [customers, count] = await customerService.listAndCount(
+      selector,
+      listConfig
+    )
 
-    res.json({ customers, count: customers.length, offset, limit })
+    res.json({ customers, count, offset, limit })
   } catch (error) {
     throw error
   }

packages/medusa/src/services/customer.js

@@ -3,6 +3,7 @@ import Scrypt from "scrypt-kdf"
 import _ from "lodash"
 import { Validator, MedusaError } from "medusa-core-utils"
 import { BaseService } from "medusa-interfaces"
+import { Brackets } from "typeorm"
 
 /**
  * Provides layer to manipulate customers.
@@ -132,6 +133,50 @@ class CustomerService extends BaseService {
     return customerRepo.find(query)
   }
 
+  async listAndCount(
+    selector,
+    config = { relations: [], skip: 0, take: 50, order: { created_at: "DESC" } }
+  ) {
+    const customerRepo = this.manager_.getCustomRepository(
+      this.customerRepository_
+    )
+
+    let q
+    if ("q" in selector) {
+      q = selector.q
+      delete selector.q
+    }
+
+    const query = this.buildQuery_(selector, config)
+
+    if (q) {
+      const where = query.where
+
+      delete where.email
+      delete where.first_name
+      delete where.last_name
+
+      query.join = {
+        alias: "customer",
+      }
+
+      query.where = qb => {
+        qb.where(where)
+
+        qb.andWhere(
+          new Brackets(qb => {
+            qb.where(`customer.first_name ILIKE :q`, { q: `%${q}%` })
+              .orWhere(`customer.last_name ILIKE :q`, { q: `%${q}%` })
+              .orWhere(`customer.email ILIKE :q`, { q: `%${q}%` })
+          })
+        )
+      }
+    }
+
+    const [customers, count] = await customerRepo.findAndCount(query)
+    return [customers, count]
+  }
+
   /**
    * Return the total number of documents in database
    * @return {Promise} the result of the count operation