Merge from questions to develop

.env

@@ -4,4 +4,4 @@ DB_PORT=3306
 MYSQL_USER=Admin
 MYSQL_PASSWORD=Xp@7qZr#3wT2
 DB_NAME=base_de_datos_de_usuarios
-JWT_TOKEN='eyJhbGciOiJIUzI1NiJ9.eyJSb2xlIjoiQWRtaW4iLCJJc3N1ZXIiOiJJc3N1ZXIiLCJVc2VybmFtZSI6IkphdmFJblVzZSIsImV4cCI6MTcwOTQ2OTkzMywiaWF0IjoxNzA5NDY5OTMzfQ.pQ8H6FKeZyEHPnGs4Ah3-n-QXJ5E8YM_u1AfZHI7Ip0'
+DATABASE_URI=mongodb://mongodb:27017/questionDB

.github/workflows/build.yml

@@ -15,14 +15,10 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 20
-    - run: npm --prefix users/authservice ci
-    - run: npm --prefix users/userservice ci
+    - run: npm --prefix users ci
+    - run: npm --prefix questions 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 gatewayservice test -- --coverage
-    - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:

.github/workflows/release.yml

@@ -12,14 +12,10 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 20
-    - run: npm --prefix users/authservice ci
-    - run: npm --prefix users/userservice ci
+    - run: npm --prefix users ci
+    - run: npm --prefix questions 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 gatewayservice test -- --coverage
-    - run: npm --prefix webapp test -- --coverage
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:

.gitignore

@@ -1,4 +1,9 @@
-node_modules
 coverage
 docs/build
-.vscode
+
+# Node.js dependencies
+node_modules
+
+# IDE/Editor files
+.idea/
+.vscode/

docker-compose.yml

@@ -39,14 +39,28 @@ services:
     environment:
       DATABASE_URL: mariadb:3306/userdb
 
+  questions:
+      container_name: questions-${teamname:-defaultASW}
+      image: ghcr.io/arquisoft/wiq_es04a/questions:latest
+      profiles: ["dev", "prod"]
+      build: ./questions
+      depends_on:
+        - mongodb
+      ports:
+        - "8010:8010"
+      networks:
+        - mynetwork
+      environment:
+        DATABASE_URI: mongodb://mongodb:27017/questionDB
+
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_0/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
-      - mariadb
       - users
+      - questions
     ports:
       - "8000:8000"
     networks:

gatewayservice/gateway-service.js

@@ -8,6 +8,8 @@ const port = 8000;
 
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://users:8001';
 
+const questionGenerationServiceUrl = 'http://questions:8010';
+
 app.use(cors());
 app.use(express.json());
 
@@ -52,6 +54,15 @@ app.post('/user/add', async (req, res) => {
   }
 });
 
+app.get('/questions', async (req, res) => {
+  try {
+    const questionsResponse = await axios.get(questionGenerationServiceUrl+'/questions/');
+    res.json(questionsResponse.data);
+  } catch (error) {
+    res.status(error.response).json({ error: error.response });
+  }
+});
+
 app.post('/user/edit', async (req, res) => {
   try {
     // Forward the add user request to the user service
@@ -83,21 +94,6 @@ app.get('/group/list', async (req, res) => {
   }
 });
 
-app.post('/user/edit', async (req, res) => {
-  try {
-    // Forward the add user request to the user service
-    const userResponse = await axios.post(userServiceUrl + '/user/edit', req.body);
-    res.json(userResponse.data);
-  } catch (error) {
-    if (error.response && error.response.status) {
-      res.status(error.response.status).json({ error: error.response.data.error });
-    } else if (error.message) {
-      res.status(500).json({ error: error.message });
-    } else {
-      res.status(500).json({ error: 'Internal Server Error' });
-    }
-  }
-});
 
 app.post('/group/add', async (req, res) => {
   try {

questions/Dockerfile

@@ -0,0 +1,17 @@
+# Use an official Node.js runtime as a parent image
+FROM node:20
+
+# Set the working directory in the container
+WORKDIR /usr/src/questions
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install app dependencies
+RUN npm install
+
+# Copy the app source code to the working directory
+COPY . .
+
+# Define the command to run your app
+CMD ["node", "index.js"]

questions/index.js

@@ -0,0 +1,23 @@
+// Imports (express syntax)
+const express = require('express');
+const cors = require('cors');
+// Routes:
+const questionRoutes = require('./routes/question-routes.js');
+
+// App definition and
+const app = express();
+const port = 8010;
+
+// Middlewares added to the application
+app.use(cors());
+app.use(express.json());
+
+// Routes middlewares to be used
+app.use('/questions', questionRoutes);
+
+// Start the service
+const server = app.listen(port, () => {
+  console.log(`Question Service listening at http://localhost:${port}`);
+});
+
+module.exports = server

questions/investigation_wikidata/bulkNodejs.js

@@ -0,0 +1,42 @@
+const fetch = require('node-fetch');
+const { wbk } = require('wikibase-sdk');
+
+// Configura la URL base de la API de Wikidata
+const wikidataEndpoint = 'https://www.wikidata.org/w/api.php';
+
+// Función para hacer la consulta bulk
+async function bulkQuery(entityIds, propertyIds) {
+    const formattedEntityIds = entityIds.join('|');
+    const formattedPropertyIds = propertyIds.join('|');
+    const sparqlQuery = `
+      SELECT ?item ?itemLabel ?property ?propertyLabel WHERE {
+        VALUES ?item {${formattedEntityIds}}
+        VALUES ?property {${formattedPropertyIds}}
+        SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+      }
+    `;
+    const url = wbk.sparqlQuery(sparqlQuery);
+    const response = await fetch(url);
+    const data = await response.json();
+    return data.results.bindings;
+  }
+
+  function option5() {
+// IDs de las entidades y propiedades que deseas consultar
+const entityIds = ['Q515']; // Ejemplo de IDs de entidades
+const propertyIds = ['P31', 'P1082']; // Ejemplo de IDs de propiedades
+
+// Realizar la consulta bulk
+bulkQuery(entityIds, propertyIds)
+  .then(results => {
+    console.log('Resultados de la consulta bulk:');
+    console.log(results);
+  })
+  .catch(error => {
+    console.error('Error al realizar la consulta bulk:', error);
+  });
+
+  }
+
+  module.exports = {option5};
+