Remove metadata from PaymentMethodInfo

knitemblazor · Sep 10, 2021 · f953990 · f953990
1 parent b49fa28
commit f953990
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 44 deletions.
diff --git a/saleor/payment/gateways/stripe/stripe_api.py b/saleor/payment/gateways/stripe/stripe_api.py
@@ -222,7 +222,6 @@ def retrieve_payment_intent(
                 payment_intent_id,
                 api_key=api_key,
                 stripe_version=STRIPE_API_VERSION,
-                expand=["payment_method"],
             )
         return payment_intent, None
     except StripeError as error:
@@ -243,7 +242,6 @@ def capture_payment_intent(
                 amount_to_capture=amount_to_capture,
                 api_key=api_key,
                 stripe_version=STRIPE_API_VERSION,
-                expand=["payment_method"],
             )
         return payment_intent, None
     except StripeError as error:
@@ -321,14 +319,11 @@ def get_payment_method_details(
             exp_year = int(exp_year) if exp_year else None
             exp_month = card_details.get("exp_month", "")
             exp_month = int(exp_month) if exp_month else None
-            payment_method = payment_intent.get("payment_method", {})
-            metadata = payment_method.get("metadata", {})
             payment_method_info = PaymentMethodInfo(
                 last_4=card_details.get("last4", ""),
                 exp_year=exp_year,
                 exp_month=exp_month,
                 brand=card_details.get("brand", ""),
                 type="card",
-                metadata=metadata,
             )
     return payment_method_info
diff --git a/saleor/payment/gateways/stripe/tests/test_plugin.py b/saleor/payment/gateways/stripe/tests/test_plugin.py
@@ -973,38 +973,6 @@ def test_confirm_payment(
     assert response.error is None
 
 
-@pytest.mark.parametrize("metadata", [{"key": "value"}, {}, None])
-@patch("saleor.payment.gateways.stripe.stripe_api.stripe.PaymentIntent.retrieve")
-def test_confirm_payment_metadata(
-    mocked_intent_retrieve,
-    stripe_plugin,
-    payment_stripe_for_checkout,
-    metadata,
-):
-    # given
-    payment_intent_id = "payment-intent-id"
-
-    payment = payment_stripe_for_checkout
-
-    payment_intent = StripeObject(id=payment_intent_id)
-    payment_intent["amount"] = price_to_minor_unit(payment.total, payment.currency)
-    payment_intent["status"] = SUCCESS_STATUS
-    payment_intent["currency"] = payment.currency
-    payment_intent["charges"] = {"data": [{"payment_method_details": {"type": "card"}}]}
-    if metadata is not None:
-        payment_intent["payment_method"] = {"metadata": metadata}
-    mocked_intent_retrieve.return_value = payment_intent
-
-    payment_info = create_payment_information(payment, payment_token=payment_intent_id)
-
-    # when
-    plugin = stripe_plugin()
-    response = plugin.confirm_payment(payment_info, None)
-
-    # then
-    assert response.payment_method_info.metadata == (metadata or {})
-
-
 @patch("saleor.payment.gateways.stripe.stripe_api.stripe.PaymentIntent.retrieve")
 def test_confirm_payment_incorrect_payment_intent(
     mocked_intent_retrieve, stripe_plugin, payment_stripe_for_checkout

diff --git a/saleor/payment/gateways/stripe/tests/test_stripe_api.py b/saleor/payment/gateways/stripe/tests/test_stripe_api.py
@@ -207,7 +207,6 @@ def test_retrieve_payment_intent(mocked_payment_intent):
         payment_intent_id,
         api_key=api_key,
         stripe_version=STRIPE_API_VERSION,
-        expand=["payment_method"],
     )
     assert isinstance(intent, StripeObject)
 
@@ -228,7 +227,6 @@ def test_retrieve_payment_intent_stripe_returns_error(mocked_payment_intent):
         payment_intent_id,
         api_key=api_key,
         stripe_version=STRIPE_API_VERSION,
-        expand=["payment_method"],
     )
 
     assert error == expected_error
@@ -253,7 +251,6 @@ def test_capture_payment_intent(mocked_payment_intent):
         amount_to_capture=amount,
         api_key=api_key,
         stripe_version=STRIPE_API_VERSION,
-        expand=["payment_method"],
     )
     assert isinstance(intent, StripeObject)
 
@@ -278,7 +275,6 @@ def test_capture_payment_intent_stripe_returns_error(mocked_payment_intent):
         amount_to_capture=amount,
         api_key=api_key,
         stripe_version=STRIPE_API_VERSION,
-        expand=["payment_method"],
     )
 
     assert error == expected_error
@@ -520,7 +516,6 @@ def test_get_payment_method_details():
             }
         ]
     }
-    payment_intent.payment_method = {"metadata": {"key": "value"}}
 
     payment_method_info = get_payment_method_details(payment_intent)
 
@@ -530,7 +525,6 @@ def test_get_payment_method_details():
         exp_month=12,
         brand="visa",
         type="card",
-        metadata={"key": "value"},
     )
 
 

diff --git a/saleor/payment/interface.py b/saleor/payment/interface.py
@@ -18,7 +18,6 @@ class PaymentMethodInfo:
     brand: Optional[str] = None
     name: Optional[str] = None
     type: Optional[str] = None
-    metadata: Dict[str, str] = field(default_factory=dict)
 
 
 @dataclass