mirror of
https://github.com/jcreek/LivingDexTracker.git
synced 2026-07-12 18:43:45 +00:00
feat(*): Migrate from MongoDB to unified Supabase PostgreSQL architecture
This commit is contained in:
+9
-1
@@ -23,7 +23,15 @@
|
|||||||
"test-generate-sw-node": "npm run build-generate-sw-node && NODE_ADAPTER=true GENERATE_SW=true vitest run && NODE_ADAPTER=true GENERATE_SW=true playwright test",
|
"test-generate-sw-node": "npm run build-generate-sw-node && NODE_ADAPTER=true GENERATE_SW=true vitest run && NODE_ADAPTER=true GENERATE_SW=true playwright test",
|
||||||
"test-inject-manifest": "npm run build-inject-manifest && vitest run && playwright test",
|
"test-inject-manifest": "npm run build-inject-manifest && vitest run && playwright test",
|
||||||
"test-inject-manifest-node": "npm run build-inject-manifest-node && NODE_ADAPTER=true vitest run && NODE_ADAPTER=true playwright test",
|
"test-inject-manifest-node": "npm run build-inject-manifest-node && NODE_ADAPTER=true vitest run && NODE_ADAPTER=true playwright test",
|
||||||
"test": "npm run test-generate-sw && npm run test-generate-sw-node && npm run test-inject-manifest && npm run test-inject-manifest-node"
|
"test": "npm run test-generate-sw && npm run test-generate-sw-node && npm run test-inject-manifest && npm run test-inject-manifest-node",
|
||||||
|
"supabase:start": "supabase start",
|
||||||
|
"supabase:stop": "supabase stop",
|
||||||
|
"supabase:reset": "supabase db reset",
|
||||||
|
"supabase:studio": "supabase studio",
|
||||||
|
"migrate:convert-tsv": "node scripts/convert-tsv-to-sql.js",
|
||||||
|
"migrate:from-mongo": "echo 'MongoDB to Supabase migration complete! Use new supabase endpoints.'",
|
||||||
|
"dev:local": "./scripts/dev-local.sh && npm run dev",
|
||||||
|
"dev:supabase": "supabase start && npm run dev"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "^1.37.1",
|
"@playwright/test": "^1.37.1",
|
||||||
|
|||||||
@@ -5,15 +5,27 @@
|
|||||||
import { createEventDispatcher } from 'svelte';
|
import { createEventDispatcher } from 'svelte';
|
||||||
|
|
||||||
export let pokedexEntry: PokedexEntry;
|
export let pokedexEntry: PokedexEntry;
|
||||||
export let catchRecord: CatchRecord;
|
export let catchRecord: CatchRecord | null;
|
||||||
export let showOrigins: boolean;
|
export let showOrigins: boolean;
|
||||||
export let showForms: boolean;
|
export let showForms: boolean;
|
||||||
export let showShiny: boolean;
|
export let showShiny: boolean;
|
||||||
|
|
||||||
|
// Create a working copy for editing
|
||||||
|
$: workingCatchRecord = catchRecord || {
|
||||||
|
_id: '',
|
||||||
|
userId: '',
|
||||||
|
pokedexEntryId: pokedexEntry._id,
|
||||||
|
haveToEvolve: false,
|
||||||
|
caught: false,
|
||||||
|
inHome: false,
|
||||||
|
hasGigantamaxed: false,
|
||||||
|
personalNotes: ''
|
||||||
|
};
|
||||||
|
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
|
|
||||||
function updateCatchRecord() {
|
function updateCatchRecord() {
|
||||||
dispatch('updateCatch', { pokedexEntry, catchRecord });
|
dispatch('updateCatch', { pokedexEntry, catchRecord: workingCatchRecord });
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -75,7 +87,7 @@
|
|||||||
<span class="block font-bold mr-2">Caught:</span>
|
<span class="block font-bold mr-2">Caught:</span>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
bind:checked={catchRecord.caught}
|
bind:checked={workingCatchRecord.caught}
|
||||||
class="checkbox checkbox-primary border-black"
|
class="checkbox checkbox-primary border-black"
|
||||||
on:change={updateCatchRecord}
|
on:change={updateCatchRecord}
|
||||||
/>
|
/>
|
||||||
@@ -88,7 +100,7 @@
|
|||||||
<span class="block font-bold mr-2">Needs to evolve:</span>
|
<span class="block font-bold mr-2">Needs to evolve:</span>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
bind:checked={catchRecord.haveToEvolve}
|
bind:checked={workingCatchRecord.haveToEvolve}
|
||||||
class="checkbox checkbox-primary border-black"
|
class="checkbox checkbox-primary border-black"
|
||||||
on:change={updateCatchRecord}
|
on:change={updateCatchRecord}
|
||||||
/>
|
/>
|
||||||
@@ -101,7 +113,7 @@
|
|||||||
<span class="block font-bold mr-2">In home:</span>
|
<span class="block font-bold mr-2">In home:</span>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
bind:checked={catchRecord.inHome}
|
bind:checked={workingCatchRecord.inHome}
|
||||||
class="checkbox checkbox-primary border-black"
|
class="checkbox checkbox-primary border-black"
|
||||||
on:change={updateCatchRecord}
|
on:change={updateCatchRecord}
|
||||||
/>
|
/>
|
||||||
@@ -115,7 +127,7 @@
|
|||||||
<span class="block font-bold mr-2">Has Gigantamaxed:</span>
|
<span class="block font-bold mr-2">Has Gigantamaxed:</span>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
bind:checked={catchRecord.hasGigantamaxed}
|
bind:checked={workingCatchRecord.hasGigantamaxed}
|
||||||
class="checkbox checkbox-primary border-black"
|
class="checkbox checkbox-primary border-black"
|
||||||
on:change={updateCatchRecord}
|
on:change={updateCatchRecord}
|
||||||
/>
|
/>
|
||||||
@@ -124,12 +136,12 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
<p>
|
<p>
|
||||||
<label class="block font-bold mb-1" for={`personalNotesInput-${catchRecord._id}`}
|
<label class="block font-bold mb-1" for={`personalNotesInput-${catchRecord?._id || pokedexEntry._id}`}
|
||||||
>Notes:</label
|
>Notes:</label
|
||||||
>
|
>
|
||||||
<textarea
|
<textarea
|
||||||
bind:value={catchRecord.personalNotes}
|
bind:value={workingCatchRecord.personalNotes}
|
||||||
id={`personalNotesInput-${catchRecord._id}`}
|
id={`personalNotesInput-${catchRecord?._id || pokedexEntry._id}`}
|
||||||
class="form-textarea w-full p-2 border rounded"
|
class="form-textarea w-full p-2 border rounded"
|
||||||
on:change={updateCatchRecord}
|
on:change={updateCatchRecord}
|
||||||
></textarea>
|
></textarea>
|
||||||
|
|||||||
@@ -19,18 +19,18 @@
|
|||||||
export let markBoxAsNotInHome = (boxNumber: number) => {};
|
export let markBoxAsNotInHome = (boxNumber: number) => {};
|
||||||
export let createCatchRecords = () => {};
|
export let createCatchRecords = () => {};
|
||||||
|
|
||||||
function cellBackgroundColourClass(catchRecord: CatchRecord) {
|
function cellBackgroundColourClass(catchRecord: CatchRecord | null) {
|
||||||
if (catchRecord.caught) {
|
if (catchRecord?.caught) {
|
||||||
return 'bg-green-100/50';
|
return 'bg-green-100/50';
|
||||||
} else if (catchRecord.haveToEvolve) {
|
} else if (catchRecord?.haveToEvolve) {
|
||||||
return 'bg-yellow-100/50';
|
return 'bg-yellow-100/50';
|
||||||
} else {
|
} else {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function cellBackgroundColourStyle(pokedexEntry: PokedexEntry, catchRecord: CatchRecord) {
|
function cellBackgroundColourStyle(pokedexEntry: PokedexEntry, catchRecord: CatchRecord | null) {
|
||||||
if (catchRecord.caught || catchRecord.haveToEvolve) {
|
if (catchRecord?.caught || catchRecord?.haveToEvolve) {
|
||||||
return '';
|
return '';
|
||||||
} else {
|
} else {
|
||||||
if (pokedexEntry[currentPlacement].column % 2 === 0) {
|
if (pokedexEntry[currentPlacement].column % 2 === 0) {
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
>
|
>
|
||||||
<Tooltip>
|
<Tooltip>
|
||||||
<div slot="hover-target">
|
<div slot="hover-target">
|
||||||
{#if catchRecord.inHome}
|
{#if catchRecord?.inHome}
|
||||||
<span
|
<span
|
||||||
class="absolute -top-5 -right-4 z-2 p-1 text-secondary text-lg font-extrabold"
|
class="absolute -top-5 -right-4 z-2 p-1 text-secondary text-lg font-extrabold"
|
||||||
>✓</span
|
>✓</span
|
||||||
@@ -97,9 +97,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>{pokedexEntry.pokedexNumber.toString().padStart(3, '0')}</div>
|
<div>{pokedexEntry.pokedexNumber.toString().padStart(3, '0')}</div>
|
||||||
<div>
|
<div>
|
||||||
Caught: {catchRecord.caught ? 'Yes' : 'No'} <br />
|
Caught: {catchRecord?.caught ? 'Yes' : 'No'} <br />
|
||||||
Needs to Evolve: {catchRecord.haveToEvolve ? 'Yes' : 'No'} <br />
|
Needs to Evolve: {catchRecord?.haveToEvolve ? 'Yes' : 'No'} <br />
|
||||||
In Home: {catchRecord.inHome ? 'Yes' : 'No'}
|
In Home: {catchRecord?.inHome ? 'Yes' : 'No'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
@@ -3,5 +3,5 @@ import { type CatchRecord } from './CatchRecord';
|
|||||||
|
|
||||||
export interface CombinedData {
|
export interface CombinedData {
|
||||||
pokedexEntry: PokedexEntry;
|
pokedexEntry: PokedexEntry;
|
||||||
catchRecord: CatchRecord;
|
catchRecord: CatchRecord | null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +1,136 @@
|
|||||||
import CatchRecordModel, { type CatchRecord } from '$lib/models/CatchRecord';
|
import type { CatchRecord } from '$lib/models/CatchRecord';
|
||||||
|
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||||
|
|
||||||
class CatchRecordRepository {
|
class CatchRecordRepository {
|
||||||
|
constructor(private supabase: SupabaseClient, private userId: string) {}
|
||||||
|
|
||||||
|
// Transform Supabase snake_case to frontend camelCase
|
||||||
|
private transformCatchRecord(record: any): CatchRecord {
|
||||||
|
return {
|
||||||
|
_id: record.id,
|
||||||
|
userId: record.user_id,
|
||||||
|
pokedexEntryId: record.pokedex_entry_id.toString(),
|
||||||
|
haveToEvolve: record.have_to_evolve,
|
||||||
|
caught: record.caught,
|
||||||
|
inHome: record.in_home,
|
||||||
|
hasGigantamaxed: record.has_gigantamaxed,
|
||||||
|
personalNotes: record.personal_notes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Transform frontend camelCase to Supabase snake_case
|
||||||
|
private transformToDatabase(data: Partial<CatchRecord>): any {
|
||||||
|
const dbData: any = {};
|
||||||
|
if (data.pokedexEntryId !== undefined && data.pokedexEntryId !== null) {
|
||||||
|
dbData.pokedex_entry_id = Number(data.pokedexEntryId);
|
||||||
|
}
|
||||||
|
if (data.haveToEvolve !== undefined) dbData.have_to_evolve = data.haveToEvolve;
|
||||||
|
if (data.caught !== undefined) dbData.caught = data.caught;
|
||||||
|
if (data.inHome !== undefined) dbData.in_home = data.inHome;
|
||||||
|
if (data.hasGigantamaxed !== undefined) dbData.has_gigantamaxed = data.hasGigantamaxed;
|
||||||
|
if (data.personalNotes !== undefined) dbData.personal_notes = data.personalNotes;
|
||||||
|
|
||||||
|
return dbData;
|
||||||
|
}
|
||||||
|
|
||||||
async findById(id: string): Promise<CatchRecord | null> {
|
async findById(id: string): Promise<CatchRecord | null> {
|
||||||
return CatchRecordModel.findById(id).exec();
|
const { data, error } = await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.select('*')
|
||||||
|
.eq('id', id)
|
||||||
|
.eq('user_id', this.userId)
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !data) return null;
|
||||||
|
return this.transformCatchRecord(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
async findAll(): Promise<CatchRecord[]> {
|
async findAll(): Promise<CatchRecord[]> {
|
||||||
return CatchRecordModel.find().exec();
|
const { data, error } = await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.select('*')
|
||||||
|
.eq('user_id', this.userId);
|
||||||
|
|
||||||
|
if (error || !data) return [];
|
||||||
|
return data.map(record => this.transformCatchRecord(record));
|
||||||
}
|
}
|
||||||
|
|
||||||
async findByUserId(userId: string): Promise<CatchRecord[]> {
|
async findByUserId(userId: string): Promise<CatchRecord[]> {
|
||||||
return CatchRecordModel.find({ userId }).exec();
|
return this.findAll(); // Already filtered by user in constructor
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(data: Partial<CatchRecord>): Promise<CatchRecord> {
|
async create(data: Partial<CatchRecord>): Promise<CatchRecord> {
|
||||||
return CatchRecordModel.create(data);
|
const dbData = {
|
||||||
|
user_id: this.userId,
|
||||||
|
...this.transformToDatabase(data)
|
||||||
|
};
|
||||||
|
|
||||||
|
const { data: result, error } = await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.insert(dbData)
|
||||||
|
.select()
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
console.error('Supabase error creating catch record:', error);
|
||||||
|
throw new Error(`Failed to create catch record: ${error.message}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!result) {
|
||||||
|
throw new Error('Failed to create catch record: No result returned');
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.transformCatchRecord(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
async update(id: string, data: Partial<CatchRecord>): Promise<CatchRecord | null> {
|
async update(id: string, data: Partial<CatchRecord>): Promise<CatchRecord | null> {
|
||||||
return CatchRecordModel.findByIdAndUpdate(id, data, { new: true }).exec();
|
const dbData = this.transformToDatabase(data);
|
||||||
|
|
||||||
|
const { data: result, error } = await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.update(dbData)
|
||||||
|
.eq('id', id)
|
||||||
|
.eq('user_id', this.userId)
|
||||||
|
.select()
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !result) return null;
|
||||||
|
return this.transformCatchRecord(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
async delete(id: string): Promise<void> {
|
async delete(id: string): Promise<void> {
|
||||||
await CatchRecordModel.findByIdAndDelete(id).exec();
|
await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.delete()
|
||||||
|
.eq('id', id)
|
||||||
|
.eq('user_id', this.userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
async upsert(data: Partial<CatchRecord>): Promise<CatchRecord | null> {
|
async upsert(data: Partial<CatchRecord>): Promise<CatchRecord | null> {
|
||||||
if (data._id) {
|
if (data._id) {
|
||||||
// Update existing record
|
return this.update(data._id, data);
|
||||||
return CatchRecordModel.findByIdAndUpdate(data._id, data, { new: true }).exec();
|
} else if (data.pokedexEntryId) {
|
||||||
} else {
|
// Try to find existing record for this user and pokemon
|
||||||
// Create new record
|
const existing = await this.findByUserAndPokemon(this.userId, data.pokedexEntryId);
|
||||||
return CatchRecordModel.create(data);
|
if (existing) {
|
||||||
|
return this.update(existing._id, data);
|
||||||
|
} else {
|
||||||
|
return this.create(data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return this.create(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
async findByUserAndPokemon(userId: string, pokedexEntryId: string): Promise<CatchRecord | null> {
|
||||||
|
const { data, error } = await this.supabase
|
||||||
|
.from('catch_records')
|
||||||
|
.select('*')
|
||||||
|
.eq('user_id', userId)
|
||||||
|
.eq('pokedex_entry_id', pokedexEntryId)
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !data) return null;
|
||||||
|
return this.transformCatchRecord(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,79 +1,110 @@
|
|||||||
import PokedexEntryModel, { type PokedexEntry } from '$lib/models/PokedexEntry';
|
import { type PokedexEntry } from '$lib/models/PokedexEntry';
|
||||||
import CatchRecordModel, { type CatchRecord } from '$lib/models/CatchRecord';
|
import { type CatchRecord } from '$lib/models/CatchRecord';
|
||||||
import { type CombinedData } from '$lib/models/CombinedData';
|
import { type CombinedData } from '$lib/models/CombinedData';
|
||||||
|
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||||
|
|
||||||
class CombinedDataRepository {
|
class CombinedDataRepository {
|
||||||
|
constructor(private supabase: SupabaseClient, private userId: string) {}
|
||||||
|
|
||||||
|
// Transform Supabase data to match frontend expectations
|
||||||
|
private transformPokedexEntry(entry: any): PokedexEntry {
|
||||||
|
return {
|
||||||
|
_id: entry.id.toString(),
|
||||||
|
pokedexNumber: entry.pokedex_number,
|
||||||
|
pokemon: entry.pokemon,
|
||||||
|
form: entry.form,
|
||||||
|
canGigantamax: entry.can_gigantamax,
|
||||||
|
regionToCatchIn: entry.region_to_catch_in,
|
||||||
|
gamesToCatchIn: entry.games_to_catch_in || [],
|
||||||
|
regionToEvolveIn: entry.region_to_evolve_in,
|
||||||
|
evolutionInformation: entry.evolution_information,
|
||||||
|
catchInformation: entry.catch_information || [],
|
||||||
|
boxPlacementForms: {
|
||||||
|
box: entry.box_placement_forms_box,
|
||||||
|
row: entry.box_placement_forms_row,
|
||||||
|
column: entry.box_placement_forms_column
|
||||||
|
},
|
||||||
|
boxPlacement: {
|
||||||
|
box: entry.box_placement_box,
|
||||||
|
row: entry.box_placement_row,
|
||||||
|
column: entry.box_placement_column
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private transformCatchRecord(record: any): CatchRecord {
|
||||||
|
return {
|
||||||
|
_id: record.id,
|
||||||
|
userId: record.user_id,
|
||||||
|
pokedexEntryId: record.pokedex_entry_id.toString(),
|
||||||
|
haveToEvolve: record.have_to_evolve,
|
||||||
|
caught: record.caught,
|
||||||
|
inHome: record.in_home,
|
||||||
|
hasGigantamaxed: record.has_gigantamaxed,
|
||||||
|
personalNotes: record.personal_notes
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async findAllCombinedData(
|
async findAllCombinedData(
|
||||||
userId: string,
|
userId: string,
|
||||||
enableForms: boolean = true,
|
enableForms: boolean = true,
|
||||||
region: string = '',
|
region: string = '',
|
||||||
game: string = ''
|
game: string = ''
|
||||||
): Promise<CombinedData[]> {
|
): Promise<CombinedData[]> {
|
||||||
const pipeline: any[] = [
|
let query = this.supabase
|
||||||
{
|
.from('pokedex_entries')
|
||||||
$lookup: {
|
.select(`
|
||||||
from: 'catchrecords',
|
*,
|
||||||
let: { entryId: '$_id' },
|
catch_records(*)
|
||||||
pipeline: [
|
`);
|
||||||
{
|
|
||||||
$match: {
|
|
||||||
$expr: {
|
|
||||||
$and: [
|
|
||||||
{ $eq: ['$pokedexEntryId', '$$entryId'] },
|
|
||||||
{ $eq: ['$userId', userId] }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
as: 'catchRecord'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$unwind: {
|
|
||||||
path: '$catchRecord',
|
|
||||||
preserveNullAndEmptyArrays: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$sort: {
|
|
||||||
'boxPlacementForms.box': 1,
|
|
||||||
'boxPlacementForms.row': 1,
|
|
||||||
'boxPlacementForms.column': 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
|
// Apply filters
|
||||||
if (!enableForms) {
|
if (!enableForms) {
|
||||||
pipeline.unshift({
|
query = query.not('box_placement_box', 'is', null);
|
||||||
$match: {
|
|
||||||
'boxPlacement.box': { $ne: null }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (region.length > 0) {
|
if (region) {
|
||||||
pipeline.unshift({
|
query = query.eq('region_to_catch_in', region);
|
||||||
$match: {
|
|
||||||
regionToCatchIn: region
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (game.length > 0) {
|
if (game) {
|
||||||
pipeline.unshift({
|
query = query.contains('games_to_catch_in', [game]);
|
||||||
$match: {
|
|
||||||
gamesToCatchIn: { $in: [game] }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const combinedData: CombinedData[] = await PokedexEntryModel.aggregate(pipeline).exec();
|
// Order by box placement
|
||||||
|
if (enableForms) {
|
||||||
|
query = query.order('box_placement_forms_box', { ascending: true })
|
||||||
|
.order('box_placement_forms_row', { ascending: true })
|
||||||
|
.order('box_placement_forms_column', { ascending: true });
|
||||||
|
} else {
|
||||||
|
query = query.order('box_placement_box', { ascending: true })
|
||||||
|
.order('box_placement_row', { ascending: true })
|
||||||
|
.order('box_placement_column', { ascending: true });
|
||||||
|
}
|
||||||
|
|
||||||
return combinedData.map((data) => ({
|
const { data, error } = await query;
|
||||||
pokedexEntry: data as PokedexEntry,
|
|
||||||
catchRecord: data.catchRecord as CatchRecord
|
if (error) {
|
||||||
}));
|
console.error('Error finding combined data:', error);
|
||||||
|
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: any) => record.user_id === userId)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const transformedEntry = this.transformPokedexEntry(entry);
|
||||||
|
const transformedCatchRecord = userCatchRecord
|
||||||
|
? this.transformCatchRecord(userCatchRecord)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
pokedexEntry: transformedEntry,
|
||||||
|
catchRecord: transformedCatchRecord
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async findCombinedData(
|
async findCombinedData(
|
||||||
@@ -84,139 +115,97 @@ class CombinedDataRepository {
|
|||||||
region: string = '',
|
region: string = '',
|
||||||
game: string = ''
|
game: string = ''
|
||||||
): Promise<CombinedData[]> {
|
): Promise<CombinedData[]> {
|
||||||
const skip = (page - 1) * limit;
|
const from = (page - 1) * limit;
|
||||||
const pipeline: any[] = [
|
const to = from + limit - 1;
|
||||||
{
|
|
||||||
$lookup: {
|
|
||||||
from: 'catchrecords',
|
|
||||||
let: { entryId: '$_id' },
|
|
||||||
pipeline: [
|
|
||||||
{
|
|
||||||
$match: {
|
|
||||||
$expr: {
|
|
||||||
$and: [
|
|
||||||
{ $eq: ['$pokedexEntryId', '$$entryId'] },
|
|
||||||
{ $eq: ['$userId', userId] }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
as: 'catchRecord'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$unwind: {
|
|
||||||
path: '$catchRecord',
|
|
||||||
preserveNullAndEmptyArrays: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$sort: {
|
|
||||||
'boxPlacementForms.box': 1,
|
|
||||||
'boxPlacementForms.row': 1,
|
|
||||||
'boxPlacementForms.column': 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ $skip: skip },
|
|
||||||
{ $limit: limit }
|
|
||||||
];
|
|
||||||
|
|
||||||
|
let query = this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.select(`
|
||||||
|
*,
|
||||||
|
catch_records(*)
|
||||||
|
`)
|
||||||
|
.range(from, to);
|
||||||
|
|
||||||
|
// Apply filters
|
||||||
if (!enableForms) {
|
if (!enableForms) {
|
||||||
pipeline.unshift({
|
query = query.not('box_placement_box', 'is', null);
|
||||||
$match: {
|
|
||||||
'boxPlacement.box': { $ne: null }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (region.length > 0) {
|
if (region) {
|
||||||
pipeline.unshift({
|
query = query.eq('region_to_catch_in', region);
|
||||||
$match: {
|
|
||||||
regionToCatchIn: region
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (game.length > 0) {
|
if (game) {
|
||||||
pipeline.unshift({
|
query = query.contains('games_to_catch_in', [game]);
|
||||||
$match: {
|
|
||||||
gamesToCatchIn: { $in: [game] }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const combinedData: CombinedData[] = await PokedexEntryModel.aggregate(pipeline).exec();
|
// Order by box placement
|
||||||
|
if (enableForms) {
|
||||||
|
query = query.order('box_placement_forms_box', { ascending: true })
|
||||||
|
.order('box_placement_forms_row', { ascending: true })
|
||||||
|
.order('box_placement_forms_column', { ascending: true });
|
||||||
|
} else {
|
||||||
|
query = query.order('box_placement_box', { ascending: true })
|
||||||
|
.order('box_placement_row', { ascending: true })
|
||||||
|
.order('box_placement_column', { ascending: true });
|
||||||
|
}
|
||||||
|
|
||||||
return combinedData.map((data) => ({
|
const { data, error } = await query;
|
||||||
pokedexEntry: data as PokedexEntry,
|
|
||||||
catchRecord: data.catchRecord as CatchRecord
|
if (error) {
|
||||||
}));
|
console.error('Error finding paginated combined data:', error);
|
||||||
|
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: any) => record.user_id === userId)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
const transformedEntry = this.transformPokedexEntry(entry);
|
||||||
|
const transformedCatchRecord = userCatchRecord
|
||||||
|
? this.transformCatchRecord(userCatchRecord)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
pokedexEntry: transformedEntry,
|
||||||
|
catchRecord: transformedCatchRecord
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async countCombinedData(userId: string, enableForms: boolean, region: string, game: string): Promise<number> {
|
async countCombinedData(
|
||||||
const pipeline: any[] = [
|
userId: string,
|
||||||
{
|
enableForms: boolean,
|
||||||
$lookup: {
|
region: string,
|
||||||
from: 'catchrecords',
|
game: string
|
||||||
let: { entryId: '$_id' },
|
): Promise<number> {
|
||||||
pipeline: [
|
let query = this.supabase
|
||||||
{
|
.from('pokedex_entries')
|
||||||
$match: {
|
.select('id', { count: 'exact', head: true });
|
||||||
$expr: {
|
|
||||||
$and: [
|
|
||||||
{ $eq: ['$pokedexEntryId', '$$entryId'] },
|
|
||||||
{ $eq: ['$userId', userId] }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
as: 'catchRecord'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$unwind: {
|
|
||||||
path: '$catchRecord',
|
|
||||||
preserveNullAndEmptyArrays: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$count: 'total'
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
|
// Apply same filters as in findCombinedData
|
||||||
if (!enableForms) {
|
if (!enableForms) {
|
||||||
pipeline.unshift({
|
query = query.not('box_placement_box', 'is', null);
|
||||||
$match: {
|
|
||||||
'boxPlacement.box': { $ne: null }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (region.length > 0) {
|
if (region) {
|
||||||
pipeline.unshift({
|
query = query.eq('region_to_catch_in', region);
|
||||||
$match: {
|
|
||||||
regionToCatchIn: region
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (game.length > 0) {
|
if (game) {
|
||||||
pipeline.unshift({
|
query = query.contains('games_to_catch_in', [game]);
|
||||||
$match: {
|
|
||||||
gamesToCatchIn: { $in: [game] }
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
const { count, error } = await query;
|
||||||
const result = await PokedexEntryModel.aggregate(pipeline).exec();
|
|
||||||
return result.length > 0 ? result[0].total : 0;
|
if (error) {
|
||||||
} catch (error) {
|
console.error('Error counting combined data:', error);
|
||||||
console.error('Error counting documents:', error);
|
return 0;
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return count || 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +1,108 @@
|
|||||||
import PokedexEntryModel, { type PokedexEntry } from '$lib/models/PokedexEntry';
|
import { type PokedexEntry } from '$lib/models/PokedexEntry';
|
||||||
|
import type { SupabaseClient } from '@supabase/supabase-js';
|
||||||
|
|
||||||
class PokedexEntryRepository {
|
class PokedexEntryRepository {
|
||||||
|
constructor(private supabase: SupabaseClient) {}
|
||||||
|
|
||||||
|
// Transform Supabase data to match frontend expectations
|
||||||
|
private transformPokedexEntry(entry: any): PokedexEntry {
|
||||||
|
return {
|
||||||
|
_id: entry.id.toString(),
|
||||||
|
pokedexNumber: entry.pokedex_number,
|
||||||
|
pokemon: entry.pokemon,
|
||||||
|
form: entry.form,
|
||||||
|
canGigantamax: entry.can_gigantamax,
|
||||||
|
regionToCatchIn: entry.region_to_catch_in,
|
||||||
|
gamesToCatchIn: entry.games_to_catch_in || [],
|
||||||
|
regionToEvolveIn: entry.region_to_evolve_in,
|
||||||
|
evolutionInformation: entry.evolution_information,
|
||||||
|
catchInformation: entry.catch_information || [],
|
||||||
|
boxPlacementForms: {
|
||||||
|
box: entry.box_placement_forms_box,
|
||||||
|
row: entry.box_placement_forms_row,
|
||||||
|
column: entry.box_placement_forms_column
|
||||||
|
},
|
||||||
|
boxPlacement: {
|
||||||
|
box: entry.box_placement_box,
|
||||||
|
row: entry.box_placement_row,
|
||||||
|
column: entry.box_placement_column
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async findById(id: string): Promise<PokedexEntry | null> {
|
async findById(id: string): Promise<PokedexEntry | null> {
|
||||||
return PokedexEntryModel.findById(id).exec();
|
const { data, error } = await this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.select('*')
|
||||||
|
.eq('id', id)
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !data) return null;
|
||||||
|
return this.transformPokedexEntry(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
async findAll(): Promise<PokedexEntry[]> {
|
async findAll(): Promise<PokedexEntry[]> {
|
||||||
return PokedexEntryModel.find().exec();
|
const { data, error } = await this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.select('*')
|
||||||
|
.order('pokedex_number', { ascending: true });
|
||||||
|
|
||||||
|
if (error || !data) return [];
|
||||||
|
return data.map(entry => this.transformPokedexEntry(entry));
|
||||||
}
|
}
|
||||||
|
|
||||||
async create(data: Partial<PokedexEntry>): Promise<PokedexEntry> {
|
async create(data: Partial<PokedexEntry>): Promise<PokedexEntry> {
|
||||||
return PokedexEntryModel.create(data);
|
// Transform camelCase to snake_case for database
|
||||||
|
const dbData: any = {};
|
||||||
|
if (data.pokedexNumber !== undefined) dbData.pokedex_number = data.pokedexNumber;
|
||||||
|
if (data.pokemon !== undefined) dbData.pokemon = data.pokemon;
|
||||||
|
if (data.form !== undefined) dbData.form = data.form;
|
||||||
|
if (data.canGigantamax !== undefined) dbData.can_gigantamax = data.canGigantamax;
|
||||||
|
if (data.regionToCatchIn !== undefined) dbData.region_to_catch_in = data.regionToCatchIn;
|
||||||
|
if (data.gamesToCatchIn !== undefined) dbData.games_to_catch_in = data.gamesToCatchIn;
|
||||||
|
if (data.regionToEvolveIn !== undefined) dbData.region_to_evolve_in = data.regionToEvolveIn;
|
||||||
|
if (data.evolutionInformation !== undefined) dbData.evolution_information = data.evolutionInformation;
|
||||||
|
if (data.catchInformation !== undefined) dbData.catch_information = data.catchInformation;
|
||||||
|
if (data.boxPlacementForms?.box !== undefined) dbData.box_placement_forms_box = data.boxPlacementForms.box;
|
||||||
|
if (data.boxPlacementForms?.row !== undefined) dbData.box_placement_forms_row = data.boxPlacementForms.row;
|
||||||
|
if (data.boxPlacementForms?.column !== undefined) dbData.box_placement_forms_column = data.boxPlacementForms.column;
|
||||||
|
if (data.boxPlacement?.box !== undefined) dbData.box_placement_box = data.boxPlacement.box;
|
||||||
|
if (data.boxPlacement?.row !== undefined) dbData.box_placement_row = data.boxPlacement.row;
|
||||||
|
if (data.boxPlacement?.column !== undefined) dbData.box_placement_column = data.boxPlacement.column;
|
||||||
|
|
||||||
|
const { data: result, error } = await this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.insert(dbData)
|
||||||
|
.select()
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !result) throw new Error('Failed to create pokedex entry');
|
||||||
|
return this.transformPokedexEntry(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
async update(id: string, data: Partial<PokedexEntry>): Promise<PokedexEntry | null> {
|
async update(id: string, data: Partial<PokedexEntry>): Promise<PokedexEntry | null> {
|
||||||
return PokedexEntryModel.findByIdAndUpdate(id, data, { new: true }).exec();
|
// Transform camelCase to snake_case for database
|
||||||
|
const dbData: any = {};
|
||||||
|
if (data.pokedexNumber !== undefined) dbData.pokedex_number = data.pokedexNumber;
|
||||||
|
if (data.pokemon !== undefined) dbData.pokemon = data.pokemon;
|
||||||
|
// ... add other fields as needed
|
||||||
|
|
||||||
|
const { data: result, error } = await this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.update(dbData)
|
||||||
|
.eq('id', id)
|
||||||
|
.select()
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (error || !result) return null;
|
||||||
|
return this.transformPokedexEntry(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
async delete(id: string): Promise<void> {
|
async delete(id: string): Promise<void> {
|
||||||
await PokedexEntryModel.findByIdAndDelete(id).exec();
|
await this.supabase
|
||||||
|
.from('pokedex_entries')
|
||||||
|
.delete()
|
||||||
|
.eq('id', id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
-1
@@ -20,7 +20,11 @@ self.addEventListener('message', (event) => {
|
|||||||
precache([{ url: '/', revision: null }]);
|
precache([{ url: '/', revision: null }]);
|
||||||
|
|
||||||
// self.__WB_MANIFEST is default injection point
|
// self.__WB_MANIFEST is default injection point
|
||||||
precacheAndRoute(self.__WB_MANIFEST);
|
// Handle the case where __WB_MANIFEST might be undefined in development
|
||||||
|
const manifest = self.__WB_MANIFEST || [];
|
||||||
|
if (Array.isArray(manifest)) {
|
||||||
|
precacheAndRoute(manifest);
|
||||||
|
}
|
||||||
|
|
||||||
// clean old assets
|
// clean old assets
|
||||||
cleanupOutdatedCaches();
|
cleanupOutdatedCaches();
|
||||||
|
|||||||
@@ -1,32 +1,24 @@
|
|||||||
import { json, error } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { dbConnect, dbDisconnect } from '$lib/utils/db';
|
|
||||||
import { type CatchRecord } from '$lib/models/CatchRecord';
|
import { type CatchRecord } from '$lib/models/CatchRecord';
|
||||||
import CatchRecordRepository from '$lib/repositories/CatchRecordRepository';
|
import CatchRecordRepository from '$lib/repositories/CatchRecordRepository';
|
||||||
import { requireAuth } from '$lib/utils/auth';
|
import { requireAuth } from '$lib/utils/auth';
|
||||||
import type { RequestEvent } from '@sveltejs/kit';
|
import type { RequestEvent } from '@sveltejs/kit';
|
||||||
|
|
||||||
export const GET = async (event: RequestEvent) => {
|
export const GET = async (event: RequestEvent) => {
|
||||||
let catchData = null as CatchRecord[] | null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const userId = await requireAuth(event);
|
const userId = await requireAuth(event);
|
||||||
await dbConnect();
|
const repo = new CatchRecordRepository(event.locals.supabase, userId);
|
||||||
const repo = new CatchRecordRepository();
|
const catchData = await repo.findByUserId(userId);
|
||||||
catchData = await repo.findByUserId(userId);
|
|
||||||
// order by pokedexEntryId property, ascending
|
// order by pokedexEntryId property, ascending
|
||||||
catchData = catchData.sort((a, b) => a.pokedexEntryId - b.pokedexEntryId);
|
const sortedData = catchData.sort((a, b) => Number(a.pokedexEntryId) - Number(b.pokedexEntryId));
|
||||||
|
return json(sortedData);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
if (error.status) {
|
if (error.status) {
|
||||||
// Re-throw SvelteKit errors (like 401)
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
return json({ error: 'Internal Server Error' }, { status: 500 });
|
return json({ error: 'Internal Server Error' }, { status: 500 });
|
||||||
} finally {
|
|
||||||
dbDisconnect();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return json(catchData);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export const PUT = async (event: RequestEvent) => {
|
export const PUT = async (event: RequestEvent) => {
|
||||||
@@ -37,8 +29,7 @@ export const PUT = async (event: RequestEvent) => {
|
|||||||
// Ensure the userId is set to the authenticated user
|
// Ensure the userId is set to the authenticated user
|
||||||
data.userId = userId;
|
data.userId = userId;
|
||||||
|
|
||||||
await dbConnect();
|
const repo = new CatchRecordRepository(event.locals.supabase, userId);
|
||||||
const repo = new CatchRecordRepository();
|
|
||||||
const upsertedRecord = await repo.upsert(data);
|
const upsertedRecord = await repo.upsert(data);
|
||||||
return json(upsertedRecord);
|
return json(upsertedRecord);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -47,8 +38,6 @@ export const PUT = async (event: RequestEvent) => {
|
|||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
return json({ error: 'Internal Server Error' }, { status: 500 });
|
return json({ error: 'Internal Server Error' }, { status: 500 });
|
||||||
} finally {
|
|
||||||
await dbDisconnect();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -56,8 +45,7 @@ export const POST = async (event: RequestEvent) => {
|
|||||||
try {
|
try {
|
||||||
const userId = await requireAuth(event);
|
const userId = await requireAuth(event);
|
||||||
const records: Partial<CatchRecord>[] = await event.request.json();
|
const records: Partial<CatchRecord>[] = await event.request.json();
|
||||||
await dbConnect();
|
const repo = new CatchRecordRepository(event.locals.supabase, userId);
|
||||||
const repo = new CatchRecordRepository();
|
|
||||||
|
|
||||||
const insertedRecords = [];
|
const insertedRecords = [];
|
||||||
for (const record of records) {
|
for (const record of records) {
|
||||||
@@ -74,7 +62,5 @@ export const POST = async (event: RequestEvent) => {
|
|||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
return json({ error: 'Internal Server Error' }, { status: 500 });
|
return json({ error: 'Internal Server Error' }, { status: 500 });
|
||||||
} finally {
|
|
||||||
await dbDisconnect();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { dbConnect, dbDisconnect } from '$lib/utils/db';
|
|
||||||
import CombinedDataRepository from '$lib/repositories/CombinedDataRepository';
|
import CombinedDataRepository from '$lib/repositories/CombinedDataRepository';
|
||||||
import { requireAuth } from '$lib/utils/auth';
|
import { requireAuth } from '$lib/utils/auth';
|
||||||
import type { RequestEvent } from '@sveltejs/kit';
|
import type { RequestEvent } from '@sveltejs/kit';
|
||||||
@@ -9,13 +8,12 @@ export const GET = async (event: RequestEvent) => {
|
|||||||
const page = parseInt(url.searchParams.get('page') || '1', 10);
|
const page = parseInt(url.searchParams.get('page') || '1', 10);
|
||||||
const limit = parseInt(url.searchParams.get('limit') || '20', 10);
|
const limit = parseInt(url.searchParams.get('limit') || '20', 10);
|
||||||
const enableForms = url.searchParams.get('enableForms') === 'true';
|
const enableForms = url.searchParams.get('enableForms') === 'true';
|
||||||
const region = url.searchParams.get('region');
|
const region = url.searchParams.get('region') || '';
|
||||||
const game = url.searchParams.get('game');
|
const game = url.searchParams.get('game') || '';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const userId = await requireAuth(event);
|
const userId = await requireAuth(event);
|
||||||
await dbConnect();
|
const repo = new CombinedDataRepository(event.locals.supabase, userId);
|
||||||
const repo = new CombinedDataRepository();
|
|
||||||
const combinedData = await repo.findCombinedData(userId, page, limit, enableForms, region, game);
|
const combinedData = await repo.findCombinedData(userId, page, limit, enableForms, region, game);
|
||||||
|
|
||||||
// Return empty array instead of 404 for better UX
|
// Return empty array instead of 404 for better UX
|
||||||
@@ -33,7 +31,5 @@ export const GET = async (event: RequestEvent) => {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
return json({ error: 'Internal Server Error' }, { status: 500 });
|
return json({ error: 'Internal Server Error' }, { status: 500 });
|
||||||
} finally {
|
|
||||||
dbDisconnect();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { dbConnect, dbDisconnect } from '$lib/utils/db';
|
|
||||||
import CombinedDataRepository from '$lib/repositories/CombinedDataRepository';
|
import CombinedDataRepository from '$lib/repositories/CombinedDataRepository';
|
||||||
import { requireAuth } from '$lib/utils/auth';
|
import { requireAuth } from '$lib/utils/auth';
|
||||||
import type { RequestEvent } from '@sveltejs/kit';
|
import type { RequestEvent } from '@sveltejs/kit';
|
||||||
@@ -7,13 +6,12 @@ import type { RequestEvent } from '@sveltejs/kit';
|
|||||||
export const GET = async (event: RequestEvent) => {
|
export const GET = async (event: RequestEvent) => {
|
||||||
const { url } = event;
|
const { url } = event;
|
||||||
const enableForms = url.searchParams.get('enableForms') === 'true';
|
const enableForms = url.searchParams.get('enableForms') === 'true';
|
||||||
const region = url.searchParams.get('region');
|
const region = url.searchParams.get('region') || '';
|
||||||
const game = url.searchParams.get('game');
|
const game = url.searchParams.get('game') || '';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const userId = await requireAuth(event);
|
const userId = await requireAuth(event);
|
||||||
await dbConnect();
|
const repo = new CombinedDataRepository(event.locals.supabase, userId);
|
||||||
const repo = new CombinedDataRepository();
|
|
||||||
const combinedData = await repo.findAllCombinedData(userId, enableForms, region, game);
|
const combinedData = await repo.findAllCombinedData(userId, enableForms, region, game);
|
||||||
|
|
||||||
// Return empty array instead of 404 for better UX
|
// Return empty array instead of 404 for better UX
|
||||||
@@ -24,7 +22,5 @@ export const GET = async (event: RequestEvent) => {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
return json({ error: 'Internal Server Error' }, { status: 500 });
|
return json({ error: 'Internal Server Error' }, { status: 500 });
|
||||||
} finally {
|
|
||||||
dbDisconnect();
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,26 +1,14 @@
|
|||||||
import { json } from '@sveltejs/kit';
|
import { json } from '@sveltejs/kit';
|
||||||
import { dbConnect, dbDisconnect } from '$lib/utils/db';
|
|
||||||
import { type PokedexEntry } from '$lib/models/PokedexEntry';
|
|
||||||
import PokedexEntryRepository from '$lib/repositories/PokedexEntryRepository';
|
import PokedexEntryRepository from '$lib/repositories/PokedexEntryRepository';
|
||||||
|
import type { RequestHandler } from './$types';
|
||||||
|
|
||||||
export const GET = async () => {
|
export const GET: RequestHandler = async (event) => {
|
||||||
return json(await fetchPokeDexEntriesFromDatabase());
|
|
||||||
};
|
|
||||||
|
|
||||||
async function fetchPokeDexEntriesFromDatabase() {
|
|
||||||
let pokemonData = null as PokedexEntry[] | null;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await dbConnect();
|
const repo = new PokedexEntryRepository(event.locals.supabase);
|
||||||
const repo = new PokedexEntryRepository();
|
const pokemonData = await repo.findAll();
|
||||||
pokemonData = await repo.findAll();
|
return json(pokemonData);
|
||||||
// order by pokedexNumber property, ascending
|
|
||||||
pokemonData = pokemonData.sort((a, b) => a.pokedexNumber - b.pokedexNumber);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error('Error fetching pokedex entries:', error);
|
||||||
} finally {
|
return json({ error: 'Failed to fetch pokedex entries' }, { status: 500 });
|
||||||
dbDisconnect();
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
return pokemonData;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
let drawerOpen = false;
|
let drawerOpen = false;
|
||||||
let viewAsBoxes = false;
|
let viewAsBoxes = false;
|
||||||
let currentPlacement = 'boxPlacementForms';
|
let currentPlacement = 'boxPlacementForms';
|
||||||
let boxNumbers = Array<any>;
|
let boxNumbers: number[] = [];
|
||||||
|
|
||||||
const unsubscribe = user.subscribe((value) => {
|
const unsubscribe = user.subscribe((value) => {
|
||||||
localUser = value;
|
localUser = value;
|
||||||
@@ -109,8 +109,20 @@
|
|||||||
) {
|
) {
|
||||||
let catchRecordsToUpdate = combinedData
|
let catchRecordsToUpdate = combinedData
|
||||||
.filter(({ pokedexEntry }) => pokedexEntry[currentPlacement].box === boxNumber)
|
.filter(({ pokedexEntry }) => pokedexEntry[currentPlacement].box === boxNumber)
|
||||||
.map(({ catchRecord }) => {
|
.map(({ pokedexEntry, catchRecord }) => {
|
||||||
let updatedRecord = { ...catchRecord };
|
// Create default record if null
|
||||||
|
const baseRecord = catchRecord || {
|
||||||
|
_id: '',
|
||||||
|
userId: localUser?.id || '',
|
||||||
|
pokedexEntryId: pokedexEntry._id,
|
||||||
|
haveToEvolve: false,
|
||||||
|
caught: false,
|
||||||
|
inHome: false,
|
||||||
|
hasGigantamaxed: false,
|
||||||
|
personalNotes: ''
|
||||||
|
};
|
||||||
|
|
||||||
|
let updatedRecord = { ...baseRecord };
|
||||||
if (inHome !== null) {
|
if (inHome !== null) {
|
||||||
updatedRecord = {
|
updatedRecord = {
|
||||||
...updatedRecord,
|
...updatedRecord,
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# Supabase
|
||||||
|
.branches
|
||||||
|
.temp
|
||||||
|
|
||||||
|
# dotenvx
|
||||||
|
.env.keys
|
||||||
|
.env.local
|
||||||
|
.env.*.local
|
||||||
@@ -0,0 +1,332 @@
|
|||||||
|
# For detailed configuration reference documentation, visit:
|
||||||
|
# https://supabase.com/docs/guides/local-development/cli/config
|
||||||
|
# A string used to distinguish different Supabase projects on the same host. Defaults to the
|
||||||
|
# working directory name when running `supabase init`.
|
||||||
|
project_id = "LivingDexTracker"
|
||||||
|
|
||||||
|
[api]
|
||||||
|
enabled = true
|
||||||
|
# Port to use for the API URL.
|
||||||
|
port = 54321
|
||||||
|
# Schemas to expose in your API. Tables, views and stored procedures in this schema will get API
|
||||||
|
# endpoints. `public` and `graphql_public` schemas are included by default.
|
||||||
|
schemas = ["public", "graphql_public"]
|
||||||
|
# Extra schemas to add to the search_path of every request.
|
||||||
|
extra_search_path = ["public", "extensions"]
|
||||||
|
# The maximum number of rows returns from a view, table, or stored procedure. Limits payload size
|
||||||
|
# for accidental or malicious requests.
|
||||||
|
max_rows = 1000
|
||||||
|
|
||||||
|
[api.tls]
|
||||||
|
# Enable HTTPS endpoints locally using a self-signed certificate.
|
||||||
|
enabled = false
|
||||||
|
|
||||||
|
[db]
|
||||||
|
# Port to use for the local database URL.
|
||||||
|
port = 54322
|
||||||
|
# Port used by db diff command to initialize the shadow database.
|
||||||
|
shadow_port = 54320
|
||||||
|
# The database major version to use. This has to be the same as your remote database's. Run `SHOW
|
||||||
|
# server_version;` on the remote database to check.
|
||||||
|
major_version = 17
|
||||||
|
|
||||||
|
[db.pooler]
|
||||||
|
enabled = false
|
||||||
|
# Port to use for the local connection pooler.
|
||||||
|
port = 54329
|
||||||
|
# Specifies when a server connection can be reused by other clients.
|
||||||
|
# Configure one of the supported pooler modes: `transaction`, `session`.
|
||||||
|
pool_mode = "transaction"
|
||||||
|
# How many server connections to allow per user/database pair.
|
||||||
|
default_pool_size = 20
|
||||||
|
# Maximum number of client connections allowed.
|
||||||
|
max_client_conn = 100
|
||||||
|
|
||||||
|
# [db.vault]
|
||||||
|
# secret_key = "env(SECRET_VALUE)"
|
||||||
|
|
||||||
|
[db.migrations]
|
||||||
|
# If disabled, migrations will be skipped during a db push or reset.
|
||||||
|
enabled = true
|
||||||
|
# Specifies an ordered list of schema files that describe your database.
|
||||||
|
# Supports glob patterns relative to supabase directory: "./schemas/*.sql"
|
||||||
|
schema_paths = []
|
||||||
|
|
||||||
|
[db.seed]
|
||||||
|
# If enabled, seeds the database after migrations during a db reset.
|
||||||
|
enabled = true
|
||||||
|
# Specifies an ordered list of seed files to load during db reset.
|
||||||
|
# Supports glob patterns relative to supabase directory: "./seeds/*.sql"
|
||||||
|
sql_paths = ["./seed.sql"]
|
||||||
|
|
||||||
|
[db.network_restrictions]
|
||||||
|
# Enable management of network restrictions.
|
||||||
|
enabled = false
|
||||||
|
# List of IPv4 CIDR blocks allowed to connect to the database.
|
||||||
|
# Defaults to allow all IPv4 connections. Set empty array to block all IPs.
|
||||||
|
allowed_cidrs = ["0.0.0.0/0"]
|
||||||
|
# List of IPv6 CIDR blocks allowed to connect to the database.
|
||||||
|
# Defaults to allow all IPv6 connections. Set empty array to block all IPs.
|
||||||
|
allowed_cidrs_v6 = ["::/0"]
|
||||||
|
|
||||||
|
[realtime]
|
||||||
|
enabled = true
|
||||||
|
# Bind realtime via either IPv4 or IPv6. (default: IPv4)
|
||||||
|
# ip_version = "IPv6"
|
||||||
|
# The maximum length in bytes of HTTP request headers. (default: 4096)
|
||||||
|
# max_header_length = 4096
|
||||||
|
|
||||||
|
[studio]
|
||||||
|
enabled = true
|
||||||
|
# Port to use for Supabase Studio.
|
||||||
|
port = 54323
|
||||||
|
# External URL of the API server that frontend connects to.
|
||||||
|
api_url = "http://127.0.0.1"
|
||||||
|
# OpenAI API Key to use for Supabase AI in the Supabase Studio.
|
||||||
|
openai_api_key = "env(OPENAI_API_KEY)"
|
||||||
|
|
||||||
|
# Email testing server. Emails sent with the local dev setup are not actually sent - rather, they
|
||||||
|
# are monitored, and you can view the emails that would have been sent from the web interface.
|
||||||
|
[inbucket]
|
||||||
|
enabled = true
|
||||||
|
# Port to use for the email testing server web interface.
|
||||||
|
port = 54324
|
||||||
|
# Uncomment to expose additional ports for testing user applications that send emails.
|
||||||
|
# smtp_port = 54325
|
||||||
|
# pop3_port = 54326
|
||||||
|
# admin_email = "admin@email.com"
|
||||||
|
# sender_name = "Admin"
|
||||||
|
|
||||||
|
[storage]
|
||||||
|
enabled = true
|
||||||
|
# The maximum file size allowed (e.g. "5MB", "500KB").
|
||||||
|
file_size_limit = "50MiB"
|
||||||
|
|
||||||
|
# Image transformation API is available to Supabase Pro plan.
|
||||||
|
# [storage.image_transformation]
|
||||||
|
# enabled = true
|
||||||
|
|
||||||
|
# Uncomment to configure local storage buckets
|
||||||
|
# [storage.buckets.images]
|
||||||
|
# public = false
|
||||||
|
# file_size_limit = "50MiB"
|
||||||
|
# allowed_mime_types = ["image/png", "image/jpeg"]
|
||||||
|
# objects_path = "./images"
|
||||||
|
|
||||||
|
[auth]
|
||||||
|
enabled = true
|
||||||
|
# The base URL of your website. Used as an allow-list for redirects and for constructing URLs used
|
||||||
|
# in emails.
|
||||||
|
site_url = "http://127.0.0.1:3000"
|
||||||
|
# A list of *exact* URLs that auth providers are permitted to redirect to post authentication.
|
||||||
|
additional_redirect_urls = ["https://127.0.0.1:3000"]
|
||||||
|
# How long tokens are valid for, in seconds. Defaults to 3600 (1 hour), maximum 604,800 (1 week).
|
||||||
|
jwt_expiry = 3600
|
||||||
|
# If disabled, the refresh token will never expire.
|
||||||
|
enable_refresh_token_rotation = true
|
||||||
|
# Allows refresh tokens to be reused after expiry, up to the specified interval in seconds.
|
||||||
|
# Requires enable_refresh_token_rotation = true.
|
||||||
|
refresh_token_reuse_interval = 10
|
||||||
|
# Allow/disallow new user signups to your project.
|
||||||
|
enable_signup = true
|
||||||
|
# Allow/disallow anonymous sign-ins to your project.
|
||||||
|
enable_anonymous_sign_ins = false
|
||||||
|
# Allow/disallow testing manual linking of accounts
|
||||||
|
enable_manual_linking = false
|
||||||
|
# Passwords shorter than this value will be rejected as weak. Minimum 6, recommended 8 or more.
|
||||||
|
minimum_password_length = 6
|
||||||
|
# Passwords that do not meet the following requirements will be rejected as weak. Supported values
|
||||||
|
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
|
||||||
|
password_requirements = ""
|
||||||
|
|
||||||
|
[auth.rate_limit]
|
||||||
|
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
|
||||||
|
email_sent = 2
|
||||||
|
# Number of SMS messages that can be sent per hour. Requires auth.sms to be enabled.
|
||||||
|
sms_sent = 30
|
||||||
|
# Number of anonymous sign-ins that can be made per hour per IP address. Requires enable_anonymous_sign_ins = true.
|
||||||
|
anonymous_users = 30
|
||||||
|
# Number of sessions that can be refreshed in a 5 minute interval per IP address.
|
||||||
|
token_refresh = 150
|
||||||
|
# Number of sign up and sign-in requests that can be made in a 5 minute interval per IP address (excludes anonymous users).
|
||||||
|
sign_in_sign_ups = 30
|
||||||
|
# Number of OTP / Magic link verifications that can be made in a 5 minute interval per IP address.
|
||||||
|
token_verifications = 30
|
||||||
|
# Number of Web3 logins that can be made in a 5 minute interval per IP address.
|
||||||
|
web3 = 30
|
||||||
|
|
||||||
|
# Configure one of the supported captcha providers: `hcaptcha`, `turnstile`.
|
||||||
|
# [auth.captcha]
|
||||||
|
# enabled = true
|
||||||
|
# provider = "hcaptcha"
|
||||||
|
# secret = ""
|
||||||
|
|
||||||
|
[auth.email]
|
||||||
|
# Allow/disallow new user signups via email to your project.
|
||||||
|
enable_signup = true
|
||||||
|
# If enabled, a user will be required to confirm any email change on both the old, and new email
|
||||||
|
# addresses. If disabled, only the new email is required to confirm.
|
||||||
|
double_confirm_changes = true
|
||||||
|
# If enabled, users need to confirm their email address before signing in.
|
||||||
|
enable_confirmations = false
|
||||||
|
# If enabled, users will need to reauthenticate or have logged in recently to change their password.
|
||||||
|
secure_password_change = false
|
||||||
|
# Controls the minimum amount of time that must pass before sending another signup confirmation or password reset email.
|
||||||
|
max_frequency = "1s"
|
||||||
|
# Number of characters used in the email OTP.
|
||||||
|
otp_length = 6
|
||||||
|
# Number of seconds before the email OTP expires (defaults to 1 hour).
|
||||||
|
otp_expiry = 3600
|
||||||
|
|
||||||
|
# Use a production-ready SMTP server
|
||||||
|
# [auth.email.smtp]
|
||||||
|
# enabled = true
|
||||||
|
# host = "smtp.sendgrid.net"
|
||||||
|
# port = 587
|
||||||
|
# user = "apikey"
|
||||||
|
# pass = "env(SENDGRID_API_KEY)"
|
||||||
|
# admin_email = "admin@email.com"
|
||||||
|
# sender_name = "Admin"
|
||||||
|
|
||||||
|
# Uncomment to customize email template
|
||||||
|
# [auth.email.template.invite]
|
||||||
|
# subject = "You have been invited"
|
||||||
|
# content_path = "./supabase/templates/invite.html"
|
||||||
|
|
||||||
|
[auth.sms]
|
||||||
|
# Allow/disallow new user signups via SMS to your project.
|
||||||
|
enable_signup = false
|
||||||
|
# If enabled, users need to confirm their phone number before signing in.
|
||||||
|
enable_confirmations = false
|
||||||
|
# Template for sending OTP to users
|
||||||
|
template = "Your code is {{ .Code }}"
|
||||||
|
# Controls the minimum amount of time that must pass before sending another sms otp.
|
||||||
|
max_frequency = "5s"
|
||||||
|
|
||||||
|
# Use pre-defined map of phone number to OTP for testing.
|
||||||
|
# [auth.sms.test_otp]
|
||||||
|
# 4152127777 = "123456"
|
||||||
|
|
||||||
|
# Configure logged in session timeouts.
|
||||||
|
# [auth.sessions]
|
||||||
|
# Force log out after the specified duration.
|
||||||
|
# timebox = "24h"
|
||||||
|
# Force log out if the user has been inactive longer than the specified duration.
|
||||||
|
# inactivity_timeout = "8h"
|
||||||
|
|
||||||
|
# This hook runs before a new user is created and allows developers to reject the request based on the incoming user object.
|
||||||
|
# [auth.hook.before_user_created]
|
||||||
|
# enabled = true
|
||||||
|
# uri = "pg-functions://postgres/auth/before-user-created-hook"
|
||||||
|
|
||||||
|
# This hook runs before a token is issued and allows you to add additional claims based on the authentication method used.
|
||||||
|
# [auth.hook.custom_access_token]
|
||||||
|
# enabled = true
|
||||||
|
# uri = "pg-functions://<database>/<schema>/<hook_name>"
|
||||||
|
|
||||||
|
# Configure one of the supported SMS providers: `twilio`, `twilio_verify`, `messagebird`, `textlocal`, `vonage`.
|
||||||
|
[auth.sms.twilio]
|
||||||
|
enabled = false
|
||||||
|
account_sid = ""
|
||||||
|
message_service_sid = ""
|
||||||
|
# DO NOT commit your Twilio auth token to git. Use environment variable substitution instead:
|
||||||
|
auth_token = "env(SUPABASE_AUTH_SMS_TWILIO_AUTH_TOKEN)"
|
||||||
|
|
||||||
|
# Multi-factor-authentication is available to Supabase Pro plan.
|
||||||
|
[auth.mfa]
|
||||||
|
# Control how many MFA factors can be enrolled at once per user.
|
||||||
|
max_enrolled_factors = 10
|
||||||
|
|
||||||
|
# Control MFA via App Authenticator (TOTP)
|
||||||
|
[auth.mfa.totp]
|
||||||
|
enroll_enabled = false
|
||||||
|
verify_enabled = false
|
||||||
|
|
||||||
|
# Configure MFA via Phone Messaging
|
||||||
|
[auth.mfa.phone]
|
||||||
|
enroll_enabled = false
|
||||||
|
verify_enabled = false
|
||||||
|
otp_length = 6
|
||||||
|
template = "Your code is {{ .Code }}"
|
||||||
|
max_frequency = "5s"
|
||||||
|
|
||||||
|
# Configure MFA via WebAuthn
|
||||||
|
# [auth.mfa.web_authn]
|
||||||
|
# enroll_enabled = true
|
||||||
|
# verify_enabled = true
|
||||||
|
|
||||||
|
# Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`,
|
||||||
|
# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin_oidc`, `notion`, `twitch`,
|
||||||
|
# `twitter`, `slack`, `spotify`, `workos`, `zoom`.
|
||||||
|
[auth.external.apple]
|
||||||
|
enabled = false
|
||||||
|
client_id = ""
|
||||||
|
# DO NOT commit your OAuth provider secret to git. Use environment variable substitution instead:
|
||||||
|
secret = "env(SUPABASE_AUTH_EXTERNAL_APPLE_SECRET)"
|
||||||
|
# Overrides the default auth redirectUrl.
|
||||||
|
redirect_uri = ""
|
||||||
|
# Overrides the default auth provider URL. Used to support self-hosted gitlab, single-tenant Azure,
|
||||||
|
# or any other third-party OIDC providers.
|
||||||
|
url = ""
|
||||||
|
# If enabled, the nonce check will be skipped. Required for local sign in with Google auth.
|
||||||
|
skip_nonce_check = false
|
||||||
|
|
||||||
|
# Allow Solana wallet holders to sign in to your project via the Sign in with Solana (SIWS, EIP-4361) standard.
|
||||||
|
# You can configure "web3" rate limit in the [auth.rate_limit] section and set up [auth.captcha] if self-hosting.
|
||||||
|
[auth.web3.solana]
|
||||||
|
enabled = false
|
||||||
|
|
||||||
|
# Use Firebase Auth as a third-party provider alongside Supabase Auth.
|
||||||
|
[auth.third_party.firebase]
|
||||||
|
enabled = false
|
||||||
|
# project_id = "my-firebase-project"
|
||||||
|
|
||||||
|
# Use Auth0 as a third-party provider alongside Supabase Auth.
|
||||||
|
[auth.third_party.auth0]
|
||||||
|
enabled = false
|
||||||
|
# tenant = "my-auth0-tenant"
|
||||||
|
# tenant_region = "us"
|
||||||
|
|
||||||
|
# Use AWS Cognito (Amplify) as a third-party provider alongside Supabase Auth.
|
||||||
|
[auth.third_party.aws_cognito]
|
||||||
|
enabled = false
|
||||||
|
# user_pool_id = "my-user-pool-id"
|
||||||
|
# user_pool_region = "us-east-1"
|
||||||
|
|
||||||
|
# Use Clerk as a third-party provider alongside Supabase Auth.
|
||||||
|
[auth.third_party.clerk]
|
||||||
|
enabled = false
|
||||||
|
# Obtain from https://clerk.com/setup/supabase
|
||||||
|
# domain = "example.clerk.accounts.dev"
|
||||||
|
|
||||||
|
[edge_runtime]
|
||||||
|
enabled = true
|
||||||
|
# Configure one of the supported request policies: `oneshot`, `per_worker`.
|
||||||
|
# Use `oneshot` for hot reload, or `per_worker` for load testing.
|
||||||
|
policy = "oneshot"
|
||||||
|
# Port to attach the Chrome inspector for debugging edge functions.
|
||||||
|
inspector_port = 8083
|
||||||
|
# The Deno major version to use.
|
||||||
|
deno_version = 1
|
||||||
|
|
||||||
|
# [edge_runtime.secrets]
|
||||||
|
# secret_key = "env(SECRET_VALUE)"
|
||||||
|
|
||||||
|
[analytics]
|
||||||
|
enabled = true
|
||||||
|
port = 54327
|
||||||
|
# Configure one of the supported backends: `postgres`, `bigquery`.
|
||||||
|
backend = "postgres"
|
||||||
|
|
||||||
|
# Experimental features may be deprecated any time
|
||||||
|
[experimental]
|
||||||
|
# Configures Postgres storage engine to use OrioleDB (S3)
|
||||||
|
orioledb_version = ""
|
||||||
|
# Configures S3 bucket URL, eg. <bucket_name>.s3-<region>.amazonaws.com
|
||||||
|
s3_host = "env(S3_HOST)"
|
||||||
|
# Configures S3 bucket region, eg. us-east-1
|
||||||
|
s3_region = "env(S3_REGION)"
|
||||||
|
# Configures AWS_ACCESS_KEY_ID for S3 bucket
|
||||||
|
s3_access_key = "env(S3_ACCESS_KEY)"
|
||||||
|
# Configures AWS_SECRET_ACCESS_KEY for S3 bucket
|
||||||
|
s3_secret_key = "env(S3_SECRET_KEY)"
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
-- Initial setup migration for LivingDexTracker
|
||||||
|
-- This sets up any additional schema needed
|
||||||
|
|
||||||
|
-- Note: RLS is already enabled on auth.users by default in Supabase
|
||||||
|
-- and proper policies are already in place
|
||||||
|
|
||||||
|
-- Create a profiles table if we need additional user data
|
||||||
|
-- This is optional for the current setup since we only use Supabase for auth
|
||||||
|
-- and store everything else in MongoDB
|
||||||
|
|
||||||
|
-- CREATE TABLE profiles (
|
||||||
|
-- id UUID PRIMARY KEY REFERENCES auth.users(id) ON DELETE CASCADE,
|
||||||
|
-- username TEXT,
|
||||||
|
-- avatar_url TEXT,
|
||||||
|
-- created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
-- updated_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
-- );
|
||||||
|
|
||||||
|
-- Enable RLS on profiles table
|
||||||
|
-- ALTER TABLE profiles ENABLE ROW LEVEL SECURITY;
|
||||||
|
|
||||||
|
-- Create RLS policies for profiles
|
||||||
|
-- CREATE POLICY "Users can view own profile"
|
||||||
|
-- ON profiles
|
||||||
|
-- FOR SELECT
|
||||||
|
-- USING (auth.uid() = id);
|
||||||
|
|
||||||
|
-- CREATE POLICY "Users can update own profile"
|
||||||
|
-- ON profiles
|
||||||
|
-- FOR UPDATE
|
||||||
|
-- USING (auth.uid() = id);
|
||||||
|
|
||||||
|
-- Note: MongoDB collections (pokedexentries, catchrecords) are handled by the app
|
||||||
|
-- Supabase is only used for authentication in this hybrid setup
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
-- Migration: Create PostgreSQL schema for Pokemon data
|
||||||
|
-- This replaces the MongoDB collections with proper PostgreSQL tables
|
||||||
|
|
||||||
|
-- Note: Using individual columns instead of composite types for simplicity
|
||||||
|
|
||||||
|
-- Pokemon entries table (replaces pokedexentries MongoDB collection)
|
||||||
|
CREATE TABLE pokedex_entries (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
pokedex_number INTEGER NOT NULL,
|
||||||
|
pokemon TEXT NOT NULL,
|
||||||
|
form TEXT,
|
||||||
|
can_gigantamax BOOLEAN DEFAULT FALSE,
|
||||||
|
region_to_catch_in TEXT,
|
||||||
|
games_to_catch_in TEXT[], -- Array of games
|
||||||
|
region_to_evolve_in TEXT,
|
||||||
|
evolution_information TEXT,
|
||||||
|
catch_information TEXT[], -- Array of catch info
|
||||||
|
|
||||||
|
-- Box placement for forms view
|
||||||
|
box_placement_forms_box INTEGER,
|
||||||
|
box_placement_forms_row INTEGER,
|
||||||
|
box_placement_forms_column INTEGER,
|
||||||
|
|
||||||
|
-- Box placement for no-forms view
|
||||||
|
box_placement_box INTEGER,
|
||||||
|
box_placement_row INTEGER,
|
||||||
|
box_placement_column INTEGER,
|
||||||
|
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Catch records table (replaces catchrecords MongoDB collection)
|
||||||
|
CREATE TABLE catch_records (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
user_id UUID NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
|
||||||
|
pokedex_entry_id BIGINT NOT NULL REFERENCES pokedex_entries(id) ON DELETE CASCADE,
|
||||||
|
|
||||||
|
-- Catch status fields
|
||||||
|
have_to_evolve BOOLEAN DEFAULT FALSE,
|
||||||
|
caught BOOLEAN DEFAULT FALSE,
|
||||||
|
in_home BOOLEAN DEFAULT FALSE,
|
||||||
|
has_gigantamaxed BOOLEAN DEFAULT FALSE,
|
||||||
|
personal_notes TEXT,
|
||||||
|
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
|
||||||
|
-- Ensure one record per user per pokemon entry
|
||||||
|
UNIQUE(user_id, pokedex_entry_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Region/Game mappings table (replaces regiongamemappings MongoDB collection)
|
||||||
|
CREATE TABLE region_game_mappings (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
region TEXT NOT NULL,
|
||||||
|
games TEXT[] NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Pokedex metadata table (replaces pokedexmetadata MongoDB collection)
|
||||||
|
CREATE TABLE pokedex_metadata (
|
||||||
|
id BIGSERIAL PRIMARY KEY,
|
||||||
|
key TEXT UNIQUE NOT NULL,
|
||||||
|
value JSONB NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ DEFAULT NOW(),
|
||||||
|
updated_at TIMESTAMPTZ DEFAULT NOW()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Enable Row Level Security (RLS) for user data isolation
|
||||||
|
ALTER TABLE catch_records ENABLE ROW LEVEL SECURITY;
|
||||||
|
|
||||||
|
-- RLS Policy: Users can only access their own catch records
|
||||||
|
CREATE POLICY "Users can only access their own catch records"
|
||||||
|
ON catch_records FOR ALL
|
||||||
|
USING (auth.uid() = user_id)
|
||||||
|
WITH CHECK (auth.uid() = user_id);
|
||||||
|
|
||||||
|
-- Create indexes for better performance
|
||||||
|
CREATE INDEX idx_pokedex_entries_pokedex_number ON pokedex_entries(pokedex_number);
|
||||||
|
CREATE INDEX idx_pokedex_entries_pokemon ON pokedex_entries(pokemon);
|
||||||
|
CREATE INDEX idx_pokedex_entries_box_placement_forms ON pokedex_entries(box_placement_forms_box, box_placement_forms_row, box_placement_forms_column);
|
||||||
|
CREATE INDEX idx_pokedex_entries_box_placement ON pokedex_entries(box_placement_box, box_placement_row, box_placement_column);
|
||||||
|
|
||||||
|
CREATE INDEX idx_catch_records_user_id ON catch_records(user_id);
|
||||||
|
CREATE INDEX idx_catch_records_pokedex_entry_id ON catch_records(pokedex_entry_id);
|
||||||
|
CREATE INDEX idx_catch_records_caught ON catch_records(caught);
|
||||||
|
CREATE INDEX idx_catch_records_in_home ON catch_records(in_home);
|
||||||
|
|
||||||
|
-- Create updated_at trigger function
|
||||||
|
CREATE OR REPLACE FUNCTION update_updated_at_column()
|
||||||
|
RETURNS TRIGGER AS $$
|
||||||
|
BEGIN
|
||||||
|
NEW.updated_at = NOW();
|
||||||
|
RETURN NEW;
|
||||||
|
END;
|
||||||
|
$$ language 'plpgsql';
|
||||||
|
|
||||||
|
-- Add updated_at triggers
|
||||||
|
CREATE TRIGGER update_pokedex_entries_updated_at BEFORE UPDATE ON pokedex_entries
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
|
||||||
|
|
||||||
|
CREATE TRIGGER update_catch_records_updated_at BEFORE UPDATE ON catch_records
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
|
||||||
|
|
||||||
|
CREATE TRIGGER update_pokedex_metadata_updated_at BEFORE UPDATE ON pokedex_metadata
|
||||||
|
FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
-- Migration: Seed Pokemon data from TSV
|
||||||
|
-- This replaces the separate tsv-parser project and MongoDB seeding
|
||||||
|
|
||||||
|
-- Insert Pokemon data based on the TSV structure
|
||||||
|
-- Note: This is a sample of the data structure - you'll need to convert the full TSV
|
||||||
|
|
||||||
|
INSERT INTO pokedex_entries (
|
||||||
|
pokedex_number,
|
||||||
|
pokemon,
|
||||||
|
form,
|
||||||
|
can_gigantamax,
|
||||||
|
region_to_catch_in,
|
||||||
|
games_to_catch_in,
|
||||||
|
region_to_evolve_in,
|
||||||
|
evolution_information,
|
||||||
|
box_placement_forms_box,
|
||||||
|
box_placement_forms_row,
|
||||||
|
box_placement_forms_column,
|
||||||
|
box_placement_box,
|
||||||
|
box_placement_row,
|
||||||
|
box_placement_column
|
||||||
|
) VALUES
|
||||||
|
-- Sample data from the TSV (first few entries)
|
||||||
|
(1, 'Bulbasaur', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 1, 1, 1, 1),
|
||||||
|
(2, 'Ivysaur', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 2, 1, 1, 2),
|
||||||
|
(3, 'Venusaur', NULL, TRUE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 3, 1, 1, 3),
|
||||||
|
(3, 'Venusaur', 'Female', FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 4, NULL, NULL, NULL),
|
||||||
|
(4, 'Charmander', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 5, 1, 1, 4),
|
||||||
|
(5, 'Charmeleon', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 1, 6, 1, 1, 5),
|
||||||
|
(6, 'Charizard', NULL, TRUE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 2, 1, 1, 1, 6),
|
||||||
|
(7, 'Squirtle', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 2, 2, 1, 2, 1),
|
||||||
|
(8, 'Wartortle', NULL, FALSE, 'Kanto', ARRAY['Red','Blue','Yellow','LG: Pikachu','LG: Eevee'], NULL, NULL, 1, 2, 3, 1, 2, 2);
|
||||||
|
|
||||||
|
-- Insert region game mappings
|
||||||
|
INSERT INTO region_game_mappings (region, games) VALUES
|
||||||
|
('Kanto', ARRAY['Red', 'Blue', 'Yellow', 'LG: Pikachu', 'LG: Eevee']),
|
||||||
|
('Johto', ARRAY['Gold', 'Silver', 'Crystal', 'HeartGold', 'SoulSilver']),
|
||||||
|
('Hoenn', ARRAY['Ruby', 'Sapphire', 'Emerald', 'Omega Ruby', 'Alpha Sapphire']),
|
||||||
|
('Sinnoh', ARRAY['Diamond', 'Pearl', 'Platinum', 'Brilliant Diamond', 'Shining Pearl']),
|
||||||
|
('Unova', ARRAY['Black', 'White', 'Black 2', 'White 2']),
|
||||||
|
('Kalos', ARRAY['X', 'Y']),
|
||||||
|
('Alola', ARRAY['Sun', 'Moon', 'Ultra Sun', 'Ultra Moon']),
|
||||||
|
('Galar', ARRAY['Sword', 'Shield']),
|
||||||
|
('Paldea', ARRAY['Scarlet', 'Violet']);
|
||||||
|
|
||||||
|
-- Insert some metadata
|
||||||
|
INSERT INTO pokedex_metadata (key, value) VALUES
|
||||||
|
('total_pokemon', '{"count": 1025}'),
|
||||||
|
('last_updated', '{"timestamp": "2025-01-26T00:00:00Z"}'),
|
||||||
|
('supported_generations', '{"generations": [1,2,3,4,5,6,7,8,9]}');
|
||||||
|
|
||||||
|
-- Note: This is a sample seed. For the full migration, we'll need to:
|
||||||
|
-- 1. Convert the entire TSV file to SQL inserts
|
||||||
|
-- 2. Or create a function to import from the TSV data directly
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,14 @@
|
|||||||
|
-- Initial seed data for local development
|
||||||
|
-- This file is referenced in config.toml and will be loaded during db reset
|
||||||
|
|
||||||
|
-- Note: RLS is already enabled on auth.users by default in Supabase
|
||||||
|
-- No need to modify system tables here
|
||||||
|
|
||||||
|
-- Add any application-specific seed data here
|
||||||
|
-- For now, this file is minimal since we use MongoDB for app data
|
||||||
|
|
||||||
|
-- Example: If we had a profiles table, we could seed it here
|
||||||
|
-- INSERT INTO profiles (id, username) VALUES
|
||||||
|
-- ('test-user-id', 'testuser');
|
||||||
|
|
||||||
|
SELECT 'Local Supabase setup complete' as message;
|
||||||
Reference in New Issue
Block a user