xync-schema 0.6.40__tar.gz → 0.6.42__tar.gz

{xync_schema-0.6.40/xync_schema.egg-info → xync_schema-0.6.42}/PKG-INFO

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

{xync_schema-0.6.40 → xync_schema-0.6.42}/xync_schema/enums.py

@@ -54,6 +54,7 @@ class PmType(IntEnum):
     cash = 2
     gift_card = 3
     credit_card = 4
+    IFSC = 5
 
 
 class TaskType(IntEnum):

{xync_schema-0.6.40 → xync_schema-0.6.42}/xync_schema/models.py

@@ -23,7 +23,7 @@ from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
-    rate: float | None = fields.FloatField(null=True)
+    rate: float | None = fields.FloatField(default=0)
     # country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
@@ -40,7 +40,7 @@ class Cur(Model):
 class Coin(Model):
     id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
-    rate: float | None = fields.FloatField(null=True)
+    rate: float | None = fields.FloatField(default=0)
     is_fiat: bool = fields.BooleanField(default=False)
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="coinex")
 
@@ -167,17 +167,19 @@ class User(Model, TsTrait):
         return sum(asset["free"] * asset["coin__rate"] for asset in assets)
 
     async def fiats_sum(self):
-        fiats = await self.fiats._db_queryset().values("amount", "pmcur__cur__rate")
+        fiats = await Fiat.filter(user=self).values("amount", "pmcur__cur__rate")
         return sum(fiat["amount"] * fiat["pmcur__cur__rate"] for fiat in fiats)
 
-    async def balance(self):
+    async def balance(self) -> float:
         return await self.free_assets() + await self.fiats_sum()
 
     def get_auth(self) -> AuthUser:
         return AuthUser.model_validate(self, from_attributes=True)
 
-    class PydanticMeta(Model.PydanticMeta):
-        computed = ["balance"]
+    # class PydanticMeta(Model.PydanticMeta):
+    # max_recursion = 0
+    # include = "role", "status"
+    # computed = ["balance"]
 
 
 class Agent(Model, TsTrait):
@@ -185,7 +187,7 @@ class Agent(Model, TsTrait):
     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
+    user_id: int
     assets: fields.ReverseRelation["Asset"]
     orders: fields.ReverseRelation["Order"]
     ads: fields.ReverseRelation["Ad"]

{xync_schema-0.6.40 → xync_schema-0.6.42/xync_schema.egg-info}/PKG-INFO

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