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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.6.73.dev12
+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.dev12 → 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,
-        "https://avatars.mds.yandex.net/i?id=130c32d9900d514d738ef89b9c61bcd3_l-4767909-images-thumbs&n=13",
+        "AgACAgIAAxkBAAIEaWferbY69OMAASKXObrcYYLciuWVswACPPAxGxf4-EqNHJqqRTQmMgEAAwIAA3kAAzYE",
         "bitpapa.com",
         "bitpapa.com",
         "bitpapa.com/log-in",
@@ -207,7 +207,7 @@ exs = {
     "Bitvalve ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Bybit": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/698/large/bybit_spot.png",
+        "AgACAgIAAxkBAAIENGfeY4AfRquwTL2LpDrzqvFMVNt_AAIG9DEbXX3wSq3oI7t_PqQGAQADAgADbQADNgQ",
         "bybit.com",
         "api2.bybit.com",
         "bybit.com/login",
@@ -218,7 +218,7 @@ exs = {
     "Garantex": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Gate": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/403/large/gate_io_logo.jpg",
+        "AgACAgIAAxkBAAIEMmfeY2WPV9axwELiZp9JsG1qVVSDAAIF9DEbXX3wSmqKNrQMcr0GAQADAgADbQADNgQ",
         "gate.io",
         "gate.io",
         "www.gate.io/login",
@@ -227,7 +227,7 @@ exs = {
     "HodlHodl": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Htx": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/25/large/logo_V_colour_black.png",
+        "CAACAgIAAxkBAAIEQWfeZKFue_EuEx4aCWQuUUiBUFUWAAJcbQACXX3wSgpUwu_LgrVCNgQ",
         "www.htx.com",
         "www.htx.com",
         "htx.com/login",
@@ -236,7 +236,7 @@ exs = {
     "Koshelek": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "KuCoin": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/61/large/kucoin.png",
+        "AgACAgIAAxkBAAIELWfeYuCy-IaY2x4WDEFV30eDAlrLAAIC9DEbXX3wSskAAdr5c_L0LQEAAwIAA20AAzYE",
         "kucoin.com",
         "kucoin.com",
         "www.kucoin.com/ucenter/signin",
@@ -246,7 +246,7 @@ exs = {
     "LocalMonero": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Mexc": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/409/large/MEXC_logo_square.jpeg",
+        "AgACAgIAAxkBAAIEJ2feYl-98-SXYJQAARlswmCK7ihM-gAD9DEbXX3wSheqy--NeUvRAQADAgADbQADNgQ",
         "www.mexc.com",
         "www.mexc.com",
         "www.mexc.com/login",
@@ -255,7 +255,7 @@ exs = {
     "Noones ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Okx": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/379/large/WeChat_Image_20220117220452.png",
+        "AgACAgIAAxkBAAIEJWfeYkG29cU8Nt1oaiskDutGInGvAAL_8zEbXX3wSrPVVMfw6kI5AQADAgADeQADNgQ",
         "www.okx.cab",
         "www.okx.cab",
         "www.okx.cab/account/login",
@@ -270,7 +270,7 @@ exs = {
     "RoboSats": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Sigen": (
         ExType.p2p,
-        "https://yastatic.net/naydex/yandex-search/neZ1W6346/a21f02dA/2SvJ6dTLJwRiz_lTFP-fhywHqi1fxPNRcIxuKzcpwJ0DGlJzbzdT8ARet86SrINoGNj87R9U-t8HLZcrrBASQf0_6OkAL7cgl6uc0gCrHxI9Y369emE2MJF5yotCyODdZ5iXljtkQJMXTMV9VXsEL68seaiqQF578wnB3V",
+        "AgACAgIAAxkBAAIEIWfeYbAYWyMCtPtZ6q233_7VoQ87AAL-8zEbXX3wSqgLi3m0_G7AAQADAgADbQADNgQ",
         "sigen.pro",
         "sigen.pro",
         "sigen.pro/p2p",
@@ -281,7 +281,7 @@ exs = {
     "Solid": (ExType.main, "", "", "", "", ExStatus.plan),
     "TgWallet": (
         ExType.tg,
-        "https://telerock.ru/uploads/posts/2024-03/f658443d9e_c9d505bbf856e2360ba6812079ba02d0.webp",
+        "AgACAgIAAxkBAAIEEGfd3oDil7jFpVEZh_ek2RlmDSrpAALA6jEb7cjwSo3tCIf7UsVoAQADAgADbQADNgQ",
         "walletbot.me",
         "p2p.walletbot.me",
         "walletbot.me",
@@ -291,7 +291,7 @@ exs = {
     "WazirX": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "WebMoney": (
         ExType.p2p,
-        "https://vectorseek.com/wp-content/uploads/2023/08/Webmoney-Icon-Logo-Vector.svg-.png",
+        "AgACAgIAAxkBAAIEb2ferkkq2wWB-aJwIY6I2VZxSK4CAAJM8DEbF_j4SlHZDVKCzkUxAQADAgADeQADNgQ",
         "exchanger.money",
         "exchanger.money",
         "exchanger.money",
@@ -300,7 +300,7 @@ exs = {
     "WhiteBIT": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "xRocket": (
         ExType.p2p,
-        "https://cdn.allmylinks.com/prod/Upload/file/R/L/6/8G0TaGNtUV8C1V7VQsivDtJcpEz2z7Lc.jpg",
+        "AgACAgIAAxkBAAIEHWfeXy5a7fM9D5ys8ReQrDIRpwAB0wAC8_MxG1198Eo01GgWSVjQ3wEAAwIAA3gAAzYE",
         "",
         "",
         "",

{xync_schema-0.6.73.dev12 → 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
 
@@ -84,7 +83,7 @@ class Ex(Model):
     pmexs: fields.ReverseRelation["Pmex"]
     pairexs: fields.ReverseRelation["PairEx"]
     # deps: fields.ReverseRelation["Dep"]
-    # tests: fields.ReverseRelation["TestEx"]
+    tests: fields.ReverseRelation["TestEx"]
 
     class Meta:
         table_description = "Exchanges"
@@ -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.dev12 → 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.dev12 → xync_schema-0.6.73.dev15/xync_schema.egg-info}/PKG-INFO

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