Merge branch 'master' into Marina

.github/workflows/build.yml

@@ -19,6 +19,9 @@ jobs:
     - run: npm --prefix webapp ci
     - run: npm --prefix questiongenerator ci
     - run: npm --prefix gamehistoryservice ci
+    - run: npm --prefix apis/allquestionservice ci
+    - run: npm --prefix apis/alluserservice ci
+    - run: npm --prefix perfilservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage

.github/workflows/release.yml

@@ -155,10 +155,62 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: gamehistoryservice
+  docker-push-perfilservice:
+    name: Push perfil service 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_es2c/perfilservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: perfilservice
+  docker-push-allquestionservice:
+    name: Push all question service 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_es2c/apis/allquestionservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: apis/allquestionservice
+  docker-push-alluserservice:
+    name: Push all user service 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_es2c/apis/alluserservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: apis/alluserservice
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,docker-push-questiongenerator,docker-push-gamehistoryservice]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp,
+          docker-push-questiongenerator,docker-push-gamehistoryservice,docker-push-perfilservice,docker-push-allquestionservice,docker-push-alluserservice]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

apis/allquestionservice/Dockerfile

@@ -13,8 +13,11 @@ RUN npm install
 # Copy the app source code to the working directory
 COPY . .
 
-# Expose the port the app runs on
+# Expose the port the app runs on 
 EXPOSE 8007
 
+ARG API_ORIGIN_URI="http://localhost:3000"
+ENV REACT_APP_API_ORIGIN_ENDPOINT=$API_ORIGIN_URI
+
 # Define the command to run your app
 CMD ["node", "allquestions-api.js"]

apis/alluserservice/Dockerfile

@@ -16,5 +16,8 @@ COPY . .
 # Expose the port the app runs on
 EXPOSE 8006
 
+ARG API_ORIGIN_URI="http://localhost:3000"
+ENV REACT_APP_API_ORIGIN_ENDPOINT=$API_ORIGIN_URI
+
 # Define the command to run your app
 CMD ["node", "allusers-api.js"]

docker-compose.yml

@@ -77,9 +77,11 @@ services:
 
   perfilservice:
     container_name: perfilservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es2c/perfilservice/perfil-api:latest
+    image: ghcr.io/arquisoft/wiq_es2c/perfilservice:latest
     profiles: ["dev", "prod"]
     build: ./perfilservice
+    volumes:
+      - mongodb_data:/data/db
     depends_on:
       - mongodb
     ports:
@@ -91,9 +93,11 @@ services:
 
   alluserservice:
     container_name: alluserservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es2c/apis/alluserservice/allusers-api:latest
+    image: ghcr.io/arquisoft/wiq_es2c/apis/alluserservice:latest
     profiles: ["dev", "prod"]
     build: ./apis/alluserservice
+    volumes:
+      - mongodb_data:/data/db
     depends_on:
       - mongodb
     ports:
@@ -105,9 +109,11 @@ services:
 
   allquestionservice:
     container_name: allquestionservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_es2c/apis/allquestionservice/allquestions-api:latest
+    image: ghcr.io/arquisoft/wiq_es2c/apis/allquestionservice:latest
     profiles: ["dev", "prod"]
     build: ./apis/allquestionservice
+    volumes:
+      - mongodb_data:/data/db
     depends_on:
       - mongodb
     ports:

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "i18next": "^23.11.2"
+  }
+}

perfilservice/Dockerfile

@@ -16,5 +16,8 @@ COPY . .
 # Expose the port the app runs on
 EXPOSE 8005
 
+ARG API_ORIGIN_URI="http://localhost:3000"
+ENV REACT_APP_API_ORIGIN_ENDPOINT=$API_ORIGIN_URI
+
 # Define the command to run your app
 CMD ["node", "perfil-api.js"]

users/userservice/user-service.test.js

@@ -2,7 +2,7 @@ const request = require('supertest');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 
 let mongoServer;
-let 
+let newString = "testadduser";
 const newUser = {
   username: 'testuser',
   email: '[email protected]',

webapp/e2e/steps/register-form.steps.js

@@ -30,16 +30,16 @@ defineFeature(feature, test => {
 
     given('An unregistered user', async () => {
       username = "pablo"
-      email = "pablo@email.com"
+      email = "pablo@gmail.com"
       password = "pabloasw"
       await expect(page).toClick("button", { text: "¿No tienes cuenta? Registrate aquí." });
     });
-
+ 
     when('I fill the data in the form and press submit', async () => {
       await expect(page).toFill('input[name="username"]', username);
       await expect(page).toFill('input[name="email"]', email);
       await expect(page).toFill('input[name="password"]', password);
-      await expect(page).toClick('button', { text: 'REGÍSTRATE' })
+      await expect(page).toClick('button', { text: 'REGÍSTRATE' });
     });
 
     then('A confirmation message should be shown in the screen', async () => {