Reminder

.github/workflows/test.yml

@@ -4,6 +4,7 @@ on: [push, pull_request]
 env:
   DATABASE_PRISMA_URL: postgres://postgres:postgres@localhost:5432/test
   DATABASE_URL: postgres://postgres:postgres@localhost:5432/test
+  PUBLIC_URL: http://localhost:5173
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -42,6 +43,9 @@ jobs:
     - name: Build in node mode
       run: yarn nodebuild
 
+    - name: Install playwright
+      run: npx playwright install
+
     - name: Install Playwright dependencies (just chromium for now)
       run: npx playwright install-deps chromium
 

package.json

@@ -19,8 +19,8 @@
 		"test:unit": "vitest",
 		"lint": "prettier --plugin-search-dir . --check . && eslint .",
 		"format": "prettier --plugin-search-dir . --write .",
-		"reset": "prisma migrate reset  && yarn dev",
-		"postinstall": "prisma generate",
+		"reset": "prisma migrate reset && yarn dev",
+		"postinstall": "prisma migrate dev",
 		"build:prev": "vite build && vite preview",
 		"seed": "prisma db seed"
 	},

src/hooks.server.ts

@@ -1,11 +1,18 @@
 import type { Handle, RequestEvent } from '@sveltejs/kit';
 import { PrismaClient } from '@prisma/client';
 import type { User, PhoneContactPermissions } from '@prisma/client';
+import * as cron from 'node-cron';
+import { sendNotif } from '$lib/server/twilio';
+
 const prisma = new PrismaClient();
 
 import { redirect } from '@sveltejs/kit';
 import type { MaybePromise, ResolveOptions } from '@sveltejs/kit/types/internal';
 
+cron.schedule('*/1 * * * *', function () {
+	sendNotif();
+});
+
 const setLocal = async (
 	user: (User & { phonePermissions: PhoneContactPermissions }) | null,
 	phone: string,

src/lib/server/db.ts

@@ -423,10 +423,14 @@ async function saveUser(
 		allowInvites,
 		allowReminders
 	} = req;
+	// Get the current date in the user's timezone
+	const userLocalDate = new Date().toLocaleString('en-US', { timeZone });
 
-	const d = new Date();
-	const day = d.getDay();
-	const diff = d.getDate() - day + notifStartDay;
+	// Convert the user's date to a JavaScript Date object
+	const d = new Date(userLocalDate);
+
+	// Calculate the desired date based on the user's timezone
+	const diff = d.getDate() - d.getDay() + notifStartDay;
 	d.setDate(diff);
 	d.setHours(notifHr);
 	d.setMinutes(notifMin);

src/lib/server/twilio.ts

@@ -94,12 +94,24 @@ const msgToSend = async (
 			msg = `Thanks for subscribing to reminders and friend availability notifications from ${url}! You can disable this at any time on your Profile page or by responding STOP.`;
 			break;
 		}
+		case 'reminder': {
+			const { phone } = msgComps;
+			msg = `Hi! It's your periodic reminder to update your schedule: https://playdate.help/login/${phone}`;
+			break;
+		}
+		default:
+			throw error(400, {
+				message: `Message type ${type} not supported`
+			});
 	}
 	return msg;
 };
 
-export const sendMsg = async (request: Request, initiator: User | null) => {
-	const { phone, sendAt, type, ...rest } = await request.json();
+export const sendMsg = async (
+	request: { phone: string; sendAt?: Date; type: string },
+	initiator: User | null
+) => {
+	const { phone, sendAt, type, ...rest } = request;
 	if (!phone || !type) {
 		throw error(400, {
 			message: `Missing a ${!phone ? 'phone number' : 'type of message to send'}`
@@ -229,3 +241,53 @@ export const getMsg = async (url: URL) => {
 
 	return response;
 };
+
+export async function sendNotif() {
+	const nowLocal = new Date();
+	const users = await prisma.user.findMany({
+		select: {
+			id: true,
+			phone: true,
+			reminderDatetime: true,
+			reminderIntervalDays: true,
+			timeZone: true,
+			phonePermissions: {
+				select: {
+					allowReminders: true,
+					blocked: true
+				}
+			}
+		}
+	});
+	users.forEach(async (user) => {
+		const { id, phone, reminderDatetime, reminderIntervalDays, phonePermissions, timeZone } = user;
+		const { allowReminders, blocked } = phonePermissions;
+		if (!allowReminders || blocked) return;
+
+		const options = {
+			timeZone
+		};
+
+		const formattedDate = nowLocal.toLocaleString('en-US', options);
+		const now = new Date(formattedDate);
+		const timeDifference = Math.abs(now.getTime() - reminderDatetime.getTime()); // Get the absolute time difference in milliseconds
+		const minuteInMillis = 60 * 1000; // 1 minute in milliseconds
+		if (timeDifference < minuteInMillis) {
+			// currently within a minute of when user should be reminded
+			// send notif
+			await sendMsg({ phone, type: 'reminder' }, null);
+
+			// update reminder date for next notif
+			const newReminderDate = new Date(reminderDatetime);
+			newReminderDate.setDate(reminderDatetime.getDate() + reminderIntervalDays);
+			await prisma.user.update({
+				where: {
+					id
+				},
+				data: {
+					reminderDatetime: newReminderDate
+				}
+			});
+		}
+	});
+}

src/routes/circle/+page.svelte

@@ -104,7 +104,7 @@
 							: 'line-through'}"
 					>
 						{parent.firstName}
-						{parent.lastName}
+						{parent.lastName ?? ''}
 					</p>
 				{/each}
 			</div>

src/routes/household/+page.svelte

@@ -308,15 +308,15 @@
 					<h4 class="subtitle-3">Sender</h4>
 					<p class="subtitle-2" style="display: inline; color: black; font-weight: 500;">
 						{householdInvites[0].fromUser.firstName}
-						{householdInvites[0].fromUser.lastName}
+						{householdInvites[0].fromUser.lastName ?? ''}
 					</p>
 					<span style="padding: 0 0.5rem; font-size: 15px;"
 						>({householdInvites[0].fromUser.phone})</span
 					>
 
 					<h4 class="subtitle-3">Kids</h4>
 					{#each householdInvites[0].household.children as kid}
-						<p style="font-size: 18px;">{kid.firstName} {kid.lastName}</p>
+						<p style="font-size: 18px;">{kid.firstName} {kid.lastName ?? ''}</p>
 					{/each}
 				</div>
 
@@ -375,7 +375,7 @@
 		<p class="subtitle">Kids</p>
 		{#each kids as kid, ind}
 			<div class="card">
-				<p>{kid.firstName} {kid.lastName}</p>
+				<p>{kid.firstName} {kid.lastName ?? ''}</p>
 				<button class="delete-btn" on:click|preventDefault={() => deleteKid(ind)}><hr /></button>
 			</div>
 			<hr class="inner-section" />

src/routes/household/[householdId]/+page.svelte

@@ -21,7 +21,7 @@
 	<p class="subtitle">Kids</p>
 	{#each household.kids as kid}
 		<div class="card">
-			<p>{kid.firstName} {kid.lastName}</p>
+			<p>{kid.firstName} {kid.lastName ?? ''}</p>
 			<p class="small-font">Pronouns: {PRONOUNS[kid.pronouns]}</p>
 			<p class="small-font">Age: {kid.age}</p>
 		</div>
@@ -30,7 +30,7 @@
 	<p class="subtitle">Adults</p>
 	{#each household.adults as adult}
 		<div class="card">
-			<p>{adult.firstName} {adult.lastName}</p>
+			<p>{adult.firstName} {adult.lastName ?? ''}</p>
 			<p class="small-font">Pronouns: {PRONOUNS[adult.pronouns]}</p>
 			<p class="small-font">
 				Phone: <a href="tel:{adult.phone}">{adult.phone}</a>

src/routes/invites/+page.svelte

@@ -80,7 +80,7 @@
 			<p class="household-name">{household.name}</p>
 			<div>
 				{#each household.parents as parent}
-					<p>{parent.firstName} {parent.lastName}</p>
+					<p>{parent.firstName} {parent.lastName ?? ''}</p>
 				{/each}
 			</div>
 			<a href="tel:{household.phone}">{household.phone}</a>
@@ -132,12 +132,12 @@
 			<p class="household-name">{invite.household.name}</p>
 			<div>
 				{#each invite.household.parents as parent}
-					<p>{parent.firstName} {parent.lastName}: {parent.phone}</p>
+					<p>{parent.firstName} {parent.lastName ?? ''}: {parent.phone}</p>
 				{/each}
 			</div>
 			<div>
 				{#each invite.household.children as child}
-					<p>{child.firstName} {child.lastName}</p>
+					<p>{child.firstName} {child.lastName ?? ''}</p>
 				{/each}
 			</div>
 			<div class="w-full">

src/routes/twilio/+server.ts

@@ -10,8 +10,7 @@ export async function POST({
 }) {
 	const sessionToken = cookies.get('session');
 	const { user } = await getProfileFromSession(sessionToken);
-
-	return sendMsg(request, user);
+	return sendMsg(await request.json(), user);
 }
 
 export function GET({ url }: { url: URL }) {