xync-schema 0.6.84.dev3__tar.gz → 0.6.85__tar.gz

{xync_schema-0.6.84.dev3/xync_schema.egg-info → xync_schema-0.6.85}/PKG-INFO

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

{xync_schema-0.6.84.dev3 → xync_schema-0.6.85}/xync_schema/models.py

@@ -327,8 +327,10 @@ class Ad(Model, TsTrait):
     maker_id: int
     pay_req: fields.ForeignKeyNullableRelation["PayReq"] = fields.ForeignKeyField("models.PayReq", "ads", null=True)
 
-    pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
-    creds: fields.ManyToManyRelation["Cred"] = fields.ManyToManyField("models.Cred", through="adcred")
+    pmexs: fields.ManyToManyRelation["Pmex"] = fields.ManyToManyField("models.Pm", "adpmex", related_name="ads")
+    credexs: fields.ManyToManyRelation["CredEx"] = fields.ManyToManyField(
+        "models.CredEx", through="adcredex", related_name="ads"
+    )
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
@@ -362,7 +364,6 @@ class Pm(Model):
 
     typ: PmType | None = fields.IntEnumField(PmType, null=True)
 
-    ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
     exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", "pmex")  # no need. use pmexs[.exid]
     orders: fields.ReverseRelation["Order"]
@@ -412,6 +413,7 @@ class Pmex(BaseModel):  # existence pm in ex with no cur tie
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
 
+    ads: fields.ManyToManyRelation[Ad]
     banks: fields.BackwardFKRelation["PmexBank"]
 
     class Meta:
@@ -452,7 +454,6 @@ class Cred(Model):
     banks: fields.ManyToManyRelation[PmexBank] = fields.ManyToManyField("models.PmexBank", related_name="creds")
 
     fiat: fields.BackwardOneToOneRelation["Fiat"]
-    ads: fields.ManyToManyRelation[Ad]
     credexs: fields.BackwardFKRelation["CredEx"]
     orders: fields.BackwardFKRelation["Order"]
 
@@ -470,6 +471,8 @@ class CredEx(Model):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "credexs")
     ex_id: int
 
+    ads: fields.ManyToManyRelation[Ad]
+
     _name = {"exid"}
 
     class Meta:
@@ -551,14 +554,20 @@ class PayReq(Model, TsTrait):
     asset: fields.ForeignKeyNullableRelation[Asset] = fields.ForeignKeyField("models.Asset", "pay_reqs", null=True)
     fiat: fields.ForeignKeyNullableRelation[Fiat] = fields.ForeignKeyField("models.Fiat", "pay_reqs", null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "pay_reqs")
+    user_id: int
     amount: float = fields.FloatField()
     parts: int = fields.SmallIntField(default=1)
+    # todo: payed_at or status?
 
     ads: fields.ReverseRelation["Ad"]
 
     _icon = "pay"
     _name = {"ad_id"}
 
+    class Meta:
+        table_description = "Payment request"
+        unique_together = (("user_id", "fiat_id", "asset_id"),)
+
 
 class Order(Model):
     exid: int = fields.BigIntField()

{xync_schema-0.6.84.dev3 → xync_schema-0.6.85}/xync_schema/types.py

@@ -41,6 +41,7 @@ class BaseAd(BaseModel):
 
 class BaseAdIn(BaseAd):
     min_fiat: float
+    amount: float
     max_fiat: float
     direction_id: int
     detail: str | None = None

{xync_schema-0.6.84.dev3 → xync_schema-0.6.85/xync_schema.egg-info}/PKG-INFO

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