feat: Add decimal digits and rounding info to currencies (#6991)

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

@@ -1,6 +1,5 @@
 import { remoteQueryObjectFromString } from "@medusajs/utils"
 import { MedusaRequest, MedusaResponse } from "../../../../types/routing"
-import { defaultAdminCurrencyFields } from "../query-config"
 
 export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
   const remoteQuery = req.scope.resolve("remoteQuery")
@@ -10,7 +9,7 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
   const queryObject = remoteQueryObjectFromString({
     entryPoint: "currency",
     variables,
-    fields: defaultAdminCurrencyFields,
+    fields: req.remoteQueryConfig.fields,
   })
 
   const [currency] = await remoteQuery(queryObject)

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

@@ -1,11 +1,8 @@
-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 {
-  AdminGetCurrenciesCurrencyParams,
-  AdminGetCurrenciesParams,
-} from "./validators"
+import { AdminGetCurrencyParams, AdminGetCurrenciesParams } from "./validators"
 
 export const adminCurrencyRoutesMiddlewares: MiddlewareRoute[] = [
   {
@@ -17,7 +14,7 @@ export const adminCurrencyRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["GET"],
     matcher: "/admin/currencies",
     middlewares: [
-      transformQuery(
+      validateAndTransformQuery(
         AdminGetCurrenciesParams,
         QueryConfig.listTransformQueryConfig
       ),
@@ -27,8 +24,8 @@ export const adminCurrencyRoutesMiddlewares: MiddlewareRoute[] = [
     method: ["GET"],
     matcher: "/admin/currencies/:code",
     middlewares: [
-      transformQuery(
-        AdminGetCurrenciesCurrencyParams,
+      validateAndTransformQuery(
+        AdminGetCurrencyParams,
         QueryConfig.retrieveTransformQueryConfig
       ),
     ],

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

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

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

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

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

@@ -1,30 +1,18 @@
-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 AdminGetCurrenciesCurrencyParams extends FindParams {}
-/**
- * Parameters used to filter and configure the pagination of the retrieved currencies.
- */
-export class AdminGetCurrenciesParams extends extendedFindParamsMixin({
-  limit: 50,
+export const AdminGetCurrencyParams = createSelectParams()
+
+export type AdminGetCurrenciesParamsType = z.infer<
+  typeof AdminGetCurrenciesParams
+>
+export const AdminGetCurrenciesParams = createFindParams({
   offset: 0,
-}) {
-  /**
-   * Search parameter for currencies.
-   */
-  @IsString({ each: true })
-  @IsOptional()
-  code?: string | string[]
-
-  // Additional filters from BaseFilterable
-  @IsOptional()
-  @ValidateNested({ each: true })
-  @Type(() => AdminGetCurrenciesParams)
-  $and?: AdminGetCurrenciesParams[]
-
-  @IsOptional()
-  @ValidateNested({ each: true })
-  @Type(() => AdminGetCurrenciesParams)
-  $or?: AdminGetCurrenciesParams[]
-}
+  limit: 50,
+}).merge(
+  z.object({
+    code: z.union([z.string(), z.array(z.string())]).optional(),
+    $and: z.lazy(() => AdminGetCurrenciesParams.array()).optional(),
+    $or: z.lazy(() => AdminGetCurrenciesParams.array()).optional(),
+  })
+)