Fix types

upleveled · Oct 24, 2024 · 5c308a5 · 5c308a5
1 parent f300af0
commit 5c308a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/(tabs)/newGuest.tsx b/app/(tabs)/newGuest.tsx
@@ -10,6 +10,7 @@ import {
   View,
 } from 'react-native';
 import { colors } from '../../constants/colors';
+import type { GuestResponseBodyGet } from '../api/[guestId]+api';
 
 const styles = StyleSheet.create({
   container: {
@@ -106,8 +107,9 @@ export default function NewGuest() {
 
           if (!response.ok) {
             let errorMessage = 'Error creating guest';
-            const body: { error: string } = await response.json();
-            if (body.error) {
+            const body: GuestResponseBodyGet = await response.json();
+
+            if ('error' in body) {
               errorMessage = body.error;
             }
 

diff --git a/app/guests/[guestId].tsx b/app/guests/[guestId].tsx
@@ -12,7 +12,7 @@ import {
 } from 'react-native';
 import placeholder from '../../assets/candidate-default.avif';
 import { colors } from '../../constants/colors';
-import type { Guest } from '../../migrations/00000-createTableGuests';
+import type { GuestResponseBodyGet } from '../api/[guestId]+api';
 
 const styles = StyleSheet.create({
   container: {
@@ -126,11 +126,13 @@ export default function GuestPage() {
         }
 
         const response = await fetch(`/api/${guestId}`);
-        const body: { guest: Guest } = await response.json();
+        const body: GuestResponseBodyGet = await response.json();
 
-        setFirstName(body.guest.firstName);
-        setLastName(body.guest.lastName);
-        setAttending(body.guest.attending);
+        if ('guest' in body) {
+          setFirstName(body.guest.firstName);
+          setLastName(body.guest.lastName);
+          setAttending(body.guest.attending);
+        }
       }
 
       loadGuest().catch((error) => {