xync-schema 0.6.73.dev3__tar.gz → 0.6.73.dev4__tar.gz

{xync_schema-0.6.73.dev3/xync_schema.egg-info → xync_schema-0.6.73.dev4}/PKG-INFO

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

{xync_schema-0.6.73.dev3 → xync_schema-0.6.73.dev4}/xync_schema/models.py

@@ -1,8 +1,10 @@
 import sys
 from datetime import datetime
+
 from tortoise import fields
 from tortoise.queryset import QuerySet
 from tortoise import Model as BaseModel
+from tortoise.signals import pre_save
 from x_auth.enums import Role
 from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
@@ -164,11 +166,10 @@ class CredHolder(Model, TsTrait):
     actor: fields.BackwardOneToOneRelation["Actor"]
 
 
-class User(Model, UserInfoTrait):
+class User(Model, UserInfoTrait, TsTrait):
     id: int = fields.BigIntField(True)
     ch: fields.OneToOneRelation[CredHolder] = fields.OneToOneField("models.CredHolder", "users")
     ch_id: int
-    forum: int = fields.BigIntField()
     role: Role = fields.IntEnumField(Role, default=Role.READER)
     status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
     username: str | None = fields.CharField(95, unique=True, null=True)
@@ -177,6 +178,7 @@ class User(Model, UserInfoTrait):
     )
     ref_id: int | None
 
+    forum: fields.BackwardOneToOneRelation["Forum"]
     proteges: fields.BackwardFKRelation["User"]
     agents: fields.BackwardFKRelation["Agent"]
     # fiats: fields.BackwardFKRelation["Fiat"]
@@ -208,6 +210,18 @@ class User(Model, UserInfoTrait):
     # computed = ["balance"]
 
 
+@pre_save(User)
+async def ch(_meta, user: User, _db, _updated: dict) -> None:
+    if not user.ch_id:
+        user.ch = await CredHolder.create()
+
+
+class Forum(Model, TsTrait):
+    id: int = fields.BigIntField(True)
+    joined: bool = fields.BooleanField(default=False)
+    user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", "forum")
+
+
 class Actor(Model):
     exid: int = fields.BigIntField()
     name: int = fields.CharField(63)

{xync_schema-0.6.73.dev3 → xync_schema-0.6.73.dev4}/xync_schema/pydantic.py

@@ -73,7 +73,7 @@ class CredPydIn(BaseModel):
         arbitrary_types_allowed = True
 
     def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "exid", "actor", "pmcur"
+        unq: tuple[str, ...] = "id", "exid", "ch", "pmcur"
         df: tuple[str, ...] = "detail", "name"
         d = self.model_dump()
         return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}

{xync_schema-0.6.73.dev3 → xync_schema-0.6.73.dev4/xync_schema.egg-info}/PKG-INFO

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