From 39d6157a3c9e05d5558d88aa16fc3e28d1b9bf9d Mon Sep 17 00:00:00 2001 From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com> Date: Thu, 7 Apr 2022 07:36:43 +0200 Subject: [PATCH] Fix naming issues in routers and remove unnecessary files --- src/controller/orders.controller.ts | 2 +- src/controller/organisations.controller.ts | 6 +++--- src/controller/testcontroller.controller.ts | 5 ----- src/index.ts | 2 -- src/routes/testrouter.route.ts | 12 ------------ 5 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 src/controller/testcontroller.controller.ts delete mode 100644 src/routes/testrouter.route.ts diff --git a/src/controller/orders.controller.ts b/src/controller/orders.controller.ts index 164c380..0bfebe0 100644 --- a/src/controller/orders.controller.ts +++ b/src/controller/orders.controller.ts @@ -79,7 +79,7 @@ export const getOrder = async (req: Request, res: Response) => { }); } - const order = await prisma.restaurant.findUnique({ + const order = await prisma.order.findUnique({ where: { id: id, }, diff --git a/src/controller/organisations.controller.ts b/src/controller/organisations.controller.ts index 4af0f52..d0b0030 100644 --- a/src/controller/organisations.controller.ts +++ b/src/controller/organisations.controller.ts @@ -7,7 +7,7 @@ export const addOrganization = async (req: Request, res: Response) => { if (typeof req.body.name !== "string" || typeof req.body.domain !== "string") { res.status(HttpStatusCodes.BAD_REQUEST).json({ name: DataType.STRING, - description: DataType.STRING, + domain: DataType.STRING, }); return; } @@ -32,7 +32,7 @@ export const updateOrganization = async (req: Request, res: Response) => { } else if (typeof req.body.name !== "string" || typeof req.body.domain !== "string") { res.status(HttpStatusCodes.BAD_REQUEST).json({ name: DataType.STRING, - description: DataType.STRING, + domain: DataType.STRING, }); return; } @@ -77,7 +77,7 @@ export const getOrganization = async (req: Request, res: Response) => { }); } - const organization = await prisma.restaurant.findUnique({ + const organization = await prisma.organization.findUnique({ where: { id: id, }, diff --git a/src/controller/testcontroller.controller.ts b/src/controller/testcontroller.controller.ts deleted file mode 100644 index cb7ef10..0000000 --- a/src/controller/testcontroller.controller.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Request, Response } from "express"; - -export const sayHello = async (request: Request, response: Response) => { - response.status(200).send("Hello!"); -}; diff --git a/src/index.ts b/src/index.ts index 6423178..3d5f077 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,14 +1,12 @@ import express from "express"; const app = express(); -const testRoutes = require("./routes/testrouter.route"); const ordersRoutes = require("./routes/orders.route"); const organizationsRoutes = require("./routes/organisations.route"); const pizzasRoutes = require("./routes/pizzas.route"); const restaurantsRoutes = require("./routes/restaurants.route"); app.use(express.json()); -app.use("/tests", testRoutes); app.use("/order", ordersRoutes); app.use("/organization", organizationsRoutes); app.use("/pizza", pizzasRoutes); diff --git a/src/routes/testrouter.route.ts b/src/routes/testrouter.route.ts deleted file mode 100644 index 721a764..0000000 --- a/src/routes/testrouter.route.ts +++ /dev/null @@ -1,12 +0,0 @@ -import express from "express"; -import { sayHello } from "../controller/testcontroller.controller"; - -export const router = express.Router(); - -router.get("/", (request: Request, response: Response) => { - response.status(200).send("Cool test stuff!"); -}); - -router.post("/test1", sayHello); - -module.exports = router;