From 0346493648e22c12075436db5ef56780d3e61814 Mon Sep 17 00:00:00 2001
From: dev1lfreak <kvachuk.sergey@yandex.ru>
Date: Mon, 15 Jun 2026 13:53:47 +0300
Subject: [PATCH] refactor: swap currency

---
 src/application/commands/purchase_request_commands.py  |  6 +++---
 src/application/domain/entities/organization.py        |  4 ++--
 src/infrastructure/database/models/purchase_request.py |  4 ++--
 src/presentation/routing/purchase_requests.py          |  4 ++--
 src/presentation/schemas/entity.py                     | 10 +++++-----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/application/commands/purchase_request_commands.py b/src/application/commands/purchase_request_commands.py
index f0450c6..6d5b973 100644
--- a/src/application/commands/purchase_request_commands.py
+++ b/src/application/commands/purchase_request_commands.py
@@ -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,
diff --git a/src/application/domain/entities/organization.py b/src/application/domain/entities/organization.py
index 2518084..d7d0ae4 100644
--- a/src/application/domain/entities/organization.py
+++ b/src/application/domain/entities/organization.py
@@ -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
diff --git a/src/infrastructure/database/models/purchase_request.py b/src/infrastructure/database/models/purchase_request.py
index 2b6caf7..f093839 100644
--- a/src/infrastructure/database/models/purchase_request.py
+++ b/src/infrastructure/database/models/purchase_request.py
@@ -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)
diff --git a/src/presentation/routing/purchase_requests.py b/src/presentation/routing/purchase_requests.py
index ca76b09..cf17f49 100644
--- a/src/presentation/routing/purchase_requests.py
+++ b/src/presentation/routing/purchase_requests.py
@@ -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,
diff --git a/src/presentation/schemas/entity.py b/src/presentation/schemas/entity.py
index c834f80..e9c8d8e 100644
--- a/src/presentation/schemas/entity.py
+++ b/src/presentation/schemas/entity.py
@@ -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