Merge pull request #5 from GithubOrgProjectPiza/routes-implementation

Merge Routes implementation

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,
     },
@@ -87,3 +87,9 @@ export const getOrder = async (req: Request, res: Response) => {
 
   res.status(HttpStatusCodes.OK).json(order);
 };
+
+export const getOrders = async (_req: Request, res: Response) => {
+  const orders = await prisma.order.findMany();
+
+  res.status(HttpStatusCodes.OK).json(orders);
+};

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,
     },
@@ -85,3 +85,9 @@ export const getOrganization = async (req: Request, res: Response) => {
 
   res.status(HttpStatusCodes.OK).json(organization);
 };
+
+export const getOrganizations = async (_req: Request, res: Response) => {
+  const organizations = await prisma.organization.findMany();
+
+  res.status(HttpStatusCodes.OK).json(organizations);
+};

src/controller/pizzas.controller.ts

@@ -96,3 +96,9 @@ export const getPizza = async (req: Request, res: Response) => {
 
   res.status(HttpStatusCodes.OK).json(pizza);
 };
+
+export const getPizzas = async (_req: Request, res: Response) => {
+  const pizzas = await prisma.pizza.findMany();
+
+  res.status(HttpStatusCodes.OK).json(pizzas);
+};

src/controller/restaurants.controller.ts

@@ -85,3 +85,9 @@ export const getRestaurant = async (req: Request, res: Response) => {
 
   res.status(HttpStatusCodes.OK).json(restaurant);
 };
+
+export const getRestaurants = async (_req: Request, res: Response) => {
+  const restaurants = await prisma.restaurant.findMany();
+
+  res.status(HttpStatusCodes.OK).json(restaurants);
+};

src/controller/testcontroller.controller.ts

@@ -1,5 +0,0 @@
-import { Request, Response } from "express";
-
-export const sayHello = async (request: Request, response: Response) => {
-  response.status(200).send("Hello!");
-};

src/index.ts

@@ -1,21 +1,19 @@
 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);
 app.use("/restaurant", restaurantsRoutes);
 
 async function main() {
-  app.get("/", (req, res) => {
+  app.get("/", (_req, res) => {
     res.send("Hello World!");
   });
 

src/routes/orders.route.ts

@@ -1,8 +1,9 @@
 import express from "express";
-import { addOrder, deleteOrder, getOrder, updateOrder } from "../controller/orders.controller";
+import { addOrder, deleteOrder, getOrder, updateOrder, getOrders } from "../controller/orders.controller";
 
 const router = express.Router();
 
+router.get("/", getOrders);
 router.get("/:id", getOrder);
 router.post("/", addOrder);
 router.put("/:id", updateOrder);

src/routes/organisations.route.ts

@@ -1,5 +1,6 @@
 import express from "express";
 import {
+  getOrganizations,
   addOrganization,
   deleteOrganization,
   getOrganization,
@@ -8,6 +9,7 @@ import {
 
 const router = express.Router();
 
+router.get("/", getOrganizations);
 router.get("/:id", getOrganization);
 router.post("/", addOrganization);
 router.put("/:id", updateOrganization);

src/routes/pizzas.route.ts

@@ -1,8 +1,9 @@
 import express from "express";
-import { addPizza, deletePizza, getPizza, updatePizza } from "../controller/pizzas.controller";
+import { getPizzas, addPizza, deletePizza, getPizza, updatePizza } from "../controller/pizzas.controller";
 
 const router = express.Router();
 
+router.get("/", getPizzas);
 router.get("/:id", getPizza);
 router.post("/", addPizza);
 router.put("/:id", updatePizza);

src/routes/restaurants.route.ts

@@ -1,8 +1,15 @@
 import express from "express";
-import { addRestaurant, deleteRestaurant, getRestaurant, updateRestaurant } from "../controller/restaurants.controller";
+import {
+  getRestaurants,
+  addRestaurant,
+  deleteRestaurant,
+  getRestaurant,
+  updateRestaurant,
+} from "../controller/restaurants.controller";
 
 const router = express.Router();
 
+router.get("/", getRestaurants);
 router.get("/:id", getRestaurant);
 router.post("/", addRestaurant);
 router.put("/:id", updateRestaurant);

src/routes/testrouter.route.ts

@@ -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;