xync-schema 0.6.88__tar.gz → 0.6.90__tar.gz

{xync_schema-0.6.88/xync_schema.egg-info → xync_schema-0.6.90}/PKG-INFO

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

{xync_schema-0.6.88 → xync_schema-0.6.90}/xync_schema/models.py

@@ -177,10 +177,12 @@ 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):
     status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.SLEEP)
+    gmail_auth: dict = fields.JSONField(default={})
 
     person: fields.OneToOneRelation[Person] = fields.OneToOneField("models.Person", related_name="user")
     person_id: int
@@ -210,8 +212,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")
@@ -275,7 +277,7 @@ class Actor(Model):
 
 
 class Agent(Model, TsTrait):
-    auth: dict[str, str] = fields.JSONField(default={})
+    auth: dict = fields.JSONField(default={})
     actor: fields.OneToOneRelation[Actor] = fields.OneToOneField("models.Actor", "agent")
     actor_id: int
 
@@ -356,7 +358,8 @@ class Pm(Model):
     # name: str = fields.CharField(63)  # mv to pmex cause it diffs on each ex
     norm: str | None = fields.CharField(63)
     acronym: str | None = fields.CharField(7, null=True)
-    country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", "pms", null=True)
+    country: fields.ForeignKeyNullableRelation[Country] = fields.ForeignKeyField("models.Country", "pms", null=True)
+    df_cur: fields.ForeignKeyNullableRelation[Cur] = fields.ForeignKeyField("models.Cur", "df_pms", null=True)
     alias: str | None = fields.CharField(63, null=True)
     extra: str | None = fields.CharField(63, null=True)
     ok: bool = fields.BooleanField(default=True)
@@ -385,6 +388,16 @@ class Pm(Model):
     #     return sys.modules[module_name].PmEpyd
 
 
+class PmAgent(Model):
+    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", related_name="agents")
+    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="pm_agents")
+    user_id: int
+    auth: dict = fields.JSONField(default={})
+
+    class Meta:
+        unique_together = (("pm_id", "user_id"),)
+
+
 class Pmcur(Model):  # for fiat with no exs tie
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm")
     pm_id: int

{xync_schema-0.6.88 → xync_schema-0.6.90/xync_schema.egg-info}/PKG-INFO

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