.github/workflows/build.yml

@@ -31,6 +31,9 @@ jobs:
     - run: npm --prefix jordi test -- --coverage
     - run: npm --prefix webapp test -- --coverage
 
+    - name: Remove some coverage files
+      run: rm -rf gatewayservice/node_modules/difunc/coverage
+
     - name: Analyze with SonarCloud
       uses: sonarsource/sonarcloud-github-action@master
       env:

.github/workflows/deploy.yml

@@ -446,6 +446,14 @@ jobs:
           rm -rf ./*
           wget https://raw.githubusercontent.com/arquisoft/wiq_es05b/master/docker-compose.yml -O docker-compose.yml
           wget https://raw.githubusercontent.com/arquisoft/wiq_es05b/master/.env -O .env
+          echo "GF_SECURITY_ADMIN_USER=${{ secrets.GF_SECURITY_ADMIN_USER }}" >> .env
+          echo "GF_SECURITY_ADMIN_PASSWORD=${{ secrets.GF_SECURITY_ADMIN_PASSWORD }}" >> .env
+          echo "GF_SERVER_SERVE_FROM_SUB_PATH=false" >> .env
+          echo "GF_SERVER_DOMAIN=cyt.is-cool.dev" >> .env
+          echo "GF_SERVER_PROTOCOL=http" >> .env
+          echo "ELASTIC_PASSWORD=${{ secrets.ELASTIC_PASSWORD }}" >> .env
+          echo "LOGSTASH_INTERNAL_PASSWORD=${{ secrets.LOGSTASH_INTERNAL_PASSWORD }}" >> .env
+          echo "KIBANA_SYSTEM_PASSWORD=${{ secrets.KIBANA_SYSTEM_PASSWORD }}" >> .env
           docker logout ghcr.io
           docker logout ghcr
           docker image prune -f

README.md

@@ -29,8 +29,7 @@ This repo is a basic application composed of several components.
 - **User service**. Express service that handles the insertion of new users in the system.
 - **Auth service**. Express service that handles the authentication of users.
 - **Webapp**. React web application that uses the gateway service to allow basic login and new user features.
-- **Jordi Ask Service**. Express service that handles the wikidata-based questions generated.
-- **Jordi Think Service**. Local service that generates questions periodically using the WikiData API.
+- **Jordi**. Express service that generates Wikidata-based questions and serves them to the users.
 - **Ranking Service**. Express service that handles the global scoring system of the app.
 
 Both the user and auth service share a Mongo database that is accessed with mongoose.
@@ -150,7 +149,7 @@ Note that this action logs in the remote machine and downloads the docker-compos
 | 📚 UOId | 🧑‍💻 Name | 📧 Email | 😺 GitHub |
 | :---: | :---: | :---: | :---: |
 | UO289295 | Álvaro García | [UO289295@uniovi.es](mailto:UO289295@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-algarfer-brightgreen)](https://github.com/algarfer) |
-| UO288787 | Donato Martín | [UO288787@uniovi.es](mailto:UO288787@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-dononitram-brightgreen)](https://github.com/dononitram) |
+| UO288787 | Donato Martín | [UO288787@uniovi.es](mailto:UO288787@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-donatomartin-brightgreen)](https://github.com/donatomartin) |
 | UO288705 | David Álvarez | [UO288705@uniovi.es](mailto:UO288705@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-DavidAlvrz-brightgreen)](https://github.com/DavidAlvrz) |
 | UO276255 | Rubén Rubio | [UO276255@uniovi.es](mailto:UO276255@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-UO276255-brightgreen)](https://github.com/UO2766255) |
 | UO289321 | Luna Valdés | [UO289321@uniovi.es](mailto:UO289321@uniovi.es) | [![GitHub](https://img.shields.io/badge/GitHub-uo28931-brightgreen)](https://github.com/uo289321) |
@@ -173,7 +172,7 @@ We are grateful for their support and dedication in making this project a succes
 - [Project](https://cyt.is-cool.dev/)
 - [Docs](https://arquisoft.github.io/wiq_es05b/)
 - [npm package](https://www.npmjs.com/package/cyt-utils?activeTab=versions)
-- [OpenApi](https://cyt.is-cool.dev/api/doc)
+- [OpenApi](https://cyt.is-cool.dev/api/doc) (For unknown reasons it is necessary to open the link and refresh the URL on the open page or [clear the browser cache](https://kinsta.com/knowledgebase/how-to-clear-browser-cache/#how-to-force-refresh-a-single-page). [#226](https://github.com/Arquisoft/wiq_es05b/issues/226))
 - [Grafana](https://cyt.is-cool.dev/grafana)
 - [Kibana](https://cyt.is-cool.dev/kibana) 
 

adminpanel/adminPanel.py

@@ -0,0 +1,149 @@
+import tkinter as tk
+from tkinter import scrolledtext, messagebox
+import requests
+import json
+
+# Define the domain constant
+DOMAIN = "http://158.179.216.208:8000"
+
+# Global variable to store the auth token
+auth_token = None
+
+def format_json_display(json_text):
+    try:
+        parsed = json.loads(json_text)
+        formatted_json = json.dumps(parsed, indent=4)
+        return formatted_json
+    except json.JSONDecodeError:
+        return json_text  # return original text if it's not JSON
+
+def login():
+    global auth_token
+    try:
+        # Getting username and password from the GUI
+        username = username_entry.get()
+        password = password_entry.get()
+
+        # Sending POST request to login
+        response = requests.post(f"{DOMAIN}/login", json={"username": username, "password": password})
+        if response.status_code == 200:
+            auth_token = response.json().get('token')
+            response_display.config(state=tk.NORMAL)
+            response_display.delete('1.0', tk.END)
+            response_display.insert(tk.END, "Login Successful!\n")
+            response_display.config(state=tk.DISABLED)
+        else:
+            raise Exception("Login failed with status code: " + str(response.status_code))
+    except Exception as e:
+        messagebox.showerror("Login Error", str(e))
+
+def send_post_request():
+    global auth_token
+    try:
+        # Extracting and preparing JSON data from the text field
+        json_data = json_input.get("1.0", tk.END)
+        json_payload = json.loads(json_data)
+
+        # Sending POST request
+        headers = {"Authorization": f"Bearer {auth_token}"}
+        response = requests.post(f"{DOMAIN}/admin/addGroups", json=json_payload, headers=headers)
+        response_display.config(state=tk.NORMAL)
+        response_display.delete('1.0', tk.END)
+        response_display.insert(tk.END, f"POST Response:\n{format_json_display(response.text)}\n")
+        response_display.config(state=tk.DISABLED)
+    except Exception as e:
+        messagebox.showerror("Request Error", str(e))
+
+def send_get_groups_request():
+    global auth_token
+    try:
+        # Sending GET request
+        headers = {"Authorization": f"Bearer {auth_token}"}
+        response = requests.get(f"{DOMAIN}/admin/groups", headers=headers)
+        response_display.config(state=tk.NORMAL)
+        response_display.delete('1.0', tk.END)
+        response_display.insert(tk.END, f"Groups Data:\n{format_json_display(response.text)}\n")
+        response_display.config(state=tk.DISABLED)
+    except Exception as e:
+        messagebox.showerror("Request Error", str(e))
+
+def send_remove_group_request():
+    global auth_token
+    try:
+        group_id = group_id_entry.get()
+        url = f"{DOMAIN}/admin/removeGroup/{group_id}"
+
+        # Sending GET request
+        headers = {"Authorization": f"Bearer {auth_token}"}
+        response = requests.get(url, headers=headers)
+        response_display.config(state=tk.NORMAL)
+        response_display.delete('1.0', tk.END)
+        response_display.insert(tk.END, f"Remove Group Response:\n{format_json_display(response.text)}\n")
+        response_display.config(state=tk.DISABLED)
+    except Exception as e:
+        messagebox.showerror("Request Error", str(e))
+
+def send_gen_request():
+    global auth_token
+    try:
+        # Sending GET request
+        headers = {"Authorization": f"Bearer {auth_token}"}
+        response = requests.get(f"{DOMAIN}/admin/gen", headers=headers)
+        response_display.config(state=tk.NORMAL)
+        response_display.delete('1.0', tk.END)
+        response_display.insert(tk.END, f"Gen Response:\n{format_json_display(response.text)}\n")
+        response_display.config(state=tk.DISABLED)
+    except Exception as e:
+        messagebox.showerror("Request Error", str(e))
+
+def main():
+    global json_input, response_display, group_id_entry, username_entry, password_entry
+
+    # Setting up the main window
+    root = tk.Tk()
+    root.title("jordiPanel Admin")
+    root.geometry("600x700")  # Set the window size
+
+    # Login Frame
+    login_frame = tk.Frame(root, padx=10, pady=10)
+    login_frame.pack(pady=(10, 0))
+    tk.Label(login_frame, text="Username:").pack(side=tk.LEFT)
+    username_entry = tk.Entry(login_frame)
+    username_entry.pack(side=tk.LEFT, padx=(0, 10))
+    tk.Label(login_frame, text="Password:").pack(side=tk.LEFT)
+    password_entry = tk.Entry(login_frame, show="*")
+    password_entry.pack(side=tk.LEFT, padx=(0, 10))
+    login_button = tk.Button(login_frame, text="Login", command=login)
+    login_button.pack(side=tk.LEFT)
+
+
+    # Data Input Frame
+    data_frame = tk.Frame(root, padx=10, pady=10)
+    data_frame.pack(pady=(10, 0))
+    tk.Label(data_frame, text="JSON Data:").pack()
+    json_input = scrolledtext.ScrolledText(data_frame, height=10, width=70)
+    json_input.pack()
+
+    # Operations Frame
+    operations_frame = tk.Frame(root, padx=10, pady=10)
+    operations_frame.pack(pady=(10, 0))
+    post_button = tk.Button(operations_frame, text="Add Groups", command=send_post_request)
+    post_button.pack(side=tk.LEFT, padx=5)
+    get_groups_button = tk.Button(operations_frame, text="Get Groups", command=send_get_groups_request)
+    get_groups_button.pack(side=tk.LEFT, padx=5)
+    group_id_entry = tk.Entry(operations_frame, width=20)
+    group_id_entry.pack(side=tk.LEFT, padx=5)
+    remove_group_button = tk.Button(operations_frame, text="Remove Group", command=send_remove_group_request)
+    remove_group_button.pack(side=tk.LEFT, padx=5)
+    gen_button = tk.Button(operations_frame, text="Generate", command=send_gen_request)
+    gen_button.pack(side=tk.LEFT, padx=5)
+
+    # Response Display Area
+    response_display = scrolledtext.ScrolledText(root, height=20, width=70, bg="light grey")
+    response_display.pack(pady=(10, 0))
+    response_display.config(state=tk.DISABLED)
+
+    root.mainloop()
+
+if __name__ == "__main__":
+    main()

adminpanel/groups.json

@@ -0,0 +1,122 @@
+[
+    {
+        "groupId": "capitals",
+        "questionItem": "Q6256",
+        "answer": "P36",
+        "statements": [
+            "The capital of <QuestionItem> is...",
+            "What is the capital of <QuestionItem>?",
+            "Select the capital of <QuestionItem>"
+        ],
+        "categories": [
+            "capitals",
+            "geography"
+        ]
+    },
+    {
+        "groupId": "continent",
+        "questionItem": "Q6256",
+        "answer": "P30",
+        "statements": [
+            "The continent of <QuestionItem> is...",
+            "What is the continent of <QuestionItem>?",
+            "Select the continent of <QuestionItem>"
+        ],
+        "categories": [
+            "continent",
+            "geography"
+        ]
+    },
+    {
+        "groupId": "languages",
+        "questionItem": "Q6256",
+        "answer": "P37",
+        "statements": [
+            "The language spoken in <QuestionItem> is...",
+            "What is the language spoken in <QuestionItem>?",
+            "Select the language spoken in <QuestionItem>"
+        ],
+        "categories": [
+            "languages",
+            "geography"
+        ]
+    },
+    {
+        "groupId": "population",
+        "questionItem": "Q6256",
+        "answer": "P1082",
+        "statements": [
+            "The population of <QuestionItem> is...",
+            "What is the population of <QuestionItem>",
+            "Select the population of <QuestionItem>"
+        ],
+        "categories": [
+            "population",
+            "geography"
+        ],
+        "plainText": true,
+        "filter": "FILTER(LANG(?question) = 'en')"
+    },
+    {
+        "groupId": "area",
+        "questionItem": "Q6256",
+        "answer": "P2046",
+        "statements": [
+            "The area of <QuestionItem> is...",
+            "What is the area of <QuestionItem>",
+            "Select the area of <QuestionItem>"
+        ],
+        "categories": [
+            "area",
+            "geography"
+        ],
+        "plainText": true,
+        "filter": "FILTER(LANG(?question) = 'en')"
+    },
+    {
+        "groupId": "gdp",
+        "questionItem": "Q6256",
+        "answer": "P2131",
+        "statements": [
+            "The GDP of <QuestionItem> is...",
+            "What is the GDP of <QuestionItem>",
+            "Select the GDP of <QuestionItem>"
+        ],
+        "categories": [
+            "gdp",
+            "geography"
+        ],
+        "plainText": true,
+        "filter": "FILTER(LANG(?question) = 'en')"
+    },
+    {
+        "groupId": "currency",
+        "questionItem": "Q6256",
+        "answer": "P38",
+        "statements": [
+            "The currency of <QuestionItem> is...",
+            "What is the currency of <QuestionItem>",
+            "Select the currency of <QuestionItem>"
+        ],
+        "categories": [
+            "currency",
+            "geography",
+            "economy"
+        ]
+    },
+    {
+        "groupId": "president",
+        "questionItem": "Q6256",
+        "answer": "P35",
+        "statements": [
+            "The president of <QuestionItem> is...",
+            "Who is the president of <QuestionItem>",
+            "Select the president of <QuestionItem>"
+        ],
+        "categories": [
+            "president",
+            "geography",
+            "politics"
+        ]
+    }
+]

jordi/groupsLoader.py → adminpanel/groupsLoader.py

@@ -14,6 +14,8 @@
 
 """
 
+
+
 def main():
     data = None
     with open('groups.json') as f:
@@ -23,6 +25,7 @@ def main():
     print(response.text)
 
     requests.get('http://localhost:8003/gen')
+    pass
 
 if __name__ == "__main__":
     main()

docker-compose.yml

@@ -229,8 +229,7 @@ services:
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-changeme}
       - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-true}
       - GF_SERVER_DOMAIN=${GF_SERVER_DOMAIN:-}
-      - GF_SERVER_HTTP_PORT=${GF_SERVER_HTTP_PORT:-}
-      - GF_SERVER_PROTOCOL=${GF_PROTOCOL:-}
+      - GF_SERVER_PROTOCOL=${GF_SERVER_PROTOCOL:-}
     ports:
       - "9091:9091"
     depends_on: 

docs/src/05_building_block_view.adoc

@@ -63,11 +63,14 @@ Contained Building Blocks::
 |Service which will handle the user authentication process when a new user logs in
 
 |Users
-|Service containing all user related information such as scores or history of games played.
+|Service containing all user related information.
 
 |Questions
 |Service that bears the responsibility of interacting with te Wikidata API and generating the questions to be presented to the user.
 
+|History
+|Service that stores the user's game history.
+
 |===
 
 === Level 3: