chore: Hide repository creation if they are not custom + add upsert support by default (#6127)

packages/pricing/integration-tests/__tests__/services/currency/index.spec.ts

@@ -1,11 +1,13 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
 
 import { Currency } from "@models"
-import { CurrencyRepository } from "@repositories"
 import { CurrencyService } from "@services"
 
 import { createCurrencies } from "../../../__fixtures__/currency"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -34,13 +36,12 @@ describe("Currency Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const currencyRepository = new CurrencyRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new CurrencyService({
-      currencyRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("currencyService")
 
     testManager = await MikroOrmWrapper.forkManager()
 

packages/pricing/integration-tests/__tests__/services/money-amount/index.spec.ts

@@ -1,12 +1,14 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
 
 import { Currency, MoneyAmount } from "@models"
-import { MoneyAmountRepository } from "@repositories"
 import { MoneyAmountService } from "@services"
 
 import { createCurrencies } from "../../../__fixtures__/currency"
 import { createMoneyAmounts } from "../../../__fixtures__/money-amount"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -21,13 +23,12 @@ describe("MoneyAmount Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const moneyAmountRepository = new MoneyAmountRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new MoneyAmountService({
-      moneyAmountRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("moneyAmountService")
 
     testManager = await MikroOrmWrapper.forkManager()
     currencyData = await createCurrencies(testManager)

packages/pricing/integration-tests/__tests__/services/price-list-rule/index.spec.ts

@@ -1,12 +1,13 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-
-import { PriceListRuleRepository } from "@repositories"
 import { PriceListRuleService } from "@services"
 
 import { createPriceLists } from "../../../__fixtures__/price-list"
 import { createPriceListRules } from "../../../__fixtures__/price-list-rules"
 import { createRuleTypes } from "../../../__fixtures__/rule-type"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -19,13 +20,12 @@ describe("PriceListRule Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const priceListRuleRepository = new PriceListRuleRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new PriceListRuleService({
-      priceListRuleRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("priceListRuleService")
 
     testManager = await MikroOrmWrapper.forkManager()
     await createRuleTypes(testManager)

packages/pricing/integration-tests/__tests__/services/price-list/index.spec.ts

@@ -1,8 +1,10 @@
 import { MikroOrmWrapper } from "../../../utils"
-import { PriceListRepository } from "@repositories"
 import { PriceListService } from "@services"
 import { SqlEntityManager } from "@mikro-orm/postgresql"
 import { createPriceLists } from "../../../__fixtures__/price-list"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -15,13 +17,12 @@ describe("PriceList Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const priceListRepository = new PriceListRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new PriceListService({
-      priceListRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("priceListService")
 
     testManager = await MikroOrmWrapper.forkManager()
     await createPriceLists(testManager)

packages/pricing/integration-tests/__tests__/services/price-rule/index.spec.ts

@@ -2,7 +2,6 @@ import { PriceSetMoneyAmount } from "@models"
 
 import { CreatePriceRuleDTO } from "@medusajs/types"
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-import { PriceRuleRepository } from "@repositories"
 import { PriceRuleService } from "@services"
 import { createCurrencies } from "../../../__fixtures__/currency"
 import { createMoneyAmounts } from "../../../__fixtures__/money-amount"
@@ -12,6 +11,9 @@ import { createPriceSetMoneyAmounts } from "../../../__fixtures__/price-set-mone
 import { createPriceSetMoneyAmountRules } from "../../../__fixtures__/price-set-money-amount-rules"
 import { createRuleTypes } from "../../../__fixtures__/rule-type"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -25,13 +27,13 @@ describe("PriceRule Service", () => {
     repositoryManager = await MikroOrmWrapper.forkManager()
     testManager = await MikroOrmWrapper.forkManager()
 
-    const priceRuleRepository = new PriceRuleRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
+
+    await ContainerLoader({ container })
+
+    service = container.resolve("priceRuleService")
 
-    service = new PriceRuleService({
-      priceRuleRepository: priceRuleRepository,
-    })
     await createCurrencies(testManager)
     await createMoneyAmounts(testManager)
     await createPriceSets(testManager)

packages/pricing/integration-tests/__tests__/services/price-set-money-amonut-rules/index.spec.ts

@@ -1,10 +1,11 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-
-import { PriceSetMoneyAmountRulesRepository } from "@repositories"
 import { PriceSetMoneyAmountRulesService } from "@services"
 
 import { seedPriceData } from "../../../__fixtures__/seed-price-data"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -17,14 +18,12 @@ describe("PriceSetMoneyAmountRules Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const priceSetMoneyAmountRulesRepository =
-      new PriceSetMoneyAmountRulesRepository({
-        manager: repositoryManager,
-      })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new PriceSetMoneyAmountRulesService({
-      priceSetMoneyAmountRulesRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("priceSetMoneyAmountRulesService")
 
     testManager = await MikroOrmWrapper.forkManager()
 

packages/pricing/integration-tests/__tests__/services/price-set/index.spec.ts

@@ -1,13 +1,15 @@
 import { CreatePriceSetDTO } from "@medusajs/types"
 import { SqlEntityManager } from "@mikro-orm/postgresql"
 import { MoneyAmount, PriceSet } from "@models"
-import { PriceSetRepository } from "@repositories"
 import { PriceSetService } from "@services"
 
 import { createCurrencies } from "../../../__fixtures__/currency"
 import { createMoneyAmounts } from "../../../__fixtures__/money-amount"
 import { createPriceSets } from "../../../__fixtures__/price-set"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -54,13 +56,12 @@ describe("PriceSet Service", () => {
     repositoryManager = await MikroOrmWrapper.forkManager()
     testManager = await MikroOrmWrapper.forkManager()
 
-    const priceSetRepository = new PriceSetRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new PriceSetService({
-      priceSetRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("priceSetService")
 
     await createCurrencies(testManager)
 

packages/pricing/integration-tests/__tests__/services/rule-type/index.spec.ts

@@ -1,10 +1,11 @@
 import { SqlEntityManager } from "@mikro-orm/postgresql"
-
-import { RuleTypeRepository } from "@repositories"
 import { RuleTypeService } from "@services"
 
 import { createRuleTypes } from "../../../__fixtures__/rule-type"
 import { MikroOrmWrapper } from "../../../utils"
+import { createMedusaContainer } from "@medusajs/utils"
+import { asValue } from "awilix"
+import ContainerLoader from "../../../../src/loaders/container"
 
 jest.setTimeout(30000)
 
@@ -17,13 +18,12 @@ describe("RuleType Service", () => {
     await MikroOrmWrapper.setupDatabase()
     repositoryManager = await MikroOrmWrapper.forkManager()
 
-    const ruleTypeRepository = new RuleTypeRepository({
-      manager: repositoryManager,
-    })
+    const container = createMedusaContainer()
+    container.register("manager", asValue(repositoryManager))
 
-    service = new RuleTypeService({
-      ruleTypeRepository,
-    })
+    await ContainerLoader({ container })
+
+    service = container.resolve("ruleTypeService")
 
     testManager = await MikroOrmWrapper.forkManager()