Read operations transferred (#11)

Nyumat · Jan 8, 2023 · 2758b3f · 2758b3f
1 parent 0e6a4d7
commit 2758b3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 31 deletions.
diff --git a/backend/routes/crud/read/get_machines.js b/backend/routes/crud/read/get_machines.js
diff --git a/backend/routes/crud/read/get_machine.js → backend/routes/crud/read/get_machines.ts b/backend/routes/crud/read/get_machine.js → 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 → backend/routes/crud/read/get_user.ts b/backend/routes/crud/read/get_user.js → 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 → backend/routes/crud/read/get_workouts.ts b/backend/routes/crud/read/get_workouts.js → 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();