Combine PlainAmount and AmountWithCurrency into Amount to simpl…

…ify API

glQiwiApi/core/event_fetching/class_based/bill.py

@@ -5,7 +5,7 @@
 
 from glQiwiApi.core.event_fetching.class_based.base import Handler
 from glQiwiApi.qiwi.clients.p2p.types import Bill
-from glQiwiApi.types.amount import PlainAmount
+from glQiwiApi.types.amount import Amount
 
 if TYPE_CHECKING:
  from glQiwiApi.qiwi.clients.p2p.client import QiwiP2PClient
@@ -21,7 +21,7 @@ def bill_id(self) -> str:
  return self.event.id
 
  @property
- def bill_sum(self) -> PlainAmount:
+ def bill_sum(self) -> Amount:
  return self.event.amount
 
  @property

glQiwiApi/core/event_fetching/class_based/transaction.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, cast
 
 from glQiwiApi.qiwi.clients.wallet.types.transaction import Transaction
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 
 from .base import Handler
 
@@ -22,5 +22,5 @@ def transaction_id(self) -> int:
  return self.event.id
 
  @property
- def transaction_sum(self) -> AmountWithCurrency:
+ def transaction_sum(self) -> Amount:
  return self.event.sum

glQiwiApi/qiwi/clients/p2p/client.py

@@ -11,7 +11,7 @@
 from glQiwiApi.qiwi.clients.p2p.methods.refund_bill import RefundBill
 from glQiwiApi.qiwi.clients.p2p.methods.reject_p2p_bill import RejectP2PBill
 from glQiwiApi.qiwi.clients.p2p.types import Bill, Customer, PairOfP2PKeys, RefundedBill
-from glQiwiApi.types.amount import PlainAmount
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.utils.compat import remove_suffix
 from glQiwiApi.utils.deprecated import warn_deprecated
 from glQiwiApi.utils.validators import String
@@ -105,7 +105,7 @@ async def get_bill_status(self, bill_id: str) -> str:
  :param bill_id:
  :return: status of bill
  """
- return (await self.get_bill_by_id(bill_id)).status.value
+ return (await self.get_bill_by_id(bill_id)).status.amount
 
  async def create_p2p_bill(
  self,
@@ -175,7 +175,7 @@ async def refund_bill(
  self,
  bill_id: Union[str, int],
  refund_id: Union[str, int],
- json_bill_data: Union[PlainAmount, Dict[str, Union[str, int]]],
+ json_bill_data: Union[Amount, Dict[str, Union[str, int]]],
  ) -> RefundedBill:
  """
  The method allows you to make a refund on a paid invoice.

glQiwiApi/qiwi/clients/p2p/methods/refund_bill.py

@@ -5,7 +5,7 @@
 from glQiwiApi.core.abc.api_method import Request
 from glQiwiApi.qiwi.base import QiwiAPIMethod
 from glQiwiApi.qiwi.clients.p2p.types import RefundedBill
-from glQiwiApi.types.amount import PlainAmount
+from glQiwiApi.types.amount import Amount
 
 
 class RefundBill(QiwiAPIMethod[RefundedBill]):
@@ -15,11 +15,11 @@ class RefundBill(QiwiAPIMethod[RefundedBill]):
  bill_id: str = Field(..., path_runtime_value=True)
  refund_id: str = Field(..., path_runtime_value=True)
 
- json_bill_data: Union[PlainAmount, Dict[str, Union[str, int]]]
+ json_bill_data: Union[Amount, Dict[str, Union[str, int]]]
 
  def build_request(self, **url_format_kw: Any) -> 'Request':
  json_payload = self.json_bill_data
- if isinstance(self.json_bill_data, PlainAmount):
+ if isinstance(self.json_bill_data, Amount):
  json_payload = self.json_bill_data.json(encoder=self.Config.json_dumps) # type: ignore
 
  return Request(

glQiwiApi/qiwi/clients/p2p/types.py

@@ -8,7 +8,7 @@
 
 from pydantic import BaseConfig, Extra, Field
 
-from glQiwiApi.types.amount import HashablePlainAmount, PlainAmount
+from glQiwiApi.types.amount import Amount, HashableAmount
 from glQiwiApi.types.base import HashableBase
 from glQiwiApi.types.exceptions import WebhookSignatureUnverifiedError
 
@@ -20,7 +20,7 @@ class Customer(HashableBase):
 
 
 class BillStatus(HashableBase):
- value: str
+ amount: str
  changed_datetime: Optional[datetime] = Field(None, alias='changedDateTime')
 
 
@@ -39,7 +39,7 @@ class BillError(HashableBase):
 
 
 class Bill(HashableBase):
- amount: HashablePlainAmount
+ amount: HashableAmount
  status: BillStatus
  site_id: str = Field(..., alias='siteId')
  id: str = Field(..., alias='billId')
@@ -61,7 +61,7 @@ def invoice_uid(self) -> str:
 class RefundedBill(HashableBase):
  """object: RefundedBill"""
 
- amount: PlainAmount
+ amount: Amount
  datetime: datetime
  refund_id: str = Field(..., alias='refundId')
  status: str
@@ -85,7 +85,7 @@ def verify_signature(self, sha256_signature: str, secret_p2p_key: str) -> None:
  webhook_key = base64.b64decode(bytes(secret_p2p_key, 'utf-8'))
  bill = self.bill
 
- invoice_params = f'{bill.amount.currency}|{bill.amount.value}|{bill.id}|{bill.site_id}|{bill.status.value}'
+ invoice_params = f'{bill.amount.currency}|{bill.amount.amount}|{bill.id}|{bill.site_id}|{bill.status.amount}'
  generated_signature = hmac.new(
  webhook_key, invoice_params.encode('utf-8'), hashlib.sha256
  ).hexdigest()

glQiwiApi/qiwi/clients/wallet/client.py

@@ -49,7 +49,7 @@
 from glQiwiApi.qiwi.clients.wallet.methods.webhook.send_test_notification import (
  SendTestWebhookNotification,
 )
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.arbitrary import File
 from glQiwiApi.utils.validators import PhoneNumber, String
 
@@ -381,7 +381,7 @@ async def get_list_of_balances(self) -> List[Balance]:
  GetBalances(), phone_number=self.phone_number_without_plus_sign
  )
 
- async def get_balance(self, *, account_number: int = 1) -> AmountWithCurrency:
+ async def get_balance(self, *, account_number: int = 1) -> Amount:
  resp: List[Balance] = await self._request_service.execute_api_method(
  GetBalances(),
  phone_number=self._phone_number,
@@ -506,7 +506,7 @@ async def get_cross_rates(self) -> List[CrossRate]:
 
  async def payment_by_payment_details(
  self,
- payment_sum: AmountWithCurrency,
+ payment_sum: Amount,
  payment_method: PaymentMethod,
  fields: PaymentDetails,
  payment_id: Optional[str] = None,

glQiwiApi/qiwi/clients/wallet/methods/detect_mobile_number.py

@@ -18,7 +18,7 @@ class DetectMobileNumber(QiwiAPIMethod[MobileOperator]):
  @classmethod
  def parse_http_response(cls, response: HTTPResponse) -> ReturningType:
  mobile_operator: MobileOperator = super().parse_http_response(response)
- if mobile_operator.code.value == '2' or mobile_operator.code.name == 'ERROR':
+ if mobile_operator.code.amount == '2' or mobile_operator.code.name == 'ERROR':
  raise MobileOperatorCannotBeDeterminedError(
  response, custom_message=mobile_operator.message
  )

glQiwiApi/qiwi/clients/wallet/methods/payment_by_details.py

@@ -6,7 +6,7 @@
 from glQiwiApi.core.abc.api_method import RuntimeValue
 from glQiwiApi.qiwi.base import QiwiAPIMethod
 from glQiwiApi.qiwi.clients.wallet.types import PaymentDetails, PaymentInfo, PaymentMethod
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 
 
 class MakePaymentByDetails(QiwiAPIMethod[PaymentInfo]):
@@ -20,7 +20,7 @@ class MakePaymentByDetails(QiwiAPIMethod[PaymentInfo]):
  'fields': RuntimeValue(),
  }
 
- payment_sum: AmountWithCurrency = Field(..., scheme_path='sum')
+ payment_sum: Amount = Field(..., scheme_path='sum')
  payment_method: PaymentMethod = Field(..., scheme_path='paymentMethod')
  details: PaymentDetails = Field(..., scheme_path='fields')
  payment_id: Optional[str] = Field(None, scheme_path='id')

glQiwiApi/qiwi/clients/wallet/types/account_info.py

@@ -4,9 +4,8 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount, Currency
 from glQiwiApi.types.base import Base
-from glQiwiApi.types.currency import Currency
 
 
 class PassInfo(Base):
@@ -48,7 +47,7 @@ class AuthInfo(Base):
 class SmsNotification(Base):
  """object: SmsNotification"""
 
- price: AmountWithCurrency
+ price: Amount
  enabled: bool
  active: bool
  end_date: Optional[datetime] = Field(None, alias='endDate')

glQiwiApi/qiwi/clients/wallet/types/balance.py

@@ -2,9 +2,8 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount, Currency
 from glQiwiApi.types.base import HashableBase
-from glQiwiApi.types.currency import Currency
 
 
 class AvailableBalance(HashableBase):
@@ -20,7 +19,7 @@ class Balance(HashableBase):
  fs_alias: str = Field(alias='fsAlias')
  bank_alias: str = Field(alias='bankAlias')
  has_balance: bool = Field(alias='hasBalance')
- balance: Optional[AmountWithCurrency] = None
+ balance: Optional[Amount] = None
  currency: Currency
  account_type: Optional[Dict[str, Any]] = Field(None, alias='type')
  is_default_account: bool = Field(alias='defaultAccount')

glQiwiApi/qiwi/clients/wallet/types/commission.py

@@ -1,12 +1,12 @@
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.base import Base
 
 
 class Commission(Base):
  provider_id: int = Field(alias='providerId')
- withdraw_sum: AmountWithCurrency = Field(alias='withdrawSum')
- enrollment_sum: AmountWithCurrency = Field(alias='enrollmentSum')
- qiwi_commission: AmountWithCurrency = Field(alias='qwCommission')
+ withdraw_sum: Amount = Field(alias='withdrawSum')
+ enrollment_sum: Amount = Field(alias='enrollmentSum')
+ qiwi_commission: Amount = Field(alias='qwCommission')
  withdraw_to_enrollment_rate: int = Field(alias='withdrawToEnrollmentRate')

glQiwiApi/qiwi/clients/wallet/types/limit.py

@@ -3,8 +3,8 @@
 
 from pydantic import Field
 
+from glQiwiApi.types.amount import Currency
 from glQiwiApi.types.base import Base
-from glQiwiApi.types.currency import Currency
 
 
 class Interval(Base):

glQiwiApi/qiwi/clients/wallet/types/mobile_operator.py

@@ -6,7 +6,7 @@
 
 
 class Code(Base):
- value: str
+ amount: str
  name: str = Field(..., alias='_name')
 
 

glQiwiApi/qiwi/clients/wallet/types/other.py

@@ -1,7 +1,7 @@
 from pydantic import Field
 
+from glQiwiApi.types.amount import Currency
 from glQiwiApi.types.base import Base, HashableBase
-from glQiwiApi.types.currency import Currency
 
 
 class CrossRate(HashableBase):

glQiwiApi/qiwi/clients/wallet/types/payment_info.py

@@ -2,7 +2,7 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.base import Base
 
 
@@ -29,7 +29,7 @@ class PaymentInfo(Base):
  """object: PaymentInfo"""
 
  id: int
- amount: AmountWithCurrency = Field(..., alias='sum')
+ amount: Amount = Field(..., alias='sum')
  terms: str
  fields: Fields
  source: str
@@ -44,7 +44,7 @@ class PaymentMethod(Base):
 
 class QiwiPayment(Base):
  id: int
- sum: AmountWithCurrency
+ sum: Amount
  method: PaymentMethod = Field(..., alias='paymentMethod')
  fields: Dict[Any, Any]
  comment: Optional[str] = None

glQiwiApi/qiwi/clients/wallet/types/qiwi_master.py

@@ -5,7 +5,7 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.base import Base, HashableBase
 
 
@@ -19,7 +19,7 @@ class OrderDetails(Base):
  order_id: str = Field(..., alias='id')
  card_alias: str = Field(..., alias='cardAlias')
  status: str
- price: Optional[AmountWithCurrency] = None
+ price: Optional[Amount] = None
  card_id: Optional[str] = Field(alias='cardId', default=None)
 
 
@@ -42,7 +42,7 @@ class CardCredentials(Base):
 
 class Requisite(Base):
  name: str
- value: str
+ amount: str
 
 
 class Details(Base):
@@ -58,13 +58,13 @@ class CardInfo(Base):
  id_: int = Field(..., alias='id')
  name: str
  alias: str
- price: AmountWithCurrency
+ price: Amount
  period: str
  type_: str = Field(..., alias='type')
  details: Details
 
 
 class Card(HashableBase):
  details: CardCredentials = Field(..., alias='qvx')
- balance: Optional[AmountWithCurrency] = None
+ balance: Optional[Amount] = None
  info: CardInfo

glQiwiApi/qiwi/clients/wallet/types/stats.py

@@ -2,15 +2,15 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.base import Base
 
 
 class Statistic(Base):
  """object: Statistic"""
 
- incoming: List[AmountWithCurrency] = Field(alias='incomingTotal')
- out: List[AmountWithCurrency] = Field(alias='outgoingTotal')
+ incoming: List[Amount] = Field(alias='incomingTotal')
+ out: List[Amount] = Field(alias='outgoingTotal')
 
 
 __all__ = ['Statistic']

glQiwiApi/qiwi/clients/wallet/types/transaction.py

@@ -6,7 +6,7 @@
 
 from pydantic import Field
 
-from glQiwiApi.types.amount import AmountWithCurrency
+from glQiwiApi.types.amount import Amount
 from glQiwiApi.types.base import Base
 
 
@@ -100,13 +100,13 @@ class Transaction(Base):
  Для пополнений - номер отправителя,
  терминала или название агента пополнения кошелька
  """
- sum: AmountWithCurrency
+ sum: Amount
  """Данные о сумме платежа или пополнения."""
 
- commission: AmountWithCurrency
+ commission: Amount
  """Данные о комиссии"""
 
- total: AmountWithCurrency
+ total: Amount
  """Общие данные о платеже в формате объекта Sum"""
 
  provider: Provider