From 3246350319c3efe0e0d4b74ca3b484fb5e5d9ffc Mon Sep 17 00:00:00 2001
From: IK <ilia.klimentiev@gmail.com>
Date: Mon, 21 Sep 2026 20:11:10 +0700
Subject: [PATCH] fix: clamp stale pair pagination

---
 apps/web/src/pages/waterbodies/[slug]/[fish].astro | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/pages/waterbodies/[slug]/[fish].astro b/apps/web/src/pages/waterbodies/[slug]/[fish].astro
index 6a0c1f0..d4ed89b 100644
--- a/apps/web/src/pages/waterbodies/[slug]/[fish].astro
+++ b/apps/web/src/pages/waterbodies/[slug]/[fish].astro
@@ -12,13 +12,20 @@ const requestedHours = Astro.url.searchParams.get("hours") ?? "72";
 const hours = ["24", "72", "168"].includes(requestedHours) ? requestedHours : "72";
 const periodLabel = { "24": "24 часа", "72": "72 часа", "168": "7 дней" }[hours];
 const requestedOffset = Number(Astro.url.searchParams.get("offset") ?? 0);
-const offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
+let offset = Number.isInteger(requestedOffset) && requestedOffset >= 0 ? requestedOffset : 0;
 const activityLimit = 24;
 let water: DictionaryItem | undefined, fish: DictionaryItem | undefined, items: Activity[] = [], totalItems = 0, unavailable = false;
 try {
   const [waters, fishes] = await Promise.all([api<DictionaryItem[]>("/api/v1/waterbodies?limit=500"), api<DictionaryItem[]>("/api/v1/fishes?limit=500")]);
   water = waters.find(item => item.slug === slug); fish = fishes.find(item => item.slug === fishSlug);
-  if (water && fish) { const paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`); items = paginated.items; totalItems = paginated.total; }
+  if (water && fish) {
+    let paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
+    if (paginated.total > 0 && offset >= paginated.total) {
+      offset = Math.floor((paginated.total - 1) / activityLimit) * activityLimit;
+      paginated = await api<PaginatedActivity>(`/api/v1/activity?hours=${hours}&waterbody=${encodeURIComponent(water.slug)}&fish=${encodeURIComponent(fish.slug)}&limit=${activityLimit}&offset=${offset}`);
+    }
+    items = paginated.items; totalItems = paginated.total;
+  }
 } catch { unavailable = true; }
 if (unavailable) {
   Astro.response.status = 503;