xync-schema 0.6.73.dev13__tar.gz → 0.6.73.dev15__tar.gz

{xync_schema-0.6.73.dev13/xync_schema.egg-info → xync_schema-0.6.73.dev15}/PKG-INFO

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

{xync_schema-0.6.73.dev13 → xync_schema-0.6.73.dev15}/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-0.6.73.dev13 → xync_schema-0.6.73.dev15}/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
 
@@ -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-0.6.73.dev13 → xync_schema-0.6.73.dev15}/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

{xync_schema-0.6.73.dev13 → xync_schema-0.6.73.dev15/xync_schema.egg-info}/PKG-INFO

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