xync-schema 0.6.43__tar.gz → 0.6.44__tar.gz

{xync_schema-0.6.43/xync_schema.egg-info → xync_schema-0.6.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.43
+Version: 0.6.44
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA

{xync_schema-0.6.43 → xync_schema-0.6.44}/xync_schema/enums.py

@@ -11,14 +11,20 @@ class AdStatus(IntEnum):
 
 
 class OrderStatus(IntEnum):
-    zero = 0
-    active = 1
-    two = 2
-    three = 3
-    done = 4
-    fifth = 5
+    requested = 1
+    request_canceled = 2
+    created = 3
+    rejected = 4
+    paid = 5
     canceled = 6
-    paid_and_canceled = 7
+    completed = 7
+    appealed_by_seller = 9
+    appealed_by_buyer = 10
+    seller_appeal_disputed_by_buyer = 11
+    buyer_appeal_disputed_by_seller = 12
+    appeal_canceled = 15
+    # todo: 8T - один вирт экшн на бездействие обеих сторон, а 12T и 13T - по отдельности?
+    # paid_and_canceled = 7
     # COMPLETED, PENDING, TRADING, BUYER_PAYED, DISTRIBUTING, COMPLETED, IN_APPEAL, CANCELLED, CANCELLED_BY_SYSTEM
 
 

{xync_schema-0.6.43 → xync_schema-0.6.44}/xync_schema/models.py

@@ -182,12 +182,14 @@ class User(Model, TsTrait):
     # computed = ["balance"]
 
 
-class Agent(Model, TsTrait):
-    exid: int = fields.IntField()
+class Agent(Model):
+    exid: int = fields.BigIntField()
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
     auth: dict[str, str] = fields.JSONField(null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
     user_id: int
+    updated_at: datetime | None = DatetimeSecField(auto_now=True)
+
     assets: fields.ReverseRelation["Asset"]
     orders: fields.ReverseRelation["Order"]
     ads: fields.ReverseRelation["Ad"]
@@ -209,9 +211,6 @@ class Agent(Model, TsTrait):
     async def client(self):
         import sys
 
-        if isinstance(self.ex, QuerySet):
-            # noinspection PyTypeChecker
-            self.ex: Ex = await self.ex
         client = sys.modules[f"xync_client.{self.ex.name}.agent"].Client
         return client(self)
 
@@ -330,7 +329,7 @@ class Fiat(Model):
         table_description = "Currency accounts balance"
 
     class PydanticMeta(Model.PydanticMeta):
-        #     max_recursion: int = 2
+        # max_recursion: int = 2
         backward_relations = False
         include = "id", "pmcur", "detail", "name", "amount"
 
@@ -388,7 +387,7 @@ class Asset(Model):
         max_recursion: int = 2  # default: 3
 
 
-class Order(Model, TsTrait):
+class Order(Model):
     id: int = fields.BigIntField(True)
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
@@ -398,14 +397,31 @@ class Order(Model, TsTrait):
     taker: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "orders")
     taker_id: int
     status: OrderStatus = fields.IntEnumField(OrderStatus)
-    notify_pay_at: datetime | None = DatetimeSecField(null=True)
-    confirm_pay_at: datetime | None = DatetimeSecField(null=True)
+    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
+    payed_at: datetime | None = DatetimeSecField(null=True)
+    confirmed_at: datetime | None = DatetimeSecField(null=True)
+    appealed_at: datetime | None = DatetimeSecField(null=True)
 
     _name = {"fiat__pmcur__pm__name"}
 
     def repr(self):
         return f"{self.fiat.pmcur.pm.name}/{self.fiat_id}:{self.amount:.3g} {self.status.name}"
 
+    async def client(self):
+        import sys
+
+        if isinstance(self.ad, QuerySet):
+            # noinspection PyTypeChecker
+            self.ad: Ad = await self.ad.prefetch_related("agent__ex")
+        elif isinstance(self.ad, Ad) and isinstance(self.ad.agent, QuerySet):
+            # noinspection PyTypeChecker
+            self.ad.agent = await self.ad.agent.prefetch_related("ex")
+        elif isinstance(self.ad.agent, Agent) and isinstance(self.ad.agent.ex, QuerySet):
+            # noinspection PyTypeChecker
+            self.ad.agent.ex = await self.ad.agent.ex
+        client = sys.modules[f"xync_client.{self.ad.agent.ex.name}.order"].Client
+        return client(self)
+
     class Meta:
         table_description = "P2P Orders"
 

{xync_schema-0.6.43 → xync_schema-0.6.44/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.43
+Version: 0.6.44
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA