Merge branch 'develop' into chore/clean-up-models

.changeset/little-carrots-serve.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/client-types": patch
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Adds support for ordering GET /admin/orders

integration-tests/api/__tests__/admin/order/order.js

@@ -78,6 +78,23 @@ describe("/admin/orders", () => {
         })
       expect(response.status).toEqual(200)
     })
+
+    it("gets orders ordered by display_id", async () => {
+      const api = useApi()
+
+      const response = await api
+        .get("/admin/orders?order=display_id", adminReqConfig)
+        .catch((err) => {
+          console.log(err)
+        })
+      expect(response.status).toEqual(200)
+
+      const sortedOrders = response.data.orders.sort((a, b) => {
+        return a.display_id - b.display_id
+      })
+
+      expect(response.data.orders).toEqual(sortedOrders)
+    })
   })
 
   describe("POST /admin/orders/:id", () => {

integration-tests/plugins/__tests__/customer/admin/list-customer-groups.spec.ts

@@ -0,0 +1,63 @@
+import { ModuleRegistrationName } from "@medusajs/modules-sdk"
+import { ICustomerModuleService } from "@medusajs/types"
+import path from "path"
+import { startBootstrapApp } from "../../../../environment-helpers/bootstrap-app"
+import { useApi } from "../../../../environment-helpers/use-api"
+import { getContainer } from "../../../../environment-helpers/use-container"
+import { initDb, useDb } from "../../../../environment-helpers/use-db"
+import adminSeeder from "../../../../helpers/admin-seeder"
+
+const env = { MEDUSA_FF_MEDUSA_V2: true }
+const adminHeaders = {
+  headers: { "x-medusa-access-token": "test_token" },
+}
+
+describe("GET /admin/customer-groups", () => {
+  let dbConnection
+  let appContainer
+  let shutdownServer
+  let customerModuleService: ICustomerModuleService
+
+  beforeAll(async () => {
+    const cwd = path.resolve(path.join(__dirname, "..", "..", ".."))
+    dbConnection = await initDb({ cwd, env } as any)
+    shutdownServer = await startBootstrapApp({ cwd, env })
+    appContainer = getContainer()
+    customerModuleService = appContainer.resolve(
+      ModuleRegistrationName.CUSTOMER
+    )
+  })
+
+  afterAll(async () => {
+    const db = useDb()
+    await db.shutdown()
+    await shutdownServer()
+  })
+
+  beforeEach(async () => {
+    await adminSeeder(dbConnection)
+  })
+
+  afterEach(async () => {
+    const db = useDb()
+    await db.teardown()
+  })
+
+  it("should get all customer groups and its count", async () => {
+    await customerModuleService.createCustomerGroup({
+      name: "Test",
+    })
+
+    const api = useApi() as any
+    const response = await api.get(`/admin/customer-groups`, adminHeaders)
+
+    expect(response.status).toEqual(200)
+    expect(response.data.count).toEqual(1)
+    expect(response.data.groups).toEqual([
+      expect.objectContaining({
+        id: expect.any(String),
+        name: "Test",
+      }),
+    ])
+  })
+})

integration-tests/plugins/__tests__/customer/admin/list-customers.spec.ts

@@ -0,0 +1,119 @@
+import { ModuleRegistrationName } from "@medusajs/modules-sdk"
+import { ICustomerModuleService } from "@medusajs/types"
+import path from "path"
+import { startBootstrapApp } from "../../../../environment-helpers/bootstrap-app"
+import { useApi } from "../../../../environment-helpers/use-api"
+import { getContainer } from "../../../../environment-helpers/use-container"
+import { initDb, useDb } from "../../../../environment-helpers/use-db"
+import adminSeeder from "../../../../helpers/admin-seeder"
+
+const env = { MEDUSA_FF_MEDUSA_V2: true }
+const adminHeaders = {
+  headers: { "x-medusa-access-token": "test_token" },
+}
+
+describe("GET /admin/customers", () => {
+  let dbConnection
+  let appContainer
+  let shutdownServer
+  let customerModuleService: ICustomerModuleService
+
+  beforeAll(async () => {
+    const cwd = path.resolve(path.join(__dirname, "..", "..", ".."))
+    dbConnection = await initDb({ cwd, env } as any)
+    shutdownServer = await startBootstrapApp({ cwd, env })
+    appContainer = getContainer()
+    customerModuleService = appContainer.resolve(
+      ModuleRegistrationName.CUSTOMER
+    )
+  })
+
+  afterAll(async () => {
+    const db = useDb()
+    await db.shutdown()
+    await shutdownServer()
+  })
+
+  beforeEach(async () => {
+    await adminSeeder(dbConnection)
+  })
+
+  afterEach(async () => {
+    const db = useDb()
+    await db.teardown()
+  })
+
+  it("should get all customers and its count", async () => {
+    await customerModuleService.create([
+      {
+        first_name: "Test",
+        last_name: "Test",
+        email: "test@me.com",
+      },
+    ])
+
+    const api = useApi() as any
+    const response = await api.get(`/admin/customers`, adminHeaders)
+
+    expect(response.status).toEqual(200)
+    expect(response.data.count).toEqual(1)
+    expect(response.data.customers).toEqual([
+      expect.objectContaining({
+        id: expect.any(String),
+        first_name: "Test",
+        last_name: "Test",
+        email: "test@me.com",
+      }),
+    ])
+  })
+
+  it("should filter customers by last name", async () => {
+    await customerModuleService.create([
+      {
+        first_name: "Jane",
+        last_name: "Doe",
+        email: "jane@me.com",
+      },
+      {
+        first_name: "John",
+        last_name: "Doe",
+        email: "john@me.com",
+      },
+      {
+        first_name: "LeBron",
+        last_name: "James",
+        email: "lebron@me.com",
+      },
+      {
+        first_name: "John",
+        last_name: "Silver",
+        email: "johns@me.com",
+      },
+    ])
+
+    const api = useApi() as any
+    const response = await api.get(
+      `/admin/customers?last_name=Doe`,
+      adminHeaders
+    )
+
+    expect(response.status).toEqual(200)
+    expect(response.data.count).toEqual(2)
+    expect(response.data.customers).toContainEqual(
+      expect.objectContaining({
+        id: expect.any(String),
+        first_name: "Jane",
+        last_name: "Doe",
+        email: "jane@me.com",
+      })
+    )
+    expect(response.data.customers).toContainEqual(
+      expect.objectContaining({
+        id: expect.any(String),
+        first_name: "John",
+        last_name: "Doe",
+        email: "john@me.com",
+      })
+    )
+  })
+})

integration-tests/plugins/medusa-config.js

@@ -71,6 +71,11 @@ module.exports = {
       resources: "shared",
       resolve: "@medusajs/promotion",
     },
+    [Modules.CUSTOMER]: {
+      scope: "internal",
+      resources: "shared",
+      resolve: "@medusajs/customer",
+    },
     [Modules.SALES_CHANNEL]: {
       scope: "internal",
       resources: "shared",

integration-tests/plugins/package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@medusajs/cache-inmemory": "workspace:*",
+    "@medusajs/customer": "workspace:^",
     "@medusajs/event-bus-local": "workspace:*",
     "@medusajs/inventory": "workspace:^",
     "@medusajs/medusa": "workspace:*",

packages/core-flows/src/definition/index.ts

@@ -2,4 +2,3 @@ export * from "./cart"
 export * from "./inventory"
 export * from "./price-list"
 export * from "./product"
-export * from "./promotion"

packages/core-flows/src/index.ts

@@ -1,3 +1,4 @@
 export * from "./definition"
 export * from "./definitions"
 export * as Handlers from "./handlers"
+export * from "./promotion"

packages/core-flows/src/promotion/index.ts

@@ -0,0 +1,2 @@
+export * from "./steps"
+export * from "./workflows"

packages/core-flows/src/definition/promotion/create-campaigns.ts → packages/core-flows/src/promotion/workflows/create-campaigns.ts

@@ -1,6 +1,6 @@
 import { CampaignDTO, CreateCampaignDTO } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
-import { createCampaignsStep } from "../../handlers/promotion"
+import { createCampaignsStep } from "../steps"
 
 type WorkflowInput = { campaignsData: CreateCampaignDTO[] }
 

packages/core-flows/src/definition/promotion/create-promotions.ts → packages/core-flows/src/promotion/workflows/create-promotions.ts

@@ -1,6 +1,6 @@
 import { CreatePromotionDTO, PromotionDTO } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
-import { createPromotionsStep } from "../../handlers/promotion"
+import { createPromotionsStep } from "../steps"
 
 type WorkflowInput = { promotionsData: CreatePromotionDTO[] }
 

packages/core-flows/src/definition/promotion/delete-campaigns.ts → packages/core-flows/src/promotion/workflows/delete-campaigns.ts

@@ -1,5 +1,5 @@
 import { createWorkflow, WorkflowData } from "@medusajs/workflows-sdk"
-import { deleteCampaignsStep } from "../../handlers/promotion"
+import { deleteCampaignsStep } from "../steps"
 
 type WorkflowInput = { ids: string[] }
 

packages/core-flows/src/definition/promotion/delete-promotions.ts → packages/core-flows/src/promotion/workflows/delete-promotions.ts

@@ -1,5 +1,5 @@
 import { createWorkflow, WorkflowData } from "@medusajs/workflows-sdk"
-import { deletePromotionsStep } from "../../handlers/promotion"
+import { deletePromotionsStep } from "../steps"
 
 type WorkflowInput = { ids: string[] }
 

packages/core-flows/src/definition/promotion/update-campaigns.ts → packages/core-flows/src/promotion/workflows/update-campaigns.ts

@@ -1,6 +1,6 @@
 import { CampaignDTO, UpdateCampaignDTO } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
-import { updateCampaignsStep } from "../../handlers/promotion"
+import { updateCampaignsStep } from "../steps"
 
 type WorkflowInput = { campaignsData: UpdateCampaignDTO[] }
 

packages/core-flows/src/definition/promotion/update-promotions.ts → packages/core-flows/src/promotion/workflows/update-promotions.ts

@@ -1,6 +1,6 @@
 import { PromotionDTO, UpdatePromotionDTO } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
-import { updatePromotionsStep } from "../../handlers/promotion"
+import { updatePromotionsStep } from "../steps"
 
 type WorkflowInput = { promotionsData: UpdatePromotionDTO[] }
 

packages/customer/tsconfig.json

@@ -23,7 +23,7 @@
       "@models": ["./src/models"],
       "@services": ["./src/services"],
       "@repositories": ["./src/repositories"],
-      "@types": ["./src/types"],
+      "@types": ["./src/types"]
     }
   },
   "include": ["src"],

packages/generated/client-types/src/lib/models/AdminGetOrdersParams.ts

@@ -155,4 +155,8 @@ export interface AdminGetOrdersParams {
    * Comma-separated fields that should be included in the returned order.
    */
   fields?: string
+  /**
+   * A order field to sort-order the retrieved orders by.
+   */
+  order?: string
 }