feat(product, pricing, utils): Transaction issues and reference issues (

#5533) * feat(product, pricing, utils): Transaction issues and reference issues * fixes decorators * cleanup * fix product module upsert * fix missing active manager * increase timeout * revert package.json * WIP * try another node version based on findings with memory issues with jest introduced after 16.11 but fixed in 21 * re add bail * fix variant options * chore: bulk create pricing * chore: workflow bulk * Create big-chefs-dream.md * fix missing update for upserty * Add integration tests for product options upsert * rm unnecessary return * fix product prices workflow issue * cleanup * fix flag * fix model --------- Co-authored-by: Carlos R. L. Rodrigues <37986729+carlos-r-l-rodrigues@users.noreply.github.com> Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> Co-authored-by: Riqwan Thamir <rmthamir@gmail.com>
medusajs · Nov 6, 2023 · f88d75b · f88d75b
1 parent 57c3a24
commit f88d75b
Show file tree

Hide file tree

Showing 47 changed files with 621 additions and 472 deletions.
diff --git a/.changeset/big-chefs-dream.md b/.changeset/big-chefs-dream.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/pricing": patch
+"@medusajs/product": patch
+---
+
+feat(product, pricing, utils): Transaction issues and reference issues + refactoring
diff --git a/.github/actions/setup-server/action.yml b/.github/actions/setup-server/action.yml
@@ -5,7 +5,7 @@ inputs:
   node-version:
     description: "Node version"
     required: false
-    default: "16.20.2"
+    default: "16.10.0"
   cache-extension:
     description: "Extension for fetching cached dependencies"
     required: true

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Assert changed
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Assert changed
@@ -171,7 +171,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -223,7 +223,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -275,7 +275,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/codegen-test.yml b/.github/workflows/codegen-test.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/docs-freshness-check.yml b/.github/workflows/docs-freshness-check.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/docs-new-announcement.yml b/.github/workflows/docs-new-announcement.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/docs-remove-announcement.yml b/.github/workflows/docs-remove-announcement.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/generate-references.yml b/.github/workflows/generate-references.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies
@@ -89,7 +89,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/oas-test.yml b/.github/workflows/oas-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/release-notifications.yml b/.github/workflows/release-notifications.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: "16.20.2"
+          node-version: "16.10.0"
           cache: "yarn"
 
       - name: Post to Slack channel

diff --git a/integration-tests/environment-helpers/bootstrap-app.js b/integration-tests/environment-helpers/bootstrap-app.js
@@ -54,6 +54,7 @@ module.exports = {
 
     const shutdown = async () => {
       await Promise.all([
+        container.dispose(),
         expressServer.close(),
         db?.destroy(),
         pgConnection?.context?.destroy(),

diff --git a/integration-tests/plugins/__tests__/product/admin/create-product.ts b/integration-tests/plugins/__tests__/product/admin/create-product.ts
@@ -22,7 +22,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products", () => {
+describe("[Product & Pricing Module] POST /admin/products", () => {
   let dbConnection
   let appContainer
   let shutdownServer

diff --git a/integration-tests/plugins/__tests__/product/admin/update-product-variant.spec.ts b/integration-tests/plugins/__tests__/product/admin/update-product-variant.spec.ts
@@ -26,7 +26,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products/:id/variants/:id", () => {
+describe("[Product & Pricing Module] POST /admin/products/:id/variants/:id", () => {
   let dbConnection
   let appContainer
   let shutdownServer

diff --git a/integration-tests/plugins/__tests__/product/admin/update-product.spec.ts b/integration-tests/plugins/__tests__/product/admin/update-product.spec.ts
@@ -24,7 +24,7 @@ const env = {
   MEDUSA_FF_ISOLATE_PRODUCT_DOMAIN: true,
 }
 
-describe.skip("[Product & Pricing Module] POST /admin/products/:id", () => {
+describe("[Product & Pricing Module] POST /admin/products/:id", () => {
   let dbConnection
   let appContainer
   let shutdownServer
@@ -172,9 +172,7 @@ describe.skip("[Product & Pricing Module] POST /admin/products/:id", () => {
       ],
     }
 
-    console.log("I am here first")
     await api.post(`/admin/products/${product.id}`, data, adminHeaders)
-    console.log("I am here")
 
     const response = await api.get(
       `/admin/products/${product.id}`,

diff --git a/integration-tests/plugins/__tests__/workflows/product/update-product.ts b/integration-tests/plugins/__tests__/workflows/product/update-product.ts
@@ -12,7 +12,7 @@ import { getContainer } from "../../../../environment-helpers/use-container"
 import { initDb, useDb } from "../../../../environment-helpers/use-db"
 import { simpleProductFactory } from "../../../../factories"
 
-jest.setTimeout(30000)
+jest.setTimeout(100000)
 
 describe("UpdateProduct workflow", function () {
   let dbConnection

diff --git a/integration-tests/plugins/jest.config.js b/integration-tests/plugins/jest.config.js
@@ -9,7 +9,7 @@ module.exports = {
     `/www/`,
     `/dist/`,
     `/node_modules/`,
-    "<rootDir>/node_modules",
+    `<rootDir>/node_modules/`,
     `__tests__/fixtures`,
     `__testfixtures__`,
     `.cache`,

diff --git a/integration-tests/plugins/package.json b/integration-tests/plugins/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --silent=false --runInBand --bail --logHeapUsage --forceExit",
+    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --silent=false --runInBand --bail --detectOpenHandles --logHeapUsage --clearMocks --no-compilation-cache --forceExit",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {

diff --git a/packages/pricing/src/repositories/pricing.ts b/packages/pricing/src/repositories/pricing.ts
@@ -27,7 +27,7 @@ export class PricingRepository
     pricingContext: PricingContext = { context: {} },
     sharedContext: Context = {}
   ): Promise<CalculatedPriceSetDTO[]> {
-    const manager = this.getActiveManager<SqlEntityManager>()
+    const manager = this.getActiveManager<SqlEntityManager>(sharedContext)
     const knex = manager.getKnex()
     const context = pricingContext.context || {}
 

diff --git a/packages/pricing/src/services/currency.ts b/packages/pricing/src/services/currency.ts
@@ -9,8 +9,6 @@ import {
 import { Currency } from "@models"
 import { CurrencyRepository } from "@repositories"
 
-import { doNotForceTransaction, shouldForceTransaction } from "@medusajs/utils"
-
 type InjectedDependencies = {
   currencyRepository: DAL.RepositoryService
 }
@@ -75,7 +73,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     return queryOptions
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async create(
     data: PricingTypes.CreateCurrencyDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -86,7 +84,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async update(
     data: PricingTypes.UpdateCurrencyDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -97,7 +95,7 @@ export default class CurrencyService<TEntity extends Currency = Currency> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "currencyRepository_")
+  @InjectTransactionManager("currencyRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}

diff --git a/packages/pricing/src/services/money-amount.ts b/packages/pricing/src/services/money-amount.ts
@@ -9,8 +9,6 @@ import {
 import { MoneyAmount } from "@models"
 import { MoneyAmountRepository } from "@repositories"
 
-import { doNotForceTransaction, shouldForceTransaction } from "@medusajs/utils"
-
 type InjectedDependencies = {
   moneyAmountRepository: DAL.RepositoryService
 }
@@ -73,7 +71,7 @@ export default class MoneyAmountService<
     )) as [TEntity[], number]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async create(
     data: PricingTypes.CreateMoneyAmountDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -84,7 +82,7 @@ export default class MoneyAmountService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async update(
     data: PricingTypes.UpdateMoneyAmountDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -95,7 +93,7 @@ export default class MoneyAmountService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "moneyAmountRepository_")
+  @InjectTransactionManager("moneyAmountRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}

diff --git a/packages/pricing/src/services/price-rule.ts b/packages/pricing/src/services/price-rule.ts
@@ -4,9 +4,7 @@ import {
   InjectTransactionManager,
   MedusaContext,
   ModulesSdkUtils,
-  doNotForceTransaction,
   retrieveEntity,
-  shouldForceTransaction,
 } from "@medusajs/utils"
 import { PriceRule } from "@models"
 import { PriceRuleRepository } from "@repositories"
@@ -65,7 +63,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as [TEntity[], number]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async create(
     data: PricingTypes.CreatePriceRuleDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -76,7 +74,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(shouldForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async update(
     data: PricingTypes.UpdatePriceRuleDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -87,7 +85,7 @@ export default class PriceRuleService<TEntity extends PriceRule = PriceRule> {
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(doNotForceTransaction, "priceRuleRepository_")
+  @InjectTransactionManager("priceRuleRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}

diff --git a/packages/pricing/src/services/price-set-money-amount-rules.ts b/packages/pricing/src/services/price-set-money-amount-rules.ts
@@ -8,8 +8,6 @@ import {
 } from "@medusajs/utils"
 import { PriceSetMoneyAmountRules } from "@models"
 
-import { doNotForceTransaction, shouldForceTransaction } from "@medusajs/utils"
-
 type InjectedDependencies = {
   priceSetMoneyAmountRulesRepository: DAL.RepositoryService
 }
@@ -79,10 +77,7 @@ export default class PriceSetMoneyAmountRulesService<
     return queryOptions
   }
 
-  @InjectTransactionManager(
-    shouldForceTransaction,
-    "priceSetMoneyAmountRulesRepository_"
-  )
+  @InjectTransactionManager("priceSetMoneyAmountRulesRepository_")
   async create(
     data: PricingTypes.CreatePriceSetMoneyAmountRulesDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -93,10 +88,7 @@ export default class PriceSetMoneyAmountRulesService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(
-    shouldForceTransaction,
-    "priceSetMoneyAmountRulesRepository_"
-  )
+  @InjectTransactionManager("priceSetMoneyAmountRulesRepository_")
   async update(
     data: PricingTypes.UpdatePriceSetMoneyAmountRulesDTO[],
     @MedusaContext() sharedContext: Context = {}
@@ -107,10 +99,7 @@ export default class PriceSetMoneyAmountRulesService<
     )) as TEntity[]
   }
 
-  @InjectTransactionManager(
-    doNotForceTransaction,
-    "priceSetMoneyAmountRulesRepository_"
-  )
+  @InjectTransactionManager("priceSetMoneyAmountRulesRepository_")
   async delete(
     ids: string[],
     @MedusaContext() sharedContext: Context = {}