[pull] develop from medusajs:develop

.changeset/clean-news-sin.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/fulfillment": patch
+"@medusajs/types": patch
+"@medusajs/utils": patch
+"@medusajs/medusa": patch
+---
+
+chore: fulfillment module DML

.changeset/eight-pigs-wave.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/product": patch
+---
+
+fix(product): updating collections with products fix

.changeset/slimy-seas-join.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/core-flows": patch
+---
+
+fix(core-flows): refresh payment collections upon shipping changes

integration-tests/http/__tests__/cart/store/cart.spec.ts

@@ -302,7 +302,7 @@ medusaIntegrationTestRunner({
       })
 
       describe("POST /store/carts/:id/line-items", () => {
-        let shippingOption
+        let shippingOption, shippingOptionExpensive
 
         beforeEach(async () => {
           const stockLocation = (
@@ -358,25 +358,63 @@ medusaIntegrationTestRunner({
             adminHeaders
           )
 
+          const shippingOptionPayload = {
+            name: `Shipping`,
+            service_zone_id: fulfillmentSet.service_zones[0].id,
+            shipping_profile_id: shippingProfile.id,
+            provider_id: "manual_test-provider",
+            price_type: "flat",
+            type: {
+              label: "Test type",
+              description: "Test description",
+              code: "test-code",
+            },
+            prices: [
+              { currency_code: "usd", amount: 1000 },
+              {
+                currency_code: "usd",
+                amount: 0,
+                rules: [
+                  {
+                    attribute: "item_total",
+                    operator: "gt",
+                    value: 5000,
+                  },
+                ],
+              },
+            ],
+            rules: [
+              {
+                attribute: "enabled_in_store",
+                value: '"true"',
+                operator: "eq",
+              },
+              {
+                attribute: "is_return",
+                value: "false",
+                operator: "eq",
+              },
+            ],
+          }
+
           shippingOption = (
+            await api.post(
+              `/admin/shipping-options`,
+              shippingOptionPayload,
+              adminHeaders
+            )
+          ).data.shipping_option
+
+          shippingOptionExpensive = (
             await api.post(
               `/admin/shipping-options`,
               {
-                name: `Shipping`,
-                service_zone_id: fulfillmentSet.service_zones[0].id,
-                shipping_profile_id: shippingProfile.id,
-                provider_id: "manual_test-provider",
-                price_type: "flat",
-                type: {
-                  label: "Test type",
-                  description: "Test description",
-                  code: "test-code",
-                },
+                ...shippingOptionPayload,
                 prices: [
-                  { currency_code: "usd", amount: 1000 },
+                  { currency_code: "usd", amount: 10000 },
                   {
                     currency_code: "usd",
-                    amount: 0,
+                    amount: 5000,
                     rules: [
                       {
                         attribute: "item_total",
@@ -386,18 +424,6 @@ medusaIntegrationTestRunner({
                     ],
                   },
                 ],
-                rules: [
-                  {
-                    attribute: "enabled_in_store",
-                    value: '"true"',
-                    operator: "eq",
-                  },
-                  {
-                    attribute: "is_return",
-                    value: "false",
-                    operator: "eq",
-                  },
-                ],
               },
               adminHeaders
             )
@@ -555,6 +581,61 @@ medusaIntegrationTestRunner({
               })
             )
           })
+
+          it("should update payment collection upon changing shipping option", async () => {
+            await api.post(
+              `/store/carts/${cart.id}/shipping-methods`,
+              { option_id: shippingOption.id },
+              storeHeaders
+            )
+
+            await api.post(
+              `/store/payment-collections`,
+              { cart_id: cart.id },
+              storeHeaders
+            )
+
+            const cartAfterCollection = (
+              await api.get(`/store/carts/${cart.id}`, storeHeaders)
+            ).data.cart
+
+            expect(cartAfterCollection).toEqual(
+              expect.objectContaining({
+                id: cart.id,
+                shipping_methods: expect.arrayContaining([
+                  expect.objectContaining({
+                    shipping_option_id: shippingOption.id,
+                  }),
+                ]),
+                payment_collection: expect.objectContaining({
+                  amount: 2398,
+                }),
+              })
+            )
+
+            let cartAfterExpensiveShipping = (
+              await api.post(
+                `/store/carts/${cart.id}/shipping-methods`,
+                { option_id: shippingOptionExpensive.id },
+                storeHeaders
+              )
+            ).data.cart
+
+            expect(cartAfterExpensiveShipping).toEqual(
+              expect.objectContaining({
+                id: cartAfterExpensiveShipping.id,
+                shipping_methods: expect.arrayContaining([
+                  expect.objectContaining({
+                    shipping_option_id: shippingOptionExpensive.id,
+                    amount: 5000,
+                  }),
+                ]),
+                payment_collection: expect.objectContaining({
+                  amount: 6398,
+                }),
+              })
+            )
+          })
         })
 
         it("should add item to cart with tax lines multiple times", async () => {

integration-tests/http/__tests__/collection/admin/colllection.spec.ts

@@ -1,7 +1,7 @@
 import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
 import {
-  createAdminUser,
   adminHeaders,
+  createAdminUser,
 } from "../../../../helpers/create-admin-user"
 
 jest.setTimeout(30000)
@@ -216,9 +216,7 @@ medusaIntegrationTestRunner({
       it("adds products to collection", async () => {
         const response = await api.post(
           `/admin/collections/${baseCollection.id}/products?fields=*products`,
-          {
-            add: [baseProduct.id, baseProduct1.id],
-          },
+          { add: [baseProduct.id, baseProduct1.id] },
           adminHeaders
         )
 
@@ -242,6 +240,54 @@ medusaIntegrationTestRunner({
         )
       })
 
+      it("should not remove products from collection when updating collection", async () => {
+        const addProductsResponse = await api.post(
+          `/admin/collections/${baseCollection.id}/products?fields=*products`,
+          { add: [baseProduct.id, baseProduct1.id] },
+          adminHeaders
+        )
+
+        expect(addProductsResponse.status).toEqual(200)
+        expect(addProductsResponse.data.collection).toEqual(
+          expect.objectContaining({
+            id: baseCollection.id,
+            products: expect.arrayContaining([
+              expect.objectContaining({
+                collection_id: baseCollection.id,
+                title: "test-product",
+              }),
+              expect.objectContaining({
+                collection_id: baseCollection.id,
+                title: "test-product1",
+              }),
+            ]),
+          })
+        )
+
+        const updateCollectionResponse = await api.post(
+          `/admin/collections/${baseCollection.id}?fields=*products`,
+          { title: "test collection update" },
+          adminHeaders
+        )
+
+        expect(updateCollectionResponse.status).toEqual(200)
+        expect(updateCollectionResponse.data.collection).toEqual(
+          expect.objectContaining({
+            title: "test collection update",
+            products: expect.arrayContaining([
+              expect.objectContaining({
+                collection_id: baseCollection.id,
+                title: "test-product",
+              }),
+              expect.objectContaining({
+                collection_id: baseCollection.id,
+                title: "test-product1",
+              }),
+            ]),
+          })
+        )
+      })
+
       it("removes products from collection", async () => {
         await api.post(
           `/admin/collections/${baseCollection.id}/products`,

integration-tests/http/__tests__/shipping-option/admin/shipping-option.spec.ts

@@ -237,10 +237,10 @@ medusaIntegrationTestRunner({
               },
             ]),
             provider_id: "manual_test-provider",
-            provider: {
+            provider: expect.objectContaining({
               id: "manual_test-provider",
               is_enabled: true,
-            },
+            }),
             rules: [],
             service_zone_id: expect.any(String),
             service_zone: {

integration-tests/http/__tests__/stock-location/admin/fulfillment-provider.spec.ts

@@ -39,7 +39,10 @@ medusaIntegrationTestRunner({
 
         expect(response.status).toEqual(200)
         expect(response.data.stock_location.fulfillment_providers).toEqual([
-          { id: "manual_test-provider", is_enabled: true },
+          expect.objectContaining({
+            id: "manual_test-provider",
+            is_enabled: true,
+          }),
         ])
       })
 

integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts

@@ -502,6 +502,7 @@ medusaIntegrationTestRunner({
             provider_id: provider_id,
             data: null,
             metadata: null,
+            shipping_option_type_id: expect.any(String),
             type: expect.objectContaining({
               id: expect.any(String),
               code: shippingOptionData.type.code,

packages/core/core-flows/src/cart/workflows/add-shipping-method-to-cart.ts

@@ -17,8 +17,7 @@ import { validateAndReturnShippingMethodsDataStep } from "../steps/validate-ship
 import { validateCartShippingOptionsPriceStep } from "../steps/validate-shipping-options-price"
 import { cartFieldsForRefreshSteps } from "../utils/fields"
 import { listShippingOptionsForCartWithPricingWorkflow } from "./list-shipping-options-for-cart-with-pricing"
-import { updateCartPromotionsWorkflow } from "./update-cart-promotions"
-import { updateTaxLinesWorkflow } from "./update-tax-lines"
+import { refreshCartItemsWorkflow } from "./refresh-cart-items"
 
 export interface AddShippingMethodToCartWorkflowInput {
   cart_id: string
@@ -132,9 +131,9 @@ export const addShippingMethodToCartWorkflow = createWorkflow(
       }
     )
 
-    const currentShippingMethods = transform({ cart }, ({ cart }) => {
-      return cart.shipping_methods.map((sm) => sm.id)
-    })
+    const currentShippingMethods = transform({ cart }, ({ cart }) =>
+      cart.shipping_methods.map((sm) => sm.id)
+    )
 
     parallelize(
       removeShippingMethodFromCartStep({
@@ -149,16 +148,8 @@ export const addShippingMethodToCartWorkflow = createWorkflow(
       })
     )
 
-    updateTaxLinesWorkflow.runAsStep({
-      input: {
-        cart_id: input.cart_id,
-      },
-    })
-
-    updateCartPromotionsWorkflow.runAsStep({
-      input: {
-        cart_id: input.cart_id,
-      },
+    refreshCartItemsWorkflow.runAsStep({
+      input: { cart_id: cart.id },
     })
   }
 )

packages/core/core-flows/src/order/workflows/create-fulfillment.ts

@@ -257,6 +257,12 @@ export const createOrderFulfillmentWorkflow = createWorkflow(
         "items.*",
         "items.variant.manage_inventory",
         "items.variant.allow_backorder",
+        "items.variant.product.id",
+        "items.variant.weight",
+        "items.variant.length",
+        "items.variant.height",
+        "items.variant.width",
+        "items.variant.material",
         "shipping_address.*",
         "shipping_methods.shipping_option_id",
         "shipping_methods.data",

packages/core/types/src/dml/index.ts

@@ -147,7 +147,9 @@ export interface EntityConstructor<Props> extends Function {
  */
 export type InferForeignKeys<Schema extends DMLSchema> = {
   [K in keyof Schema as Schema[K] extends { $foreignKey: true }
-    ? `${K & string}_id`
+    ? Schema[K] extends { $foreignKeyName: `${infer FkName}` }
+      ? `${FkName & string}`
+      : `${K & string}_id`
     : never]: Schema[K] extends { $foreignKey: true }
     ? null extends Schema[K]["$dataType"]
       ? string | null

packages/core/types/src/fulfillment/mutations/shipping-option.ts

@@ -87,7 +87,7 @@ export interface UpdateShippingOptionDTO {
   /**
    * The shipping option type associated with the shipping option.
    */
-  type:
+  type?:
     | Omit<CreateShippingOptionTypeDTO, "shipping_option_id">
     | {
         /**