damanukyan/adminka
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: swap currency

Browse Source
This commit is contained in:
Sergey Kvachuk
2026-06-15 13:53:47 +03:00
parent a97605c478
commit 0346493648
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/application/commands/purchase_request_commands.py
View File

@@ -64,9 +64,9 @@ class CreatePurchaseRequestCommand:
self,
*,
organization_id: str,
usdt_amount: Decimal,
rub_amount: Decimal,
status: str = 'submitted',
rub_amount: Decimal | None = None,
usdt_amount: Decimal | None = None,
exchange_rate: Decimal | None = None,
service_fee_percent: Decimal | None = None,
comment: str | None = None,
@@ -83,8 +83,8 @@ class CreatePurchaseRequestCommand:
values: dict[str, Any] = {
'organization_id': organization_id,
'status': status,
'usdt_amount': usdt_amount,
'rub_amount': rub_amount,
'usdt_amount': usdt_amount,
'exchange_rate': exchange_rate,
'service_fee_percent': service_fee_percent,
'comment': comment,

4
src/application/domain/entities/organization.py
View File

@@ -75,8 +75,8 @@ class PurchaseRequestEntity:
id: str
organization_id: str
status: str
usdt_amount: Decimal
rub_amount: Decimal | None
rub_amount: Decimal
usdt_amount: Decimal | None
exchange_rate: Decimal | None
service_fee_percent: Decimal | None
comment: str | None

4
src/infrastructure/database/models/purchase_request.py
View File

@@ -20,8 +20,8 @@ class PurchaseRequestModel(Base, UlidPrimaryKeyMixin, AuditTimestampsMixin):
index=True,
)
status: Mapped[str] = mapped_column(String(32), nullable=False, server_default='submitted', default='submitted')
usdt_amount: Mapped[Decimal] = mapped_column(Numeric(18, 8), nullable=False)
rub_amount: Mapped[Decimal | None] = mapped_column(Numeric(18, 2), nullable=True)
rub_amount: Mapped[Decimal] = mapped_column(Numeric(18, 8), nullable=False)
usdt_amount: Mapped[Decimal | None] = mapped_column(Numeric(18, 2), nullable=True)
exchange_rate: Mapped[Decimal | None] = mapped_column(Numeric(18, 8), nullable=True)
service_fee_percent: Mapped[Decimal | None] = mapped_column(Numeric(5, 2), nullable=True)
comment: Mapped[str | None] = mapped_column(Text, nullable=True)

4
src/presentation/routing/purchase_requests.py
View File

@@ -60,9 +60,9 @@ async def create_purchase_request(
):
item = await command(
organization_id=body.organization_id,
usdt_amount=body.usdt_amount,
status=body.status,
rub_amount=body.rub_amount,
status=body.status,
usdt_amount=body.usdt_amount,
exchange_rate=body.exchange_rate,
service_fee_percent=body.service_fee_percent,
comment=body.comment,

10
src/presentation/schemas/entity.py
View File

@@ -50,9 +50,9 @@ class SecretKeyResponse(BaseModel):
class CreatePurchaseRequestBody(BaseModel):
organization_id: str
usdt_amount: Decimal = Field(gt=0)
rub_amount: Decimal = Field(gt=0)
status: str = 'submitted'
rub_amount: Decimal | None = Field(default=None, gt=0)
usdt_amount: Decimal | None = Field(default=None, gt=0)
exchange_rate: Decimal | None = Field(default=None, gt=0)
service_fee_percent: Decimal | None = Field(default=None, ge=0)
comment: str | None = None
@@ -72,8 +72,8 @@ class UpdatePurchaseRequestStatusBody(BaseModel):
class UpdatePurchaseRequestBody(BaseModel):
status: str | None = None
usdt_amount: Decimal | None = Field(default=None, gt=0)
rub_amount: Decimal | None = Field(default=None, gt=0)
usdt_amount: Decimal | None = Field(default=None, gt=0)
exchange_rate: Decimal | None = Field(default=None, gt=0)
service_fee_percent: Decimal | None = Field(default=None, ge=0)
comment: str | None = None
@@ -95,8 +95,8 @@ class PurchaseRequestResponse(BaseModel):
id: str
organization_id: str
status: str
usdt_amount: str
rub_amount: str | None
rub_amount: str
usdt_amount: str | None
exchange_rate: str | None
service_fee_percent: str | None
comment: str | None