minor bug fixes

ubclaunchpad · Dec 4, 2024 · cbdbfde · cbdbfde
1 parent aaeb5ee
commit cbdbfde
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/backend/index.js b/backend/index.js
@@ -1,9 +1,9 @@
 import cors from "cors";
 import dotenv from "dotenv";
 import express from "express";
-import authRoutes from "./src/routes/authRoutes.js";
-import logRoutes from "./src/routes/logRoutes.js";
-import transcriptionRoutes from "./src/routes/transcriptionRoutes.js";
+import authRoutes from "./src/routes/auth-route.js";
+import logbookRoutes from "./src/routes/logbooks-route.js";
+import transcriptionRoutes from "./src/routes/transcription-route.js";
 import fileUpload from "express-fileupload";
 
 dotenv.config();
@@ -20,7 +20,7 @@ app.use(fileUpload());
 
 //Routes
 app.use("/api/auth", authRoutes);
-app.use("/api/log", logRoutes);
+app.use("/api/logbooks", logbookRoutes);
 app.use("/api/transcriptions", transcriptionRoutes);
 
 app.listen(PORT, () => {

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -20,6 +20,7 @@
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
     "express-fileupload": "^1.5.1",
+    "form-data": "^4.0.1",
     "jsonwebtoken": "^9.0.2",
     "supabase": "^1.207.9"
   },

diff --git a/backend/src/services/logbooks-service.js b/backend/src/services/logbooks-service.js
@@ -16,7 +16,7 @@ export async function getUserLogbooks(req) {
         const token = req.header("Authorization")?.split(" ")[1];
         const userID = parseUserID(token);
         if (userID.error) {
-            throw new Error(userID.error.message)
+            throw new Error(userID.error)
         }
         const userLogbooks = await getTable(supabase, "logbooks", "user_id", userID, "collection");
         return userLogbooks;
@@ -47,7 +47,7 @@ export async function createLog(req) {
         body["logbook_id"] = logbookID;
         const logbookType = await getLogbookType(logbookID, supabase);
         if (logbookType.error) {
-            throw new Error(logbookType.error.message);
+            throw new Error(logbookType.error);
         }
         if (body["type"] !== logbookType) {
             throw new Error(`log type '${body["type"]}' does not match logbook type '${logbookType}'`);
@@ -69,7 +69,7 @@ export async function getLogbookLogs(req) {
         const { logbookID } = req.params;
         const logbookType = await getLogbookType(logbookID, supabase);
         if (logbookType.error) {
-            throw new Error(logbookType.error.message);
+            throw new Error(logbookType.error);
         }
         const logbookLogs = await getTable(supabase, logbookType, "logbook_id", logbookID, "collection");
         return logbookLogs;
@@ -84,7 +84,7 @@ export async function getLog(req) {
         const { logbookID, logID } = req.params;
         const logbookType = await getLogbookType(logbookID, supabase);
         if (logbookType.error) {
-            throw new Error(logbookType.error.message);
+            throw new Error(logbookType.error);
         }
         const log = await getTable(supabase, logbookType, "id", logID, "resource");
         if (typeof log == "undefined") {

diff --git a/backend/src/utils/get-logbook-type.js b/backend/src/utils/get-logbook-type.js
@@ -1,7 +1,7 @@
 export default async function getLogbookType(logbookID, supabase) {
     try {
         const { data, error } = await supabase.from("logbooks").select().eq("id", logbookID);
-        if (data.length == 0 && typeof error == "undefined") {
+        if (data.length == 0) {
             throw new Error(`logbook ${logbookID} does not exist`); 
         } else if (error) {
             throw new Error(error.message);