diff --git a/backend/routes/crud/read/get_machines.js b/backend/routes/crud/read/get_machines.js deleted file mode 100644 index c889d52..0000000 --- a/backend/routes/crud/read/get_machines.js +++ /dev/null @@ -1,27 +0,0 @@ -import { Router } from "express"; -import { Dixon } from "../../../models/dixon.js"; -const router = Router(); - -router.get("/", async (req, res) => { - try { - let dixon = await Dixon.find({}).exec(); - let machines = []; - dixon.map((machine) => { - machines.push({ - machine_name: machine.machine_name, - machine_id: machine.machine_id, - machine_type: machine.machine_type, - machine_status: machine.machine_status, - machine_image: machine.machine_image - }); - }); - return res.status(200).json({ - msg: `Machines found successfully!`, - machines: machines - }); - } catch (error) { - return res.status(400).send(error); - } -}); - -export default router; diff --git a/backend/routes/crud/read/get_machine.js b/backend/routes/crud/read/get_machines.ts similarity index 88% rename from backend/routes/crud/read/get_machine.js rename to backend/routes/crud/read/get_machines.ts index c889d52..60e4790 100644 --- a/backend/routes/crud/read/get_machine.js +++ b/backend/routes/crud/read/get_machines.ts @@ -1,11 +1,11 @@ import { Router } from "express"; -import { Dixon } from "../../../models/dixon.js"; +import Dixon from "../../../models/dixon.js"; const router = Router(); router.get("/", async (req, res) => { try { let dixon = await Dixon.find({}).exec(); - let machines = []; + let machines: any[] = []; dixon.map((machine) => { machines.push({ machine_name: machine.machine_name, diff --git a/backend/routes/crud/read/get_user.js b/backend/routes/crud/read/get_user.ts similarity index 75% rename from backend/routes/crud/read/get_user.js rename to backend/routes/crud/read/get_user.ts index 485e7ce..b10ed25 100644 --- a/backend/routes/crud/read/get_user.js +++ b/backend/routes/crud/read/get_user.ts @@ -1,11 +1,15 @@ -import { User } from "../../../models/user.js"; import { Router } from "express"; +import User from "../../../models/user.js"; const router = Router(); router.get("/", async (req, res) => { const username = req.query.username; try { let user = await User.findOne({ username: username }).exec(); + + if (!user) { + return res.status(400).json({ msg: "User does not exist." }); + } return res.status(200).json({ msg: `User ${user.username} found successfully!`, diff --git a/backend/routes/crud/read/get_workouts.js b/backend/routes/crud/read/get_workouts.ts similarity index 91% rename from backend/routes/crud/read/get_workouts.js rename to backend/routes/crud/read/get_workouts.ts index bf4375f..ce71844 100644 --- a/backend/routes/crud/read/get_workouts.js +++ b/backend/routes/crud/read/get_workouts.ts @@ -1,4 +1,5 @@ -import { User } from "../../../models/user.js"; +//@ts-nocheck +import User from "../../../models/user.js"; import { Router } from "express"; const router = Router();