Fix search results merge logic

Author: BlasterAlex

bot/handlers/search.py

@@ -61,7 +61,8 @@ async def _do_search(message: Message, state: FSMContext, session: AsyncSession,
             by_title.setdefault(key, {})[region.code] = RegionPrice(
                 game.price, game.currency, game.base_price, game.discount_text, game.ps_id
             )
-            if key not in rep_game:
+            # Prefer ASCII title so localized prefixes ("Набір", "세트" etc.) don't win
+            if key not in rep_game or game.title.isascii():
                 rep_game[key] = game
             ps_ids_by_title.setdefault(key, {})[region.code] = game.ps_id
 
@@ -70,17 +71,14 @@ async def _do_search(message: Message, state: FSMContext, session: AsyncSession,
     visible_keys = set(all_keys[:_MAX_SEARCH_RESULTS])
 
     # Fallback: for regions that didn't find a game by name, try fetching by ps_id.
-    # Each ps_id is tried only once per title to avoid redundant requests.
     fallback_tasks: list[tuple[str, object, str]] = []
     for title_key, found in by_title.items():
         if title_key not in visible_keys:
             continue
-        tried: set[str] = set()
         for region in user_regions:
             if region.code not in found:
                 best = _best_ps_id(region.code, ps_ids_by_title[title_key])
-                if best and best not in tried:
-                    tried.add(best)
+                if best:
                     fallback_tasks.append((title_key, region, best))
 
     if fallback_tasks:

deploy/docker-compose.prod.yml

@@ -6,6 +6,8 @@ services:
       POSTGRES_USER: pricestation
       POSTGRES_PASSWORD: pricestation
       POSTGRES_DB: pricestation
+    ports:
+      - "127.0.0.1:5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped

services/ps_store.py

@@ -38,12 +38,12 @@
 _WARN_STATUSES = {403, 404, 410, 429}
 
 
-# Removes punctuation, trademark symbols, CJK/Korean language tags, and whitespace
-# so that titles like "Foo™: Bar (Standalone)" and "Foo Bar Stand Alone" collapse
-# to the same key, and Asian store suffixes like "(중국어, 한국어)" are ignored.
+# Removes punctuation, trademark symbols, non-ASCII characters (Cyrillic, CJK,
+# locale prefixes like "Набір", etc.), and whitespace so that titles collapse
+# to the same key regardless of regional language prefix.
 def normalize_title(title: str) -> str:
-    t = re.sub(r"[™®©:().,'\"!?\-]", "", title.lower())
-    t = re.sub(r"[぀-鿿가-퟿]", "", t)
+    t = re.sub(r"[™®©:().,'\"!?\-/]", "", title.lower())
+    t = re.sub(r"[^\x00-\x7f]", "", t)
     return re.sub(r"\s+", "", t)
 
 

tests/unit/test_ps_store.py

@@ -31,9 +31,21 @@ def test_normalize_title_strips_japanese_chars():
         == normalize_title("FINAL FANTASY VII")
     )
 
+def test_normalize_title_strips_cyrillic_prefix():
+    assert (
+        normalize_title("Набір FINAL FANTASY VII REMAKE & REBIRTH Twin Pack")
+        == normalize_title("FINAL FANTASY VII REMAKE & REBIRTH Twin Pack")
+    )
+
 def test_normalize_title_collapses_spaces():
     assert normalize_title("God  of   War") == normalize_title("God of War")
 
+def test_normalize_title_preserves_numbers():
+    assert normalize_title("FIFA 23") == "fifa23"
+
+def test_normalize_title_numbers_across_regions():
+    assert normalize_title("FIFA 23 (중국어, 한국어)") == normalize_title("FIFA 23")
+
 
 # --- fixtures ---
 

tests/unit/test_search.py

@@ -45,6 +45,53 @@ def test_best_ps_id_multiple_ep_returns_first():
     assert result.startswith("EP")
 
 
+# --- rep_game title selection ---
+
+@pytest.mark.asyncio
+async def test_ascii_title_preferred_over_cyrillic(mocker, common_mocks):
+    """ASCII title from a later region should replace a non-ASCII title found first."""
+    regions = [_region("uk-ua"), _region("en-gb")]
+    mocker.patch("bot.handlers.search.get_user_regions", new_callable=AsyncMock, return_value=regions)
+
+    cyrillic_game = _make_game(EP_ID, title="Набір FINAL FANTASY VII REMAKE & REBIRTH Twin Pack")
+    ascii_game = _make_game(EP_ID, title="FINAL FANTASY VII REMAKE & REBIRTH Twin Pack")
+    mocker.patch("bot.handlers.search.search_games", new_callable=AsyncMock,
+                 side_effect=[[cyrillic_game], [ascii_game]])
+    mocker.patch("bot.handlers.search.get_game_info", new_callable=AsyncMock)
+
+    state = AsyncMock()
+    captured = {}
+    state.update_data = AsyncMock(side_effect=lambda **kw: captured.update(kw))
+
+    await _do_search(_make_message(), state, AsyncMock(), "final fantasy")
+
+    entries = captured.get("entries", [])
+    assert len(entries) == 1
+    assert entries[0]["game"]["title"] == "FINAL FANTASY VII REMAKE & REBIRTH Twin Pack"
+
+
+@pytest.mark.asyncio
+async def test_non_ascii_title_kept_when_no_ascii_alternative(mocker, common_mocks):
+    """If only non-ASCII title exists (regional exclusive), it should still be shown."""
+    regions = [_region("uk-ua")]
+    mocker.patch("bot.handlers.search.get_user_regions", new_callable=AsyncMock, return_value=regions)
+
+    cyrillic_game = _make_game(EP_ID, title="Набір FINAL FANTASY VII REMAKE & REBIRTH Twin Pack")
+    mocker.patch("bot.handlers.search.search_games", new_callable=AsyncMock,
+                 side_effect=[[cyrillic_game]])
+    mocker.patch("bot.handlers.search.get_game_info", new_callable=AsyncMock)
+
+    state = AsyncMock()
+    captured = {}
+    state.update_data = AsyncMock(side_effect=lambda **kw: captured.update(kw))
+
+    await _do_search(_make_message(), state, AsyncMock(), "final fantasy")
+
+    entries = captured.get("entries", [])
+    assert len(entries) == 1
+    assert entries[0]["game"]["title"] == "Набір FINAL FANTASY VII REMAKE & REBIRTH Twin Pack"
+
+
 # --- fallback helpers ---
 
 def _make_game(ps_id, title="Test Game", price=49.99, currency="€"):
@@ -126,8 +173,8 @@ async def test_fallback_not_fired_when_all_regions_found(mocker, common_mocks):
 
 
 @pytest.mark.asyncio
-async def test_fallback_deduplication(mocker, common_mocks):
-    """en-gb finds game (EP id); de-de and fr-fr both miss → get_game_info called once, not twice."""
+async def test_fallback_fires_per_region(mocker, common_mocks):
+    """en-gb finds game (EP id); de-de and fr-fr both miss → get_game_info called for each missing region."""
     regions = [_region("en-gb"), _region("de-de"), _region("fr-fr")]
     mocker.patch("bot.handlers.search.get_user_regions", new_callable=AsyncMock, return_value=regions)
 
@@ -139,8 +186,9 @@ async def test_fallback_deduplication(mocker, common_mocks):
 
     await _do_search(_make_message(), AsyncMock(), AsyncMock(), "test game")
 
-    assert mock_get_info.call_count == 1
-    mock_get_info.assert_called_once_with(EP_ID, "de-de")
+    assert mock_get_info.call_count == 2
+    calls = {call.args for call in mock_get_info.call_args_list}
+    assert calls == {(EP_ID, "de-de"), (EP_ID, "fr-fr")}
 
 
 @pytest.mark.asyncio