Añadir puertos y cambiar workflow

Arquisoft · May 1, 2022 · 5212ff3 · 5212ff3
1 parent 4bf8934
commit 5212ff3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/pruebaDeploy.yml b/.github/workflows/pruebaDeploy.yml
@@ -1,7 +1,7 @@
 name: CI for ASW2122
 on:
-  push:
-    branch: [Despliegue]
+  release:
+    types: [published]
 
 jobs:
   docker-push-webapp:

diff --git a/restapi/Dockerfile b/restapi/Dockerfile
@@ -2,8 +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
 
 
+#Install the dependencies
 RUN npm install
+
 CMD [ "npm", "start" ]
diff --git a/restapi/routes/pedido.router.ts b/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{

diff --git a/restapi/server.ts b/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});
@@ -27,7 +27,7 @@ app.use(metricsMiddleware);
 bd.connect();
 config(); 
 
-app.use(cors());
+app.use(cors(options));
 app.use(bp.json());
 
 app.use("/juguete", jugueteRouter);

diff --git a/webapp/server.ts b/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'))