xync-schema 0.6.73.dev13__py3-none-any.whl → 0.6.73.dev16__py3-none-any.whl

xync_schema/enums.py

@@ -164,7 +164,7 @@ class ExAction(IntEnum):
 exs = {
     "Beribit": (
         ExType.p2p,
-        "https://sun9-41.userapi.com/impg/cZCGFTXH5-11_HjiWw9aWr3__SlbmMIiXSc-ig/YtOHJpjuVW0.jpg?size=604x604&quality=95&sign=def93bbe4283c563eb2d75a5968350f2",
+        "AgACAgIAAxkBAAIEY2ferEZ38wZbpG9kmfFPjsSGC3CmAAIo8DEbF_j4StC_ac-XA5fbAQADAgADeAADNgQ",
         "beribit.app",
         "beribit.app",
         "beribit.app/login",
@@ -172,7 +172,7 @@ exs = {
     ),
     "Binance": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/52/large/binance.jpg",
+        "AgACAgIAAxkBAAIEYGfeq1hpcgu2el0ROqFvWtWNHrtWAAIQ8DEbF_j4Sq7oecXCtoONAQADAgADbQADNgQ",
         "binance.com",
         "p2p.binance.com",
         "accounts.binance.com/login",
@@ -180,7 +180,7 @@ exs = {
     ),
     "BingX": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/812/large/YtFwQwJr_400x400.jpg",
+        "AgACAgIAAxkBAAIEZWferWiY5ZCV2SAWgSnUan76cl-TAAIy8DEbF_j4Sq1aMXmyATzQAQADAgADbQADNgQ",
         "bingx.com",
         "api-app.we-api.com",
         "bingx.com/login",
@@ -190,7 +190,7 @@ exs = {
     "BitcoinGlobal": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "BitGet": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/591/large/2023-07-25_21.47.43.jpg",
+        "AgACAgIAAxkBAAIEZ2ferYwPfGrx1PX-C7SBToZG-h-iAAI08DEbF_j4StxKwJlnBT3XAQADAgADbQADNgQ",
         "www.bitget.com",
         "www.bitget.com",
         "www.bitget.com/login",
@@ -198,7 +198,7 @@ exs = {
     ),
     "BitPapa": (
         ExType.p2p,
-        "",
+        "AgACAgIAAxkBAAIEaWferbY69OMAASKXObrcYYLciuWVswACPPAxGxf4-EqNHJqqRTQmMgEAAwIAA3kAAzYE",
         "bitpapa.com",
         "bitpapa.com",
         "bitpapa.com/log-in",
@@ -291,7 +291,7 @@ exs = {
     "WazirX": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "WebMoney": (
         ExType.p2p,
-        "",
+        "AgACAgIAAxkBAAIEb2ferkkq2wWB-aJwIY6I2VZxSK4CAAJM8DEbF_j4SlHZDVKCzkUxAQADAgADeQADNgQ",
         "exchanger.money",
         "exchanger.money",
         "exchanger.money",

xync_schema/models.py

@@ -4,7 +4,6 @@ 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.models import Model, UserTg
 from x_model.models import TsTrait, DatetimeSecField
 
@@ -103,7 +102,7 @@ class Ex(Model):
 class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
-    exid: str = fields.CharField(31)
+    exid: str = fields.CharField(32)
     minimum: float = fields.FloatField(null=True)
     rounding_scale: int = fields.SmallIntField(null=True)
     countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
@@ -120,7 +119,7 @@ class Coinex(BaseModel):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     minimum: float = fields.FloatField(null=True)
 
-    exid: str = fields.CharField(31)
+    exid: str = fields.CharField(32)
     p2p: bool = fields.BooleanField(default=True)
 
     class Meta:
@@ -204,12 +203,12 @@ class User(UserTg, TsTrait):
     # investments: fields.BackwardFKRelation["Investment"]
 
     async def free_assets(self):
-        assets = await Asset.filter(agent__user_id=self.id).values("free", "coin__rate")
+        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)
 
     async def fiats_sum(self):
-        fiats = await Fiat.filter(user=self).values("amount", "pmcur__cur__rate")
-        return sum(fiat["amount"] * fiat["pmcur__cur__rate"] for fiat in fiats)
+        fiats = await Fiat.filter(cred__person__user__id=self.id).values("amount", "cred__pmcur__cur__rate")
+        return sum(fiat["amount"] * fiat["cred__pmcur__cur__rate"] for fiat in fiats)
 
     async def balance(self) -> float:
         return await self.free_assets() + await self.fiats_sum()
@@ -223,12 +222,6 @@ class User(UserTg, TsTrait):
         # computed = ["balance"]
 
 
-@pre_save(User)
-async def person(_meta, user: User, _db, _updated: dict) -> None:
-    if not user.person_id:
-        user.person = await Person.create(name=f"{user.first_name} {user.last_name}".strip())
-
-
 class Forum(Model, TsTrait):
     id: int = fields.BigIntField(True)
     joined: bool = fields.BooleanField(default=False)

xync_schema/types.py

@@ -91,22 +91,6 @@ class BaseOrder(BaseModel):
     id: int | None = None
 
 
-class Order(BaseModel):
-    id: int
-    amount: float
-    status: str
-    cred: models.Cred.out_type()
-    is_sell: bool
-    created_at: datetime
-    topic: int
-    actions: dict | None = {}
-    actor: int | None = None
-    payed_at: datetime | None = None
-    appealed_at: datetime | None = None
-    confirmed_at: datetime | None = None
-    msgs: int = 0
-
-
 class OrderIn(BaseModel):
     exid: int
     amount: float
@@ -125,8 +109,3 @@ class OrderIn(BaseModel):
 
     class Config:
         arbitrary_types_allowed = True
-
-
-class UreadMsgs(BaseModel):
-    order_id: int
-    unread_cnt: int

{xync_schema-0.6.73.dev13.dist-info → xync_schema-0.6.73.dev16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.6.73.dev13
+Version: 0.6.73.dev16
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -8,9 +8,11 @@ Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: xtg-auth
+Requires-Dist: xn-auth
+Requires-Dist: python-dotenv
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 

xync_schema-0.6.73.dev16.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=yNXG1ZMWKSrjS7kFMVUHpbruws5c_xO_UxswmQJPNOE,12547
+xync_schema/models.py,sha256=5CdUxuWBRQPGhcqcJJFq9lAWlA12jwmobO5H4C516zw,26808
+xync_schema/types.py,sha256=fyuuiIcqrpStiCHpKB3vNMEnUhSyvMvW4bW10rK3vRY,2247
+xync_schema-0.6.73.dev16.dist-info/METADATA,sha256=T1B9kKcBoTNF1eLH8XMvlf3ZByRmYFgCya5OF6um05g,4061
+xync_schema-0.6.73.dev16.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xync_schema-0.6.73.dev16.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.73.dev16.dist-info/RECORD,,

{xync_schema-0.6.73.dev13.dist-info → xync_schema-0.6.73.dev16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xync_schema-0.6.73.dev13.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=EkPJ5BhSSLVAO1BHsKHK7qo495Q9j-KOJ9vu4Cbmf-Q,12412
-xync_schema/models.py,sha256=lqxKUZE8yMD70596ORTvmtRX2DDjPpONTGwedWmYu3c,27002
-xync_schema/types.py,sha256=e55yfU8Z5iXgUFa50ZqNhIgM9mxmPsWK0vshB_mZoU0,2673
-xync_schema-0.6.73.dev13.dist-info/METADATA,sha256=iUo2_9CiRym9jTBrUtx0V3m0rfhenJlMXkWcEE1ADQA,3991
-xync_schema-0.6.73.dev13.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-xync_schema-0.6.73.dev13.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.73.dev13.dist-info/RECORD,,