Merge pull request #58 from Arquisoft/generacionRespuestas

Generacion respuestas

docker-compose.yml

@@ -39,6 +39,34 @@ services:
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
+  questiongenservice:
+    container_name: questiongenservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6a/questiongenservice:latest
+    profiles: ["dev", "prod"]
+    build: ./questions/questiongenservice
+    depends_on:
+      - mongodb
+    ports:
+      - "8003:8003"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/questiondb
+
+  questionaskservice:
+    container_name: questionaskservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es6a/questionaskservice:latest
+    profiles: ["dev", "prod"]
+    build: ./questions/questionaskservice
+    depends_on:
+      - mongodb
+    ports:
+      - "8004:8004"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/questiondb
+
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_es6a/gatewayservice:latest
@@ -48,13 +76,17 @@ services:
       - mongodb
       - userservice
       - authservice
+      - questiongenservice
+      - questionaskservice
     ports:
       - "8000:8000"
     networks:
       - mynetwork
     environment:
-      AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
+      AUTH_SERVICE_URL: http://authservice:8002
+      QUESTION_GEN_SERVICE_URL: http://questiongenservice:8003
+      QUESTION_ASK_SERVICE_URL: http://questionaskservice:8004
 
   webapp:
     container_name: webapp-${teamname:-defaultASW}

gatewayservice/gateway-service.js

@@ -6,8 +6,10 @@ const promBundle = require('express-prom-bundle');
 const app = express();
 const port = 8000;
 
-const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
+const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
+const questionGenServiceUrl = process.env.QUESTION_GEN_SERVICE_URL || 'http://localhost:8003';
+const questionAskServiceUrl = process.env.QUESTION_ASK_SERVICE_URL || 'http://localhost:8004';
 
 app.use(cors());
 app.use(express.json());
@@ -41,6 +43,26 @@ app.post('/adduser', async (req, res) => {
   }
 });
 
+app.post('/addquestion', async (req, res) => {
+  try {
+    // Forward the add question request to the question generation service
+    const questionGenResponse = await axios.post(questionGenServiceUrl+'/addquestion', req.body);
+    res.json(questionGenResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
+app.post('/getquestion', async (req, res) => {
+  try {
+    // Forward the get question request to the question asking service
+    const questionAskResponse = await axios.post(questionAskServiceUrl+'/getquestion', req.body);
+    res.json(questionAskResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
 // Start the gateway service
 const server = app.listen(port, () => {
   console.log(`Gateway Service listening at http://localhost:${port}`);

questions/SPARQLQueryDispatcher.js

@@ -0,0 +1,12 @@
+class SPARQLQueryDispatcher {
+    constructor( endpoint ) {
+        this.endpoint = endpoint;
+    }
+
+    query( sparqlQuery ) {
+        const fullUrl = this.endpoint + '?query=' + encodeURIComponent( sparqlQuery );
+        const headers = { 'Accept': 'application/sparql-results+json' };
+
+        return fetch( fullUrl, { headers } ).then( body => body.json() );
+    }
+}