From bb0a1fb36282d44093dcb3109040c976343b19da Mon Sep 17 00:00:00 2001
From: Jessica Ho <hojessica1230@gmail.com>
Date: Sun, 18 Feb 2024 10:31:33 +0000
Subject: [PATCH] fix tests

---
 prisma/seed.ts                   | 38 ++++++++++++++++++++++++++------
 src/lib/server/dbRoutes/index.ts |  4 ++++
 src/routes/+page.svelte          |  2 +-
 src/routes/circle/+page.svelte   |  2 +-
 src/routes/db/+server.ts         |  6 ++---
 src/routes/invites/+page.svelte  |  2 +-
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/prisma/seed.ts b/prisma/seed.ts
index ce62500..5b8aaee 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -1,4 +1,3 @@
-import AvailabilityDateRepository from '$lib/server/repository/AvailabilityDate';
 import { AvailabilityStatus, PrismaClient, Pronoun } from '@prisma/client';
 import { DateTime } from 'luxon';
 
@@ -313,14 +312,27 @@ async function main() {
 		}
 	);
 
-	await AvailabilityDateRepository.upsert({
-		householdId: 3,
-		date: firstDate.toJSDate(),
+
+	const firstDateBase = {
 		status: AvailabilityStatus.AVAILABLE,
 		notes: 'first date',
 		emoticons: '',
 		startTime: firstDate.set({ hour: 14 }).toJSDate(),
 		endTime: firstDate.set({ hour: 15 }).toJSDate()
+	};
+	await prisma.availabilityDate.upsert({
+		where: {
+			householdId_date: {
+				householdId: 3,
+				date: firstDate.toJSDate(),
+			}
+		},
+		update: firstDateBase,
+		create: {
+			householdId: 3,
+			date: firstDate.toJSDate(),
+			...firstDateBase
+		}
 	});
 
 	const lastDate = DateTime.fromObject(
@@ -334,14 +346,26 @@ async function main() {
 		}
 	);
 
-	await AvailabilityDateRepository.upsert({
-		householdId: 3,
-		date: lastDate.toJSDate(),
+	const lastDateBase = {
 		status: AvailabilityStatus.AVAILABLE,
 		notes: 'last date',
 		emoticons: '',
 		startTime: lastDate.set({ hour: 14 }).toJSDate(),
 		endTime: lastDate.set({ hour: 15 }).toJSDate()
+	};
+	await prisma.availabilityDate.upsert({
+		where: {
+			householdId_date: {
+				householdId: 3,
+				date: lastDate.toJSDate(),
+			}
+		},
+		update: lastDateBase,
+		create: {
+			householdId: 3,
+			date: lastDate.toJSDate(),
+			...lastDateBase
+		}
 	});
 }
 
diff --git a/src/lib/server/dbRoutes/index.ts b/src/lib/server/dbRoutes/index.ts
index c62cfa6..d84490c 100644
--- a/src/lib/server/dbRoutes/index.ts
+++ b/src/lib/server/dbRoutes/index.ts
@@ -1,8 +1,10 @@
 import acceptFriendReq from './acceptFriendReq';
+import acceptHouseholdInvite from './acceptHouseholdInvite';
 import createCircleInvite from './createCircleInvite';
 import createHouseholdInvite from './createHouseholdInvite';
 import createKid from './createKid';
 import deleteFriend from './deleteFriend';
+import deleteHouseholdInvite from './_shared/deleteHouseholdInvite';
 import rejectFriendReq from './rejectFriendReq';
 import rejectHouseholdInvite from './rejectHouseholdInvite';
 import upsertDate from './upsertDate';
@@ -12,10 +14,12 @@ import upsertUser from './upsertUser';
 
 export {
 	acceptFriendReq,
+	acceptHouseholdInvite,
 	createCircleInvite,
 	createHouseholdInvite,
 	createKid,
 	deleteFriend,
+	deleteHouseholdInvite,
 	rejectFriendReq,
 	rejectHouseholdInvite,
 	upsertDate,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index b400a14..d5cd082 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { env as public_env } from '$env/dynamic/public';
-	import { writeReq } from '$lib/utils';
+	import { writeReq } from '$lib/logics/_shared/utils';
 	import { onMount } from 'svelte';
 	import intlTelInput from 'intl-tel-input';
 
diff --git a/src/routes/circle/+page.svelte b/src/routes/circle/+page.svelte
index e4829d0..8edc882 100644
--- a/src/routes/circle/+page.svelte
+++ b/src/routes/circle/+page.svelte
@@ -2,7 +2,7 @@
 	import { onMount, afterUpdate } from 'svelte';
 	import { page } from '$app/stores';
 	import { invalidate } from '$app/navigation';
-	import { writeReq } from '$lib/utils';
+	import { writeReq } from '$lib/logics/_shared/utils';
 	import NavBar from '$lib/components/NavBar.svelte';
 	import Modal from '$lib/components/Modal.svelte';
 	import PhoneInput from '$lib/components/PhoneInput.svelte';
diff --git a/src/routes/db/+server.ts b/src/routes/db/+server.ts
index f2f96bd..06481f6 100644
--- a/src/routes/db/+server.ts
+++ b/src/routes/db/+server.ts
@@ -40,10 +40,8 @@ export async function POST({
 		res = await routes[req.type](req, user);
 		return json(res);
 	} catch (err) {
-		console.error(err);
-		throw error(500, {
-			message: `${req.type} for user ${user.id} failed`
-		});
+		console.error(`${req.type} for user ${user.id} failed`);
+		throw error(err.status, err.body.message);
 	}
 }
 
diff --git a/src/routes/invites/+page.svelte b/src/routes/invites/+page.svelte
index e9f9a68..3cda0f1 100644
--- a/src/routes/invites/+page.svelte
+++ b/src/routes/invites/+page.svelte
@@ -5,7 +5,7 @@
 	import AcceptIcon from '$lib/icons/checkIcon.svelte';
 	import NavBar from '$lib/components/NavBar.svelte';
 	import { invalidate } from '$app/navigation';
-	import { writeReq } from '$lib/utils';
+	import { writeReq } from '$lib/logics/_shared/utils';
 
 	let { friendReqsInfo, householdInvites } = $page.data;
 	afterUpdate(() => {