Merge pull request #14 from ubclaunchpad/backend-endpoints

Author: rafaelpark11

backend/eslint.config.js

@@ -1,34 +1,14 @@
-import js from '@eslint/js'
-import jest from 'eslint-plugin-jest'
-import globals from 'globals'
+import globals from "globals";
+import pluginJs from "@eslint/js";
 
+/** @type {import('eslint').Linter.Config[]} */
 export default [
-  { ignores: ['dist'] },
-  {
-    files: ['**/*.{js,ts}'],
-    languageOptions: {
-      ecmaVersion: 'latest',
-      globals: globals.node,
-      parserOptions: {
-        ecmaVersion: 'latest',
-        ecmaFeatures: { jsx: true },
-        sourceType: 'module',
-      },
-    },
-    rules: {
-      ...js.configs.recommended.rules,
-    },
-  },
-  {
-    files: ['**/__tests__/**/*.test.{js,ts}'],
-    plugins: {
-      jest,
-    },
-    languageOptions: {
-      globals: jest.environments.globals.globals
-    },
-    rules: {
-      ...jest.configs.recommended.rules,
-    }
-  }
-]
+    { languageOptions: { globals: { ...globals.node, ...globals.jest } } },
+    pluginJs.configs.recommended,
+    {
+        rules: {
+            camelcase: ["warn", { properties: "never", ignoreDestructuring: false }],
+            "max-len": ["warn", { code: 140 }],
+        },
+    },
+];

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, () => {

backend/package-lock.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "babel index.js -d dist",
     "dev": "nodemon server",
-    "lint": "eslint .",
+    "lint": "eslint",
     "start": "node index.js",
     "test": "jest"
   },
@@ -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"
   },

backend/package.json

@@ -16,15 +16,12 @@ const auth = async (req, res, next) => {
 			})
 			req.supabase = supabase;
 		} else {
-			console.error("No token: Authentication Denied");
 			return res.status(401).json({ message: "No token: Authentication Denied" });
 		}
 		next();
 	} catch (err) {
-		console.error("Invalid token, authentication denied:", err.message);
 		return res.status(400).json({ message: `Invalid token, authentication denied: ${err.message}`});
 	}
 };
 
-export default auth;
-
+export default auth;

backend/src/middlewares/__tests__/auth.test.js

@@ -3,7 +3,6 @@ import auth from "../middlewares/auth.js";
 
 const router = express.Router();
 
-//auth test
 router.post("/check", auth, async (req, res) => {
     res.json({ message: "Auth Check Ok"});
 })

backend/src/middlewares/auth.js

@@ -0,0 +1,61 @@
+import express from "express";
+import auth from "../middlewares/auth.js";
+import { createLogbook, getUserLogbooks, getLogbook, createLog, getLogbookLogs, getLog } from "../services/logbooks-service.js";
+
+const router = express.Router();
+
+router.post("", auth, async (req, res) => {
+    const logbook = await createLogbook(req);
+    if (logbook.error) {
+        res.status(500).json({ error: logbook.error });
+    } else {
+        res.status(201).json({ data: logbook });
+    }
+});
+
+router.get("", auth, async (req, res) => {
+    const userLogbooks = await getUserLogbooks(req);
+    if (userLogbooks.error) {
+        res.status(500).json({ error: userLogbooks.error });
+    } else {
+        res.status(200).json({ data: userLogbooks });
+    }
+});
+
+router.get("/:logbookID", auth, async (req, res) => {
+    const logbook = await getLogbook(req);
+    if (logbook.error) {
+        res.status(500).json({ error: logbook.error });
+    } else {
+        res.status(200).json({ data: logbook });
+    }
+});
+
+router.post("/:logbookID/logs", auth, async (req, res) => {
+    const log = await createLog(req);
+    if (log.error) {
+        res.status(500).json({ error: log.error });
+    } else {
+        res.status(201).json({ data: log });
+    }
+});
+
+router.get("/:logbookID/logs", auth, async (req, res) => {
+    const logbookLogs = await getLogbookLogs(req);
+    if (logbookLogs.error) {
+        res.status(500).json({ error: logbookLogs.error });
+    } else {
+        res.status(200).json({ data: logbookLogs });
+    }
+});
+
+router.get("/:logbookID/logs/:logID", auth, async (req, res) => {
+    const log = await getLog(req);
+    if (log.error) {
+        res.status(500).json({ error: log.error });
+    } else {
+        res.status(200).json({ data: log });
+    }
+});
+
+export default router;

backend/src/routes/authRoutes.js renamed to backend/src/routes/auth-route.js

@@ -0,0 +1,3 @@
+test("empty test", () => {
+    expect(true).toBe(true);
+});