From 41d5935fb5e65e98f04c8fa5a5f1810267a0a282 Mon Sep 17 00:00:00 2001 From: Regalijan Date: Thu, 22 Feb 2024 13:40:54 -0500 Subject: [PATCH] Improve existing event checks --- functions/api/events-team/events/new.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/api/events-team/events/new.ts b/functions/api/events-team/events/new.ts index 836e52f..eeb9325 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 = false AND day = ? AND month = ? AND type = ? AND year = ?;", + "SELECT * FROM events WHERE (approved = true OR approved IS NULL) 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 day > ? AND day <= ? AND month = ? AND type = 'rotw' AND year = ?;", + "SELECT id FROM events WHERE (approved = true OR approved IS NULL) AND day > ? AND day <= ? AND month = ? AND type = 'rotw' AND year = ?;", ) .bind( weekRanges[weekRange] - 7,