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

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

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

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

@@ -95,9 +95,25 @@ class FileType(IntEnum):
     jpeg = 10
 
 
+class SynonymType(IntEnum):
+    name = 1
+    ppo = 2
+    from_party = 3
+    to_party = 4
+    slip_req = 5
+    slip_send = 6
+    abuser = 7
+    scale = 8
+    mtl_like = 9
+    bank_only = 10
+    no_bank = 11
+    cred_in_chat = 12
+    slavic = 13
+
+
 class Party(IntEnum):
     fst = 1
-    lk = 2
+    lk = 2  # lk-photo/1-family/comment
     trd = 3
 
 

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

@@ -57,6 +57,7 @@ from xync_schema.enums import (
     DepType,
     Party,
     Slip,
+    SynonymType,
 )
 
 
@@ -77,6 +78,7 @@ class Cur(Model):
     exs: ManyToManyRelation["Ex"] = ManyToManyField("models.Ex", through="curex")
     pairs: BackwardFKRelation["Pair"]
     countries: BackwardFKRelation[Country]
+    synonyms: ManyToManyRelation["Synonym"]
 
     _name = {"ticker"}
 
@@ -351,29 +353,41 @@ class Agent(Model, TsTrait):
 
 
 class Cond(Model, TsTrait):
-    party: Party = IntEnumField(Party, null=True)
+    raw_txt: str = CharField(4095, unique=True)
+    last_ver: str = CharField(4095, null=True)
+
+    ads: BackwardFKRelation["Ad"]
+    banks: BackwardFKRelation["CondPm"]
+    parsed: BackwardOneToOneRelation["CondParsed"]
+    sim: BackwardOneToOneRelation["Cond"]
+
+    async def sims(self):
+        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: Slip = IntEnumField(Slip, null=True)
+    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)
-    raw_txt: str = CharField(4095, unique=True)
-    parsed: bool = BooleanField(default=False)
-    last_ver: str = CharField(4095, null=True)
-
-    sim: BackwardOneToOneRelation["Cond"]
-    banks: BackwardFKRelation["CondPm"]
 
-    ads: BackwardFKRelation["Ad"]
 
-    async def sims(self):
-        return {self.raw_txt: await self.sim.sims()} if await self.sim else self.raw_txt
+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")
 
 
 class CondSim(BaseModel):
-    cond: ForeignKeyRelation[Cond] = OneToOneField("models.Cond", "sim", primary_key=True)
+    cond: OneToOneRelation[Cond] = OneToOneField("models.Cond", "sim", primary_key=True)
     cond_id: int  # new
     similarity: int = SmallIntField(db_index=True)  # /1000
     cond_rel: ForeignKeyRelation[Cond] = ForeignKeyField("models.Cond", "sims_rel")

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

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