Merge pull request #22 from oslabs-beta/orders

Orders 2:19PM

Author: ZhongyanLiang

examples_new/microservices/orders/package-lock.json

@@ -18,7 +18,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@chronosrx/common": "^1.0.2",
+
+    "@chronosrx/common": "^1.0.4",
     "axios": "^1.6.2",
     "bcryptjs": "^2.4.3",
     "cookie-parser": "^1.4.6",

examples_new/microservices/orders/package.json

@@ -2,6 +2,12 @@ import { Request, Response } from 'express';
 import axios from 'axios';
 import { Order } from '../models/Order';
 import { BadRequestError, CurrentUserRequest, Events } from '@chronosrx/common';
+
+export const createOrder = async (req: CurrentUserRequest, res: Response) => {
+  //deconstruct req.body
+  const { itemId, amount } = req.body;
+  //create Order document in the databse
+  const newOrder = Order.build({ itemId, amount });
 import { Inventory } from '../models/Inventory';
 
 export const createOrder = async (req: CurrentUserRequest, res: Response) => {
@@ -21,31 +27,25 @@ export const createOrder = async (req: CurrentUserRequest, res: Response) => {
   res.status(201).send(newOrder);
 };
 
-export const getOrder = async (req: Request, res: Response) => {
-  // check if order already exists
-  const { buyerId } = req.body;
-  const exsitingOrder = await Order.findOne({ buyerId });
-  if (!exsitingOrder) {
-    throw new BadRequestError('Order with that id does not exists');
-  }
-  //check inventory itemId, amount
-  res.status(200).send(exsitingOrder);
-};
 
-export const getSale = async (req: Request, res: Response) => {
-  const { sellerId } = req.body;
-  const sales = await Order.find({ sellerId });
-  if (!sales) {
-    throw new BadRequestError('Sales with that sellerId does not exist');
-  }
-  res.status(200).send(sales);
-};
+// export const getOrder = async (req: Request, res: Response) => {
+//   // check if order already exists
+//   const { buyerId } = req.body;
+//   const exsitingOrder = await Order.findOne({ buyerId });
+//   if (!exsitingOrder) {
+//     throw new BadRequestError('Order with that id does not exists');
+//   }
+//   //check inventory itemId, amount
+//   res.status(200).send(exsitingOrder);
+// };
+
+// export const deleteOrder = async (req: Request, res: Response) => {
+//   const { id } = req.body;
+//   const deletedOrder = await Order.findOneAndDelete({ id });
+//   if (!deletedOrder) {
+//     throw new BadRequestError(`Could not find that order by id to delete`);
+//   }
+//   res.status(200).send(deletedOrder);
+// };
+
 
-export const deleteOrder = async (req: Request, res: Response) => {
-  const { id } = req.body;
-  const deletedOrder = await Order.findOneAndDelete({ id });
-  if (!deletedOrder) {
-    throw new BadRequestError(`Could not find that order by id to delete`);
-  }
-  res.status(200).send(deletedOrder);
-};

examples_new/microservices/orders/src/controllers/order-controller.ts

@@ -3,8 +3,6 @@ import mongoose from 'mongoose';
 interface OrderAttrs {
   itemId: string;
   amount: number;
-  totalPrice: number;
-  sellerId: string;
 }
 
 interface OrderModel extends mongoose.Model<OrderDoc> {
@@ -14,8 +12,6 @@ interface OrderModel extends mongoose.Model<OrderDoc> {
 interface OrderDoc extends mongoose.Document {
   itemId: string;
   amount: number;
-  totalPrice: number;
-  sellerId: string;
 }
 
 //create the Schema in mongoose with defined requirements
@@ -30,14 +26,6 @@ const OrderSchema = new mongoose.Schema(
       type: Number,
       required: true,
     },
-    totalPrice: {
-      type: Number,
-      required: true,
-    },
-    sellerId: {
-      type: String,
-      require: true,
-    },
   },
   {
     //anytime we create Json formatted data, transform the user document as following
@@ -55,8 +43,6 @@ OrderSchema.statics.build = (attrs: OrderAttrs) => {
   return new Order({
     itemId: attrs.itemId,
     amount: attrs.amount,
-    totalPrice: attrs.totalPrice,
-    sellerId: attrs.sellerId,
   });
 };
 

examples_new/microservices/orders/src/models/Order.ts

@@ -1,23 +1,26 @@
+import { EventTypes, Events } from '@chronosrx/common';
 import express from 'express';
-import { Events } from '@chronosrx/common';
 import { Order } from '../models/Order';
-import { Inventory } from '../models/Inventory';
+
 
 const router = express.Router();
 
 router.post('/', async (req, res) => {
-  const { event } = req.body;
+  const event: Events = req.body.event;
   console.log(event);
-  switch (event.type) {
-    case Events.ITEM_CREATED:
-      const newOrder = Inventory.build(event.payload);
-      await newOrder.save();
-      break;
-    default:
-      res.send({});
-  }
-
-  res.send({ message: '🎃 Event received' });
+  // switch (event.type) {
+  //   case EventTypes.USER_CREATED:
+  //     // console.log(event);
+  //     const newUser = User.build(event.payload);
+  //     await newUser.save();
+  //     break;
+  // default:
+  //   res.send({});
+  // }
+  res.send({ message: 'Event received' });
 });
 
+// router.get('/events');
+
+
 export default router;

examples_new/microservices/orders/src/routes/event-router.ts

@@ -1,13 +1,14 @@
 import express from 'express';
-import { getOrder, getSale, createOrder, deleteOrder } from '../controllers/order-controller';
+import { createOrder } from '../controllers/order-controller';
 import { currentUser, requireAuth } from '@chronosrx/common';
 
 const router = express.Router();
 router.use(currentUser);
 router.use(requireAuth);
-router.get('/getMyOrders', getOrder);
-router.get('/getMySales', getSale);
+
+// router.get('/getMyOrders', getOrder);
 router.post('/createOrder', createOrder);
-router.delete('/deleteOrder', deleteOrder);
+// router.delete('/deleteOrder', deleteOrder);
+
 
 export default router;