Allow searching events

Also upgrade Fresh

lib/data/calendar.ts

@@ -288,3 +288,20 @@ export async function deleteCalendarEvent(id: string, calendarId: string, userId
 
   await updateCalendarRevision(calendar);
 }
+
+export async function searchCalendarEvents(
+  searchTerm: string,
+  userId: string,
+  calendarIds: string[],
+): Promise<CalendarEvent[]> {
+  const calendarEvents = await db.query<CalendarEvent>(
+    sql`SELECT * FROM "bewcloud_calendar_events" WHERE "user_id" = $1 AND "calendar_id" = ANY($2) AND ("title" ILIKE $3 OR "extra"::text ILIKE $3) ORDER BY "start_date" ASC`,
+    [
+      userId,
+      calendarIds,
+      `%${searchTerm.split(' ').join('%')}%`,
+    ],
+  );
+
+  return calendarEvents;
+}

lib/data/contacts.ts

@@ -28,13 +28,13 @@ export async function getContactsCount(userId: string) {
   return Number(results[0]?.count || 0);
 }
 
-export async function searchContacts(search: string, userId: string, pageIndex: number) {
+export async function searchContacts(searchTerm: string, userId: string, pageIndex: number) {
   const contacts = await db.query<Pick<Contact, 'id' | 'first_name' | 'last_name'>>(
     sql`SELECT "id", "first_name", "last_name" FROM "bewcloud_contacts" WHERE "user_id" = $1 AND ("first_name" ILIKE $3 OR "last_name" ILIKE $3 OR "extra"::text ILIKE $3) ORDER BY "first_name" ASC, "last_name" ASC LIMIT ${CONTACTS_PER_PAGE_COUNT} OFFSET $2`,
     [
       userId,
       pageIndex * CONTACTS_PER_PAGE_COUNT,
-      `%${search}%`,
+      `%${searchTerm.split(' ').join('%')}%`,
     ],
   );