xync-schema 0.6.45__tar.gz → 0.6.47__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {xync_schema-0.6.45/xync_schema.egg-info → xync_schema-0.6.47}/PKG-INFO +1 -1
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema/enums.py +1 -2
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema/models.py +2 -2
- {xync_schema-0.6.45 → xync_schema-0.6.47/xync_schema.egg-info}/PKG-INFO +1 -1
- {xync_schema-0.6.45 → xync_schema-0.6.47}/.env.sample +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/.gitignore +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/.pre-commit-config.yaml +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/README.md +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/makefile +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/pyproject.toml +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/setup.cfg +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/tests/__init__.py +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/tests/test_db.py +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema/__init__.py +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema/pydantic.py +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema.egg-info/SOURCES.txt +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema.egg-info/dependency_links.txt +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema.egg-info/requires.txt +0 -0
- {xync_schema-0.6.45 → xync_schema-0.6.47}/xync_schema.egg-info/top_level.txt +0 -0
|
@@ -11,6 +11,7 @@ class AdStatus(IntEnum):
|
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
class OrderStatus(IntEnum):
|
|
14
|
+
deleted = 0
|
|
14
15
|
requested = 1
|
|
15
16
|
request_canceled = 2
|
|
16
17
|
created = 3
|
|
@@ -23,9 +24,7 @@ class OrderStatus(IntEnum):
|
|
|
23
24
|
appealed_by_buyer = 10
|
|
24
25
|
seller_appeal_disputed_by_buyer = 11
|
|
25
26
|
buyer_appeal_disputed_by_seller = 12
|
|
26
|
-
appeal_canceled = 15
|
|
27
27
|
# todo: 8T - один вирт экшн на бездействие обеих сторон, а 12T и 13T - по отдельности?
|
|
28
|
-
# paid_and_canceled = 7
|
|
29
28
|
# COMPLETED, PENDING, TRADING, BUYER_PAYED, DISTRIBUTING, COMPLETED, IN_APPEAL, CANCELLED, CANCELLED_BY_SYSTEM
|
|
30
29
|
|
|
31
30
|
|
|
@@ -5,7 +5,7 @@ from tortoise import Model as BaseModel
|
|
|
5
5
|
from x_auth.enums import Role
|
|
6
6
|
from x_auth.models import Model
|
|
7
7
|
from x_model.models import TsTrait, DatetimeSecField
|
|
8
|
-
from tg_auth.models import UserStatus, AuthUser
|
|
8
|
+
from tg_auth.models import UserStatus, AuthUser, UserInfoTrait
|
|
9
9
|
|
|
10
10
|
from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
|
|
11
11
|
|
|
@@ -141,7 +141,7 @@ class Direction(Model):
|
|
|
141
141
|
unique_together = (("pair", "sell"),)
|
|
142
142
|
|
|
143
143
|
|
|
144
|
-
class User(Model, TsTrait):
|
|
144
|
+
class User(Model, TsTrait, UserInfoTrait):
|
|
145
145
|
id: int = fields.BigIntField(True)
|
|
146
146
|
role: Role = fields.IntEnumField(Role, default=Role.READER)
|
|
147
147
|
status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|