Add game subscription logic

bot/handlers/regions.py

@@ -17,6 +17,7 @@
     get_user_regions,
     remove_user_region,
 )
+from services.subscription import sync_subscriptions_for_new_region
 from services.user import get_or_create_user
 
 _MAX_REGION_RESULTS = 20
@@ -125,7 +126,7 @@ async def on_region_add(
     await session.commit()
 
     region = await get_or_create_region(session, locale, country["name"])
-    added = await add_user_region(session, user.id, region.id)
+    added = await add_user_region(session, user, region.id)
 
     await state.clear()
 
@@ -134,6 +135,7 @@ async def on_region_add(
             f"✓ <b>{country['name']}</b> added to your tracked regions.\n\n"
             "View your regions: /my_regions"
         )
+        await sync_subscriptions_for_new_region(session, user, region)
     else:
         await callback.answer("This region is already in your list.", show_alert=True)
 
@@ -149,7 +151,7 @@ async def on_region_remove(
     )
     await session.commit()
 
-    await remove_user_region(session, user.id, region_id)
+    await remove_user_region(session, user, region_id)
 
     regions = await get_user_regions(session, user.id)
     if not regions:

bot/handlers/search.py

@@ -7,27 +7,14 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from bot.formatters import format_game_card, format_game_list
-from bot.keyboards.inline import search_results_keyboard
+from bot.keyboards.inline import game_card_keyboard, search_results_keyboard
 from bot.states.subscription import SearchForm
 from services.currency import get_rates
-from services.ps_store import GameInfo, RegionPrice, get_game_info, normalize_title, search_games
+from services.ps_store import GameInfo, RegionPrice, best_ps_id, get_game_info, search_games
 from services.region import get_user_regions
+from services.subscription import is_subscribed
 from services.user import get_or_create_user
 
-# PS Store product ID prefixes by region group
-_COUNTRY_TO_PS_PREFIX: dict[str, str] = {
-    "us": "UP", "ca": "UP", "mx": "UP", "br": "UP", "ar": "UP", "cl": "UP", "co": "UP",
-    "jp": "JP",
-    "kr": "KP",
-}
-
-
-def _best_ps_id(region_code: str, ps_ids: dict[str, str]) -> str | None:
-    country = region_code.split("-")[-1].lower()
-    preferred = _COUNTRY_TO_PS_PREFIX.get(country, "EP")
-    return next((pid for pid in ps_ids.values() if pid.startswith(preferred)), None)
-
-
 _MAX_SEARCH_RESULTS = 15
 
 router = Router()
@@ -57,10 +44,8 @@ async def _do_search(message: Message, state: FSMContext, session: AsyncSession,
 
     for region, region_games in zip(user_regions, results):
         for game, price in region_games:
-            key = normalize_title(game.title)
-            # Don't overwrite a paid price with a free/unavailable one
-            if price.price is not None or region.code not in by_title.get(key, {}):
-                by_title.setdefault(key, {})[region.code] = price
+            key = game.normalized_title
+            by_title.setdefault(key, {})[region.code] = price
             # Prefer ASCII title so localized prefixes ("Набір", "세트" etc.) don't win
             if key not in rep_game or game.title.isascii():
                 rep_game[key] = game
@@ -78,7 +63,7 @@ async def _do_search(message: Message, state: FSMContext, session: AsyncSession,
             continue
         for region in user_regions:
             if region.code not in found:
-                best = _best_ps_id(region.code, ps_ids_by_title[title_key])
+                best = best_ps_id(region.code, ps_ids_by_title[title_key])
                 if best:
                     fallback_tasks.append((title_key, region, best))
 
@@ -90,11 +75,7 @@ async def _do_search(message: Message, state: FSMContext, session: AsyncSession,
         for (title_key, region, _), result in zip(fallback_tasks, fallback_results):
             if result is not None:
                 _, region_price = result
-                if region_price is not None:
-                    by_title[title_key][region.code] = region_price
-
-    # Exclude games with no purchasable price in any of the user's regions (free games, demos, removed titles).
-    all_keys = [k for k in all_keys if any(rp.price is not None for rp in by_title.get(k, {}).values())]
+                by_title[title_key][region.code] = region_price
 
     all_games = [rep_game[k] for k in all_keys]
     games = all_games[:_MAX_SEARCH_RESULTS]
@@ -148,7 +129,7 @@ async def on_search_query(
 
 
 @router.callback_query(F.data.startswith("game_select:"))
-async def on_game_select(callback: CallbackQuery, state: FSMContext) -> None:
+async def on_game_select(callback: CallbackQuery, state: FSMContext, session: AsyncSession) -> None:
     await callback.answer()
 
     data = await state.get_data()
@@ -187,8 +168,10 @@ async def on_game_select(callback: CallbackQuery, state: FSMContext) -> None:
         rates,
         footer="Want to track prices in more regions?\nAdd a new one: /add_region",
     )
+    subscribed = await is_subscribed(session, callback.from_user.id, game.normalized_title)
+    keyboard = game_card_keyboard(index, is_subscribed=subscribed)
 
     if game.cover_url:
-        await callback.message.answer_photo(photo=game.cover_url, caption=caption)
+        await callback.message.answer_photo(photo=game.cover_url, caption=caption, reply_markup=keyboard)
     else:
-        await callback.message.answer(caption)
+        await callback.message.answer(caption, reply_markup=keyboard)

bot/handlers/subscriptions.py

@@ -1,14 +1,72 @@
-from aiogram import Router
+from aiogram import F, Router
 from aiogram.filters import Command
-from aiogram.types import Message
+from aiogram.fsm.context import FSMContext
+from aiogram.types import CallbackQuery, Message
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from bot.states.subscription import SearchForm
+from services.ps_store import GameInfo, RegionPrice
+from services.subscription import subscribe_to_game, unsubscribe_from_game
+from services.user import get_or_create_user
+
 router = Router()
 
 
+@router.callback_query(SearchForm.showing_results, F.data.startswith("subscribe:"))
+async def on_subscribe(callback: CallbackQuery, state: FSMContext, session: AsyncSession) -> None:
+    await callback.answer()
+
+    data = await state.get_data()
+    entries = data.get("entries", [])
+
+    index = int(callback.data.split(":", 1)[1])
+    if index >= len(entries):
+        await callback.message.answer("Game not found. Please search again.")
+        return
+
+    entry = entries[index]
+    game_info = GameInfo.from_dict(entry["game"])
+    prices = {region: RegionPrice.from_dict(v) for region, v in entry["prices"].items()}
+
+    user = await get_or_create_user(session, callback.from_user.id, callback.from_user.username)
+
+    created = await subscribe_to_game(session, user, game_info, prices)
+
+    if created:
+        await callback.message.answer(
+            f"🔔 Subscribed to <b>{game_info.title}</b>.\n"
+            "You'll be notified when the price drops."
+        )
+    else:
+        await callback.message.answer(
+            f"You're already subscribed to <b>{game_info.title}</b> 🔔"
+        )
+
+
+@router.callback_query(SearchForm.showing_results, F.data.startswith("unsubscribe:"))
+async def on_unsubscribe(callback: CallbackQuery, state: FSMContext, session: AsyncSession) -> None:
+    await callback.answer()
+
+    data = await state.get_data()
+    entries = data.get("entries", [])
+
+    index = int(callback.data.split(":", 1)[1])
+    if index >= len(entries):
+        await callback.message.answer("Game not found. Please search again.")
+        return
+
+    game_info = GameInfo.from_dict(entries[index]["game"])
+    removed = await unsubscribe_from_game(session, callback.from_user.id, game_info.normalized_title)
+
+    if removed:
+        await callback.message.answer(f"🔕 Unsubscribed from <b>{game_info.title}</b>.")
+    else:
+        await callback.message.answer(f"You're not subscribed to <b>{game_info.title}</b>.")
+
+
 @router.message(Command("subscribe"))
 async def cmd_subscribe(message: Message, session: AsyncSession) -> None:
-    await message.answer("Enter the game title to search:")
+    await message.answer("Search for a game first with /search, then use the Subscribe button on its card.")
 
 
 @router.message(Command("my"))

bot/keyboards/inline.py

@@ -46,6 +46,15 @@ def search_results_keyboard(games: list[GameInfo]) -> InlineKeyboardMarkup:
     return builder.as_markup()
 
 
+def game_card_keyboard(game_index: int, is_subscribed: bool = False) -> InlineKeyboardMarkup:
+    builder = InlineKeyboardBuilder()
+    if is_subscribed:
+        builder.button(text="🔕 Unsubscribe", callback_data=f"unsubscribe:{game_index}")
+    else:
+        builder.button(text="🔔 Subscribe", callback_data=f"subscribe:{game_index}")
+    return builder.as_markup()
+
+
 def cancel_keyboard() -> InlineKeyboardMarkup:
     builder = InlineKeyboardBuilder()
     builder.button(text="Cancel", callback_data="cancel")

db/models/game.py

@@ -1,5 +1,7 @@
 
-from sqlalchemy import Index, String, Text
+from datetime import datetime
+
+from sqlalchemy import DateTime, Index, String, Text, func
 from sqlalchemy.dialects.postgresql import ARRAY
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -16,6 +18,7 @@ class Game(Base):
     cover_url: Mapped[str | None] = mapped_column(Text)
     game_type: Mapped[str | None] = mapped_column(String(64))
     platforms: Mapped[list[str] | None] = mapped_column(ARRAY(String))
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
 
     subscriptions: Mapped[list["Subscription"]] = relationship(back_populates="game")
     game_regions: Mapped[list["GameRegion"]] = relationship(back_populates="game")

db/models/game_region.py

@@ -1,7 +1,7 @@
 
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, Numeric, String, Text, UniqueConstraint
+from sqlalchemy import DateTime, ForeignKey, Numeric, String, Text, UniqueConstraint, func
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from db.base import Base
@@ -21,6 +21,7 @@ class GameRegion(Base):
     discount_text: Mapped[str | None] = mapped_column(Text)
     discount_end: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
     last_checked: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
 
     game: Mapped["Game"] = relationship(back_populates="game_regions")
     region: Mapped["Region"] = relationship(back_populates="game_regions")

db/models/region.py

@@ -1,5 +1,7 @@
 
-from sqlalchemy import String
+from datetime import datetime
+
+from sqlalchemy import DateTime, String, func
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from db.base import Base
@@ -12,6 +14,7 @@ class Region(Base):
     code: Mapped[str] = mapped_column(String(16), unique=True, nullable=False)
     name: Mapped[str] = mapped_column(String(128), nullable=False)
     currency: Mapped[str | None] = mapped_column(String(8), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
 
     game_regions: Mapped[list["GameRegion"]] = relationship(back_populates="region")
     users: Mapped[list["User"]] = relationship(

db/models/user_region.py

@@ -1,4 +1,6 @@
-from sqlalchemy import ForeignKey
+from datetime import datetime
+
+from sqlalchemy import DateTime, ForeignKey, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from db.base import Base
@@ -9,3 +11,4 @@ class UserRegion(Base):
 
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), primary_key=True)
     region_id: Mapped[int] = mapped_column(ForeignKey("regions.id"), primary_key=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())

migrations/versions/0004_add_created_at.py

@@ -0,0 +1,28 @@
+"""add created_at to games, game_regions, regions, user_regions
+
+Revision ID: 0004
+Revises: 0003
+Create Date: 2026-05-17
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+revision = "0004"
+down_revision = "0003"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("games", sa.Column("created_at", sa.DateTime(), server_default=sa.func.now(), nullable=False))
+    op.add_column("game_regions", sa.Column("created_at", sa.DateTime(), server_default=sa.func.now(), nullable=False))
+    op.add_column("regions", sa.Column("created_at", sa.DateTime(), server_default=sa.func.now(), nullable=False))
+    op.add_column("user_regions", sa.Column("created_at", sa.DateTime(), server_default=sa.func.now(), nullable=False))
+
+
+def downgrade() -> None:
+    op.drop_column("user_regions", "created_at")
+    op.drop_column("regions", "created_at")
+    op.drop_column("game_regions", "created_at")
+    op.drop_column("games", "created_at")