Merge pull request #104 from Arquisoft/develop

Añadidos cambios a master
Arquisoft · Mar 13, 2024 · 7f14caf · 7f14caf
2 parents 7563646 + 2b6f75f
commit 7f14caf
Show file tree

Hide file tree

Showing 57 changed files with 17,260 additions and 1,604 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # wiq_es05c
+Visit our app : http://20.68.253.187:3000/
 
 [![Deploy on release](https://github.com/Arquisoft/wiq_es05c/actions/workflows/release.yml/badge.svg)](https://github.com/Arquisoft/wiq_es05c/actions/workflows/release.yml)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wiq_es05c&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wiq_es05c)
@@ -11,17 +12,24 @@ This repo is a basic application composed of several components.
 - **Gateway service**. Express service that is exposed to the public and serves as a proxy to the two previous ones.
 - **User service**. Express service that handles the insertion of new users in the system.
 - **Auth service**. Express service that handles the authentication of users.
+- **QuestionsService**. Express service that manages the search for questions and answers, their insertion into the database and their obtaining from the database.
 - **Webapp**. React web application that uses the gateway service to allow basic login and new user features.
 
-Both the user and auth service share a Mongo database that is accessed with mongoose.
+Both the user, auth service and questions service share a Mongo database that is accessed with mongoose.
 
 ## Members of the group
-  Adrián Santamarina
 
-## Quick start guide
+  Sonia Moro Lauda
+
+  Lucía Villanueva Rodríguez
+
+  Pedro Castro Montes
+
+  Adrián Santamarina Romero
 
-## Team Members
-### David Gonzalez
+  David González González
+
+## Quick start guide
 
 ### Using docker
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -39,6 +39,19 @@ services:
     environment:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
+  questionservice:
+    container_name: questionservice-${teamname:-defaultASW}
+    profiles: ["dev", "prod"]
+    build: ./questionsService/
+    depends_on:
+      - mongodb
+    ports:
+      - "8003:8003"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/questionsdb
+
   gatewayservice:
     container_name: gatewayservice-${teamname:-wiq_es05c}
     image: ghcr.io/arquisoft/wiq_es05c/gatewayservice:latest
@@ -48,13 +61,15 @@ services:
       - mongodb
       - userservice
       - authservice
+      - questionservice
     ports:
       - "8000:8000"
     networks:
       - mynetwork
     environment:
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
+      QUESTION_SERVICE_URL: http://questionservice:8003
 
   webapp:
     container_name: webapp-${teamname:-wiq_es05c}

diff --git a/docs/images/06-generateQuestion.png b/docs/images/06-generateQuestion.png
diff --git a/docs/images/06-loginSecuencia.png b/docs/images/06-loginSecuencia.png
diff --git a/docs/images/06-registerSecuencia.png b/docs/images/06-registerSecuencia.png
diff --git a/docs/images/07-diagramaDespliegue.png b/docs/images/07-diagramaDespliegue.png
diff --git a/docs/images/3.BusinessContext.png b/docs/images/3.BusinessContext.png
diff --git a/docs/images/Business Context.png b/docs/images/Business Context.png
diff --git a/docs/images/Level2Databases.png b/docs/images/Level2Databases.png
diff --git a/docs/images/Level2Services.png b/docs/images/Level2Services.png
diff --git a/docs/images/Level2Webapp.png b/docs/images/Level2Webapp.png
diff --git a/docs/images/Technical Context.png b/docs/images/Technical Context.png
diff --git a/docs/images/level1.png b/docs/images/level1.png
diff --git a/docs/images/scopeAndContext.png b/docs/images/scopeAndContext.png
diff --git a/docs/index.adoc b/docs/index.adoc
@@ -6,7 +6,7 @@
 // configure EN settings for asciidoc
 include::src/config.adoc[]
 
-= image:arc42-logo.png[arc42] Template
+= image:arc42-logo.png[arc42] Documentación WIQ-ES05C
 :revnumber: 8.2 EN
 :revdate: January 2023
 :revremark: (based upon AsciiDoc version)
@@ -35,14 +35,6 @@ include::src/about-arc42.adoc[]
 ***
 
 [role="arc42help"]
-****
-[NOTE]
-====
-This version of the template contains some help and explanations.
-It is used for familiarization with arc42 and the understanding of the concepts.
-For documentation of your own system you use better the _plain_ version.
-====
-****
 
 
 // numbering from here on