Merge pull request #208 from Arquisoft/develop

Despliegue

.github/workflows/pruebaDeploy.yml

@@ -1,7 +1,7 @@
 name: CI for ASW2122
 on:
   release:
-
+    types: [published]
 jobs:
   docker-push-webapp:
     name: Push webapp Docker Image to GitHub Packages

restapi/Dockerfile

@@ -2,6 +2,9 @@ FROM node:16.13.1
 LABEL org.opencontainers.image.source https://github.com/Arquisoft/dede_es2a
 COPY . /app
 WORKDIR /app
+
+
 #Install the dependencies
 RUN npm install
+
 CMD [ "npm", "start" ]

restapi/routes/juguete.router.ts

@@ -157,5 +157,26 @@ jugueteRouter.post("/addStock/:nombre", async (req:Request,res:Response) => {
         res.status(500).send("Error al añadir stock al juguete")
     }
 });
+/*
+jugueteRouter.post("/subtock/:nombre", async (req:Request,res:Response) => {
+    try{
+        const filter = {
+            nombre: req.params.nombre,
+        }
+
+        var juguete = await JugueteRepository.findJuguete(filter); 
 
+        const stock = {stock: juguete.stock - req.body.stock}
+        
+        var jugueteActualizado = await JugueteRepository.updateJuguete(filter,stock);
+        if(jugueteActualizado){
+            res.send("Stock del juguete restado correctamente");
+        } else{
+            res.status(500).send("No se pudo restar stock al producto")
+        }
+    }catch (error){
+        res.status(500).send("Error al restar stock al juguete")
+    }
+});
+*/
 export default jugueteRouter;

restapi/routes/pedido.router.ts

@@ -153,7 +153,7 @@ pedidoRouter.get("/byUser/:user", async(req:Request,res:Response)=>{
             res.send("El usuario no existe");
         }
         else{
-            var pedidos = await Pedido.find({"usuario":usuario._id});
+            var pedidos = await Pedido.find({"usuario":usuario._id}).populate("juguetes._id");
             if(pedidos.length > 0){
                 res.send(pedidos);
             }else{

restapi/server.ts

@@ -9,16 +9,16 @@ import { pedidoRouter } from "./routes/pedido.router";
 import { usuarioRouter } from "./routes/usuario.router";
 
 const app: Application = express();
-const port: number = 5000;
+const port  = process.env.PORT ||  5000;
 
 
 require('dotenv').config()
 let bd = require('./modules/gestorDB')
 let {config} = require('./modules/cloudinary');
 
 const options: cors.CorsOptions = {
-  origin: ['http://localhost:3000']
-  //origin: ['https://dede-es2a-webapp.herokuapp.com']
+  //origin: ['http://localhost:3000']
+  origin: ['https://dede-es2a-webapp.herokuapp.com']
 };
 
 const metricsMiddleware:RequestHandler = promBundle({includeMethod: true});

webapp/server.ts

@@ -3,7 +3,7 @@ import express,{Application} from 'express';
 //setting the option module to commonjs
 
 var app: Application = express()
-const port: number = 3000;
+const port = process.env.PORT  || 3000;
 
 app.use(express.static('build'))