xync-schema 0.6.87__tar.gz → 0.6.89__tar.gz

{xync_schema-0.6.87/xync_schema.egg-info → xync_schema-0.6.89}/PKG-INFO

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

{xync_schema-0.6.87 → xync_schema-0.6.89}/xync_schema/models.py

@@ -177,6 +177,7 @@ class Person(Model, TsTrait):
     user: fields.BackwardOneToOneRelation["User"]
     creds: fields.BackwardFKRelation["Cred"]
     actors: fields.BackwardFKRelation["Actor"]
+    pm_agents: fields.BackwardFKRelation["PmAgent"]
 
 
 class User(UserTg, TsTrait):
@@ -210,8 +211,8 @@ class User(UserTg, TsTrait):
     # investments: fields.BackwardFKRelation["Investment"]
 
     async def free_assets(self):
-        assets = await Asset.filter(agent__actor__person__user__id=self.id).values("free", "coin__rate")
-        return sum(asset["free"] * asset["coin__rate"] for asset in assets)
+        assets = await Asset.filter(agent__actor__person__user__id=self.id).values("free", "addr__coin__rate")
+        return sum(asset["free"] * asset["addr__coin__rate"] for asset in assets)
 
     async def fiats_sum(self):
         fiats = await Fiat.filter(cred__person__user__id=self.id).values("amount", "cred__pmcur__cur__rate")
@@ -385,6 +386,15 @@ class Pm(Model):
     #     return sys.modules[module_name].PmEpyd
 
 
+class PmAgent(Model):
+    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", related_name="agents")
+    person: fields.ForeignKeyRelation[Person] = fields.ForeignKeyField("models.Person", related_name="pm_agents")
+    auth: dict[str, str] = fields.JSONField(default={})
+
+    class Meta:
+        unique_together = (("pm_id", "person_id"),)
+
+
 class Pmcur(Model):  # for fiat with no exs tie
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm")
     pm_id: int
@@ -456,7 +466,7 @@ class Cred(Model):
     fiat: fields.BackwardOneToOneRelation["Fiat"]
     credexs: fields.BackwardFKRelation["CredEx"]
     orders: fields.BackwardFKRelation["Order"]
-    pay_reqs: fields.ReverseRelation["PayReq"]
+    pay_reqs: fields.BackwardFKRelation["PayReq"]
 
     _name = {"detail"}
 
@@ -484,8 +494,9 @@ class CredEx(Model):
 class Fiat(Model):
     cred: fields.OneToOneRelation[Cred] = fields.OneToOneField("models.Cred", "fiat")
     cred_id: int
-    amount: float | None = fields.FloatField(default=0)
+    amount: float = fields.FloatField(default=0)
     target: float = fields.FloatField(default=0)
+    min_deposit: int = fields.IntField(null=True)
 
     class Meta:
         table_description = "Currency balances"
@@ -525,8 +536,9 @@ class Addr(Model):
     coin_id: int
     actor: fields.ForeignKeyRelation[Actor] = fields.ForeignKeyField("models.Actor", "addrs")
     actor_id: int
+    val: str = fields.CharField(127)
 
-    pay_reqs: fields.ReverseRelation["PayReq"]
+    pay_reqs: fields.BackwardFKRelation["PayReq"]
 
     _name = {"coin__ticker", "free"}
 
@@ -562,12 +574,14 @@ class Asset(Model):
 class PayReq(Model, TsTrait):
     pay_until: datetime = DatetimeSecField()
     addr: fields.ForeignKeyNullableRelation[Addr] = fields.ForeignKeyField("models.Addr", "pay_reqs", null=True)
+    addr_id: int
     cred: fields.ForeignKeyNullableRelation[Cred] = fields.ForeignKeyField("models.Cred", "pay_reqs", null=True)
+    cred_id: int
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "pay_reqs")
     user_id: int
     amount: float = fields.FloatField()
-    min_amount: int = fields.IntField()
-    payed_at: datetime | None = DatetimeSecField(default=None)
+    parts: int = fields.IntField(default=1)
+    payed_at: datetime | None = DatetimeSecField(null=True)
 
     ads: fields.ReverseRelation["Ad"]
 

{xync_schema-0.6.87 → xync_schema-0.6.89/xync_schema.egg-info}/PKG-INFO

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