jcreek/LivingDexTracker
1
0
Fork 0
mirror of https://github.com/jcreek/LivingDexTracker.git synced 2026-07-12 18:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(*): Clean up migration artifacts and optimize data repository queries

Browse Source
This commit is contained in:
Josh Creek
2025-07-26 21:50:54 +01:00
parent fa38fa69ca
commit 389f73d164
16 changed files with 95 additions and 37333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/repositories/CombinedDataRepository.ts
+54 -29
View File
@@ -54,10 +54,7 @@ class CombinedDataRepository {
region: string = '',
game: string = ''
): Promise<CombinedData[]> {
let query = this.supabase.from('pokedex_entries').select(`
*,
catch_records(*)
`);
let query = this.supabase.from('pokedex_entries').select('*');
// Apply filters
if (!enableForms) {
@@ -85,18 +82,36 @@ class CombinedDataRepository {
.order('boxPlacementColumn', { ascending: true });
}
const { data, error } = await query;
const { data: entries, error: entriesError } = await query;
if (error) {
console.error('Error finding combined data:', error);
if (entriesError) {
console.error('Error finding combined data:', entriesError);
return [];
}
// Transform the data and filter catch records by user
return (data || []).map((entry) => {
const userCatchRecord = Array.isArray(entry.catch_records)
? entry.catch_records.find((record: CatchRecordDB) => record.userId === userId)
: null;
if (!entries || entries.length === 0) {
return [];
}
// Get catch records for all entries
let catchRecords: CatchRecordDB[] = [];
if (userId) {
const entryIds = entries.map((entry) => entry.id);
const { data: records, error: recordsError } = await this.supabase
.from('catch_records')
.select('*')
.eq('userId', userId)
.in('pokedexEntryId', entryIds);
if (!recordsError && records) {
catchRecords = records;
}
}
// Combine the data exactly like master branch
return entries.map((entry) => {
const userCatchRecord =
catchRecords.find((record) => record.pokedexEntryId === entry.id) || null;
const transformedEntry = this.transformPokedexEntry(entry);
const transformedCatchRecord = userCatchRecord
@@ -121,15 +136,7 @@ class CombinedDataRepository {
const from = (page - 1) * limit;
const to = from + limit - 1;
let query = this.supabase
.from('pokedex_entries')
.select(
`
*,
catch_records(*)
`
)
.range(from, to);
let query = this.supabase.from('pokedex_entries').select('*').range(from, to);
// Apply filters
if (!enableForms) {
@@ -157,18 +164,36 @@ class CombinedDataRepository {
.order('boxPlacementColumn', { ascending: true });
}
const { data, error } = await query;
const { data: entries, error: entriesError } = await query;
if (error) {
console.error('Error finding paginated combined data:', error);
if (entriesError) {
console.error('Error finding paginated combined data:', entriesError);
return [];
}
// Transform the data and filter catch records by user
return (data || []).map((entry) => {
const userCatchRecord = Array.isArray(entry.catch_records)
? entry.catch_records.find((record: CatchRecordDB) => record.userId === userId)
: null;
if (!entries || entries.length === 0) {
return [];
}
// Get catch records for these entries
let catchRecords: CatchRecordDB[] = [];
if (userId) {
const entryIds = entries.map((entry) => entry.id);
const { data: records, error: recordsError } = await this.supabase
.from('catch_records')
.select('*')
.eq('userId', userId)
.in('pokedexEntryId', entryIds);
if (!recordsError && records) {
catchRecords = records;
}
}
// Combine the data exactly like master branch
return entries.map((entry) => {
const userCatchRecord =
catchRecords.find((record) => record.pokedexEntryId === entry.id) || null;
const transformedEntry = this.transformPokedexEntry(entry);
const transformedCatchRecord = userCatchRecord