fix: throw and error to catch instead of returning null when error occurs

Author: david-roper

apps/web/src/hooks/useFindSession.ts

@@ -7,6 +7,6 @@ export const sessionInfo = async (sessionId: string): Promise<null | Session> =>
     return response.data ? (response.data as Session) : null;
   } catch (error) {
     console.error('Error fetching session:', error);
-    return null; // ensures a resolved value instead of `void`
+    throw error;
   }
 };

apps/web/src/hooks/useFindUser.ts

@@ -7,6 +7,6 @@ export const userInfo = async (userId: string): Promise<null | User> => {
     return response.data ? (response.data as User) : null;
   } catch (error) {
     console.error('Error fetching user:', error);
-    return null; // ensures a resolved value instead of `void`
+    throw error;
   }
 };

apps/web/src/hooks/useInstrumentVisualization.ts

@@ -206,37 +206,41 @@ export function useInstrumentVisualization({ params }: UseInstrumentVisualizatio
 
   useEffect(() => {
     const fetchRecords = async () => {
-      if (recordsQuery.data) {
-        const records: InstrumentVisualizationRecord[] = [];
-
-        for (const record of recordsQuery.data) {
-          const props = record.data && typeof record.data === 'object' ? record.data : {};
-
-          const sessionData = await sessionInfo(record.sessionId);
+      try {
+        if (recordsQuery.data) {
+          const records: InstrumentVisualizationRecord[] = [];
+
+          for (const record of recordsQuery.data) {
+            const props = record.data && typeof record.data === 'object' ? record.data : {};
+
+            const sessionData = await sessionInfo(record.sessionId);
+
+            if (!sessionData?.userId) {
+              records.push({
+                __date__: record.date,
+                __time__: record.date.getTime(),
+                userId: 'N/A',
+                ...record.computedMeasures,
+                ...props
+              });
+              continue;
+            }
 
-          if (!sessionData?.userId) {
+            const userData = await userInfo(sessionData.userId);
+            // safely check since userData can be null
             records.push({
               __date__: record.date,
               __time__: record.date.getTime(),
-              userId: 'N/A',
+              userId: userData?.username ?? 'N/A',
               ...record.computedMeasures,
               ...props
             });
-            continue;
           }
 
-          const userData = await userInfo(sessionData.userId);
-          // safely check since userData can be null
-          records.push({
-            __date__: record.date,
-            __time__: record.date.getTime(),
-            userId: userData?.username ?? 'N/A',
-            ...record.computedMeasures,
-            ...props
-          });
+          setRecords(records);
         }
-
-        setRecords(records);
+      } catch (error) {
+        console.error('Error occurred: ', error);
       }
     };
     void fetchRecords();