83 navigability in the UI

gatewayservice/gateway-service.js

@@ -58,9 +58,39 @@
   }
 });
 
+app.get('/questions/:lang/:amount/:type', async (req, res) => {
+  try {
+    const lang = req.params.lang.toString();
+    const amount = req.params.amount.toString();
+    const type = req.params.type.toString();
+    // Forward the question request to the quetion service
+    const questionResponse = await axios.get(questionServiceUrl+'/questions/' + lang + '/' + amount + '/' + type);
+
+    res.json(questionResponse.data);
+  } catch (error) {
+
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
+
+app.get('/questions/:lang/:amount', async (req, res) => {
+  try {
+    const lang = req.params.lang.toString();
+    const amount = req.params.amount.toString();
+    // Forward the question request to the quetion service
+    const questionResponse = await axios.get(questionServiceUrl+'/questions/' + lang + '/' + amount);
+
+    res.json(questionResponse.data);
+  } catch (error) {
+
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
 app.get('/questions/:lang', async (req, res) => {
   try {
-    const lang = req.params.lang;
+    const lang = req.params.lang.toString();
     // Forward the question request to the quetion service
     const questionResponse = await axios.get(questionServiceUrl+'/questions/' + lang);
 
@@ -81,6 +111,27 @@
   }
 });
 
+app.get('/record/ranking/top10', async(req, res)=>{
+  try {
+    // Forward the record request to the record service
+    const recordResponse = await axios.get(recordServiceUrl + '/record/ranking/top10');
+    res.json(recordResponse.data);
+  } catch (error) {
+    res.send(error);
+  }
+});
+
+app.get('/record/ranking/:user', async(req, res)=>{
+  try {
+    const user = req.params.user;
+    // Forward the record request to the record service
+    const recordResponse = await axios.get(recordServiceUrl + '/record/ranking/' + user);
+    res.json(recordResponse.data);
+  } catch (error) {
+    res.send(error);
+  }
+});
+
 app.get('/record/:user', async(req, res)=>{
   try {
     const user = req.params.user;

gatewayservice/gateway-service.test.js

@@ -20,16 +20,28 @@ describe('Gateway Service', () => {
     } 
   });
 
+  const question = { data:  [{question: "¿Cuál es la población de Oviedo?",
+                              answers: ["225089","272357","267855","231841"]}] };
+
+  //Dont need to check a good record just that it redirects the call
+  const record = {data : {record:'undefined'}};
+
   axios.get.mockImplementation((url, data) => {
     if (url.endsWith('/questions')){
-      return Promise.resolve({ data:  [{question: "¿Cuál es la población de Oviedo?",
-                                      answers: ["225089","272357","267855","231841"]}] });
+      return Promise.resolve(question);
+    } else if (url.endsWith('/questions/es/1/CAPITAL')){
+      return Promise.resolve(question);
+    } else if (url.endsWith('/questions/es/1')){
+      return Promise.resolve(question);
     } else if (url.endsWith('/questions/es')){
-      return Promise.resolve({ data:  [{question: "¿Cuál es la población de Oviedo?",
-                                      answers: ["225089","272357","267855","231841"]}] });
+      return Promise.resolve(question);
+
     } else if(url.endsWith('/record/testuser')){
-      //Dont need to check a good record just that it redirects the call
-      return Promise.resolve({data : {record:'undefined'}}) 
+      return Promise.resolve(record) 
+    } else if(url.endsWith('/record/ranking/top10')){
+      return Promise.resolve(record)
+    } else if(url.endsWith('/record/ranking/testuser')){
+      return Promise.resolve(record)  
     }
   });
 
@@ -59,17 +71,31 @@ describe('Gateway Service', () => {
     const response = await request(app)
       .get('/questions');
 
-    expect(response.statusCode).toBe(200);
-    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+      checkQuestion(response);
   });
 
   // Test /questions/:lang endpoint
   it('should forward questions request to question service', async () => {
     const response = await request(app)
       .get('/questions/es');
 
-    expect(response.statusCode).toBe(200);
-    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    checkQuestion(response);
+  });
+
+  // Test /questions/:lang/:amount endpoint
+  it('should forward questions request to question service', async () => {
+    const response = await request(app)
+      .get('/questions/es/1');
+
+      checkQuestion(response);
+  });
+
+  // Test /questions/:lang/:amount/:type endpoint
+  it('should forward questions request to question service', async () => {
+    const response = await request(app)
+      .get('/questions/es/1/CAPITAL');
+
+      checkQuestion(response);
   });
 
   // Test /record endpoint
@@ -86,7 +112,32 @@ describe('Gateway Service', () => {
     const response = await request(app)
       .get('/record/testuser');
 
-    expect(response.statusCode).toBe(200);
-    expect(response.body).toHaveProperty('record', "undefined");
+      checkRecord(response);
+  });
+
+  // Test /record/ranking/:user endpoint
+  it('should forward record request to record service', async () => {
+    const response = await request(app)
+      .get('/record/ranking/testuser');
+
+      checkRecord(response);
   });
-});
+
+  // Test /record/ranking/top10 endpoint
+  it('should forward record request to record service', async () => {
+    const response = await request(app)
+      .get('/record/ranking/top10');
+      checkRecord(response);
+
+  });
+});
+
+function checkRecord(response){
+  expect(response.statusCode).toBe(200);
+  expect(response.body).toHaveProperty('record', "undefined");
+}
+
+function checkQuestion(response){
+  expect(response.statusCode).toBe(200);
+  expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+}

questionservice/question-service.js

@@ -30,6 +30,60 @@ app.get('/questions',  async (req, res) => {
       }
 });
 
+app.get('/questions/:lang/:amount/:type',  async (req, res) => {
+  try {    
+      const lang = req.params.lang.toString();
+      let amount = checkAmount(parseInt(req.params.amount));
+      const type = req.params.type.toString();
+
+      if(amount > 20 || amount < 1)
+        amount = 5;
+
+      const questions = await Question.aggregate([
+        {$match: {language : lang, type: type}}, //Condition
+        {$sample: {size:amount}}
+      ]);
+
+      let jsonResult = {};
+      for (let i = 0; i < questions.length; i++) {
+          const question = questions[i];
+          jsonResult[i] = {
+              question : question.question,
+              answers : question.answers
+          }
+      }
+      res.json(jsonResult);
+    } catch (error) {
+      res.status(500).json({ error: 'Internal Server Error' });
+    }
+});
+
+app.get('/questions/:lang/:amount',  async (req, res) => {
+  try {    
+      const lang = req.params.lang;
+      let amount = checkAmount(parseInt(req.params.amount));
+
+
+
+      const questions = await Question.aggregate([
+        {$match: {language : lang}}, //Condition
+        {$sample: {size:amount}}
+      ]);
+
+      let jsonResult = {};
+      for (let i = 0; i < questions.length; i++) {
+          const question = questions[i];
+          jsonResult[i] = {
+              question : question.question,
+              answers : question.answers
+          }
+      }
+      res.json(jsonResult);
+    } catch (error) {
+      res.status(500).json({ error: 'Internal Server Error' });
+    }
+});
+
 app.get('/questions/:lang',  async (req, res) => {
   try {    
       const lang = req.params.lang;
@@ -53,6 +107,11 @@ app.get('/questions/:lang',  async (req, res) => {
     }
 });
 
+function checkAmount(amount){
+  if(amount > 20 || amount < 1)
+        return 5;
+  return amount;
+}
 
 const server = app.listen(port, () => {
     console.log(`Question Service listening at http://localhost:${port}`);

questionservice/question-service.test.js

@@ -12,7 +12,7 @@ beforeAll(async () => {
   app = require('./question-service'); 
 
   //Populate db
-  for(let i = 0; i < 6 ; i++){
+  for(let i = 0; i < 21 ; i++){
     const question = new Question( {
         question: "¿Cuál es la población de Oviedo?",
         answers: [
@@ -60,4 +60,52 @@ describe('Question Service', () => {
     expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
     expect(Object.keys(response.body).length).toBe(5);
   });
+
+
+  it('Should give 20 questions /questions/es/20', async () => {
+
+    let response = await request(app).get('/questions/es/20');
+    expect(response.status).toBe(200);
+    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    expect(Object.keys(response.body).length).toBe(20);
+  });
+
+  it('Should give 1 questions /questions/es/1', async () => {
+
+    let response = await request(app).get('/questions/es/20');
+    expect(response.status).toBe(200);
+    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    expect(Object.keys(response.body).length).toBe(20);
+  });
+
+  it('Should give 5 questions as the max is 20 /questions/es/21', async () => {
+
+    let response = await request(app).get('/questions/es/21');
+    expect(response.status).toBe(200);
+    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    expect(Object.keys(response.body).length).toBe(5);
+  });
+
+  it('Should give 5 questions as the min is 1 /questions/es/0', async () => {
+
+    let response = await request(app).get('/questions/es/0');
+    expect(response.status).toBe(200);
+    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    expect(Object.keys(response.body).length).toBe(5);
+  });
+
+  it('Should give 10 questions /questions/es/10/POPULATION', async () => {
+
+    let response = await request(app).get('/questions/es/10/POPULATION');
+    expect(response.status).toBe(200);
+    expect(response.body[0]).toHaveProperty('question', "¿Cuál es la población de Oviedo?");
+    expect(Object.keys(response.body).length).toBe(10);
+  });
+
+  it('Should give 0 questions /questions/es/10/CAPITAL', async () => {
+
+    let response = await request(app).get('/questions/es/10/CAPITAL');
+    expect(response.status).toBe(200);
+    expect(Object.keys(response.body).length).toBe(0);
+  });
 });

sonar-project.properties

@@ -14,4 +14,5 @@ sonar.coverage.exclusions=**/*.test.js
 sonar.sources=webapp/src/components,users/authservice,users/userservice,gatewayservice
 sonar.sourceEncoding=UTF-8
 sonar.exclusions=node_modules/**
-sonar.javascript.lcov.reportPaths=**/coverage/lcov.info
+sonar.javascript.lcov.reportPaths=**/coverage/lcov.info
+sonar.cpd.exclusions=**/*.test.js,**/*steps.js,**/*Tests.java

users/recordservice/record-model.js

@@ -1,16 +1,18 @@
 const mongoose = require('mongoose');
+const { Schema } = mongoose;
 
-const recordSchema = new mongoose.Schema({
-    user: String,
+const recordSchema = new Schema({
+    user: { type: String, required: true },
     games: [{
         questions: [{
-            question: String,
-            answers: [String],
-            answerGiven: String,
-            correctAnswer: String
+            question: { type: String, required: true },
+            answers: { type: [String], required: true },
+            answerGiven: { type: String, required: true },
+            correctAnswer: { type: String, required: true }
         }],
-        points: Number,
-        date: String
+        points: { type: Number, required: true },
+        date: { type: String, required: true },
+        competitive: { type: Boolean, required: true }
     }]
 });
 const Record = mongoose.model('Record', recordSchema);