Started to fix e2e

.gitignore

@@ -1,5 +1,5 @@
 node_modules
 coverage
-testDB.sqlite
+**/*.sqlite
 docs/build
 .idea

auth_service/config/config.json

@@ -9,12 +9,12 @@
   },
   "development": {
     "dialect": "sqlite",
-    "storage": "./testDB.sqlite",
+    "storage": "./testDBAuth.sqlite",
     "logging": false
   },
   "test": {
     "dialect": "sqlite",
-    "storage": "./testDB.sqlite",
+    "storage": "./testDBAuth.sqlite",
     "logging": false
   }
 }

game_service/config/config.json

@@ -9,12 +9,12 @@
   },
   "development": {
     "dialect": "sqlite",
-    "storage": "./testDB.sqlite",
+    "storage": "./testDBGame.sqlite",
     "logging": false
   },
   "test": {
     "dialect": "sqlite",
-    "storage": "./testDB.sqlite",
+    "storage": "./testDBGame.sqlite",
     "logging": false
   }
 }

game_service/game/verification.js

@@ -30,7 +30,13 @@ const getCurrentQuestion = async (userId) => {
 }
 
 const requestQuestion = async() => {
-  return res = (await axios.post("http://question:8002/api/questions/generate")).data;
+  let url = "http://question:8002/api/questions/generate";
+
+  if(process.env.NODE_ENV !== "production"){
+      url = "http://localhost:8002/api/questions/generate"
+  }
+
+  return (await axios.post(url)).data;
 }
 
 module.exports = {validate, getCurrentQuestion, requestQuestion}

question_service/package.json

@@ -9,6 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "axios": "^1.6.8",
+    "axios-mock-adapter": "^1.22.0",
     "bcrypt": "^5.1.1",
     "chance": "^1.1.11",
     "cookie-parser": "^1.4.6",

question_service/question.test.js

@@ -1,5 +1,25 @@
 const request = require('supertest')
 const app = require("./question")
+const MockAdapter = require('axios-mock-adapter');
+const axios = require('axios');
+// Mocking axios call
+const mock = new MockAdapter(axios);
+const responseData = {
+    results: {
+        bindings: [
+            { filmLabel: { value: "Pulp Fiction" }, directorLabel: { value: "Quentin Tarantino" } },
+            { filmLabel: { value: "Inception" }, directorLabel: { value: "Christopher Nolan" } },
+            { filmLabel: { value: "The Shawshank Redemption" }, directorLabel: { value: "Frank Darabont" } },
+            { filmLabel: { value: "The Godfather" }, directorLabel: { value: "Francis Ford Coppola" } },
+            { filmLabel: { value: "The Dark Knight" }, directorLabel: { value: "Christopher Nolan" } },
+            { filmLabel: { value: "Fight Club" }, directorLabel: { value: "David Fincher" } },
+            { filmLabel: { value: "Forrest Gump" }, directorLabel: { value: "Robert Zemeckis" } },
+            { filmLabel: { value: "The Matrix" }, directorLabel: { value: "Lana Wachowski" } }
+        ]
+    }
+};
+
+mock.onAny().reply(200, responseData);
 
 jest.mock('./db/mongo/utils', () => ({
     getRandomTemplate: () => { return Promise.resolve({
@@ -14,25 +34,6 @@ jest.mock('./db/mongo/utils', () => ({
     )}
 }));
 
-// Mock the fetch function
-global.fetch = jest.fn().mockResolvedValue({
-    ok: true, // Define the 'ok' property
-    json: async () => ({
-        results: {
-            bindings: [
-                { filmLabel: { value: "Pulp Fiction" }, directorLabel: { value: "Quentin Tarantino" } },
-                { filmLabel: { value: "Inception" }, directorLabel: { value: "Christopher Nolan" } },
-                { filmLabel: { value: "The Shawshank Redemption" }, directorLabel: { value: "Frank Darabont" } },
-                { filmLabel: { value: "The Godfather" }, directorLabel: { value: "Francis Ford Coppola" } },
-                { filmLabel: { value: "The Dark Knight" }, directorLabel: { value: "Christopher Nolan" } },
-                { filmLabel: { value: "Fight Club" }, directorLabel: { value: "David Fincher" } },
-                { filmLabel: { value: "Forrest Gump" }, directorLabel: { value: "Robert Zemeckis" } },
-                { filmLabel: { value: "The Matrix" }, directorLabel: { value: "Lana Wachowski" } }
-            ]
-        }
-    })
-});
-
 // Import Chance library for random number generation
 const Chance = require('chance')
 

question_service/questions/wikiUtils/wikidata.js

@@ -1,19 +1,16 @@
+const axios = require('axios');
+
 async function query(SPARQL) {
     const apiUrl = `https://query.wikidata.org/sparql?query=${encodeURIComponent(SPARQL)}&format=json`;
 
-    const response = await fetch(apiUrl, {
+    const response = await axios.get(apiUrl, {
         headers: {
             'Accept': 'application/json',
             'User-Agent': 'QuestionCrawler/1.0 ([email protected])'
         }
     });
 
-    if (!response.ok) {
-        console.error('Error al realizar la consulta a Wikidata:', response.statusText);
-        return;
-    }
-
-    const datos = await response.json();
+    const datos = response.data;
 
     const resultados = datos.results.bindings.map((resultado) => {
         const resultadoFormateado = {};

userdetails_service/Dockerfile

@@ -12,6 +12,7 @@ RUN npm install
 
 # Set the env var
 ENV DB_URL=mariadb
+ENV NODE_ENV=production
 
 # Copy the app source code to the working directory
 COPY . .