Test QuestionService y modificación git actions

.github/workflows/build.yml

@@ -15,10 +15,12 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice ci
     - run: npm --prefix users/userservice ci
+    - run: npm --prefix preguntas/generatorservice 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 preguntas/generatorservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud

.github/workflows/release.yml

@@ -14,10 +14,12 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice ci
     - run: npm --prefix users/userservice ci
+    - run: npm --prefix preguntas/generatorservice 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 preguntas/generatorservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage
     - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud
@@ -35,6 +37,7 @@ jobs:
         node-version: 20
     - run: npm --prefix users/authservice install
     - run: npm --prefix users/userservice install
+    - run: npm --prefix preguntas/generatorservice install
     - run: npm --prefix gatewayservice install
     - run: npm --prefix webapp install
     - run: npm --prefix webapp run build
@@ -93,6 +96,23 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: users/userservice
+  docker-push-generatorservice:
+    name: Push generator 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_es3a/generatorservice
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+        registry: ghcr.io
+        workdir: preguntas/generatorservice
   docker-push-gatewayservice:
     name: Push gateway service Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -113,7 +133,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-generatorservice,docker-push-webapp]
     steps:
     - name: Deploy over SSH
       uses: fifsky/ssh-action@master

docker-compose.yml

@@ -36,7 +36,6 @@ services:
           - mynetwork
         environment:
           MONGODB_URI: mongodb://mongodb:27017/questiondb
-          MONGODB_URI1: mongodb://localhost:27017/templatedb
   userservice:
     container_name: userservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_es3a/userservice:latest

preguntas/generatorservice/question-service.test.js

@@ -0,0 +1,47 @@
+const request = require('supertest');
+const { MongoMemoryServer } = require('mongodb-memory-server');
+
+const Template = require('./template-model');
+
+let app;
+let mongoServer;
+const template = {         
+    question: "¿Cuál es la capital de ^ ?",
+    query: "SELECT ?pLabel ?rLabel WHERE { ?p wdt:P31 wd:Q6256. ?p wdt:P36 ?r. SERVICE wikibase:label { bd:serviceParam wikibase:language \"[AUTO_LANGUAGE],es\". } }",
+
+}
+
+beforeAll(async () => {
+mongoServer = await MongoMemoryServer.create();
+const mongoUri = mongoServer.getUri();
+process.env.MONGODB_URI = mongoUri;
+app = require('./question-service');
+
+await addTemplate(template);
+});
+
+//Function to add template
+async function addTemplate(template){
+const newTemplate = new Template({  
+    question: template.question,
+    query: template.query,
+});
+
+await newTemplate.save();
+}
+
+afterAll(async () => {
+app.close();
+await mongoServer.stop();
+});
+
+describe('Question Service', () => {
+        it('should generate and store a question', async () => {
+            const response = await request(app).get('/generate-question');
+            expect(response.status).toBe(200);
+            expect(response.body).toHaveProperty('question');
+            expect(response.body).toHaveProperty('correctAnswer');
+            expect(response.body).toHaveProperty('allAnswers');
+            expect(response.body.allAnswers).toHaveLength(4);
+        });
+});