Merge branch 'develop' of https://github.com/Arquisoft/wiq_es05c into…

… adrian
Arquisoft · Mar 12, 2024 · c10198b · c10198b
2 parents 38d745e + 6e0a01f
commit c10198b
Show file tree

Hide file tree

Showing 58 changed files with 21,423 additions and 1,568 deletions.
diff --git a/README.md b/README.md
@@ -20,13 +20,15 @@ Both the user and auth service share a Mongo database that is accessed with mong
 
 ## Quick start guide
 
+## Team Members
+### David Gonzalez
+
 ### Using docker
 
 The fastest way for launching this sample project is using docker. Just clone the project:
 
 ```sh
-git clone https://github.com/Arquisoft/wiq_es05c.git
-```
+git clone https://github.com/Arquisoft/wiq_es05c.git 
 
 and launch it with docker compose:
 

diff --git a/WikidataPrueba/consultas.txt b/WikidataPrueba/consultas.txt
@@ -0,0 +1,158 @@
+                                                    --CONSULTAS GEOGRAFIA --
+--Consulta que devuelve pais y capital --
+
+SELECT ?country ?countryLabel ?capitalLabel
+WHERE
+{
+  ?country wdt:P31 wd:Q3624078. # Instance of country
+  ?country wdt:P36 ?capital. # Has capital
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+}
+
+
+--Consulta que devuelve pais y poblacion --
+SELECT ?country ?countryLabel ?population
+WHERE
+{
+  ?country wdt:P31 wd:Q3624078. # Instance of country
+  ?country wdt:P1082 ?population. # Has population
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+}
+
+--Consulta que devuelve pais, capital y poblacion --
+SELECT ?country ?countryLabel ?capitalLabel ?population
+WHERE
+{
+  ?country wdt:P31 wd:Q3624078. # Instance of country
+  ?country wdt:P36 ?capital. # Has capital
+  ?country wdt:P1082 ?population. # Has population
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+}
+
+--Consulta estado de EEUU y su capital --
+SELECT ?state ?stateLabel ?capitalLabel
+WHERE {
+  ?state wdt:P31 wd:Q35657 .
+  ?state p:P36 ?statement .
+  ?statement ps:P36 ?capital .
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+}
+
+
+--Consulta estados de EEUU, capital y poblacion 
+SELECT ?state ?stateLabel ?capitalLabel ?poblation
+WHERE {
+  ?state wdt:P31 wd:Q35657 .
+  ?state wdt:P36 ?capital .
+  ?state wdt:P1082 ?poblation .
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en".}
+}
+
+
+                                                          --CONSULTAS DEPORTES--
+--Consulta que devuelve club de futbol y su estadio --
+
+SELECT ?club ?clubLabel ?stadiumLabel
+WHERE {
+  ?club wdt:P31 wd:Q17270000 .
+  ?club p:P115 ?statement .
+  ?statement ps:P115 ?stadium .
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+}
+
+
+                                                                               --CONSULTAS ARTE---
+--Consulta libro y su autor --
+SELECT ?book ?bookLabel ?authorLabel
+WHERE {
+  ?book wdt:P31 wd:Q571 .
+  ?book wdt:P50 ?author .
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en".}
+}
+
+
+--Consulta que devuelve libre y su autor pero solo 4 resultados --
+
+SELECT ?book ?bookLabel ?authorLabel
+WHERE {
+  ?book wdt:P31 wd:Q571 .
+  ?book wdt:P50 ?author .
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en".}
+}
+LIMIT 4
+
+--Consulta que me da peliculas su genero y año de publicacion del director Steven Spielberg --
+
+SELECT ?film ?filmLabel ?genere ?d WHERE {
+  {
+    SELECT ?film (GROUP_CONCAT(DISTINCT ?gL; SEPARATOR = ", ") AS ?genere) (MIN(YEAR(?date)) AS ?d) WHERE {
+      ?sitelink schema:about ?director;
+        schema:isPartOf <https://en.wikipedia.org/>;
+        schema:name "Steven Spielberg"@en. # Edit this with different director's name to see their films. Use the English Wikipedia title only.
+      ?film wdt:P31 wd:Q11424;
+        wdt:P136 ?g, ?g.
+      ?g rdfs:label ?gL.
+      ?film wdt:P57 ?director;
+        wdt:P577 ?date.
+      FILTER((LANG(?gL)) = "en")
+      SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+    }
+    GROUP BY ?film
+  }
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+}
+
+                                                                            --CONSULTAS ENTRETENIMIENTO--
+# Consulta para obtener videojuegos y sus plataformas de desarrollo
+SELECT ?videojuego ?nombreVideojuego ?plataforma ?nombrePlataforma
+WHERE {
+  ?videojuego wdt:P31 wd:Q7889.  # Videojuegos (clase)
+  ?videojuego wdt:P178 ?plataforma.  # Relación "desarrollado para"
+  ?videojuego rdfs:label ?nombreVideojuego filter (lang(?nombreVideojuego) = "es").
+  ?plataforma rdfs:label ?nombrePlataforma filter (lang(?nombrePlataforma) = "es").
+}
+LIMIT 100
+
+
+# Consulta para obtener el nombre del videojuego y su género
+SELECT ?videojuego ?nombreVideojuego ?genero ?nombreGenero
+WHERE {
+  ?videojuego wdt:P31 wd:Q7889.  # Videojuegos (clase)
+  ?videojuego wdt:P136 ?genero.  # Relación "género"
+  ?videojuego rdfs:label ?nombreVideojuego filter (lang(?nombreVideojuego) = "es").
+  ?genero rdfs:label ?nombreGenero filter (lang(?nombreGenero) = "es").
+}
+LIMIT 100
+
+
+                                                                            --CONSULTAS CIENCIA--
+
+                                                                            --CONSULTAS HISTORIA--
+
+
+                                                                            --OTRAS CONSULTAS--
+
+
+--Consulta que me devuelve por orden descendente y solo 4 resultados las ciudades mas grandes por pais
+me devuelve el nombre de la ciudad, pais y poblacion --
+
+SELECT DISTINCT ?city ?cityLabel ?population ?countryLabel WHERE {
+  {
+    SELECT (MAX(?population_) AS ?population) ?country WHERE {
+      ?city wdt:P31/wdt:P279* wd:Q515 .
+      ?city wdt:P1082 ?population_ .
+      ?city wdt:P17 ?country .
+    }
+    GROUP BY ?country
+    ORDER BY DESC(?population)
+  }
+  ?city wdt:P31/wdt:P279* wd:Q515 .
+  ?city wdt:P1082 ?population .
+  ?city wdt:P17 ?country .
+  ?city wdt:P625 ?loc .
+  SERVICE wikibase:label {
+    bd:serviceParam wikibase:language "en" .
+  }
+}
+ORDER BY DESC(?population)
+LIMIT 4
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
 
   authservice:
     container_name: authservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/authservice:latest
+    image: ghcr.io/arquisoft/wiq_es05c/authservice:latest
     profiles: ["dev", "prod"]
     build: ./users/authservice
     depends_on:
@@ -27,7 +27,7 @@ services:
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/userservice:latest
+    image: ghcr.io/arquisoft/wiq_es05c/userservice:latest
     profiles: ["dev", "prod"]
     build: ./users/userservice
     depends_on:
@@ -39,26 +39,41 @@ 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:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/gatewayservice:latest
+    image: ghcr.io/arquisoft/wiq_es05c/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
       - 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:-defaultASW}
-    image: ghcr.io/arquisoft/wiq_0/webapp:latest
+    image: ghcr.io/arquisoft/wiq_es05c/webapp:latest
     profiles: ["dev", "prod"]
     build: ./webapp
     depends_on:

diff --git a/docs/images/06-loginSecuencia.png b/docs/images/06-loginSecuencia.png
diff --git a/docs/images/06-nextQuestion.png b/docs/images/06-nextQuestion.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/Level2-BusinessLogic.png b/docs/images/Level2-BusinessLogic.png
diff --git a/docs/images/Level2-Databases.png b/docs/images/Level2-Databases.png
diff --git a/docs/images/Level2-UserInterface.png b/docs/images/Level2-UserInterface.png
diff --git a/docs/images/QualityTree.PNG b/docs/images/QualityTree.PNG
diff --git a/docs/images/Sin título.png b/docs/images/Sin título.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)