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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.0.9.dev5
+Version: 0.0.9.dev6
 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.dev6}/xync_schema/enums.py

@@ -97,7 +97,7 @@ class FileType(IntEnum):
 
 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.dev6}/xync_schema/models.py

@@ -351,29 +351,35 @@ class Agent(Model, TsTrait):
 
 
 class Cond(Model, TsTrait):
-    party: Party = IntEnumField(Party, null=True)
-    ppo: int = SmallIntField(null=True)  # Payments per order
-    slip: 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"]
+    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_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 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.dev6/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.dev6
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA