diff --git a/packages/core/types/src/http/file/admin.ts b/packages/core/types/src/http/file/admin.ts deleted file mode 100644 index 911e00bc11..0000000000 --- a/packages/core/types/src/http/file/admin.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseFile, BaseUploadFile } from "./common" - -export interface AdminFile extends BaseFile {} - -export type AdminUploadFile = BaseUploadFile diff --git a/packages/core/types/src/http/file/admin/entities.ts b/packages/core/types/src/http/file/admin/entities.ts new file mode 100644 index 0000000000..15c10b326f --- /dev/null +++ b/packages/core/types/src/http/file/admin/entities.ts @@ -0,0 +1,3 @@ +import { BaseFile } from "../common" + +export interface AdminFile extends BaseFile {} \ No newline at end of file diff --git a/packages/core/types/src/http/file/admin/index.ts b/packages/core/types/src/http/file/admin/index.ts new file mode 100644 index 0000000000..ba78c783ea --- /dev/null +++ b/packages/core/types/src/http/file/admin/index.ts @@ -0,0 +1,3 @@ +export * from "./entities" +export * from "./payloads" +export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/file/admin/payloads.ts b/packages/core/types/src/http/file/admin/payloads.ts new file mode 100644 index 0000000000..ace748de24 --- /dev/null +++ b/packages/core/types/src/http/file/admin/payloads.ts @@ -0,0 +1,3 @@ +import { BaseUploadFile } from "../common"; + +export type AdminUploadFile = BaseUploadFile diff --git a/packages/core/types/src/http/file/admin/responses.ts b/packages/core/types/src/http/file/admin/responses.ts new file mode 100644 index 0000000000..fa409bf5fd --- /dev/null +++ b/packages/core/types/src/http/file/admin/responses.ts @@ -0,0 +1,9 @@ +import { AdminFile } from "./entities"; + +export interface AdminFileResponse { + file: AdminFile +} + +export interface AdminFileListResponse { + files: AdminFile[] +} \ No newline at end of file diff --git a/packages/core/types/src/http/index.ts b/packages/core/types/src/http/index.ts index 18abc25e4b..a4f1360351 100644 --- a/packages/core/types/src/http/index.ts +++ b/packages/core/types/src/http/index.ts @@ -36,3 +36,4 @@ export * from "./store" export * from "./tax-rate" export * from "./tax-region" export * from "./user" +export * from "./workflow-execution" diff --git a/packages/core/types/src/http/workflow-execution/admin/entities.ts b/packages/core/types/src/http/workflow-execution/admin/entities.ts new file mode 100644 index 0000000000..1df641803f --- /dev/null +++ b/packages/core/types/src/http/workflow-execution/admin/entities.ts @@ -0,0 +1,11 @@ +export interface AdminWorkflowExecution { + id: string + workflow_id: string + transaction_id: string + execution: string + context: string + state: any + created_at: Date + updated_at: Date + deleted_at: Date +} \ No newline at end of file diff --git a/packages/core/types/src/http/workflow-execution/admin/index.ts b/packages/core/types/src/http/workflow-execution/admin/index.ts new file mode 100644 index 0000000000..57fa23181b --- /dev/null +++ b/packages/core/types/src/http/workflow-execution/admin/index.ts @@ -0,0 +1,2 @@ +export * from "./entities" +export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/workflow-execution/admin/responses.ts b/packages/core/types/src/http/workflow-execution/admin/responses.ts new file mode 100644 index 0000000000..c0c3cd71d3 --- /dev/null +++ b/packages/core/types/src/http/workflow-execution/admin/responses.ts @@ -0,0 +1,10 @@ +import { PaginatedResponse } from "../../common/response"; +import { AdminWorkflowExecution } from "./entities"; + +export interface AdminWorkflowExecutionResponse { + workflow_execution: AdminWorkflowExecution +} + +export type AdminWorkflowExecutionListResponse = PaginatedResponse<{ + workflow_executions: AdminWorkflowExecution[] +}> \ No newline at end of file diff --git a/packages/core/types/src/http/workflow-execution/index.ts b/packages/core/types/src/http/workflow-execution/index.ts new file mode 100644 index 0000000000..99595b00b3 --- /dev/null +++ b/packages/core/types/src/http/workflow-execution/index.ts @@ -0,0 +1 @@ +export * from "./admin" \ No newline at end of file diff --git a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts index f42d013c24..dc0c3638bd 100644 --- a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts @@ -7,10 +7,11 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -28,7 +29,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/tax-regions/route.ts b/packages/medusa/src/api/admin/tax-regions/route.ts index 32ac89b019..8c6c29c0fa 100644 --- a/packages/medusa/src/api/admin/tax-regions/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/route.ts @@ -12,10 +12,11 @@ import { AdminGetTaxRegionsParamsType, } from "./validators" import { refetchTaxRegion } from "./helpers" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { result } = await createTaxRegionsWorkflow(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) diff --git a/packages/medusa/src/api/admin/uploads/[id]/route.ts b/packages/medusa/src/api/admin/uploads/[id]/route.ts index 2a2bfccfc6..09373763ff 100644 --- a/packages/medusa/src/api/admin/uploads/[id]/route.ts +++ b/packages/medusa/src/api/admin/uploads/[id]/route.ts @@ -3,12 +3,13 @@ import { MedusaResponse, } from "../../../../types/routing" import { deleteFilesWorkflow } from "@medusajs/core-flows" +import { DeleteResponse, HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" import { remoteQueryObjectFromString } from "@medusajs/utils" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const variables = { id: req.params.id } @@ -32,7 +33,7 @@ export const GET = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/uploads/route.ts b/packages/medusa/src/api/admin/uploads/route.ts index f573372c81..f5b9d3df98 100644 --- a/packages/medusa/src/api/admin/uploads/route.ts +++ b/packages/medusa/src/api/admin/uploads/route.ts @@ -5,10 +5,11 @@ import { } from "../../../types/routing" import { MedusaError } from "@medusajs/utils" import { AdminGetUploadParamsType } from "./validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const input = req.files as Express.Multer.File[] diff --git a/packages/medusa/src/api/admin/users/[id]/route.ts b/packages/medusa/src/api/admin/users/[id]/route.ts index 7c29e98f31..fb579930f8 100644 --- a/packages/medusa/src/api/admin/users/[id]/route.ts +++ b/packages/medusa/src/api/admin/users/[id]/route.ts @@ -1,5 +1,5 @@ import { deleteUsersWorkflow, updateUsersWorkflow } from "@medusajs/core-flows" -import { UpdateUserDTO } from "@medusajs/types" +import { HttpTypes, UpdateUserDTO } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -16,7 +16,7 @@ import { refetchUser } from "../helpers" // Get user export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const { id } = req.params @@ -41,7 +41,7 @@ export const GET = async ( // update user export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const workflow = updateUsersWorkflow(req.scope) @@ -68,7 +68,7 @@ export const POST = async ( // delete user export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params const workflow = deleteUsersWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/users/me/route.ts b/packages/medusa/src/api/admin/users/me/route.ts index 04288c4210..5a2582c318 100644 --- a/packages/medusa/src/api/admin/users/me/route.ts +++ b/packages/medusa/src/api/admin/users/me/route.ts @@ -7,10 +7,11 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const id = req.auth_context.actor_id const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) diff --git a/packages/medusa/src/api/admin/users/route.ts b/packages/medusa/src/api/admin/users/route.ts index 4e7c92bbda..8cd8d41131 100644 --- a/packages/medusa/src/api/admin/users/route.ts +++ b/packages/medusa/src/api/admin/users/route.ts @@ -1,5 +1,5 @@ import { createUserAccountWorkflow } from "@medusajs/core-flows" -import { CreateUserDTO } from "@medusajs/types" +import { CreateUserDTO, HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError, @@ -13,7 +13,7 @@ import { refetchUser } from "./helpers" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -37,7 +37,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { // If `actor_id` is present, the request carries authentication for an existing user if (req.auth_context.actor_id) { diff --git a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts index af5aa68152..5b6581f178 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts @@ -1,3 +1,4 @@ +import { HttpTypes } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -11,7 +12,7 @@ import { export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const variables = { id: req.params.id } diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts index add7ebb693..e3e8b1af9a 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts @@ -8,10 +8,11 @@ import { remoteQueryObjectFromString, } from "@medusajs/utils" import { AdminGetWorkflowExecutionDetailsParamsType } 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/workflows-executions/[workflow_id]/run/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts index 3c84e9dac8..60e6def0bb 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts @@ -11,7 +11,7 @@ import { AdminCreateWorkflowsRunType } from "../../validators" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse<{ acknowledgement: object }> ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( ModuleRegistrationName.WORKFLOW_ENGINE diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts index 8cfbcee066..2a43b77b76 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts @@ -11,7 +11,7 @@ import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse<{ success: boolean }> ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( ModuleRegistrationName.WORKFLOW_ENGINE diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts index 141a9a6920..6b33ad5606 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts @@ -11,7 +11,7 @@ import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse<{ success: boolean }> ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( ModuleRegistrationName.WORKFLOW_ENGINE diff --git a/packages/medusa/src/api/admin/workflows-executions/route.ts b/packages/medusa/src/api/admin/workflows-executions/route.ts index d8561574e2..1a40bb0d88 100644 --- a/packages/medusa/src/api/admin/workflows-executions/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/route.ts @@ -1,3 +1,4 @@ +import { HttpTypes } from "@medusajs/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -11,7 +12,7 @@ import { export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)