From e128631e8fe83f0d0a14568d3ad57db27ec8b9e9 Mon Sep 17 00:00:00 2001 From: ppc Date: Mon, 16 Sep 2024 12:39:15 +0100 Subject: [PATCH] fix upsert failures --- titles/mai2/dx.py | 3 ++- titles/mai2/schema/item.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/titles/mai2/dx.py b/titles/mai2/dx.py index 7a067d7..53abc61 100644 --- a/titles/mai2/dx.py +++ b/titles/mai2/dx.py @@ -242,7 +242,8 @@ class Mai2DX(Mai2Base): if "userFavoriteList" in upsert and len(upsert["userFavoriteList"]) > 0: for fav in upsert["userFavoriteList"]: - await self.data.item.put_favorite(user_id, fav["kind"], fav["itemIdList"]) + kind_id = fav.get("kind", fav.get("itemKind")) # itemKind key used in BUDDiES+ + await self.data.item.put_favorite(user_id, kind_id, fav["itemIdList"]) if ( "userFriendSeasonRankingList" in upsert diff --git a/titles/mai2/schema/item.py b/titles/mai2/schema/item.py index d53ebbc..13afbe4 100644 --- a/titles/mai2/schema/item.py +++ b/titles/mai2/schema/item.py @@ -453,10 +453,10 @@ class Mai2ItemData(BaseData): self, user_id: int, kind: int, item_id_list: List[int] ) -> Optional[int]: sql = insert(favorite).values( - user=user_id, kind=kind, item_id_list=item_id_list + user=user_id, itemKind=kind, itemIdList=item_id_list ) - conflict = sql.on_duplicate_key_update(item_id_list=item_id_list) + conflict = sql.on_duplicate_key_update(itemIdList=item_id_list) result = await self.execute(conflict) if result is None: