chore(order): dml (#10292)

* ../../core/types/src/dml/index.ts * ../../core/types/src/dml/index.ts * fix: relationships mapping * handle nullable foreign keys types * handle nullable foreign keys types * handle nullable foreign keys types * continue to update product category repository * fix all product category repositories issues * fix product category service types * fix product module service types * fix product module service types * fix repository template type * refactor: use a singleton DMLToMikroORM factory instance Since the MikroORM MetadataStorage is global, we will also have to turn DML to MikroORM entities conversion use a global bucket as well * refactor: update product module to use DML in tests * wip: tests * WIP product linkable fixes * continue type fixing and start test fixing * test: fix more tests * fix repository * fix pivot table computaion + fix mikro orm repository * fix many to many management and configuration * fix many to many management and configuration * fix many to many management and configuration * update product tag relation configuration * Introduce experimental dml hooks to fix some issues with categories * more fixes * fix product tests * add missing id prefixes * fix product category handle management * test: fix more failing tests * test: make it all green * test: fix breaking tests * fix: build issues * fix: build issues * fix: more breaking tests * refactor: fix issues after merge * refactor: fix issues after merge * refactor: surpress types error * test: fix DML failing tests * improve many to many inference + tests * Wip fix columns from product entity * remove product model before create hook and manage handle validation and transformation at the service level * test: fix breaking unit tests * fix: product module service to not update handle on product update * fix define link and joiner config * test: fix joiner config test * test: fix joiner config test * fix joiner config primary keys * Fix joiner config builder * Fix joiner config builder * test: remove only modifier from test * refactor: remove hooks usage from product collection * refactor: remove hooks usage from product-option * refactor: remove hooks usage for computing category handle * refactor: remove hooks usage from productCategory model * refactor: remove hooks from DML * refactor: remove cruft * order dml * cleanup * re add foerign key indexes * wip * chore: remove unused types * wip * changes * rm raw * autoincrement * wip * rel * refactor: cleanup * migration and models configuration adjustments * cleanup * number searchable * fix random ordering * fix * test: fix product-category tests * test: update breaking DML tests * test: array assertion to not care about ordering * fix: temporarily apply id ordering for products * types * wip * WIP type improvements * update order models * partially fix types temporarely * rel * fix: recursive type issue * improve type inference breaks * improve type inference breaks * update models * rm nullable * default value * repository * update default value handling * fix unit tests * WIP * toMikroORM * fix relations * cascades * fix * experimental dml hooks * rm migration * serial * nullable autoincrement * fix model * model changes * fix one to one DML * order test * fix addresses * fix unit tests * Re align dml entity name inference * update model table name config * update model table name config * revert * update return relation * WIP * hasOne * models * fix * model * initial commit * cart service * order module * utils unit test * index engine * changeset * merge * fix hasOne with fk * update * free text filter per entity * tests * prod category * property string many to many * fix big number * link modules migration set names * merge * shipping option rules * serializer * unit test * fix test mikro orm init * fix test mikro orm init * Maintain merge object properties * fix test mikro orm init * prevent unit test from connecting to db * wip * fix test * fix test * link test * schema * models * auto increment * hook * model hooks * order * wip * orm version * request return field * fix return configuration on order model * workflows * core flows * unit test * test * base repo * test * base repo * test fix * inventory move * locking inventory * test * free text fix * rm timeout mock * migrate fulfillment values * v6.4.3 * cleanup * link-modules update sql * revert test * remove fake timers --------- Co-authored-by: adrien2p <adrien.deperetti@gmail.com> Co-authored-by: Harminder Virk <virk.officials@gmail.com> Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
2025-01-21 08:04:47 -05:00
parent 05c8a67d8e
commit cc73802ab3
178 changed files with 5731 additions and 7120 deletions
@@ -2,18 +2,18 @@ import {
  removeItemReturnActionWorkflow,
  updateRequestItemReturnWorkflow,
 } from "@medusajs/core-flows"
-import {
-  ContainerRegistrationKeys,
-  remoteQueryObjectFromString,
-} from "@medusajs/framework/utils"
 import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
  refetchEntity,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/framework/utils"
 import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config"
 import { AdminPostReturnsRequestItemsActionReqSchemaType } from "../../../../../returns/validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostReturnsRequestItemsActionReqSchemaType>,
@@ -29,7 +29,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -67,7 +67,10 @@ export const DELETE = async (
 ) => {
  const { id, action_id } = req.params

-  const claim = await refetchEntity("order_claim", id, req.scope, ["return_id"])
+  const claim = await refetchEntity("order_claim", id, req.scope, [
+    "id",
+    "return_id",
+  ])

  const { result: orderPreview } = await removeItemReturnActionWorkflow(
    req.scope
@@ -8,9 +8,9 @@ import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
 import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config"
 import { AdminPostReturnsRequestItemsReqSchemaType } from "../../../../returns/validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostReturnsRequestItemsReqSchemaType>,
@@ -26,7 +26,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -41,10 +41,11 @@ export const POST = async (
    },
  })

+  const returnId = result.order_change.return_id
  const queryObject = remoteQueryObjectFromString({
    entryPoint: "return",
    variables: {
-      id: claim.return_id,
+      id: returnId,
    },
    fields: defaultAdminDetailsReturnFields,
  })
@@ -2,17 +2,17 @@ import {
  removeClaimShippingMethodWorkflow,
  updateReturnShippingMethodWorkflow,
 } from "@medusajs/core-flows"
-import {
-  ContainerRegistrationKeys,
-  remoteQueryObjectFromString,
-} from "@medusajs/framework/utils"
 import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/framework/utils"
 import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config"
 import { AdminPostClaimsShippingActionReqSchemaType } from "../../../../validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostClaimsShippingActionReqSchemaType>,
@@ -28,7 +28,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -8,9 +8,9 @@ import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
 import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config"
 import { AdminPostReturnsShippingReqSchemaType } from "../../../../returns/validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostReturnsShippingReqSchemaType>,
@@ -26,7 +26,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -41,10 +41,11 @@ export const POST = async (
    },
  })

+  const returnId = result.order_change.return_id
  const queryObject = remoteQueryObjectFromString({
    entryPoint: "return",
    variables: {
-      id: claim.return_id,
+      id: returnId,
    },
    fields: defaultAdminDetailsReturnFields,
  })
@@ -2,16 +2,16 @@ import {
  removeItemReturnActionWorkflow,
  updateRequestItemReturnWorkflow,
 } from "@medusajs/core-flows"
-import { HttpTypes } from "@medusajs/framework/types"
-import {
-  ContainerRegistrationKeys,
-  remoteQueryObjectFromString,
-} from "@medusajs/framework/utils"
 import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
  refetchEntity,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/framework/utils"
 import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config"
 import { AdminPostExchangesRequestItemsReturnActionReqSchemaType } from "../../../../validators"

@@ -29,7 +29,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -8,9 +8,9 @@ import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
 import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config"
 import { AdminPostExchangesReturnRequestItemsReqSchemaType } from "../../../validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostExchangesReturnRequestItemsReqSchemaType>,
@@ -26,7 +26,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -43,10 +43,11 @@ export const POST = async (
    },
  })

+  const returnId = result.order_change.return_id
  const queryObject = remoteQueryObjectFromString({
    entryPoint: "return",
    variables: {
-      id: exchange.return_id,
+      id: returnId,
    },
    fields: defaultAdminDetailsReturnFields,
  })
@@ -2,17 +2,17 @@ import {
  removeReturnShippingMethodWorkflow,
  updateReturnShippingMethodWorkflow,
 } from "@medusajs/core-flows"
-import {
-  ContainerRegistrationKeys,
-  remoteQueryObjectFromString,
-} from "@medusajs/framework/utils"
 import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { AdminOrderPreview, HttpTypes } from "@medusajs/framework/types"
+import {
+  ContainerRegistrationKeys,
+  remoteQueryObjectFromString,
+} from "@medusajs/framework/utils"
 import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config"
 import { AdminPostExchangesShippingActionReqSchemaType } from "../../../../validators"
-import { AdminOrderPreview, HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostExchangesShippingActionReqSchemaType>,
@@ -28,7 +28,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -76,7 +76,7 @@ export const DELETE = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -8,9 +8,9 @@ import {
  AuthenticatedMedusaRequest,
  MedusaResponse,
 } from "@medusajs/framework/http"
+import { HttpTypes } from "@medusajs/framework/types"
 import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config"
 import { AdminPostReturnsShippingReqSchemaType } from "../../../../returns/validators"
-import { HttpTypes } from "@medusajs/framework/types"

 export const POST = async (
  req: AuthenticatedMedusaRequest<AdminPostReturnsShippingReqSchemaType>,
@@ -26,7 +26,7 @@ export const POST = async (
      variables: {
        id,
      },
-      fields: ["return_id"],
+      fields: ["id", "return_id"],
    }),
    {
      throwIfKeyNotFound: true,
@@ -41,10 +41,11 @@ export const POST = async (
    },
  })

+  const returnId = result.order_change.return_id
  const queryObject = remoteQueryObjectFromString({
    entryPoint: "return",
    variables: {
-      id: exchange.return_id,
+      id: returnId,
    },
    fields: defaultAdminDetailsReturnFields,
  })