diff --git a/functions/api/events-team/events/new.ts b/functions/api/events-team/events/new.ts index 7687f00..c0680bd 100644 --- a/functions/api/events-team/events/new.ts +++ b/functions/api/events-team/events/new.ts @@ -23,7 +23,7 @@ export async function onRequestPost(context: RequestContext) { if ( await context.env.D1.prepare( - "SELECT * FROM events WHERE (approved = true OR approved IS NULL) AND day = ? AND month = ? AND type = ? AND year = ?;", + "SELECT * FROM events WHERE (approved = 1 OR pending =1) AND day = ? AND month = ? AND type = ? AND year = ?;", ) .bind(day, currentMonth, type, currentYear) .first() @@ -45,7 +45,7 @@ export async function onRequestPost(context: RequestContext) { const weekRange = Math.floor(day / 7); const existingEventInRange = await context.env.D1.prepare( - "SELECT id FROM events WHERE (approved = true OR approved IS NULL) AND day > ? AND day <= ? AND month = ? AND type = 'rotw' AND year = ?;", + "SELECT id FROM events WHERE (approved = 1 OR pending = 1) AND day BETWEEN ? AND ? AND month = ? AND type = 'rotw' AND year = ?;", ) .bind( weekRanges[weekRange] - 7,