Nuevos tipos de preguntas, todos los tests de servicios y algunos de webapp implementados

questions/creationservice/creation-service.js

@@ -22,9 +22,11 @@ var answerOptions = [];
 
 var randomQuerySelector; 
 // Array of the possible queries
-var queries = ['SELECT DISTINCT ?questionObject ?questionObjectLabel ?answer ?answerLabel WHERE { ?questionObject wdt:P31 wd:Q6256. ?questionObject wdt:P36 ?answer. SERVICE wikibase:label {bd:serviceParam wikibase:language "[AUTO_LANGUAGE],es".}}'];
+var queries = ['SELECT DISTINCT ?questionObject ?questionObjectLabel ?answer ?answerLabel WHERE { ?questionObject wdt:P31 wd:Q6256. ?questionObject wdt:P36 ?answer. SERVICE wikibase:label {bd:serviceParam wikibase:language "[AUTO_LANGUAGE],es".}}',
+  'SELECT DISTINCT ?questionObject ?questionObjectLabel ?answer ?answerLabel WHERE { ?questionObject wdt:P31 wd:Q11344; wdt:P1086 ?answer. SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],es".}}',
+  'SELECT ?questionObject ?questionObjectLabel ?answer ?answerLabel WHERE { ?questionObject wdt:P31 wd:Q6256; wdt:P1082 ?answer. SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],es".}}'];
 // Array of the possible questions
-var questions = ["¿Cuál es la capital de "];
+var questions = ["¿Cuál es la capital de ","¿Cuál es el número atómico del ", "¿Cuántos habitantes tiene "];
 
 // Recieves the information of the query and select wich data use on the question
 function getQuestionInfo(info){

users/authservice/auth-service.test.js

@@ -12,6 +12,11 @@ const user = {
   password: 'testpassword',
 };
 
+const user2 = {
+  username: 'testuser',
+  password: 'wrongpass',
+};
+
 async function addUser(user){
   const hashedPassword = await bcrypt.hash(user.password, 10);
   const newUser = new User({
@@ -42,4 +47,20 @@ describe('Auth Service', () => {
     expect(response.status).toBe(200);
     expect(response.body).toHaveProperty('username', 'testuser');
   });
+
+  it('Should perform a fail login operation du to incorrect answer /login', async () => {
+    const response = await request(app).post('/login').send(user2);
+    expect(response.status).toBe(401);
+    expect(response.body).toHaveProperty('error', 'Invalid credentials');
+  });
+
+  it('Should perform a server error due to missing value /login', async () => {
+    const response = await request(app).post('/login')
+    .send(user3 = {
+      username: 'testuser',
+    });
+    expect(response.status).toBe(500);
+    expect(response.body).toHaveProperty('error', 'Internal Server Error');
+  });
+
 });

users/userservice/user-service.test.js

@@ -1,14 +1,32 @@
 const request = require('supertest');
 const { MongoMemoryServer } = require('mongodb-memory-server');
+const bcrypt = require('bcrypt');
+const User = require('./user-model');
 
 let mongoServer;
 let app;
 
+const user = {
+  username: 'testuser',
+  password: 'testpassword',
+};
+
+async function addUser(user){
+  const hashedPassword = await bcrypt.hash(user.password, 10);
+  const newUser = new User({
+    username: user.username,
+    password: hashedPassword,
+  });
+
+  await newUser.save();
+}
+
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
   const mongoUri = mongoServer.getUri();
   process.env.MONGODB_URI = mongoUri;
   app = require('./user-service'); 
+  await addUser(user);
 });
 
 afterAll(async () => {
@@ -17,14 +35,38 @@ afterAll(async () => {
 });
 
 describe('User Service', () => {
+
+  //
+  it('should get the registered users on /getregisteredusers', async () => {
+
+    const response = await request(app).get('/getregisteredusers');
+    expect(response.status).toBe(200);
+    expect(response.body.length).toBe(1);
+    expect(Array.from(response.body[0])[0]).toBe('testuser');
+  });
+
+  //
   it('should add a new user on POST /adduser', async () => {
     const newUser = {
-      username: 'testuser',
-      password: 'testpassword',
+      username: 'testuser2',
+      password: 'testpassword2',
     };
 
     const response = await request(app).post('/adduser').send(newUser);
     expect(response.status).toBe(200);
-    expect(response.body).toHaveProperty('username', 'testuser');
+    expect(response.body).toHaveProperty('username', 'testuser2');
+  });
+
+  //
+  it('trying to add a user without username', async () => {
+    const newUser = {
+      password: 'testpassword',
+    };
+
+    const response = (await request(app).post('/adduser').send(newUser));
+    expect(response.status).toBe(400);
+    expect(response.body).toHaveProperty( "error" , "Missing required field: username" );
   });
+
+
 });