feat(medusa,medusa-payment-stripe): Move database mutation from plugi…

…n to core (medusajs#2743) **what** The goal of that PR is to first refactor the payment provider and payment plugin to support the new API that removes the data mutation from within the plugin to be done by the core instead. In any case, this pr does not include the steps of the deeper refactoring. The last part will come in later pr. **How** - The payment plugin is now capable to handle both the deprecated and new API and the plugin works the same as it use to works. - The mutation made by the plugin have been moved into the core as well as the subscriber - The tests have been updated to reflect the changed - Remove all new methods introduced by the payment collections - Mutualise types - Update provider and payment collection services - cleanup around all those refactoring including cleanup of the payment collection - refactor stripe payment plugin FIXES CORE-887
Sosyetekadir · Dec 19, 2022 · c8724da · c8724da
1 parent 8dcc805
commit c8724da
Show file tree

Hide file tree

Showing 87 changed files with 1,134 additions and 1,425 deletions.
diff --git a/.changeset/strong-radios-scream.md b/.changeset/strong-radios-scream.md
@@ -0,0 +1,6 @@
+---
+"medusa-payment-stripe": patch
+"@medusajs/medusa": patch
+---
+
+feat(medusa,medusa-payment-stripe): Move database mutation from plugin to core
diff --git a/.eslintignore b/.eslintignore
@@ -8,8 +8,6 @@ packages/*
 # List of packages to Lint
 !packages/medusa
 
-integration-tests/*
-#!integration-tests/api
 
 
 **/models/*
@@ -18,6 +16,5 @@ integration-tests/*
 **/node_modules/*
 **/migrations/*
 **/__mocks__/*
-**/__tests__/*
 
 .eslintrc.js
diff --git a/integration-tests/api/__tests__/admin/__snapshots__/price-list.js.snap b/integration-tests/api/__tests__/admin/__snapshots__/price-list.js.snap
@@ -149,37 +149,6 @@ Object {
 }
 `;
 
-exports[`/admin/price-lists POST /admin/price-lists/:id updates price list prices (inser a new MA for a specific region) 1`] = `
-Array [
-  Object {
-    "amount": 101,
-    "created_at": Any<String>,
-    "currency_code": "eur",
-    "deleted_at": null,
-    "id": Any<String>,
-    "max_quantity": null,
-    "min_quantity": null,
-    "price_list_id": "pl_with_some_ma",
-    "region_id": "region-pl",
-    "updated_at": Any<String>,
-    "variant_id": "test-variant",
-  },
-  Object {
-    "amount": 1001,
-    "created_at": Any<String>,
-    "currency_code": "usd",
-    "deleted_at": null,
-    "id": "ma_test_4",
-    "max_quantity": null,
-    "min_quantity": null,
-    "price_list_id": "pl_with_some_ma",
-    "region_id": null,
-    "updated_at": Any<String>,
-    "variant_id": "test-variant",
-  },
-]
-`;
-
 exports[`/admin/price-lists POST /admin/price-lists/:id updates the amount and currency of a price in the price list 1`] = `
 Object {
   "amount": 250,

diff --git a/integration-tests/api/__tests__/admin/price-list.js b/integration-tests/api/__tests__/admin/price-list.js
@@ -638,32 +638,34 @@ describe("/admin/price-lists", () => {
       expect(response.status).toEqual(200)
 
       expect(response.data.price_list.prices.length).toEqual(2)
-      expect(response.data.price_list.prices).toMatchSnapshot([
-        {
-          id: expect.any(String),
-          currency_code: "eur",
-          amount: 101,
-          min_quantity: null,
-          max_quantity: null,
-          price_list_id: "pl_with_some_ma",
-          variant_id: "test-variant",
-          region_id: "region-pl",
-          created_at: expect.any(String),
-          updated_at: expect.any(String),
-          deleted_at: null,
-        },
-        {
-          id: "ma_test_4",
-          currency_code: "usd",
-          amount: 1001,
-          price_list_id: "pl_with_some_ma",
-          variant_id: "test-variant",
-          region_id: null,
-          created_at: expect.any(String),
-          updated_at: expect.any(String),
-          deleted_at: null,
-        },
-      ])
+      expect(response.data.price_list.prices).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            id: expect.any(String),
+            currency_code: "eur",
+            amount: 101,
+            min_quantity: null,
+            max_quantity: null,
+            price_list_id: "pl_with_some_ma",
+            variant_id: "test-variant",
+            region_id: "region-pl",
+            created_at: expect.any(String),
+            updated_at: expect.any(String),
+            deleted_at: null,
+          }),
+          expect.objectContaining({
+            id: "ma_test_4",
+            currency_code: "usd",
+            amount: 1001,
+            price_list_id: "pl_with_some_ma",
+            variant_id: "test-variant",
+            region_id: null,
+            created_at: expect.any(String),
+            updated_at: expect.any(String),
+            deleted_at: null,
+          }),
+        ])
+      )
     })
   })
 

diff --git a/packages/medusa-core-utils/src/index.ts b/packages/medusa-core-utils/src/index.ts
@@ -10,4 +10,5 @@ export { parseCorsOrigins } from "./parse-cors-origins"
 export { transformIdableFields } from "./transform-idable-fields"
 export { default as Validator } from "./validator"
 export { default as zeroDecimalCurrencies } from "./zero-decimal-currencies"
+export * from "./is-defined"
 
diff --git a/packages/medusa/src/utils/is-defined.ts → packages/medusa-core-utils/src/is-defined.ts b/packages/medusa/src/utils/is-defined.ts → packages/medusa-core-utils/src/is-defined.ts
diff --git a/packages/medusa-payment-stripe/package.json b/packages/medusa-payment-stripe/package.json
@@ -29,9 +29,9 @@
     "medusa-test-utils": "^1.1.37"
   },
   "scripts": {
-    "build": "babel src -d . --ignore **/__tests__",
+    "build": "babel src -d . --ignore **/__tests__ --ignore **/__mocks__",
     "prepare": "cross-env NODE_ENV=production yarn run build",
-    "watch": "babel -w src --out-dir . --ignore **/__tests__",
+    "watch": "babel -w src --out-dir . --ignore **/__tests__ --ignore **/__mocks__",
     "test": "jest"
   },
   "peerDependencies": {

diff --git a/packages/medusa-payment-stripe/src/__mocks__/cart.js b/packages/medusa-payment-stripe/src/__mocks__/cart.js
@@ -91,6 +91,8 @@ export const carts = {
         customer: IdMap.getId("not-lebron"),
       },
     },
+    region: { currency_code: "usd" },
+    total: 100,
     shipping_address: {},
     billing_address: {},
     discounts: [],

diff --git a/packages/medusa-payment-stripe/src/__mocks__/stripe.js b/packages/medusa-payment-stripe/src/__mocks__/stripe.js
@@ -20,15 +20,15 @@ export const StripeMock = {
       if (data.customer === "cus_123456789_new") {
         return Promise.resolve({
           id: "pi_lebron",
-          amount: 100,
+          amount: data.amount,
           customer: "cus_123456789_new",
           description: data?.description,
         })
       }
       if (data.customer === "cus_lebron") {
         return Promise.resolve({
           id: "pi_lebron",
-          amount: 100,
+          amount: data.amount,
           customer: "cus_lebron",
           description: data?.description,
         })