2
0
forked from jmug/cactoide

fix: small adjusments, renames for the /healthz and readme

This commit is contained in:
Levente Orban
2025-09-01 10:43:02 +02:00
parent 94fffc5695
commit 8a76421571
11 changed files with 46 additions and 40 deletions

View File

@@ -1,4 +1,4 @@
import { drizzleQuery } from '$lib/database/db';
import { database } from '$lib/database/db';
import { events } from '$lib/database/schema';
import { fail, redirect } from '@sveltejs/kit';
import type { Actions } from './$types';
@@ -66,7 +66,7 @@ export const actions: Actions = {
const eventId = generateEventId();
await drizzleQuery
await database
.insert(events)
.values({
id: eventId,

View File

@@ -1,4 +1,4 @@
import { drizzleQuery } from '$lib/database/db';
import { database } from '$lib/database/db';
import { eq, desc } from 'drizzle-orm';
import type { PageServerLoad } from './$types';
import { events } from '$lib/database/schema';
@@ -6,7 +6,7 @@ import { events } from '$lib/database/schema';
export const load: PageServerLoad = async () => {
try {
// Fetch all public events ordered by creation date (newest first)
const publicEvents = await drizzleQuery
const publicEvents = await database
.select()
.from(events)
.where(eq(events.visibility, 'public'))

View File

@@ -1,4 +1,4 @@
import { drizzleQuery } from '$lib/database/db';
import { database } from '$lib/database/db';
import { events } from '$lib/database/schema';
import { fail } from '@sveltejs/kit';
import { eq, desc } from 'drizzle-orm';
@@ -11,7 +11,7 @@ export const load = async ({ cookies }) => {
}
try {
const userEvents = await drizzleQuery
const userEvents = await database
.select()
.from(events)
.where(eq(events.userId, userId))
@@ -50,7 +50,7 @@ export const actions: Actions = {
try {
// First verify the user owns this event
const [eventData] = await drizzleQuery.select().from(events).where(eq(events.id, eventId));
const [eventData] = await database.select().from(events).where(eq(events.id, eventId));
if (!eventData) {
return fail(404, { error: 'Event not found' });
@@ -61,7 +61,7 @@ export const actions: Actions = {
}
// Delete the event (RSVPs will be deleted automatically due to CASCADE)
await drizzleQuery.delete(events).where(eq(events.id, eventId));
await database.delete(events).where(eq(events.id, eventId));
return { success: true };
} catch (error) {

View File

@@ -1,4 +1,4 @@
import { drizzleQuery } from '$lib/database/db';
import { database } from '$lib/database/db';
import { events, rsvps } from '$lib/database/schema';
import { eq, asc } from 'drizzle-orm';
import { error, fail } from '@sveltejs/kit';
@@ -14,12 +14,8 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
try {
// Fetch event and RSVPs in parallel
const [eventData, rsvpData] = await Promise.all([
drizzleQuery.select().from(events).where(eq(events.id, eventId)).limit(1),
drizzleQuery
.select()
.from(rsvps)
.where(eq(rsvps.eventId, eventId))
.orderBy(asc(rsvps.createdAt))
database.select().from(events).where(eq(events.id, eventId)).limit(1),
database.select().from(rsvps).where(eq(rsvps.eventId, eventId)).orderBy(asc(rsvps.createdAt))
]);
if (!eventData[0]) {
@@ -81,33 +77,27 @@ export const actions: Actions = {
try {
// Check if event exists and get its details
const [eventData] = await drizzleQuery.select().from(events).where(eq(events.id, eventId));
const [eventData] = await database.select().from(events).where(eq(events.id, eventId));
if (!eventData) {
return fail(404, { error: 'Event not found' });
}
// Check if event is full (for limited type events)
if (eventData.type === 'limited' && eventData.attendeeLimit) {
const currentRSVPs = await drizzleQuery
.select()
.from(rsvps)
.where(eq(rsvps.eventId, eventId));
const currentRSVPs = await database.select().from(rsvps).where(eq(rsvps.eventId, eventId));
if (currentRSVPs.length >= eventData.attendeeLimit) {
return fail(400, { error: 'Event is full' });
}
}
// Check if name is already in the list
const existingRSVPs = await drizzleQuery
.select()
.from(rsvps)
.where(eq(rsvps.eventId, eventId));
const existingRSVPs = await database.select().from(rsvps).where(eq(rsvps.eventId, eventId));
if (existingRSVPs.some((rsvp) => rsvp.name.toLowerCase() === name.toLowerCase())) {
return fail(400, { error: 'Name already exists for this event' });
}
// Add RSVP to database
await drizzleQuery.insert(rsvps).values({
await database.insert(rsvps).values({
eventId: eventId,
name: name.trim(),
userId: userId,
@@ -131,7 +121,7 @@ export const actions: Actions = {
}
try {
await drizzleQuery.delete(rsvps).where(eq(rsvps.id, rsvpId));
await database.delete(rsvps).where(eq(rsvps.id, rsvpId));
return { success: true, type: 'remove' };
} catch (err) {
console.error('Error removing RSVP:', err);

View File

@@ -1,15 +1,15 @@
// src/routes/healthz/+server.ts
import { json } from '@sveltejs/kit';
import { drizzleQuery } from '$lib/database/db';
import { database } from '$lib/database/db';
import { sql } from 'drizzle-orm';
export async function GET() {
try {
await drizzleQuery.execute(sql`select 1`);
await database.execute(sql`select 1`);
return json({ ok: true }, { headers: { 'cache-control': 'no-store' } });
} catch (err) {
return json(
{ ok: false, error: (err as Error)?.message ?? 'DB unavailable' },
{ ok: false, error: (err as Error)?.message, message: 'Database unreachable.' },
{ status: 503, headers: { 'cache-control': 'no-store' } }
);
}