Merge pull request #114 from Arquisoft/preV1.0

Pre v1.0
Arquisoft · Apr 12, 2024 · fb7d392 · fb7d392
2 parents aad6f55 + cd51de1
commit fb7d392
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 87 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
     - run: npm --prefix storeQuestionService ci
     - run: npm --prefix userStatsService ci
     - run: npm --prefix gameservice ci
+    - run: npm --prefix gameservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -232,7 +232,7 @@ jobs:
   deploy:
     name: Deploy over SSH
     runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp, docker-push-questiongeneratorservice, docker-push-storequestionservice, docker-push-userstatsservice, docker-push-wikidataextractorservice]
+    needs: [docker-push-userservice,docker-push-authservice,docker-push-gatewayservice,docker-push-webapp, docker-push-questiongeneratorservice, docker-push-storequestionservice, docker-push-userstatsservice, docker-push-wikidataextractorservice, docker-push-gameservice]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
       - "27017:27017"
     networks:
       - mynetwork
+    restart: always
 
   mongodb_wiki:
     container_name: mongodb-wiki-${teamname:-defaultASW}
@@ -21,6 +22,7 @@ services:
       - "27018:27017"
     networks:
       - mynetwork
+    restart: always
 
   authservice:
     container_name: authservice-${teamname:-defaultASW}
@@ -35,6 +37,7 @@ services:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
+    restart: always
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
@@ -49,6 +52,7 @@ services:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
+    restart: always
 
   gameservice:
     container_name: gameservice-${teamname:-defaultASW}
@@ -64,6 +68,7 @@ services:
     environment:
       QUESTIONS_GENERATOR_SERVICE_URL: http://questiongeneratorservice:8007
       STORE_STATS_SERVICE: http://userstatsservice:8003
+    restart: always
 
   questiongeneratorservice:
     container_name: questiongeneratorservice-${teamname:-defaultASW}
@@ -80,6 +85,7 @@ services:
     environment:
       MONGODB_URI: mongodb://mongodb_wiki:27017/questions
       STORE_QUESTION_SERVICE_URL: http://storequestionservice:8004
+    restart: always
 
   wikidataextractorservice:
     container_name: wikidataextractorservice-${teamname:-defaultASW}
@@ -94,6 +100,7 @@ services:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb_wiki:27017/questions
+    restart: always
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
@@ -115,6 +122,7 @@ services:
       STORE_QUESTION_SERVICE_URL: http://storequestionservice:8004
       QUESTIONS_GENERATOR_SERVICE_URL: http://questiongeneratorservice:8007
       GAME_SERVICE_URL: http://gameservice:8005
+    restart: always
 
 
   webapp:
@@ -126,6 +134,7 @@ services:
       - gatewayservice
     ports:
       - "3000:3000" 
+    restart: always
 
   prometheus:
     image: prom/prometheus
@@ -173,6 +182,7 @@ services:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb:27017/storedquestion
+    restart: always
 
   userstatsservice:
     container_name: userstats-${teamname:-defaultASW}
@@ -187,6 +197,7 @@ services:
       - mynetwork
     environment:
       MONGODB_URI: mongodb://mongodb:27017/statsdb
+    restart: always
 
 
 volumes:

diff --git a/questionsservice/questiongeneratorservice/questiongenerator.js b/questionsservice/questiongeneratorservice/questiongenerator.js
@@ -4,21 +4,27 @@ class QuestionGenerator {
 
     static temas = new Map([
         ["paises", [0, 1, 2]],
-        ['capital', [0]],
-        ["lenguaje", [1]]
+        ['capital', [0, 1]],
+        ["lenguaje", [2]]
     ]);
     ;
 
     static plantillas = [
         {
-            pregunta: (param) => `¿Cual es la capital de ${param}?`,
-            filtro: { capital: { $exists: true } },
+            pregunta: (param) => `¿Cuál es la capital de ${param}?`,
+            filtro: { pais: { $exists: true }, capital: { $exists: true } },
             campo_pregunta: 'pais',
             campo_respuesta: 'capital'
         },
+        {
+            pregunta: (param) => `¿De qué país es capital ${param}?`,
+            filtro: { capital: { $exists: true }, pais: { $exists: true } },
+            campo_pregunta: 'capital',
+            campo_respuesta: 'pais'
+        },
         {
             pregunta: (param) => `¿Qué lengua se habla en ${param}?`,
-            filtro: { lenguaje: { $exists: true } },
+            filtro: { pais: { $exists: true }, lenguaje: { $exists: true } },
             campo_pregunta: 'pais',
             campo_respuesta: 'lenguaje'
         }

diff --git a/userStatsService/user-stats-service.js b/userStatsService/user-stats-service.js
@@ -61,7 +61,7 @@ app.get('/history/games/:username', async (req, res) => {
                 questions: user.questions,
                 createdAt: user.createdAt
             }));
-            res.json(userInformation.slice(0, req.query.limit || userInformation.length));
+            res.json(userInformation.slice(0, req.query.limit || userInformation.length).reverse());
         } else {
             res.status(404).json({ error: 'User not found!' });
         }

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/src/components/FirstGame.css b/webapp/src/components/FirstGame.css
@@ -22,6 +22,11 @@
     border-image: linear-gradient(to bottom, rgba(0, 255, 0,var(--border-alpha)), rgba(0, 0, 255,var(--border-alpha))) 1;
 }
 
+.questionStructure h1{
+    justify-content: center;
+    color: #F0F0F0;
+}
+
 .questionStructure .answers {
     display: flex;
     justify-content: center; /* Alinea los elementos en el centro horizontal /
@@ -34,13 +39,21 @@
     grid-template-columns: auto auto;
 }
 
+.allAnswers > div{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
 .asnwers {
     width:100%;
 }
 
 
 .questionFirstGame {
     height: 100%;
+    width: 100%;
     display: inline-block;
 }