xync-schema 0.0.9.dev7__tar.gz → 0.0.9.dev9__tar.gz

{xync_schema-0.0.9.dev7/xync_schema.egg-info → xync_schema-0.0.9.dev9}/PKG-INFO

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

{xync_schema-0.0.9.dev7 → xync_schema-0.0.9.dev9}/xync_schema/__init__.py

@@ -1,14 +1,13 @@
 from os import getenv as env
-from aerich import models as amodels
 from dotenv import load_dotenv
 
-from xync_schema import models as xmodels
+from xync_schema import models
 
 load_dotenv()
 
 TORM = {
     "connections": {"default": env("DB_URL")},
-    "apps": {"models": {"models": [xmodels, amodels]}},
+    "apps": {"models": {"models": [models, "aerich.models"]}},
     "use_tz": False,
     "timezone": "UTC",
 }

{xync_schema-0.0.9.dev7 → xync_schema-0.0.9.dev9}/xync_schema/enums.py

@@ -104,11 +104,10 @@ class SynonymType(IntEnum):
     slip_send = 6
     abuser = 7
     scale = 8
-    mtl_like = 9
-    bank_only = 10
-    no_bank = 11
-    cred_in_chat = 12
-    slavic = 13
+    slavic = 9
+    mtl_like = 10
+    bank = 11
+    bank_side = 12
 
 
 class Party(IntEnum):

{xync_schema-0.0.9.dev7 → xync_schema-0.0.9.dev9}/xync_schema/models.py

@@ -357,7 +357,6 @@ class Cond(Model, TsTrait):
     last_ver: str = CharField(4095, null=True)
 
     ads: BackwardFKRelation["Ad"]
-    banks: BackwardFKRelation["CondPm"]
     parsed: BackwardOneToOneRelation["CondParsed"]
     sim: BackwardOneToOneRelation["Cond"]
 
@@ -365,25 +364,11 @@ class Cond(Model, TsTrait):
         return {self.raw_txt: await self.sim.sims()} if await self.sim else self.raw_txt
 
 
-class CondParsed(Model, TsTrait):
-    cond: OneToOneNullableRelation[Cond] = OneToOneField("models.Cond", "parsed", null=True)
-    cond_id: int  # new
-    to_party: Party = IntEnumField(Party, null=True)
-    from_party: Party = IntEnumField(Party, null=True)
-    ppo: int = SmallIntField(null=True)  # Payments per order
-    slip_req: Slip = IntEnumField(Slip, null=True)
-    slip_send: Slip = IntEnumField(Slip, null=True)
-    abuser: bool = BooleanField(null=True)  # рейт: жмет "Оплачено" сразу, "Отмена" по аппеляции
-    slavic: bool = BooleanField(null=True)
-    mtl_like: bool = BooleanField(null=True)
-    cred_in_chat: bool = BooleanField(null=True)
-    scale: int = SmallIntField(null=True)
-
-
 class Synonym(BaseModel):
     typ: SynonymType = IntEnumField(SynonymType, db_index=True)
     txt: str = CharField(255, unique=True)
     curs: ManyToManyRelation[Cur] = ManyToManyField("models.Cur", "synonym_cur", related_name="synonyms")
+    val: int | None = SmallIntField(null=True)  # SynonymType dependent (e.g: no-slavic for name, approx for ppo..)
 
 
 class CondSim(BaseModel):
@@ -412,7 +397,7 @@ class Pm(Model):
     no_conds: ManyToManyRelation[Cond]
     only_conds: ManyToManyRelation[Cond]
     exs: ManyToManyRelation[Ex] = ManyToManyField("models.Ex", "pmex")  # no need. use pmexs[.exid]
-    conds: BackwardFKRelation["CondPm"]
+    conds: BackwardFKRelation["CondParsed"]
     orders: BackwardFKRelation["Order"]
     pmcurs: BackwardFKRelation["Pmcur"]  # no need. use curs
     pmexs: BackwardFKRelation["Pmex"]
@@ -432,6 +417,22 @@ class Pm(Model):
     #     return sys.modules[module_name].PmEpyd
 
 
+class CondParsed(Model, TsTrait):
+    cond: OneToOneNullableRelation[Cond] = OneToOneField("models.Cond", "parsed", null=True)
+    cond_id: int  # new
+    to_party: Party = IntEnumField(Party, null=True)
+    from_party: Party = IntEnumField(Party, null=True)
+    ppo: int = SmallIntField(null=True)  # Payments per order
+    slip_req: Slip = IntEnumField(Slip, null=True)
+    slip_send: Slip = IntEnumField(Slip, null=True)
+    abuser: bool = BooleanField(null=True)  # рейт: жмет "Оплачено" сразу, "Отмена" по аппеляции
+    slavic: bool = BooleanField(null=True)
+    mtl_like: bool = BooleanField(null=True)
+    scale: int = SmallIntField(null=True)
+    bank_side: bool = BooleanField(null=True)  # False - except this banks, True - only this banks
+    banks: ManyToManyRelation[Pm] = ManyToManyField("models.Pm", "cond_banks", related_name="conds")
+
+
 class Ad(Model, TsTrait):
     exid: int = BigIntField(unique=True)  # todo: спарить уникальность с биржей, тк на разных биржах могут совпасть
     pair_side: ForeignKeyRelation[PairSide] = ForeignKeyField("models.PairSide", related_name="ads")
@@ -501,17 +502,6 @@ class Race(Model):
     created_at: datetime | None = DatetimeSecField(auto_now_add=True)
 
 
-class CondPm(Model):
-    positive: int = BooleanField(default=True)  # /1000
-    cond: ForeignKeyRelation[Cond] = ForeignKeyField("models.Cond", "banks")
-    cond_id: int  # new
-    pm: ForeignKeyRelation[Pm] = ForeignKeyField("models.Pm", "conds")
-    pm_id: int  # old
-
-    class Meta:
-        unique_together = (("cond_id", "pm_id"),)
-
-
 class PmRep(Model):
     ex: ForeignKeyRelation[Ex] = ForeignKeyField("models.Ex", "pm_reps")
     ex_id: int
@@ -596,7 +586,7 @@ class Cred(Model):
     extra: str | None = CharField(255, null=True)
     person: ForeignKeyRelation[Person] = ForeignKeyField("models.Person", "creds")
     person_id: int
-    from_chat: bool = BooleanField(default=False)
+    from_chat: int  # todo: ForeignKeyNullableRelation["Order"] = ForeignKeyField("models.Order", null=True)
 
     banks: ManyToManyRelation[PmexBank] = ManyToManyField("models.PmexBank", related_name="creds")
 

{xync_schema-0.0.9.dev7 → xync_schema-0.0.9.dev9/xync_schema.egg-info}/PKG-INFO

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