Merge branch 'master' into develop

packages/medusa/src/api/routes/store/carts/update-cart.ts

@@ -8,10 +8,10 @@ import {
 } from "class-validator"
 import { defaultStoreCartFields, defaultStoreCartRelations } from "."
 import { CartService } from "../../../../services"
-import { AddressPayload } from "../../../../types/common"
 import { CartUpdateProps } from "../../../../types/cart"
-import { IsType } from "../../../../utils/validators/is-type"
+import { AddressPayload } from "../../../../types/common"
 import { validator } from "../../../../utils/validator"
+import { IsType } from "../../../../utils/validators/is-type"
 
 /**
  * @oas [post] /store/carts/{id}
@@ -90,7 +90,7 @@ export default async (req, res) => {
   // Update the cart
   const { shipping_address, billing_address, ...rest } = validated
 
-  const cartDataToUpdate: CartUpdateProps = { ...rest };
+  const cartDataToUpdate: CartUpdateProps = { ...rest }
   if (typeof shipping_address === "string") {
     cartDataToUpdate.shipping_address_id = shipping_address
   } else {

packages/medusa/src/services/__tests__/line-item-adjustment.js

@@ -1,8 +1,8 @@
-import LineItemAdjustmentService from "../line-item-adjustment"
-import { MockManager, MockRepository, IdMap } from "medusa-test-utils"
-import { EventBusServiceMock } from "../__mocks__/event-bus"
-import { DiscountServiceMock } from "../__mocks__/discount"
+import { MockManager, MockRepository } from "medusa-test-utils"
 import { In } from "typeorm"
+import LineItemAdjustmentService from "../line-item-adjustment"
+import { DiscountServiceMock } from "../__mocks__/discount"
+import { EventBusServiceMock } from "../__mocks__/event-bus"
 
 describe("LineItemAdjustmentService", () => {
   describe("list", () => {
@@ -101,7 +101,7 @@ describe("LineItemAdjustmentService", () => {
     }
 
     const lineItemAdjustmentRepo = MockRepository({
-      create: (f) => Promise.resolve(lineItemAdjustment),
+      create: (f) => lineItemAdjustment,
       save: (f) => Promise.resolve(lineItemAdjustment),
     })
 
@@ -270,11 +270,11 @@ describe("LineItemAdjustmentService", () => {
 
     it("calls createAdjustmentForLineItem once when given a line item", () => {
       const cart = {
-          id: "cart1",
-          discounts: ["disc-1"],
-          items: [{ id: "li-1" }],
-        },
-        lineItem = { id: "li-1" }
+        id: "cart1",
+        discounts: ["disc-1"],
+        items: [{ id: "li-1" }],
+      }
+      const lineItem = { id: "li-1" }
 
       lineItemAdjustmentService.createAdjustments(cart, lineItem)
       expect(

packages/medusa/src/services/cart.ts

@@ -3,6 +3,7 @@ import { MedusaError, Validator } from "medusa-core-utils"
 import { DeepPartial, EntityManager, In } from "typeorm"
 import { TransactionBaseService } from "../interfaces"
 import { IPriceSelectionStrategy } from "../interfaces/price-selection-strategy"
+import { DiscountRuleType } from "../models"
 import { Address } from "../models/address"
 import { Cart } from "../models/cart"
 import { CustomShippingOption } from "../models/custom-shipping-option"
@@ -1229,7 +1230,7 @@ class CartService extends TransactionBaseService<CartService> {
 
         const freshCart = await this.retrieve(cart.id, {
           select: ["total"],
-          relations: ["payment_sessions"],
+          relations: ["payment_sessions", "items", "items.adjustments"],
         })
 
         if (session.status === "authorized") {

packages/medusa/src/services/line-item-adjustment.ts

@@ -1,14 +1,14 @@
-import { EntityManager } from "typeorm"
-import { BaseService } from "medusa-interfaces"
 import { MedusaError } from "medusa-core-utils"
+import { BaseService } from "medusa-interfaces"
+import { EntityManager } from "typeorm"
+import { Cart } from "../models/cart"
+import { LineItem } from "../models/line-item"
+import { LineItemAdjustment } from "../models/line-item-adjustment"
+import { ProductVariant } from "../models/product-variant"
 import { LineItemAdjustmentRepository } from "../repositories/line-item-adjustment"
 import { FindConfig } from "../types/common"
-import { LineItemAdjustment } from "../models/line-item-adjustment"
 import { FilterableLineItemAdjustmentProps } from "../types/line-item-adjustment"
-import { LineItem } from "../models/line-item"
-import { Cart } from "../models/cart"
 import DiscountService from "./discount"
-import { ProductVariant } from "../models/product-variant"
 
 type LineItemAdjustmentServiceProps = {
   manager: EntityManager
@@ -96,7 +96,7 @@ class LineItemAdjustmentService extends BaseService {
       const lineItemAdjustmentRepo: LineItemAdjustmentRepository =
         manager.getCustomRepository(this.lineItemAdjustmentRepo_)
 
-      const lineItemAdjustment = await lineItemAdjustmentRepo.create(data)
+      const lineItemAdjustment = lineItemAdjustmentRepo.create(data)
 
       return await lineItemAdjustmentRepo.save(lineItemAdjustment)
     })