chore: fixes to HTTP and request types for promotions (#13820)

2025-10-28 10:03:41 +01:00
parent 5b0c6e6a94
commit 24ff9d3382
12 changed files with 43 additions and 53 deletions
@@ -4,11 +4,14 @@ import {
 } from "@medusajs/framework/http"

 import { addOrRemoveCampaignPromotionsWorkflow } from "@medusajs/core-flows"
-import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types"
+import { HttpTypes } from "@medusajs/framework/types"
 import { refetchCampaign } from "../../helpers"

 export const POST = async (
-  req: AuthenticatedMedusaRequest<LinkMethodRequest>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminBatchLink,
+    HttpTypes.AdminGetCampaignParams
+  >,
  res: MedusaResponse<HttpTypes.AdminCampaignResponse>
 ) => {
  const { id } = req.params
@@ -8,12 +8,11 @@ import {
 } from "@medusajs/core-flows"

 import { refetchCampaign } from "../helpers"
-import { AdminUpdateCampaignType } from "../validators"
 import { MedusaError } from "@medusajs/framework/utils"
 import { AdditionalData, HttpTypes } from "@medusajs/framework/types"

 export const GET = async (
-  req: AuthenticatedMedusaRequest,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetCampaignParams>,
  res: MedusaResponse<HttpTypes.AdminCampaignResponse>
 ) => {
  const campaign = await refetchCampaign(
@@ -33,7 +32,10 @@ export const GET = async (
 }

 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminUpdateCampaignType & AdditionalData>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminUpdateCampaign & AdditionalData,
+    HttpTypes.AdminGetCampaignParams
+  >,
  res: MedusaResponse<HttpTypes.AdminCampaignResponse>
 ) => {
  const existingCampaign = await refetchCampaign(req.params.id, req.scope, [
@@ -7,12 +7,11 @@ import {
  ContainerRegistrationKeys,
  remoteQueryObjectFromString,
 } from "@medusajs/framework/utils"
-import { AdminCreateCampaignType } from "./validators"
 import { refetchCampaign } from "./helpers"
 import { AdditionalData, HttpTypes } from "@medusajs/framework/types"

 export const GET = async (
-  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetCampaignParams>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetCampaignsParams>,
  res: MedusaResponse<HttpTypes.AdminCampaignListResponse>
 ) => {
  const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)
@@ -37,7 +36,10 @@ export const GET = async (
 }

 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminCreateCampaignType & AdditionalData>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminCreateCampaign & AdditionalData,
+    HttpTypes.AdminGetCampaignParams
+  >,
  res: MedusaResponse<HttpTypes.AdminCampaignResponse>
 ) => {
  const { additional_data, ...rest } = req.validatedBody
@@ -17,7 +17,7 @@ import {
 } from "../../utils"

 export const GET = async (
-  req: AuthenticatedMedusaRequest,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetPromotionRuleTypeParams>,
  res: MedusaResponse<HttpTypes.AdminPromotionRuleListResponse>
 ) => {
  const { id, rule_type: ruleType } = req.params
@@ -12,7 +12,8 @@ export const POST = async (
    BatchMethodRequest<
      HttpTypes.AdminCreatePromotionRule,
      HttpTypes.AdminUpdatePromotionRule
-    >
+    >,
+    HttpTypes.AdminGetPromotionRuleParams
  >,
  res: MedusaResponse<HttpTypes.AdminPromotionRuleBatchResponse>
 ) => {
@@ -12,14 +12,10 @@ import {
  MedusaResponse,
 } from "@medusajs/framework/http"
 import { refetchPromotion } from "../helpers"
-import {
-  AdminGetPromotionParamsType,
-  AdminUpdatePromotionType,
-} from "../validators"
 import { AdditionalData, HttpTypes } from "@medusajs/framework/types"

 export const GET = async (
-  req: AuthenticatedMedusaRequest<AdminGetPromotionParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetPromotionParams>,
  res: MedusaResponse<HttpTypes.AdminPromotionResponse>
 ) => {
  const idOrCode = req.params.id
@@ -44,7 +40,10 @@ export const GET = async (
 }

 export const POST = async (
-  req: AuthenticatedMedusaRequest<AdminUpdatePromotionType & AdditionalData>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminUpdatePromotion & AdditionalData,
+    HttpTypes.AdminGetPromotionParams
+  >,
  res: MedusaResponse<HttpTypes.AdminPromotionResponse>
 ) => {
  const { additional_data, ...rest } = req.validatedBody
@@ -12,7 +12,8 @@ export const POST = async (
    BatchMethodRequest<
      HttpTypes.AdminCreatePromotionRule,
      HttpTypes.AdminUpdatePromotionRule
-    >
+    >,
+    HttpTypes.AdminGetPromotionRuleParams
  >,
  res: MedusaResponse<HttpTypes.AdminPromotionRuleBatchResponse>
 ) => {
@@ -12,7 +12,8 @@ export const POST = async (
    BatchMethodRequest<
      HttpTypes.AdminCreatePromotionRule,
      HttpTypes.AdminUpdatePromotionRule
-    >
+    >,
+    HttpTypes.AdminGetPromotionRuleParams
  >,
  res: MedusaResponse<HttpTypes.AdminPromotionRuleBatchResponse>
 ) => {
@@ -37,7 +37,8 @@ export const GET = async (

 export const POST = async (
  req: AuthenticatedMedusaRequest<
-    HttpTypes.AdminCreatePromotion & AdditionalData
+    HttpTypes.AdminCreatePromotion & AdditionalData,
+    HttpTypes.AdminGetPromotionParams
  >,
  res: MedusaResponse<HttpTypes.AdminPromotionResponse>
 ) => {
@@ -12,7 +12,6 @@ import {
  validateRuleAttribute,
  validateRuleType,
 } from "../../../utils"
-import { AdminGetPromotionRuleParamsType } from "../../../validators"
 import {
  ApplicationMethodTargetTypeValues,
  RuleTypeValues,
@@ -26,7 +25,7 @@ import {
  from the currency module.
 */
 export const GET = async (
-  req: AuthenticatedMedusaRequest<AdminGetPromotionRuleParamsType>,
+  req: AuthenticatedMedusaRequest<HttpTypes.AdminGetPromotionsRuleValueParams>,
  res: MedusaResponse<HttpTypes.AdminRuleValueOptionsListResponse>
 ) => {
  const { rule_type: ruleType, rule_attribute_id: ruleAttributeId } = req.params