feat: Add missing endpoints and normalize customer and currency endpo…

…ints for storefront (#7160)

integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts

@@ -37,7 +37,7 @@ medusaIntegrationTestRunner({
         )
 
         expect(response.status).toEqual(200)
-        expect(response.data.address).toEqual(
+        expect(response.data.customer.addresses[0]).toEqual(
           expect.objectContaining({
             id: expect.any(String),
             first_name: "John",

integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts

@@ -1,7 +1,7 @@
 import { ICustomerModuleService } from "@medusajs/types"
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { createAuthenticatedCustomer } from "../../../helpers/create-authenticated-customer"
-import {medusaIntegrationTestRunner} from "medusa-test-utils";
+import { medusaIntegrationTestRunner } from "medusa-test-utils"
 
 const env = { MEDUSA_FF_MEDUSA_V2: true }
 

integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts

@@ -42,7 +42,7 @@ medusaIntegrationTestRunner({
         )
 
         expect(response.status).toEqual(200)
-        expect(response.data.address).toEqual(
+        expect(response.data.customer.addresses[0]).toEqual(
           expect.objectContaining({
             id: address.id,
             first_name: "Jane",

packages/core-flows/src/customer/steps/maybe-unset-default-billing-addresses.ts

@@ -1,6 +1,6 @@
 import {
   CreateCustomerAddressDTO,
-  CustomerAddressDTO,
+  UpdateCustomerAddressDTO,
   FilterableCustomerAddressProps,
   ICustomerModuleService,
 } from "@medusajs/types"
@@ -13,7 +13,7 @@ type StepInput = {
   create?: CreateCustomerAddressDTO[]
   update?: {
     selector: FilterableCustomerAddressProps
-    update: Partial<CustomerAddressDTO>
+    update: UpdateCustomerAddressDTO
   }
 }
 

packages/core-flows/src/customer/steps/maybe-unset-default-shipping-addresses.ts

@@ -1,6 +1,6 @@
 import {
   CreateCustomerAddressDTO,
-  CustomerAddressDTO,
+  UpdateCustomerAddressDTO,
   FilterableCustomerAddressProps,
   ICustomerModuleService,
 } from "@medusajs/types"
@@ -13,7 +13,7 @@ type StepInput = {
   create?: CreateCustomerAddressDTO[]
   update?: {
     selector: FilterableCustomerAddressProps
-    update: Partial<CustomerAddressDTO>
+    update: UpdateCustomerAddressDTO
   }
 }
 

packages/core-flows/src/customer/steps/update-addresses.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import {
-  CustomerAddressDTO,
+  UpdateCustomerAddressDTO,
   FilterableCustomerAddressProps,
   ICustomerModuleService,
 } from "@medusajs/types"
@@ -12,7 +12,7 @@ import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type UpdateCustomerAddresseStepInput = {
   selector: FilterableCustomerAddressProps
-  update: Partial<CustomerAddressDTO>
+  update: UpdateCustomerAddressDTO
 }
 
 export const updateCustomerAddresseStepId = "update-customer-addresses"

packages/core-flows/src/customer/steps/utils/unset-address-for-update.ts

@@ -1,5 +1,5 @@
 import {
-  CustomerAddressDTO,
+  UpdateCustomerAddressDTO,
   FilterableCustomerAddressProps,
   ICustomerModuleService,
 } from "@medusajs/types"
@@ -8,7 +8,7 @@ import { StepResponse } from "@medusajs/workflows-sdk"
 export const unsetForUpdate = async (
   data: {
     selector: FilterableCustomerAddressProps
-    update: Partial<CustomerAddressDTO>
+    update: UpdateCustomerAddressDTO
   },
   customerService: ICustomerModuleService,
   field: "is_default_billing" | "is_default_shipping"

packages/core-flows/src/customer/workflows/update-addresses.ts

@@ -1,6 +1,7 @@
 import {
   FilterableCustomerAddressProps,
   CustomerAddressDTO,
+  UpdateCustomerAddressDTO,
 } from "@medusajs/types"
 import {
   WorkflowData,
@@ -16,7 +17,7 @@ import {
 
 type WorkflowInput = {
   selector: FilterableCustomerAddressProps
-  update: Partial<CustomerAddressDTO>
+  update: UpdateCustomerAddressDTO
 }
 
 export const updateCustomerAddressesWorkflowId = "update-customer-addresses"

packages/medusa/src/api-v2/admin/currencies/[code]/route.ts

@@ -1,5 +1,6 @@
 import {
   ContainerRegistrationKeys,
+  MedusaError,
   remoteQueryObjectFromString,
 } from "@medusajs/utils"
 import { MedusaRequest, MedusaResponse } from "../../../../types/routing"
@@ -16,5 +17,12 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
   })
 
   const [currency] = await remoteQuery(queryObject)
+  if (!currency) {
+    throw new MedusaError(
+      MedusaError.Types.NOT_FOUND,
+      `Currency with code: ${req.params.code} was not found`
+    )
+  }
+
   res.status(200).json({ currency })
 }

packages/medusa/src/api-v2/admin/customers/validators.ts

@@ -83,20 +83,11 @@ export const AdminCustomerAdressesParams = createFindParams({
 }).merge(
   z.object({
     q: z.string().optional(),
-    address_name: z.union([z.string(), z.array(z.string())]).optional(),
-    is_default_shipping: z.boolean().optional(),
-    is_default_billing: z.boolean().optional(),
     company: z.union([z.string(), z.array(z.string())]).optional(),
-    first_name: z.union([z.string(), z.array(z.string())]).optional(),
-    last_name: z.union([z.string(), z.array(z.string())]).optional(),
-    address_1: z.union([z.string(), z.array(z.string())]).optional(),
-    address_2: z.union([z.string(), z.array(z.string())]).optional(),
     city: z.union([z.string(), z.array(z.string())]).optional(),
     country_code: z.union([z.string(), z.array(z.string())]).optional(),
     province: z.union([z.string(), z.array(z.string())]).optional(),
     postal_code: z.union([z.string(), z.array(z.string())]).optional(),
-    phone: z.union([z.string(), z.array(z.string())]).optional(),
-    metadata: z.record(z.unknown()).optional(),
   })
 )
 

packages/medusa/src/api-v2/store/currencies/[code]/route.ts

@@ -1,18 +1,28 @@
-import { remoteQueryObjectFromString } from "@medusajs/utils"
+import {
+  ContainerRegistrationKeys,
+  MedusaError,
+  remoteQueryObjectFromString,
+} from "@medusajs/utils"
 import { MedusaRequest, MedusaResponse } from "../../../../types/routing"
-import { defaultStoreCurrencyFields } from "../query-config"
 
 export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
-  const remoteQuery = req.scope.resolve("remoteQuery")
+  const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
 
   const variables = { code: req.params.code }
 
   const queryObject = remoteQueryObjectFromString({
     entryPoint: "currency",
     variables,
-    fields: defaultStoreCurrencyFields,
+    fields: req.remoteQueryConfig.fields,
   })
 
   const [currency] = await remoteQuery(queryObject)
+  if (!currency) {
+    throw new MedusaError(
+      MedusaError.Types.NOT_FOUND,
+      `Currency with code: ${req.params.code} was not found`
+    )
+  }
+
   res.status(200).json({ currency })
 }

packages/medusa/src/api-v2/store/currencies/middlewares.ts

@@ -1,18 +1,14 @@
-import { transformQuery } from "../../../api/middlewares"
 import { MiddlewareRoute } from "../../../loaders/helpers/routing/types"
-import { authenticate } from "../../../utils/authenticate-middleware"
+import { validateAndTransformQuery } from "../../utils/validate-query"
 import * as QueryConfig from "./query-config"
-import {
-  StoreGetCurrenciesCurrencyParams,
-  StoreGetCurrenciesParams,
-} from "./validators"
+import { StoreGetCurrenciesParams, StoreGetCurrencyParams } from "./validators"
 
 export const storeCurrencyRoutesMiddlewares: MiddlewareRoute[] = [
   {
     method: ["GET"],
     matcher: "/store/currencies",
     middlewares: [
-      transformQuery(
+      validateAndTransformQuery(
         StoreGetCurrenciesParams,
         QueryConfig.listTransformQueryConfig
       ),
@@ -22,8 +18,8 @@ export const storeCurrencyRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["GET"],
     matcher: "/store/currencies/:code",
     middlewares: [
-      transformQuery(
-        StoreGetCurrenciesCurrencyParams,
+      validateAndTransformQuery(
+        StoreGetCurrencyParams,
         QueryConfig.retrieveTransformQueryConfig
       ),
     ],

packages/medusa/src/api-v2/store/currencies/query-config.ts

@@ -1,20 +1,19 @@
-export const defaultStoreCurrencyRelations = []
-export const allowedStoreCurrencyRelations = []
 export const defaultStoreCurrencyFields = [
   "code",
   "name",
   "symbol",
   "symbol_native",
+  "decimal_digits",
+  "rounding",
 ]
 
 export const retrieveTransformQueryConfig = {
-  defaultFields: defaultStoreCurrencyFields,
-  defaultRelations: defaultStoreCurrencyRelations,
-  allowedRelations: allowedStoreCurrencyRelations,
+  defaults: defaultStoreCurrencyFields,
   isList: false,
 }
 
 export const listTransformQueryConfig = {
-  defaultLimit: 20,
+  ...retrieveTransformQueryConfig,
+  defaultLimit: 50,
   isList: true,
 }

packages/medusa/src/api-v2/store/currencies/route.ts

@@ -1,19 +1,19 @@
-import { remoteQueryObjectFromString } from "@medusajs/utils"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/utils"
 import { MedusaRequest, MedusaResponse } from "../../../types/routing"
-import { defaultStoreCurrencyFields } from "./query-config"
 
 export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
-  const remoteQuery = req.scope.resolve("remoteQuery")
+  const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
 
   const queryObject = remoteQueryObjectFromString({
     entryPoint: "currency",
     variables: {
       filters: req.filterableFields,
-      order: req.listConfig.order,
-      skip: req.listConfig.skip,
-      take: req.listConfig.take,
+      ...req.remoteQueryConfig.pagination,
     },
-    fields: defaultStoreCurrencyFields,
+    fields: req.remoteQueryConfig.fields,
   })
 
   const { rows: currencies, metadata } = await remoteQuery(queryObject)

packages/medusa/src/api-v2/store/currencies/validators.ts

@@ -1,30 +1,19 @@
-import { Type } from "class-transformer"
-import { IsOptional, IsString, ValidateNested } from "class-validator"
-import { FindParams, extendedFindParamsMixin } from "../../../types/common"
+import { createFindParams, createSelectParams } from "../../utils/validators"
+import { z } from "zod"
 
-export class StoreGetCurrenciesCurrencyParams extends FindParams {}
-/**
- * Parameters used to filter and configure the pagination of the retrieved currencies.
- */
-export class StoreGetCurrenciesParams extends extendedFindParamsMixin({
-  limit: 50,
-  offset: 0,
-}) {
-  /**
-   * Search parameter for currencies.
-   */
-  @IsString({ each: true })
-  @IsOptional()
-  code?: string | string[]
-
-  // Additional filters from BaseFilterable
-  @IsOptional()
-  @ValidateNested({ each: true })
-  @Type(() => StoreGetCurrenciesParams)
-  $and?: StoreGetCurrenciesParams[]
+export const StoreGetCurrencyParams = createSelectParams()
 
-  @IsOptional()
-  @ValidateNested({ each: true })
-  @Type(() => StoreGetCurrenciesParams)
-  $or?: StoreGetCurrenciesParams[]
-}
+export type StoreGetCurrenciesParamsType = z.infer<
+  typeof StoreGetCurrenciesParams
+>
+export const StoreGetCurrenciesParams = createFindParams({
+  offset: 0,
+  limit: 50,
+}).merge(
+  z.object({
+    q: z.string().optional(),
+    code: z.union([z.string(), z.array(z.string())]).optional(),
+    $and: z.lazy(() => StoreGetCurrenciesParams.array()).optional(),
+    $or: z.lazy(() => StoreGetCurrenciesParams.array()).optional(),
+  })
+)

packages/medusa/src/api-v2/store/customers/helpers.ts

@@ -0,0 +1,23 @@
+import { MedusaContainer } from "@medusajs/types"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/utils"
+
+export const refetchCustomer = async (
+  customerId: string,
+  scope: MedusaContainer,
+  fields: string[]
+) => {
+  const remoteQuery = scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
+  const queryObject = remoteQueryObjectFromString({
+    entryPoint: "customer",
+    variables: {
+      filters: { id: customerId },
+    },
+    fields: fields,
+  })
+
+  const customers = await remoteQuery(queryObject)
+  return customers[0]
+}