From 19e4d7b7275702c8451f7eb5420a3ce1ae229bec Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Tue, 16 Jun 2026 15:46:12 +0100
Subject: [PATCH] refactor(#91): Address PR comments

---
 src/lib/repositories/CombinedDataRepository.ts              | 2 +-
 .../migrations/20260616000002_fix_form_game_coverage.sql    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/repositories/CombinedDataRepository.ts b/src/lib/repositories/CombinedDataRepository.ts
index 361944f..51d8014 100644
--- a/src/lib/repositories/CombinedDataRepository.ts
+++ b/src/lib/repositories/CombinedDataRepository.ts
@@ -131,7 +131,7 @@ class CombinedDataRepository {
 				query = query.eq('regionToCatchIn', region);
 			}
 
-			const { data, error } = await query.range(start, end);
+			const { data, error } = await query.order('id', { ascending: true }).range(start, end);
 
 			if (error) {
 				console.error('Error fetching forms for game:', error);
diff --git a/supabase/migrations/20260616000002_fix_form_game_coverage.sql b/supabase/migrations/20260616000002_fix_form_game_coverage.sql
index 3d86a87..45575e8 100644
--- a/supabase/migrations/20260616000002_fix_form_game_coverage.sql
+++ b/supabase/migrations/20260616000002_fix_form_game_coverage.sql
@@ -75,11 +75,11 @@ CROSS JOIN games g
 WHERE p.pokemon = 'Rotom'
   AND p.form IN ('Fan', 'Fridge', 'Lightbulb', 'Mower', 'Oven', 'Washer')
   AND g."displayName" IN (
-    'Heart Gold', 'Soul Silver',
+    'Platinum', 'Heart Gold', 'Soul Silver',
     'Black', 'White', 'Black 2', 'White 2',
     'X', 'Y', 'Omega Ruby', 'Alpha Sapphire',
     'Sun', 'Moon', 'Ultra Sun', 'Ultra Moon',
-    'Sword', 'Shield',
+    'Sword', 'Shield', 'Brilliant Diamond', 'Shining Pearl',
     'Scarlet', 'Violet'
   )
 ON CONFLICT DO NOTHING;
@@ -150,7 +150,7 @@ SELECT p.id, g.id
 FROM pokemon p
 CROSS JOIN games g
 WHERE p.pokemon = 'Shaymin' AND p.form = 'Sky Form'
-  AND g."displayName" IN ('Heart Gold', 'Soul Silver', 'X', 'Y', 'Scarlet', 'Violet')
+  AND g."displayName" IN ('Platinum', 'Heart Gold', 'Soul Silver', 'X', 'Y', 'Scarlet', 'Violet')
 ON CONFLICT DO NOTHING;
 
 -- Hoopa Confined: distributed via Mystery Gift for all Gen 6 games (X/Y + OR/AS).