xync-schema 0.6.37__tar.gz → 0.6.38__tar.gz

{xync_schema-0.6.37/xync_schema.egg-info → xync_schema-0.6.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.37
+Version: 0.6.38
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -82,17 +82,9 @@ class CoinEx {
    smallint ex_id
    integer id
 }
-class Country {
-   integer code
-   varchar(3) short
-   varchar(63) name
-   smallint cur_id
-   smallint id
-}
 class Cur {
    varchar(3) ticker
    double precision rate
-   varchar(63) country
    smallint id
 }
 class CurEx {
@@ -102,10 +94,6 @@ class CurEx {
    smallint ex_id
    integer id
 }
-class CurExCountry {
-   integer curexs
-   smallint country_id
-}
 class Ex {
    varchar(31) name
    varchar(63) host  /* With no protocol 'https://' */
@@ -120,7 +108,6 @@ class Fiat {
    varchar(127) name
    double precision amount
    double precision target
-   smallint country_id
    integer pmcur_id
    bigint user_id
    integer id
@@ -181,12 +168,8 @@ Asset  -->  Agent : agent_id-id
 Asset  -->  Coin : coin_id-id
 CoinEx  -->  Coin : coin_id-id
 CoinEx  -->  Ex : ex_id-id
-Country  -->  Cur : cur_id-id
 CurEx  -->  Cur : cur_id-id
 CurEx  -->  Ex : ex_id-id
-CurExCountry  -->  Country : country_id-id
-CurExCountry  -->  CurEx : curexs-id
-Fiat  -->  Country : country_id-id
 Fiat  -->  PmCur : pmcur_id-id
 Fiat  -->  User : user_id-id
 FiatEx  -->  Ex : ex_id-id
@@ -200,5 +183,4 @@ PmCurEx  -->  PmCur : pmcur_id-id
 PmEx  -->  Ex : ex_id-id
 PmEx  -->  Pm : pm_id-id
 User  -->  User : ref_id-id
-
 ```

{xync_schema-0.6.37 → xync_schema-0.6.38}/README.md

@@ -66,17 +66,9 @@ class CoinEx {
    smallint ex_id
    integer id
 }
-class Country {
-   integer code
-   varchar(3) short
-   varchar(63) name
-   smallint cur_id
-   smallint id
-}
 class Cur {
    varchar(3) ticker
    double precision rate
-   varchar(63) country
    smallint id
 }
 class CurEx {
@@ -86,10 +78,6 @@ class CurEx {
    smallint ex_id
    integer id
 }
-class CurExCountry {
-   integer curexs
-   smallint country_id
-}
 class Ex {
    varchar(31) name
    varchar(63) host  /* With no protocol 'https://' */
@@ -104,7 +92,6 @@ class Fiat {
    varchar(127) name
    double precision amount
    double precision target
-   smallint country_id
    integer pmcur_id
    bigint user_id
    integer id
@@ -165,12 +152,8 @@ Asset  -->  Agent : agent_id-id
 Asset  -->  Coin : coin_id-id
 CoinEx  -->  Coin : coin_id-id
 CoinEx  -->  Ex : ex_id-id
-Country  -->  Cur : cur_id-id
 CurEx  -->  Cur : cur_id-id
 CurEx  -->  Ex : ex_id-id
-CurExCountry  -->  Country : country_id-id
-CurExCountry  -->  CurEx : curexs-id
-Fiat  -->  Country : country_id-id
 Fiat  -->  PmCur : pmcur_id-id
 Fiat  -->  User : user_id-id
 FiatEx  -->  Ex : ex_id-id
@@ -184,5 +167,4 @@ PmCurEx  -->  PmCur : pmcur_id-id
 PmEx  -->  Ex : ex_id-id
 PmEx  -->  Pm : pm_id-id
 User  -->  User : ref_id-id
-
 ```

{xync_schema-0.6.37 → xync_schema-0.6.38}/xync_schema/models.py

@@ -7,29 +7,29 @@ from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
 from tg_auth.models import UserStatus, AuthUser
 
-from xync_schema.enums import ExType, AdStatus, PmType, AssetType, OrderStatus, ExAction
+from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
 
 
-class Country(Model):
-    id = fields.SmallIntField(True)
-    code: int | None = fields.IntField(null=True)
-    short: str | None = fields.CharField(3, unique=True, null=True)
-    name: str | None = fields.CharField(63, unique=True, null=True)
-    cur: fields.ForeignKeyRelation["Cur"] = fields.ForeignKeyField("models.Cur", related_name="countries")
-    curexs: fields.ManyToManyRelation["Curex"]
-    fiats: fields.BackwardFKRelation["Fiat"]
+# class Country(Model):
+#     id = fields.SmallIntField(True)
+#     code: int | None = fields.IntField(null=True)
+#     short: str | None = fields.CharField(3, unique=True, null=True)
+#     name: str | None = fields.CharField(63, unique=True, null=True)
+#     cur: fields.ForeignKeyRelation["Cur"] = fields.ForeignKeyField("models.Cur", related_name="countries")
+#     curexs: fields.ManyToManyRelation["Curex"]
+#     fiats: fields.BackwardFKRelation["Fiat"]
 
 
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
     rate: float | None = fields.FloatField(null=True)
-    country: str | None = fields.CharField(63, null=True)
+    # country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="curex")
     pairs: fields.ReverseRelation["Pair"]
-    countries: fields.ReverseRelation[Country]
+    # countries: fields.ReverseRelation[Country]
 
     _name = {"ticker"}
 
@@ -92,9 +92,9 @@ class Curex(BaseModel):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     exid: str = fields.CharField(31)
     p2p: bool = fields.BooleanField(default=True)
-    countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
-        "models.Country", through="curexcountry", backward_key="curexs"
-    )
+    # countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
+    #     "models.Country", through="curexcountry", backward_key="curexs"
+    # )
 
     class Meta:
         table_description = "Currency in Exchange"
@@ -246,12 +246,11 @@ class Ad(Model, TsTrait):
 
 
 class Pm(Model):
-    name: str = fields.CharField(63, unique=True)
-    # identifier: str | None = fields.CharField(63, unique=True, null=True)
-    rank: int | None = fields.SmallIntField(default=0)
-    type_: PmType | None = fields.IntEnumField(PmType, null=True)
+    name: str = fields.CharField(63, unique=False)
+    identifier: str | None = fields.CharField(63, unique=False, null=True)
+    # type_: PmType | None = fields.IntEnumField(PmType, null=True)
+    type_: int | None = fields.SmallIntField(null=True)
     logo: str | None = fields.CharField(127, null=True)
-    multiAllow: bool | None = fields.BooleanField(null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
@@ -310,8 +309,8 @@ class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" fl
 class Fiat(Model):
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
-    country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", related_name="fiats")
-    country_id: int
+    # country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", related_name="fiats")
+    # country_id: int
     detail: str = fields.CharField(127)
     name: str | None = fields.CharField(127, null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "fiats")

{xync_schema-0.6.37 → xync_schema-0.6.38/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.37
+Version: 0.6.38
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -82,17 +82,9 @@ class CoinEx {
    smallint ex_id
    integer id
 }
-class Country {
-   integer code
-   varchar(3) short
-   varchar(63) name
-   smallint cur_id
-   smallint id
-}
 class Cur {
    varchar(3) ticker
    double precision rate
-   varchar(63) country
    smallint id
 }
 class CurEx {
@@ -102,10 +94,6 @@ class CurEx {
    smallint ex_id
    integer id
 }
-class CurExCountry {
-   integer curexs
-   smallint country_id
-}
 class Ex {
    varchar(31) name
    varchar(63) host  /* With no protocol 'https://' */
@@ -120,7 +108,6 @@ class Fiat {
    varchar(127) name
    double precision amount
    double precision target
-   smallint country_id
    integer pmcur_id
    bigint user_id
    integer id
@@ -181,12 +168,8 @@ Asset  -->  Agent : agent_id-id
 Asset  -->  Coin : coin_id-id
 CoinEx  -->  Coin : coin_id-id
 CoinEx  -->  Ex : ex_id-id
-Country  -->  Cur : cur_id-id
 CurEx  -->  Cur : cur_id-id
 CurEx  -->  Ex : ex_id-id
-CurExCountry  -->  Country : country_id-id
-CurExCountry  -->  CurEx : curexs-id
-Fiat  -->  Country : country_id-id
 Fiat  -->  PmCur : pmcur_id-id
 Fiat  -->  User : user_id-id
 FiatEx  -->  Ex : ex_id-id
@@ -200,5 +183,4 @@ PmCurEx  -->  PmCur : pmcur_id-id
 PmEx  -->  Ex : ex_id-id
 PmEx  -->  Pm : pm_id-id
 User  -->  User : ref_id-id
-
 ```