fix(medusa): Include items.variant relation in order calculation (#2869)

**What**

When an order require to decorate the totals, the variant relation should be added

FIXES CORE-930

packages/medusa/src/repositories/order.ts

@@ -2,6 +2,9 @@ import { flatten, groupBy, map, merge } from "lodash"
 import { EntityRepository, FindManyOptions, Repository } from "typeorm"
 import { Order } from "../models"
 
+const ITEMS_REL_NAME = "items"
+const REGION_REL_NAME = "region"
+
 @EntityRepository(Order)
 export class OrderRepository extends Repository<Order> {
   public async findWithRelations(
@@ -23,10 +26,12 @@ export class OrderRepository extends Repository<Order> {
 
     const entitiesIdsWithRelations = await Promise.all(
       Object.entries(groupedRelations).map(async ([topLevel, rels]) => {
+        // If top level is region or items then get deleted region as well
         return this.findByIds(entitiesIds, {
           select: ["id"],
           relations: rels,
-          withDeleted: topLevel === "region",
+          withDeleted:
+            topLevel === ITEMS_REL_NAME || topLevel === REGION_REL_NAME,
         })
       })
     ).then(flatten)

packages/medusa/src/services/new-totals.ts

@@ -71,6 +71,7 @@ export default class NewTotalsService extends TransactionBaseService {
     featureFlagRouter,
     taxCalculationStrategy,
   }: InjectedDependencies) {
+    // eslint-disable-next-line prefer-rest-params
     super(arguments[0])
 
     this.manager_ = manager
@@ -490,23 +491,34 @@ export default class NewTotalsService extends TransactionBaseService {
     }
 
     // If a gift card is not taxable, the tax_rate for the giftcard will be null
-    const { totalGiftCardBalance, totalTaxFromGiftCards } = giftCards.reduce((acc, giftCard) => {
-      let taxableAmount = 0
+    const { totalGiftCardBalance, totalTaxFromGiftCards } = giftCards.reduce(
+      (acc, giftCard) => {
+        let taxableAmount = 0
 
-      acc.totalGiftCardBalance += giftCard.balance
+        acc.totalGiftCardBalance += giftCard.balance
 
-      taxableAmount = Math.min(acc.giftCardableBalance, giftCard.balance)
-      // skip tax, if the taxable amount is not a positive number or tax rate is not set
-      if (taxableAmount <= 0 || !giftCard.tax_rate) return acc
+        taxableAmount = Math.min(acc.giftCardableBalance, giftCard.balance)
+        // skip tax, if the taxable amount is not a positive number or tax rate is not set
+        if (taxableAmount <= 0 || !giftCard.tax_rate) {
+          return acc
+        }
 
-      let taxAmountFromGiftCard = Math.round(taxableAmount * (giftCard.tax_rate / 100))
+        const taxAmountFromGiftCard = Math.round(
+          taxableAmount * (giftCard.tax_rate / 100)
+        )
 
-      acc.totalTaxFromGiftCards += taxAmountFromGiftCard
-      // Update the balance, pass it over to the next gift card (if any) for calculating tax on balance.
-      acc.giftCardableBalance -= taxableAmount
+        acc.totalTaxFromGiftCards += taxAmountFromGiftCard
+        // Update the balance, pass it over to the next gift card (if any) for calculating tax on balance.
+        acc.giftCardableBalance -= taxableAmount
 
-      return acc
-    }, { totalGiftCardBalance: 0, totalTaxFromGiftCards: 0, giftCardableBalance: giftCardableAmount })
+        return acc
+      },
+      {
+        totalGiftCardBalance: 0,
+        totalTaxFromGiftCards: 0,
+        giftCardableBalance: giftCardableAmount,
+      }
+    )
 
     result.tax_total = Math.round(totalTaxFromGiftCards)
     result.total = Math.min(giftCardableAmount, totalGiftCardBalance)

packages/medusa/src/services/order.ts

@@ -9,6 +9,7 @@ import {
   Fulfillment,
   FulfillmentItem,
   FulfillmentStatus,
+  GiftCard,
   LineItem,
   Order,
   OrderStatus,
@@ -17,7 +18,6 @@ import {
   Return,
   Swap,
   TrackingLink,
-  GiftCard,
 } from "../models"
 import { AddressRepository } from "../repositories/address"
 import { OrderRepository } from "../repositories/order"
@@ -674,7 +674,10 @@ class OrderService extends TransactionBaseService {
       const giftCardService = this.giftCardService_.withTransaction(manager)
 
       for (const giftCard of cart.gift_cards) {
-        const newGiftCardBalance = Math.max(0, giftCard.balance - giftCardableAmountBalance)
+        const newGiftCardBalance = Math.max(
+          0,
+          giftCard.balance - giftCardableAmountBalance
+        )
         const giftCardBalanceUsed = giftCard.balance - newGiftCardBalance
 
         await giftCardService.update(giftCard.id, {
@@ -687,10 +690,11 @@ class OrderService extends TransactionBaseService {
           order_id: order.id,
           amount: giftCardBalanceUsed,
           is_taxable: !!giftCard.tax_rate,
-          tax_rate: giftCard.tax_rate
+          tax_rate: giftCard.tax_rate,
         })
 
-        giftCardableAmountBalance = giftCardableAmountBalance - giftCardBalanceUsed
+        giftCardableAmountBalance =
+          giftCardableAmountBalance - giftCardBalanceUsed
       }
 
       const shippingOptionServiceTx =
@@ -709,7 +713,9 @@ class OrderService extends TransactionBaseService {
             ]
 
             if (lineItem.is_giftcard) {
-              lineItemPromises.push(this.createGiftCardsFromLineItem_(order, lineItem, manager))
+              lineItemPromises.push(
+                this.createGiftCardsFromLineItem_(order, lineItem, manager)
+              )
             }
 
             return lineItemPromises
@@ -748,7 +754,9 @@ class OrderService extends TransactionBaseService {
 
     // LineItem type doesn't promise either the subtotal or quantity. Adding a check here provides
     // additional type safety/strictness
-    if (!lineItem.subtotal || !lineItem.quantity) return createGiftCardPromises
+    if (!lineItem.subtotal || !lineItem.quantity) {
+      return createGiftCardPromises
+    }
 
     // Subtotal is the pure value of the product/variant excluding tax, discounts, etc.
     // We divide here by quantity to get the value of the product/variant as a lineItem
@@ -758,7 +766,8 @@ class OrderService extends TransactionBaseService {
     // On utilizing the gift card, the same set of taxRate will apply to gift card
     // We calculate the summation of all taxes and add that as a snapshot in the giftcard.tax_rate column
     const giftCardTaxRate = lineItem.tax_lines.reduce(
-      (sum, taxLine) => sum + taxLine.rate, 0
+      (sum, taxLine) => sum + taxLine.rate,
+      0
     )
 
     const giftCardTxnService = this.giftCardService_.withTransaction(manager)
@@ -770,7 +779,7 @@ class OrderService extends TransactionBaseService {
         value: taxExclusivePrice,
         balance: taxExclusivePrice,
         metadata: lineItem.metadata,
-        tax_rate: giftCardTaxRate || null
+        tax_rate: giftCardTaxRate || null,
       })
 
       createGiftCardPromises.push(createGiftCardPromise)
@@ -1933,6 +1942,7 @@ class OrderService extends TransactionBaseService {
     relationSet.add("items")
     relationSet.add("items.tax_lines")
     relationSet.add("items.adjustments")
+    relationSet.add("items.variant")
     relationSet.add("swaps")
     relationSet.add("swaps.additional_items")
     relationSet.add("swaps.additional_items.tax_lines")