Cambios obtención Orders usuario

Arquisoft · Apr 14, 2022 · ef11fd6 · ef11fd6
1 parent e2ef4d2
commit ef11fd6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/restapi/api.ts b/restapi/api.ts
@@ -1,6 +1,6 @@
 import express, { Request, Response, Router } from 'express';
 import {check} from 'express-validator';
-import { addOrder, findOrdersByUserDni, getDeliveryCosts } from './controllers/OrderController';
+import { addOrder, findOrdersByUserEmail, getDeliveryCosts } from './controllers/OrderController';
 import {findRocks, addRock, deleteRock, findRocksSedimentary, findRocksMetamorphic, findRocksFiery, findByCritery} from './controllers/RockController';
 import {findUsers, addUser, deleteUser, loginUser, logout} from './controllers/UserController';
 const User = require("./models/User");
@@ -37,7 +37,7 @@ api.post("/rocks/add", addRock);
 api.post("/rocks/delete", deleteRock);
 
 //Methods for product of the app
-api.get("/orders/userList", findOrdersByUserDni);
+api.get("/orders/userList", findOrdersByUserEmail);
 
 api.post("/orders/add", addOrder);
 

diff --git a/restapi/controllers/OrderController.ts b/restapi/controllers/OrderController.ts
@@ -9,24 +9,26 @@ const geocoder = NodeGeocoder(options);
 const Order = require("../models/Order");
 
 
-export const findOrdersByUserDni = async (req:Request, res:Response) => {
-    let dni = req.body.dni;
-    let query = {userDni : dni.toString()};
+export const findOrdersByUserEmail = async (req:Request, res:Response) => {
+    let email = req.body.email;
+    let query = {userEmail : email.toString()};
     const users = await Order.find(query)
-    res.send(users).json();
+    res.setHeader('Content-Type', 'application/json');
+    res.send(users);
 };
 
+
 export const addOrder = async (req:Request, res:Response): Promise<any> => { 
     const crypto = require('crypto');
     const orderId = crypto.randomBytes(60);
 
-    let userDni = req.body.dni;
+    let email = req.body.email;
     let price = req.body.price;
     let productId = req.body.productId;
 
     let order = new Order({
         orderId: orderId,
-        dni: userDni,
+        userEmail: email,
         price: price,
         productId: productId
     });

diff --git a/restapi/models/Order.ts b/restapi/models/Order.ts
@@ -5,7 +5,7 @@ const mongooseOrders = require("mongoose")
 const orderSchema = mongooseOrders.Schema({
     orderId : String,
     price : Number,
-    userDni : String,
+    userEmail : String,
     productId : String
 },{
     versionKey: false