xync-db 0.5.5.dev9__tar.gz → 0.5.5.dev10__tar.gz

{xync_db-0.5.5.dev9 → xync_db-0.5.5.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-db
-Version: 0.5.5.dev9
+Version: 0.5.5.dev10
 Summary: Xync DB schema: Tortoise ORM models, enums, pydantic DTOs.
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: LicenseRef-EULA

{xync_db-0.5.5.dev9 → xync_db-0.5.5.dev10}/src/xync_db/models/CLAUDE.md

@@ -110,6 +110,13 @@ actor.set_user(username_id):
 ### `exclude(**kwargs)` negates each kwarg separately (NOT Django's `NOT(AND)`)
 Tortoise `QuerySet.exclude(a=1, b=2)` → `NOT(a=1) AND NOT(b=2)` = `a!=1 AND b!=2` (drops a row if EITHER holds), NOT Django's `NOT(a=1 AND b=2)`. Source: `tortoise.queryset.QuerySet._filter_or_exclude` appends `~Q(**{k:v})` per kwarg, AND-joined. To exclude the **intersection**, wrap in ONE `Q`: `exclude(Q(a=1, b=2))` → `NOT(a=1 AND b=2)`. Real bug: `User.get_hot_ads` `exclude(hex__isnull=True, ad__maker__ex_id__in=SHARE_HEX_EX_IDS)` hid all hex-less ads AND all share-hex ads separately instead of only the unshared-share-hex ones; fixed with `exclude(Q(...))` + `from tortoise.expressions import Q`.
 
+### Filtering by an m2m field multiplies rows — add `.distinct()`
+`filter(credexs__cred__ovr_pm_id=0)` is a JOIN through `myad_cred`, so a `MyAd` with TWO matching
+credentials comes back **twice**. Real bug: `/hot/ads?mine=true` showed every 2-payment ad doubled
+(the taker path hid it — `_dedup_hot_by_slot` collapses by slot) and `BaseAgentClient.ads_share`
+shared it twice. Fixed with `.distinct()` in `MyAd.hot_mads_query` (test `test_hot_mads_distinct.py`);
+`unshared_ad_ids` already had it. Rule: any queryset filtered through an m2m relation needs `.distinct()`.
+
 ### id=0 rows are unhashable — never `set[Model]`
 The XyncPay `Pm` row has **pk id=0** (norm='xyncpay'). Tortoise's `Model.__hash__` does `if not self.pk: raise TypeError(... unhashable)` — and `not 0` is `True`, so a fully-saved id=0 row is unhashable; putting it in a `set[Model]` (literal, `set(...)`, comprehension, or a pydantic `set[Model]` field) raises at construction. Rule: never build a `set` of model instances if any row can be id=0 (Pm especially, ovr_pm_id=0). Diff/dedup m2m by `pm.id` instead (`{p.id: p for p in pms}`, `{p.id for p in ...}`) — int sets are always hashable. Bit us in `Ad.upsert`/`_sync_pms` (the pms m2m path: `AdXIn.pms` is `list[Pm]` not `set`, diffs by id). Test `test_ad_upsert_pms_sync`.
 

{xync_db-0.5.5.dev9 → xync_db-0.5.5.dev10}/src/xync_db/models/__init__.py

@@ -1567,8 +1567,12 @@ class MyAd(Model):  # Road
             fltr["ad__status"] = AdStatus.active
         if ex_ids:
             fltr["ad__maker__ex_id__in"] = ex_ids
-        return cls.filter(**fltr).prefetch_related(
-            "ad__pair_side__pair__coin", "ad__pair_side__pair__cur", "ad__maker__ex"
+        # distinct: credexs — m2m, и объява с двумя платёжками (2 credex с ovr_pm_id=0) иначе  # noqa: RUF003
+        # приезжает JOIN'ом дважды (дубли строк в /hot/ads?mine=true и двойной ads_share)  # noqa: RUF003
+        return (
+            cls.filter(**fltr)
+            .distinct()
+            .prefetch_related("ad__pair_side__pair__coin", "ad__pair_side__pair__cur", "ad__maker__ex")
         )
 
     @classmethod