asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Chore/rm main entity concept (#7709)

Browse Source 
**What**
Update the `MedusaService` class, factory and types to remove the concept of main modules. The idea being that all method will be explicitly named and suffixes to represent the object you are trying to manipulate.
This pr also includes various fixes in different modules

Co-authored-by: Stevche Radevski <4820812+sradevski@users.noreply.github.com>
Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
Adrien de Peretti
2024-06-19 13:02:16 +00:00
committed by GitHub
co-authored by Stevche Radevski Oli Juhl
parent 2895ccfba8
commit 48963f55ef
533 changed files with 6469 additions and 9769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/modules/region/integration-tests/__tests__/region-module.spec.ts
+37 -40
View File
@@ -1,15 +1,12 @@
import { Modules } from "@medusajs/modules-sdk"
import { IRegionModuleService } from "@medusajs/types"
import { moduleIntegrationTestRunner, SuiteOptions } from "medusa-test-utils"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
jest.setTimeout(30000)
moduleIntegrationTestRunner({
moduleIntegrationTestRunner<IRegionModuleService>({
moduleName: Modules.REGION,
testSuite: ({
MikroOrmWrapper,
service,
}: SuiteOptions<IRegionModuleService>) => {
testSuite: ({ service }) => {
describe("Region Module Service", () => {
it("should create countries on application start", async () => {
const countries = await service.listCountries({}, { take: null })
@@ -17,7 +14,7 @@ moduleIntegrationTestRunner({
})
it("should create and list a region", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "Europe",
currency_code: "EUR",
automatic_taxes: false,
@@ -33,7 +30,7 @@ moduleIntegrationTestRunner({
})
)
const region = await service.retrieve(createdRegion.id, {
const region = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
@@ -48,13 +45,13 @@ moduleIntegrationTestRunner({
})
it("should create a region with countries", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
const region = await service.retrieve(createdRegion.id, {
const region = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
@@ -80,7 +77,7 @@ moduleIntegrationTestRunner({
it("should throw when country doesn't exist", async () => {
await expect(
service.create({
service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["neverland"],
@@ -89,14 +86,14 @@ moduleIntegrationTestRunner({
})
it("should throw when country is already assigned to a region", async () => {
await service.create({
await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us"],
})
await expect(
service.create({
service.createRegions({
name: "United States",
currency_code: "USD",
countries: ["us"],
@@ -108,7 +105,7 @@ moduleIntegrationTestRunner({
it("should throw when country is being assigned to multiple regions", async () => {
await expect(
service.create([
service.createRegions([
{
name: "United States",
currency_code: "USD",
@@ -126,13 +123,13 @@ moduleIntegrationTestRunner({
})
it("should upsert the region successfully", async () => {
const createdRegion = await service.upsert({
const createdRegion = await service.upsertRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await service.upsert({
await service.upsertRegions({
id: createdRegion.id,
name: "Americas",
currency_code: "MXN",
@@ -140,7 +137,7 @@ moduleIntegrationTestRunner({
automatic_taxes: false,
})
const latestRegion = await service.retrieve(createdRegion.id, {
const latestRegion = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
@@ -154,13 +151,13 @@ moduleIntegrationTestRunner({
})
it("should allow mixing create and update operations in upsert", async () => {
const createdRegion = await service.upsert({
const createdRegion = await service.upsertRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
const upserted = await service.upsert([
const upserted = await service.upsertRegions([
{
id: createdRegion.id,
name: "Americas",
@@ -190,29 +187,29 @@ moduleIntegrationTestRunner({
})
it("should update the region successfully", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
const shouldNotBeChangedRegion = await service.create({
const shouldNotBeChangedRegion = await service.createRegions({
name: "Europe",
currency_code: "EUR",
countries: ["hr"],
})
await service.update(createdRegion.id, {
await service.updateRegions(createdRegion.id, {
name: "Americas",
currency_code: "MXN",
countries: ["us", "mx"],
})
const latestRegion = await service.retrieve(createdRegion.id, {
const latestRegion = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
const shouldNotBeChangedRegionAfter = await service.retrieve(
const shouldNotBeChangedRegionAfter = await service.retrieveRegion(
shouldNotBeChangedRegion.id,
{
relations: ["countries"],
@@ -235,18 +232,18 @@ moduleIntegrationTestRunner({
})
it("should update the region without affecting countries if countries are undefined", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await service.update(createdRegion.id, {
await service.updateRegions(createdRegion.id, {
name: "Americas",
currency_code: "MXN",
})
const updatedRegion = await service.retrieve(createdRegion.id, {
const updatedRegion = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
@@ -263,19 +260,19 @@ moduleIntegrationTestRunner({
})
it("should remove the countries in a region successfully", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await service.update(createdRegion.id, {
await service.updateRegions(createdRegion.id, {
name: "Americas",
currency_code: "MXN",
countries: [],
})
const updatedRegion = await service.retrieve(createdRegion.id, {
const updatedRegion = await service.retrieveRegion(createdRegion.id, {
relations: ["countries"],
})
@@ -289,14 +286,14 @@ moduleIntegrationTestRunner({
})
it("should fail updating the region countries to non-existent ones", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await expect(
service.update(
service.updateRegions(
{ id: createdRegion.id },
{
countries: ["us", "neverland"],
@@ -306,14 +303,14 @@ moduleIntegrationTestRunner({
})
it("should fail updating the region if there are duplicate countries", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await expect(
service.update(
service.updateRegions(
{ id: createdRegion.id },
{
countries: ["us", "us"],
@@ -325,7 +322,7 @@ moduleIntegrationTestRunner({
})
it("should fail updating the region if country is already used", async () => {
const [createdRegion] = await service.create([
const [createdRegion] = await service.createRegions([
{
name: "North America",
currency_code: "USD",
@@ -339,7 +336,7 @@ moduleIntegrationTestRunner({
])
await expect(
service.update(
service.updateRegions(
{ id: createdRegion.id },
{
countries: ["us", "mx"],
@@ -351,21 +348,21 @@ moduleIntegrationTestRunner({
})
it("should unset the region ID on the country when deleting a region", async () => {
const createdRegion = await service.create({
const createdRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
await service.delete(createdRegion.id)
await service.deleteRegions(createdRegion.id)
const newRegion = await service.create({
const newRegion = await service.createRegions({
name: "North America",
currency_code: "USD",
countries: ["us", "ca"],
})
const resp = await service.retrieve(newRegion.id, {
const resp = await service.retrieveRegion(newRegion.id, {
relations: ["countries"],
})