diff --git a/pyproject.toml b/pyproject.toml index 3c127e6..d91f360 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,7 +99,6 @@ extend-safe-fixes = [ "D415", # docstrings should end with a period, question mark, or exclamation point ] ignore = [ - "BLE001", "D100", "D101", "D103", diff --git a/src/multisafepay/api/paths/auth/auth_manager.py b/src/multisafepay/api/paths/auth/auth_manager.py index d7e1324..5ac8753 100644 --- a/src/multisafepay/api/paths/auth/auth_manager.py +++ b/src/multisafepay/api/paths/auth/auth_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.api_response import ApiResponse from multisafepay.api.base.response.custom_api_response import ( @@ -15,6 +14,7 @@ from multisafepay.client.client import Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class AuthManager(AbstractManager): @@ -57,7 +57,7 @@ def get_api_token(self: "AuthManager") -> CustomApiResponse: if not dict_empty(response.get_body_data()): try: args["data"] = ApiToken(**response.get_body_data().copy()) - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) diff --git a/src/multisafepay/api/paths/capture/capture_manager.py b/src/multisafepay/api/paths/capture/capture_manager.py index 833bf61..8eb5b46 100644 --- a/src/multisafepay/api/paths/capture/capture_manager.py +++ b/src/multisafepay/api/paths/capture/capture_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - import json from multisafepay.api.base.abstract_manager import AbstractManager @@ -19,6 +18,7 @@ from multisafepay.client.client import Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class CaptureManager(AbstractManager): @@ -73,7 +73,7 @@ def capture_reservation_cancel( args["data"] = CancelReservation( **response.get_body_data().copy(), ) - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) diff --git a/src/multisafepay/api/paths/categories/category_manager.py b/src/multisafepay/api/paths/categories/category_manager.py index c1681bd..8779ebc 100644 --- a/src/multisafepay/api/paths/categories/category_manager.py +++ b/src/multisafepay/api/paths/categories/category_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.custom_api_response import ( CustomApiResponse, @@ -13,6 +12,7 @@ from multisafepay.api.paths.categories.response.category import Category from multisafepay.client.client import Client from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class CategoryManager(AbstractManager): @@ -56,7 +56,7 @@ def get_categories(self: "CategoryManager") -> CustomApiResponse: Category.from_dict(category) for category in response.get_body_data().copy() ] - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) diff --git a/src/multisafepay/api/paths/gateways/gateway_manager.py b/src/multisafepay/api/paths/gateways/gateway_manager.py index bd12064..5b2f3bf 100644 --- a/src/multisafepay/api/paths/gateways/gateway_manager.py +++ b/src/multisafepay/api/paths/gateways/gateway_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.custom_api_response import ( CustomApiResponse, @@ -14,6 +13,7 @@ from multisafepay.client.client import Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError ALLOWED_OPTIONS = { "country": "", @@ -70,7 +70,7 @@ def get_gateways( Gateway.from_dict(gateway) for gateway in response.get_body_data().copy() ] - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) @@ -115,7 +115,7 @@ def get_by_code( if not dict_empty(response.get_body_data()): try: args["data"] = Gateway(**response.get_body_data().copy()) - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) diff --git a/src/multisafepay/api/paths/issuers/issuer_manager.py b/src/multisafepay/api/paths/issuers/issuer_manager.py index 2e21698..f47afa2 100644 --- a/src/multisafepay/api/paths/issuers/issuer_manager.py +++ b/src/multisafepay/api/paths/issuers/issuer_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.custom_api_response import ( CustomApiResponse, @@ -17,6 +16,7 @@ from multisafepay.client.client import Client from multisafepay.exception.invalid_argument import InvalidArgumentException from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class IssuerManager(AbstractManager): @@ -73,7 +73,7 @@ def get_issuers_by_gateway_code( Issuer.from_dict(issuer) for issuer in response.get_body_data().copy() ] - except Exception as e: + except ValidationError as e: print(e) args["warnings"] = ( MessageList() diff --git a/src/multisafepay/api/paths/me/me_manager.py b/src/multisafepay/api/paths/me/me_manager.py index 1d22cc5..5ca2fd9 100644 --- a/src/multisafepay/api/paths/me/me_manager.py +++ b/src/multisafepay/api/paths/me/me_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.custom_api_response import ( CustomApiResponse, @@ -14,6 +13,7 @@ from multisafepay.client.client import Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class MeManager(AbstractManager): @@ -52,7 +52,7 @@ def get(self: "MeManager") -> CustomApiResponse: if not dict_empty(response.get_body_data()): try: args["data"] = Me(**response.get_body_data().copy()) - except Exception as e: + except ValidationError as e: args["warnings"] = ( MessageList() .add_message(str(e)) diff --git a/src/multisafepay/api/paths/orders/order_manager.py b/src/multisafepay/api/paths/orders/order_manager.py index 8fcd46c..f081a06 100644 --- a/src/multisafepay/api/paths/orders/order_manager.py +++ b/src/multisafepay/api/paths/orders/order_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - import json from typing import Union @@ -41,6 +40,7 @@ from multisafepay.util.message import MessageList, gen_could_not_created_msg from multisafepay.value_object.amount import Amount from multisafepay.value_object.currency import Currency +from pydantic import ValidationError class OrderManager(AbstractManager): @@ -82,7 +82,7 @@ def __custom_api_response(response: ApiResponse) -> CustomApiResponse: args["data"] = Order.from_dict( d=response.get_body_data().copy(), ) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Order"), ) @@ -198,7 +198,7 @@ def capture( args["data"] = OrderCapture.from_dict( d=response.get_body_data().copy(), ) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("OrderCapture"), ) @@ -238,7 +238,7 @@ def refund( args["data"] = OrderRefund.from_dict( d=response.get_body_data().copy(), ) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("OrderRefund"), ) diff --git a/src/multisafepay/api/paths/payment_methods/payment_method_manager.py b/src/multisafepay/api/paths/payment_methods/payment_method_manager.py index df43f43..f43f41c 100644 --- a/src/multisafepay/api/paths/payment_methods/payment_method_manager.py +++ b/src/multisafepay/api/paths/payment_methods/payment_method_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.response.custom_api_response import ( CustomApiResponse, @@ -16,6 +15,7 @@ from multisafepay.client.client import ApiResponse, Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError ALLOWED_OPTIONS = { "country": "", @@ -98,7 +98,7 @@ def get_payment_methods( PaymentMethod.from_dict(payment_method) for payment_method in response.get_body_data().copy() ] - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Listing Payment Method"), ) @@ -140,7 +140,7 @@ def get_by_gateway_code( args["data"] = PaymentMethod.from_dict( d=response.get_body_data().copy(), ) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Payment Method"), ) diff --git a/src/multisafepay/api/paths/recurring/recurring_manager.py b/src/multisafepay/api/paths/recurring/recurring_manager.py index 1b22a60..538720b 100644 --- a/src/multisafepay/api/paths/recurring/recurring_manager.py +++ b/src/multisafepay/api/paths/recurring/recurring_manager.py @@ -18,6 +18,7 @@ from multisafepay.client.client import Client from multisafepay.util.dict_utils import dict_empty from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError class RecurringManager(AbstractManager): @@ -85,7 +86,7 @@ def get_list( if tokens["tokens"] ] - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Listing Tokens"), ) @@ -122,7 +123,7 @@ def get( if not dict_empty(response.get_body_data()): try: args["data"] = Token(**response.get_body_data().copy()) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Listing Tokens"), ) diff --git a/src/multisafepay/api/paths/transactions/transaction_manager.py b/src/multisafepay/api/paths/transactions/transaction_manager.py index 90098d0..e37131f 100644 --- a/src/multisafepay/api/paths/transactions/transaction_manager.py +++ b/src/multisafepay/api/paths/transactions/transaction_manager.py @@ -5,7 +5,6 @@ # See the DISCLAIMER.md file for disclaimer details. - from multisafepay.api.base.abstract_manager import AbstractManager from multisafepay.api.base.listings.listing_pager import ListingPager from multisafepay.api.base.listings.pager import Pager @@ -18,6 +17,7 @@ ) from multisafepay.client.client import Client from multisafepay.util.message import MessageList, gen_could_not_created_msg +from pydantic import ValidationError ALLOWED_OPTIONS = { "site_id": "", @@ -87,7 +87,7 @@ def get_transactions( pager=Pager.from_dict(response.get_pager().copy()), class_type=Transaction, ) - except Exception: + except ValidationError: args["warnings"] = MessageList().add_message( gen_could_not_created_msg("Listing Transaction"), )