diff --git a/packages/core/types/src/http/sales-channel/admin/responses.ts b/packages/core/types/src/http/sales-channel/admin/responses.ts index 9a1e02dbec..15e26611ae 100644 --- a/packages/core/types/src/http/sales-channel/admin/responses.ts +++ b/packages/core/types/src/http/sales-channel/admin/responses.ts @@ -10,4 +10,4 @@ export type AdminSalesChannelListResponse = PaginatedResponse<{ }> export interface AdminSalesChannelDeleteResponse - extends DeleteResponse<"sales_channel"> {} + extends DeleteResponse<"sales-channel"> {} diff --git a/packages/core/types/src/http/shipping-option/admin/responses.ts b/packages/core/types/src/http/shipping-option/admin/responses.ts index f2c54c944a..91a1476833 100644 --- a/packages/core/types/src/http/shipping-option/admin/responses.ts +++ b/packages/core/types/src/http/shipping-option/admin/responses.ts @@ -1,3 +1,4 @@ +import { BatchMethodResponse } from "../../../common" import { DeleteResponse, PaginatedResponse } from "../../common" import { AdminShippingOption, AdminShippingOptionRule } from "./entities" @@ -12,12 +13,4 @@ export type AdminShippingOptionListResponse = PaginatedResponse<{ export interface AdminShippingOptionDeleteResponse extends DeleteResponse<"shipping_option"> {} -export interface AdminUpdateShippingOptionRulesResponse { - created: AdminShippingOptionRule[] - updated: AdminShippingOptionRule[] - deleted: { - ids: string[] - object: "shipping_option_rule" - deleted: boolean - } -} +export type AdminUpdateShippingOptionRulesResponse = BatchMethodResponse \ No newline at end of file diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts index 78c8a82415..9ed5544683 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts @@ -4,12 +4,12 @@ import { } from "../../../../../types/routing" import { linkProductsToSalesChannelWorkflow } from "@medusajs/core-flows" -import { LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/types" import { refetchSalesChannel } from "../../helpers" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params const { add, remove } = req.validatedBody diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts index f606e921f6..65f580a49a 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts @@ -12,10 +12,11 @@ import { AdminGetSalesChannelParamsType, AdminUpdateSalesChannelType, } from "../validators" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const salesChannel = await refetchSalesChannel( req.params.id, @@ -35,7 +36,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { await updateSalesChannelsWorkflow(req.scope).run({ input: { @@ -54,7 +55,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/sales-channels/route.ts b/packages/medusa/src/api/admin/sales-channels/route.ts index 74c8fe79bc..a3b64197d6 100644 --- a/packages/medusa/src/api/admin/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/route.ts @@ -12,10 +12,11 @@ import { AdminCreateSalesChannelType, AdminGetSalesChannelsParamsType, } from "./validators" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -40,7 +41,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const salesChannelsData = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts index e6e3b716f0..f88f72128d 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts @@ -2,7 +2,7 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { BatchMethodRequest } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/types" import { AdminCreateShippingOptionRuleType, AdminUpdateShippingOptionRuleType, @@ -17,7 +17,7 @@ export const POST = async ( AdminUpdateShippingOptionRuleType > >, - res: MedusaResponse + res: MedusaResponse ) => { const id = req.params.id const { result } = await batchShippingOptionRulesWorkflow(req.scope).run({ @@ -37,5 +37,9 @@ export const POST = async ( req.remoteQueryConfig.fields ) - res.status(200).json(batchResults) + res + .status(200) + .json( + batchResults as unknown as HttpTypes.AdminUpdateShippingOptionRulesResponse + ) } diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts index 12ee9ab1c9..e6c0bb8653 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts @@ -1,5 +1,5 @@ import { batchLinksWorkflow } from "@medusajs/core-flows" -import { LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/types" import { Modules } from "@medusajs/utils" import { @@ -19,7 +19,7 @@ const buildLinks = (id, fulfillmentProviderIds: string[]) => { export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params const { add = [], remove = [] } = req.validatedBody diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts index 09f51b529d..31683ff958 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts @@ -5,10 +5,11 @@ import { } from "../../../../../types/routing" import { refetchStockLocation } from "../../helpers" import { AdminCreateStockLocationFulfillmentSetType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { await createLocationFulfillmentSetWorkflow(req.scope).run({ input: { diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts index 9029bf8949..a8c170728a 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts @@ -13,10 +13,11 @@ import { AdminGetStockLocationParamsType, AdminUpdateStockLocationType, } from "../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params await updateStockLocationsWorkflow(req.scope).run({ @@ -39,7 +40,7 @@ export const POST = async ( export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -61,7 +62,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts index 6ef549f97a..dff906ceb1 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts @@ -4,12 +4,12 @@ import { } from "../../../../../types/routing" import { linkSalesChannelsToStockLocationWorkflow } from "@medusajs/core-flows" -import { LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/types" import { refetchStockLocation } from "../../helpers" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params const { add, remove } = req.validatedBody diff --git a/packages/medusa/src/api/admin/stock-locations/route.ts b/packages/medusa/src/api/admin/stock-locations/route.ts index a674a242a7..bac5970c86 100644 --- a/packages/medusa/src/api/admin/stock-locations/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/route.ts @@ -13,11 +13,12 @@ import { AdminCreateStockLocationType, AdminGetStockLocationsParamsType, } from "./validators" +import { HttpTypes } from "@medusajs/types" // Create stock location export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { result } = await createStockLocationsWorkflow(req.scope).run({ input: { locations: [req.validatedBody] }, @@ -34,7 +35,7 @@ export const POST = async ( export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/stores/[id]/route.ts b/packages/medusa/src/api/admin/stores/[id]/route.ts index cd40c95990..232abc77d3 100644 --- a/packages/medusa/src/api/admin/stores/[id]/route.ts +++ b/packages/medusa/src/api/admin/stores/[id]/route.ts @@ -9,10 +9,11 @@ import { } from "../../../../types/routing" import { AdminGetStoreParamsType, AdminUpdateStoreType } from "../validators" import { refetchStore } from "../helpers" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const variables = { id: req.params.id } @@ -29,7 +30,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { result } = await updateStoresWorkflow(req.scope).run({ input: { diff --git a/packages/medusa/src/api/admin/stores/route.ts b/packages/medusa/src/api/admin/stores/route.ts index 3eaae6001c..c180cc132c 100644 --- a/packages/medusa/src/api/admin/stores/route.ts +++ b/packages/medusa/src/api/admin/stores/route.ts @@ -7,10 +7,11 @@ import { MedusaResponse, } from "../../../types/routing" import { AdminGetStoresParamsType } from "./validators" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts index 0b5864077d..effbcb9a8a 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts @@ -15,10 +15,11 @@ import { AdminGetTaxRateParamsType, AdminUpdateTaxRateType, } from "../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { await updateTaxRatesWorkflow(req.scope).run({ input: { @@ -37,7 +38,7 @@ export const POST = async ( export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const variables = { id: req.params.id } @@ -54,7 +55,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const id = req.params.id await deleteTaxRatesWorkflow(req.scope).run({ diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts index b8b68ee9d2..cfe6d99e99 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts @@ -4,10 +4,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { refetchTaxRate } from "../../../helpers" +import { DeleteResponse } from "@medusajs/types" export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { await deleteTaxRateRulesWorkflow(req.scope).run({ input: { ids: [req.params.rule_id] }, diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts index b24535ed74..ff643688a8 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts @@ -5,10 +5,11 @@ import { } from "../../../../../types/routing" import { AdminCreateTaxRateRuleType } from "../../validators" import { refetchTaxRate } from "../../helpers" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { await createTaxRateRulesWorkflow(req.scope).run({ input: { diff --git a/packages/medusa/src/api/admin/tax-rates/route.ts b/packages/medusa/src/api/admin/tax-rates/route.ts index 31ebd7c17d..10317daaf7 100644 --- a/packages/medusa/src/api/admin/tax-rates/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/route.ts @@ -12,10 +12,11 @@ import { AdminCreateTaxRateType, AdminGetTaxRatesParamsType, } from "./validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { result } = await createTaxRatesWorkflow(req.scope).run({ input: [ @@ -36,7 +37,7 @@ export const POST = async ( export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const { rows: tax_rates, metadata } = await remoteQuery(