Merge pull request #106 from Arquisoft/dev

Cambios semana previa a entrega
Arquisoft · Mar 8, 2024 · a649d59 · a649d59
2 parents b3653e2 + 2b0d02f
commit a649d59
Show file tree

Hide file tree

Showing 30 changed files with 6,383 additions and 273 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,10 +17,18 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice ci
     - run: npm --prefix users/userservice ci
+    - run: npm --prefix questions/answerservice ci
+    - run: npm --prefix questions/createservice ci
+    - run: npm --prefix questions/generatedquestservice ci
+    - run: npm --prefix questions/recordservice ci
     - run: npm --prefix gatewayservice ci
     - run: npm --prefix webapp ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
+    - run: npm --prefix questions/answerservice test -- --coverage
+    - run: npm --prefix questions/createservice test -- --coverage
+    - run: npm --prefix questions/generatedquestservice test -- --coverage
+    - run: npm --prefix questions/recordservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,10 +14,18 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice ci
     - run: npm --prefix users/userservice ci
+    - run: npm --prefix questions/answerservice ci
+    - run: npm --prefix questions/createservice ci
+    - run: npm --prefix questions/generatedquestservice ci
+    - run: npm --prefix questions/recordservice ci
     - run: npm --prefix gatewayservice ci
     - run: npm --prefix webapp ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
+    - run: npm --prefix questions/answerservice test -- --coverage
+    - run: npm --prefix questions/createservice test -- --coverage
+    - run: npm --prefix questions/generatedquestservice test -- --coverage
+    - run: npm --prefix questions/recordservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud
@@ -35,6 +43,10 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice install
     - run: npm --prefix users/userservice install
+    - run: npm --prefix questions/answerservice install
+    - run: npm --prefix questions/createservice install
+    - run: npm --prefix questions/generatedquestservice install
+    - run: npm --prefix questions/recordservice install
     - run: npm --prefix gatewayservice install
     - run: npm --prefix webapp install
     - run: npm --prefix webapp run build
@@ -93,6 +105,74 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: users/userservice
+  docker-push-answerservice:
+    name: Push answer service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es6b/answerservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questions/answerservice
+  docker-push-createservice:
+    name: Push create service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es6b/createservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questions/createservice
+  docker-push-recordservice:
+    name: Push record service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es6b/recordservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questions/recordservice
+  docker-push-generatedquestservice:
+    name: Push generated quest service Docker Image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [e2e-tests]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v5
+      with:
+        name: arquisoft/wiq_es6b/generatedquestservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: questions/generatedquestservice
   docker-push-gatewayservice:
     name: Push gateway service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -113,7 +193,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,docker-push-createservice,docker-push-answerservice,docker-push-recordservice,docker-push-generatedquestservice]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master
@@ -124,5 +204,5 @@ jobs:
         command: |
           wget https://raw.githubusercontent.com/arquisoft/wiq_es6b/master/docker-compose.yml -O docker-compose.yml
           wget https://raw.githubusercontent.com/arquisoft/wiq_es6b/master/.env -O .env
-          docker compose down
+          docker compose --profile prod down
           docker compose --profile prod up -d
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,34 +11,33 @@ services:
     networks:
       - mynetwork
 
-  recordservice:
-    container_name: recordservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es6b/recordservice:latest
+  authservice:
+    container_name: authservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6b/authservice:latest
     profiles: ["dev", "prod"]
-    build: ./questions/recordservice
+    build: ./users/authservice
     depends_on:
       - mongodb
     ports:
-      - "8006:8006"
+      - "8002:8002"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/recorddb
+      MONGODB_URI: mongodb://mongodb:27017/userdb
 
-  createservice:
-    container_name: createservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es6b/createservice:latest
+  userservice:
+    container_name: userservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6b/userservice:latest
     profiles: ["dev", "prod"]
-    build: ./questions/createservice
+    build: ./users/userservice
     depends_on:
       - mongodb
     ports:
-      - "8005:8005"
+      - "8001:8001"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/questiondb
-
+      MONGODB_URI: mongodb://mongodb:27017/userdb
 
   answerservice:
     container_name: answerservice-${teamname:-defaultASW}
@@ -54,34 +53,47 @@ services:
     environment:
       MONGODB_URI: mongodb://mongodb:27017/questiondb
 
+  createservice:
+    container_name: createservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6b/createservice:latest
+    profiles: ["dev", "prod"]
+    build: ./questions/createservice
+    depends_on:
+      - mongodb
+    ports:
+      - "8005:8005"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/questiondb
 
-  authservice:
-    container_name: authservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es6b/authservice:latest
+  recordservice:
+    container_name: recordservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6b/recordservice:latest
     profiles: ["dev", "prod"]
-    build: ./users/authservice
+    build: ./questions/recordservice
     depends_on:
       - mongodb
     ports:
-      - "8002:8002"
+      - "8006:8006"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_URI: mongodb://mongodb:27017/recorddb
 
-  userservice:
-    container_name: userservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es6b/userservice:latest
+  generatedquestservice:
+    container_name: generatedquestservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6b/generatedquestservice:latest
     profiles: ["dev", "prod"]
-    build: ./users/userservice
+    build: ./questions/generatedquestservice
     depends_on:
       - mongodb
     ports:
-      - "8001:8001"
+      - "8007:8007"
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_URI: mongodb://mongodb:27017/questiondb
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
@@ -92,15 +104,21 @@ services:
       - mongodb
       - userservice
       - authservice
+      - answerservice
+      - createservice
+      - recordservice
+      - generatedquestservice
     ports:
       - "8000:8000"
     networks:
       - mynetwork
     environment:
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
-      QUES_SERVICE_URL: http://createservice:8005
       ANSW_SERVICE_URL: http://answerservice:8004
+      QUES_SERVICE_URL: http://createservice:8005
+      REC_SERVICE_URL: http://recordservice:8006
+      GEN_SERVICE_URL: http://generatedquestservice:8007
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}

diff --git a/docs/images/08-DominioV2.jpeg b/docs/images/08-DominioV2.jpeg
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/src/03_system_scope_and_context.adoc b/docs/src/03_system_scope_and_context.adoc
@@ -17,7 +17,7 @@ de jugadas anteriores.
 Dentro del historial, este le mostrará el número de partidas totales realizadas y por cada una de ellas la fecha en la que se jugó, el número de respuestas acertadas, el dinero conseguido y el tiempo total 
 que le llevó completarlo.
 
-Aparte de eso también tendrán la opción de visualizar el listado completo de usuarios registrados hasta la fecha. 
+Aparte de eso también tendra el administrador la opción de visualizar el listado completo de usuarios registrados hasta la fecha. 
 
 
 

diff --git a/docs/src/08_concepts.adoc b/docs/src/08_concepts.adoc
@@ -6,7 +6,7 @@ ifndef::imagesdir[:imagesdir: ../images]
 
 === Descripción de conceptos
 ==== Dominio
-image::08-Dominio.jpeg["Dominio"]
+image::08-DominioV2.jpeg["Dominio"]
 
 
 ==== Experiencia de usuario (UX)

diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -9,6 +9,7 @@ const port = 8000;
 const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
 const questionServiceUrl = process.env.QUES_SERVICE_URL || 'http://localhost:8005';
+const recordServiceUrl = process.env.REC_SERVICE_URL || 'http://localhost:8006';
 
 app.use(cors());
 app.use(express.json());
@@ -42,6 +43,14 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
+app.post('/addRecord', async(req, res) => {
+  try{
+    const recordResponse = await axios.post(recordServiceUrl+'/addRecord', req.body);
+  }catch (error){
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
 app.post('/getQuestionBody', async (req, res) => {
   try {
     // Forward the add user request to the user service
@@ -52,9 +61,37 @@ app.post('/getQuestionBody', async (req, res) => {
   }
 });
 
+app.post('/addQuestion', async (req, res) => {
+  try {
+    // Reenviar los datos recibidos en la solicitud POST al servicio de preguntas
+    const questionResponse = await axios.post(`${questionServiceUrl}/addQuestion`, req.body);
+    res.json(questionResponse.data);
+  } catch (error) {
+    if (error.response) {
+      res.status(error.response.status).json({ error: error.response.data.error });
+    } else {
+      res.status(500).json({ error: 'Error interno del servidor' });
+    }
+  }
+});
+
+app.get('/getAllUsers', async (req, res) => {
+  try {
+    // Reenviar la solicitud GET al servicio de usuarios
+    const usersResponse = await axios.get(`${userServiceUrl}/getAllUsers`);
+    res.json(usersResponse.data);
+  } catch (error) {
+    if (error.response) {
+      res.status(error.response.status).json({ error: error.response.data.error });
+    } else {
+      res.status(500).json({ error: 'Error interno del servidor' });
+    }
+  }
+})
+
 // Start the gateway service
 const server = app.listen(port, () => {
   console.log(`Gateway Service listening at http://localhost:${port}`);
 });
 
-module.exports = server
+module.exports = server