diff --git a/.env.example b/.env.example index 4d717ca..9fb78ce 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ API_KEY_8080=secret8080 API_KEY_8081=secret8081 API_KEY_8082=secret8082 +DATABASE_URL=postgres://mi_usuario:mi_password_seguro@db:5432/joinproject_db \ No newline at end of file diff --git a/.github/scripts/depth_conditional_nesting_GP.py b/.github/scripts/depth_conditional_nesting_GP.py index d76f147..202727e 100644 --- a/.github/scripts/depth_conditional_nesting_GP.py +++ b/.github/scripts/depth_conditional_nesting_GP.py @@ -85,10 +85,10 @@ def visit_If(self, node: ast.If) -> None: def get_status_code(max_depth: int) -> str: if max_depth > CRITICAL_THRESHOLD: - return "❌ CRITICAL" + return "CRITICAL" if max_depth >= WARNING_THRESHOLD: - return "🚨 WARNING" - return "✅ OK" + return "WARNING" + return "OK" def get_metrics(filepath: Path) -> Optional[Dict[str, Any]]: @@ -144,7 +144,7 @@ def main() -> None: all_results.append({ "file": str(filepath), "avg_depth": metrics["avg"], - "max_depth": metrics["max"], + "max_nesting_depth": metrics["max"], "status_code": metrics["status_code"] }) if metrics["max"] > CRITICAL_THRESHOLD: diff --git a/.github/scripts/fog_comments_indexGP.py b/.github/scripts/fog_comments_indexGP.py index fcd9358..0c4cf57 100644 --- a/.github/scripts/fog_comments_indexGP.py +++ b/.github/scripts/fog_comments_indexGP.py @@ -1,12 +1,10 @@ -import re -import os -import sys -import json -import textstat +import re, os, sys, json, textstat from pathlib import Path SUPPORTED_EXTENSIONS = {'.py', '.js', '.ts', '.cpp', '.java', '.html'} +EXCLUDE_DIRS = {'.git', 'node_modules', 'venv', 'env', '__pycache__', 'dist'} + def extract_comments(file_path): extension = os.path.splitext(file_path)[1] @@ -75,7 +73,7 @@ def scan(target_path): files = ( [path] if path.is_file() - else [f for f in path.rglob('*') if f.suffix in SUPPORTED_EXTENSIONS] + else [f for f in path.rglob('*') if f.suffix in SUPPORTED_EXTENSIONS and not any(part in EXCLUDE_DIRS for part in f.parts)] ) results = [] @@ -92,7 +90,7 @@ def scan(target_path): results.append({ "file": str(file), "avg_fog": round(avg, 1) if avg else None, - "max_fog": round(max_score, 1) if max_score else None, + "fog_score": round(max_score, 1) if max_score else None, "status_code": status }) diff --git a/.github/scripts/render-integrity-html.js b/.github/scripts/render-integrity-html.js index 254b8f9..e2e70f8 100644 --- a/.github/scripts/render-integrity-html.js +++ b/.github/scripts/render-integrity-html.js @@ -164,7 +164,7 @@ function buildQualitySection(key, data) { const results = data.results || [] const totalFiles = (data.summary && data.summary.total_files != null) ? data.summary.total_files : results.length - const violations = results.filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!') + const violations = results.filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!' && r.status_code !== 'NO DATA') const passed = totalFiles - violations.length const findingsHtml = violations.length === 0 @@ -172,7 +172,7 @@ function buildQualitySection(key, data) { : violations.map((r) => { const val = r[qm.metric] const display = typeof val === 'number' ? val.toFixed(qm.decimals) : (val ?? '?') - const lvl = (r.status_code === 'DANGER' || r.status_code === '⚠️ IMPROVE NAMING') ? 'error' : 'warning' + const lvl = (r.status_code === 'DANGER' || r.status_code === '⚠️ IMPROVE NAMING' || r.status_code === 'COMPLEX') ? 'error' : 'warning' return `
${chip(lvl)}
@@ -225,7 +225,7 @@ const qualitySummaryRows = quality const qm = QUALITY_META[key] const data = quality[key] const status = qualityJobStatus(data) - const violations = data ? (data.results || []).filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!').length : 0 + const violations = data ? (data.results || []).filter((r) => r.status_code !== 'OK' && r.status_code !== 'OK!' && r.status_code !== 'NO DATA').length : 0 return ` ${qm.icon} ${esc(qm.name)} diff --git a/.github/workflows/quality-pipeline.yml b/.github/workflows/quality-pipeline.yml index 224ffbc..5aaadf7 100644 --- a/.github/workflows/quality-pipeline.yml +++ b/.github/workflows/quality-pipeline.yml @@ -328,7 +328,7 @@ jobs: - name: Run fog index analysis run: | mkdir -p quality-job4 - python .github/scripts/fog_comments_indexGP.py src/ \ + python .github/scripts/fog_comments_indexGP.py . \ > quality-job4/fog-results.json cat quality-job4/fog-results.json diff --git a/.gitignore b/.gitignore index 53487e7..c139f97 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ db.sqlite3 media/ env/ staticfiles/ - +.vscode/ diff --git a/Dockerfile b/Dockerfile index f1728a7..765eebd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM python:3.13-slim +FROM python:3.12-slim WORKDIR /app COPY ./requirements.txt /app/ -RUN pip install -r requirements.txt +RUN pip install --upgrade pip && pip install -r requirements.txt COPY . . @@ -12,7 +12,4 @@ EXPOSE 8000 RUN python manage.py collectstatic --noinput -CMD python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000 - - - +CMD python3 manage.py migrate --fake-initial && gunicorn web.wsgi:application --bind 0.0.0.0:${PORT:-8000} --timeout 90 \ No newline at end of file diff --git a/Templates/Details/details_base.html b/Templates/Details/details_base.html index 6258c36..99e5edf 100644 --- a/Templates/Details/details_base.html +++ b/Templates/Details/details_base.html @@ -8,21 +8,28 @@ {% block content %}
@@ -48,51 +69,129 @@

Sinopsis

Acciones

{% if user.is_authenticated %} - {% endif %}
+ +
+

Valoracions de la comunitat

+ +
+ {% if total_reviews > 0 %} + ★ {{ avg_rating|floatformat:1 }} + ({{ total_reviews }}) + {% else %} + Sense valoracions encara + {% endif %} +
+ + {% if user.is_authenticated %} +
+

Deixa la teva opinió

+
+ {% csrf_token %} + +
+ {% for i in "54321" %} + + + {% endfor %} +
+ + + + +
+
+ {% endif %} + +
+ {% for review in reviews %} +
+
+ {{ review.user.username }} + + {% for i in "12345" %} + {% if forloop.counter <= review.puntuacio %}★{% else %}★{% endif %} + {% endfor %} + +
+
{{ review.creada_a|date:"d M Y" }}
+ {% if review.comentari %} +

{{ review.comentari }}

+ {% endif %} +
+ {% empty %} +

Sigues el primer en valorar aquest contingut!

+ {% endfor %} +
+
+
✅ Añadido a tu historial
+ {% endblock %} \ No newline at end of file diff --git a/Templates/Details/details_movie.html b/Templates/Details/details_movie.html index 4b0c5ba..ad3b9cc 100644 --- a/Templates/Details/details_movie.html +++ b/Templates/Details/details_movie.html @@ -7,4 +7,26 @@ {% endblock %} -{% block favorite_url %}{% url 'toggle_movie_favorite' content.id %}{% endblock %} \ No newline at end of file +{% block favorite_url %}{% url 'toggle_movie_favorite' content.id %}{% endblock %} + +{% block extra_main_content %} +
+

També et pot agradar...

+
+ {% for rec in recommendations %} + + {% if rec.poster_path %} + {{ rec.title }} + {% else %} +
+ {{ rec.title }} +
+ {% endif %} +

{{ rec.title }}

+ + {% empty %} +

No hi ha recomanacions disponibles.

+ {% endfor %} +
+
+{% endblock %} \ No newline at end of file diff --git a/Templates/base.html b/Templates/base.html index c7f5a31..9f42415 100644 --- a/Templates/base.html +++ b/Templates/base.html @@ -32,8 +32,6 @@ {% if user.is_authenticated %} {% trans "Welcome" %} {{ user.username }} {% endif %} - -
{% csrf_token %} @@ -111,7 +109,12 @@ {% if user.is_authenticated %}
- + {% if user.type == 'Consumer' %} + + {% else %} + + {% endif %} + {% endblock %} + {% block content %} -
+
-
-
-
-
- -
- -

{% trans "Results" %}: {{ search_query }}

+
+

+ {% if request.GET.q %} + {% trans "Results for" %}: {{ request.GET.q }} + {% else %} + {% trans "Catálogo completo" %} + {% endif %} +

-
- {% for item in items %} - {% include 'part/card.html' with item=item %} - {% empty %} -

- {% trans "No content found matching those filters." %} -

- {% endfor %} +
+
+
+ +

{% trans "Cargando contenido..." %}

- -
- -
-
+ +
+
+ + {% endblock %} \ No newline at end of file diff --git a/Templates/home/home_parts/paginator.html b/Templates/home/home_parts/paginator.html new file mode 100644 index 0000000..9bdf48c --- /dev/null +++ b/Templates/home/home_parts/paginator.html @@ -0,0 +1,32 @@ +{% load i18n %} + +
+ +
\ No newline at end of file diff --git a/Templates/home/includes/result_fragment.html b/Templates/home/includes/result_fragment.html new file mode 100644 index 0000000..2836268 --- /dev/null +++ b/Templates/home/includes/result_fragment.html @@ -0,0 +1,6 @@ +{% load i18n %} +{% for item in items %} + {% include 'part/card.html' with item=item %} +{% empty %} +

{% trans "No se han encontrado resultados." %}

+{% endfor %} \ No newline at end of file diff --git a/Templates/part/card.html b/Templates/part/card.html index 038071f..3df0b3b 100644 --- a/Templates/part/card.html +++ b/Templates/part/card.html @@ -1,32 +1,53 @@ {% load i18n %} -{% if item.content_type == 'movie' %} -
-{% elif item.content_type == 'series' %} -
+{% if item.content_type == 'movie' and item.movie %} +
+{% elif item.content_type == 'series' and item.series %} +
+{% else %} +
{% endif %} -
-

{{ item.title }}

- {{ item.year }} +
+ {% if item.poster_path %} + {{ item.titol }} + {% else %} +
{{ item.titol|slice:":1" }}
+ {% endif %} +
+

{{ item.titol }}

+ {% if item.data_estrena %}{{ item.data_estrena }}{% endif %} +
-
-

{% trans "Genre" %}: {{ item.genre.name|default:_("N/A") }}

-

{% trans "Director" %}: {{ item.director.name|default:_("N/A") }}

-
- - - {{ item.rating|default:_("N/A") }} - - {{ item.age_rating.description|default:_("N/A") }} +
+
+

{{ item.titol }}

+ {% if item.data_estrena %}{{ item.data_estrena }}{% endif %} +
+

{% trans "Género" %}: {{ item.genere.name|default:"N/A" }}

+

{% trans "Director" %}: {{ item.director.name|default:"N/A" }}

+
+
+ {% if item.rating %} + + + {{ item.rating }} + + {% endif %} + {% if item.age_rating %} + {{ item.age_rating.description }} + {% endif %} +
+ {% if item.synopsis %}

{{ item.synopsis|truncatewords:15 }}

{% endif %} + + {% if item.available_platforms %} +
+ {% trans "Disponible en" %}: +
+ {% for platform in item.available_platforms %} + {{ platform.name|default:platform.port }} + {% endfor %} +
+
+ {% endif %}
- - {% if item.synopsis %} -

{{ item.synopsis|truncatewords:20 }}

- {% endif %}
\ No newline at end of file diff --git a/clon_DB.py b/clon_DB.py new file mode 100644 index 0000000..405bdee --- /dev/null +++ b/clon_DB.py @@ -0,0 +1,134 @@ +#!/usr/bin/env python3 +""" +Script per clonar la base de dades remota (PostgreSQL a Neon) a la base de dades local (SQLite). +Útil per treballar en local (DEBUG=True) amb les dades reals de producció. +""" + +import os +import sys +import subprocess +from pathlib import Path +from dotenv import load_dotenv + +BASE_DIR = Path(__file__).resolve().parent +DUMP_FILE = BASE_DIR / "data_dump.json" + +''' +def load_env(): + + env_file = BASE_DIR / ".env" + if not env_file.exists(): + print("❌ No s'ha trobat el fitxer .env") + sys.exit(1) + load_dotenv(env_file) +''' + +def run_manage(args, env_override=None, description=""): + """ + Funció auxiliar per executar comandes de Django ('manage.py') de manera segura. + Afegeix variables d'entorn personalitzades si és necessari i controla els errors. + """ + + #copia el diccionari de variables d'entorn + env = os.environ.copy() + # Si s'han passat variables per sobreescriure (ex: DJANGO_DEBUG), les afegeix o modifica + if env_override: + env.update(env_override) + + print(f"⏳ {description}...") + + # Executa el procés fill a la terminal (equival a posar "python manage.py ") + result = subprocess.run( + [sys.executable, "manage.py"] + args, + env=env, + cwd=BASE_DIR, + timeout=180, + ) + + # Si el codi de sortida no és 0, significa que el procés ha fallat + + if result.returncode != 0: + print(f"❌ Error (codi {result.returncode})") + return False + + # Si tot ha anat bé, retorna True + return True + + +def main(): + """ + Funció principal que orquestra tot el procés de clonació de la base de dades. + """ + # Carrega les variables d'entorn del fitxer .env + load_dotenv() + + db_url = os.getenv("DATABASE_URL") + if not db_url: + print("❌ DATABASE_URL no definit al .env") + sys.exit(1) + + # Variables d'entorn per executar les comandes com si estiguéssim en producció + prod_env = {"DJANGO_DEBUG": "False", "DISABLE_SCHEDULER": "True"} #per a fer que s'accedeixi a la base de dades de producció + + + # Executa el dumpdata per extreure totes les dades de la base de dades de producció# PAS 1: Exporta totes les dades del PostgreSQL remot a un fitxer JSON + ok = run_manage( + [ + "dumpdata", + "--natural-foreign", + "--natural-primary", + "--exclude", "contenttypes", + "--exclude", "auth.Permission", + "-o", str(DUMP_FILE), + ], + env_override=prod_env, + description="Exportant dades de PostgreSQL (Neon)", + ) + if not ok: + sys.exit(1) + + # Força que Django canviï a l'entorn local (SQLite) activant el mode DEBUG + local_env = {"DJANGO_DEBUG": "True", "DISABLE_SCHEDULER": "True"} + + db_path = BASE_DIR / "db.sqlite3" + if db_path.exists(): + db_path.unlink() + print("🗑️ Base de dades local anterior eliminada") + + # Executa la migración (syncdb) sobre el nuevo SQLite para crear el esquema vacío + ok = run_manage( + ["migrate", "--run-syncdb"], + env_override=local_env, + description="Executant migracions a SQLite", + ) + if not ok: + sys.exit(1) + + load_script = ( + "import django;" + "from django.core.management import call_command;" + "from django.db.models.signals import post_save;" + "from web_app.models import CustomUser;" + "from web_app.signals import create_user_profile, save_user_profile;" + "post_save.disconnect(create_user_profile, sender=CustomUser);" + "post_save.disconnect(save_user_profile, sender=CustomUser);" + "call_command('loaddata', '{}')".format(DUMP_FILE) + ) + + ok = run_manage( + ["shell", "-c", load_script], + env_override=local_env, + description="Important dades a SQLite (sense signals)", + ) + if not ok: + sys.exit(1) + + if DUMP_FILE.exists(): + DUMP_FILE.unlink() + + print("\n✅ Base de dades local actualitzada correctament!") + print(f"📁 {db_path}") + + +if __name__ == "__main__": + main() diff --git a/docker-compose.yml b/docker-compose.yml index 283165c..e0f23a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,5 +3,3 @@ services: build: . ports: - "8000:8000" - volumes: - - .:/app \ No newline at end of file diff --git a/histogram.py b/histogram.py index d717e0c..4a8b528 100644 --- a/histogram.py +++ b/histogram.py @@ -18,6 +18,10 @@ # ── Fetch con paginación ─────────────────────────────────────────────────────── def fetch_all_issues(owner: str, repo: str) -> list[dict]: + """ + Fetches all issues from the specified GitHub repository using pagination + to ensure no data is left behind during the request process. + """ issues, page = [], 1 while True: resp = requests.get( @@ -35,6 +39,10 @@ def fetch_all_issues(owner: str, repo: str) -> list[dict]: # ── Parseo de fechas ─────────────────────────────────────────────────────────── def parse_dates(issues: list[dict]) -> list[tuple[datetime, datetime | None]]: + """ + Parses the creation and closure timestamps from the GitHub API payload + into standard Python datetime objects for further analysis. + """ result = [] for issue in issues: created = datetime.strptime(issue["created_at"], "%Y-%m-%dT%H:%M:%SZ") @@ -76,6 +84,10 @@ def count_open_per_week( # ── Main ─────────────────────────────────────────────────────────────────────── def main(): + """ + Generates a bar chart using matplotlib to visually represent the total + number of open issues distributed across the calculated weeks. + """ print("Obteniendo issues de GitHub…") issues = fetch_all_issues(OWNER, REPO_NAME) issue_dates = parse_dates(issues) diff --git a/locale/ca/LC_MESSAGES/django.mo b/locale/ca/LC_MESSAGES/django.mo index 13f4180..d0bf4cd 100644 Binary files a/locale/ca/LC_MESSAGES/django.mo and b/locale/ca/LC_MESSAGES/django.mo differ diff --git a/locale/ca/LC_MESSAGES/django.po b/locale/ca/LC_MESSAGES/django.po index 4eee51c..af2d88e 100644 --- a/locale/ca/LC_MESSAGES/django.po +++ b/locale/ca/LC_MESSAGES/django.po @@ -241,6 +241,10 @@ msgstr "Director" msgid "Age Rating" msgstr "Classificació" +#: Templates/home/home.html:57 +msgid "Platform" +msgstr "Plataforma" + #: Templates/home/home.html:58 msgid "Filter / Search" msgstr "Filtrar / Cercar" @@ -258,7 +262,14 @@ msgstr "Resultats" msgid "N/A" msgstr "N/A" -#: Templates/home/home.html:103 +#: Templates/home/home.html:82 +msgid "No content found matching those filters." +msgstr "No s'ha trobat cap contingut amb aquests filtres." + +#: Templates/part/card.html +msgid "Available on" +msgstr "Disponible a" + msgid "No movies found matching those filters." msgstr "No s'han trobat pel·lícules amb aquests filtres." diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 22ea945..8e1cfa5 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 920ec1f..8298561 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -240,6 +240,10 @@ msgstr "Director" msgid "Age Rating" msgstr "Age Rating" +#: Templates/home/home.html:57 +msgid "Platform" +msgstr "Platform" + #: Templates/home/home.html:58 msgid "Filter / Search" msgstr "Filter / Search" @@ -257,7 +261,14 @@ msgstr "Results" msgid "N/A" msgstr "N/A" -#: Templates/home/home.html:103 +#: Templates/home/home.html:82 +msgid "No content found matching those filters." +msgstr "No content found matching those filters." + +#: Templates/part/card.html +msgid "Available on" +msgstr "Available on" + msgid "No movies found matching those filters." msgstr "No movies found matching those filters." diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index ba82787..c0f4e57 100644 Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index f5c5bd5..bb49c24 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -246,6 +246,10 @@ msgstr "Director" msgid "Age Rating" msgstr "Clasificación" +#: Templates/home/home.html:57 +msgid "Platform" +msgstr "Plataforma" + #: Templates/home/home.html:58 msgid "Filter / Search" msgstr "Filtrar / Buscar" @@ -263,7 +267,14 @@ msgstr "Resultados" msgid "N/A" msgstr "N/A" -#: Templates/home/home.html:103 +#: Templates/home/home.html:82 +msgid "No content found matching those filters." +msgstr "No se ha encontrado ningún contenido con esos filtros." + +#: Templates/part/card.html +msgid "Available on" +msgstr "Disponible en" + msgid "No movies found matching those filters." msgstr "No se encontraron películas con esos filtros." diff --git a/make_DB_backup.py b/make_DB_backup.py new file mode 100644 index 0000000..66ca514 --- /dev/null +++ b/make_DB_backup.py @@ -0,0 +1,79 @@ +import subprocess +from datetime import datetime +import os +from dotenv import load_dotenv + +''' +necessari: +sudo apt update +sudo apt-get install -y postgresql-client-17 +sudo apt install postgresql postgresql-contrib + +sudo systemctl enable postgresql +sudo systemctl start postgresql + +sudo systemctl status postgresql #comprovar estat, ha de dir active (running) +sudo systemctl stop postgresql #parar servei postgresql + +sudo -u postgres psql +CREATE ROLE admin WITH LOGIN SUPERUSER PASSWORD 'admin'; + +\q +''' + +# --- CONFIGURACIÓN --- +load_dotenv() +NEON_DB_URL = os.getenv("DATABASE_URL") # URL de Neon +LOCAL_DB_NAME = "db_auxiliar" # Nombre que usará Django en local +LOCAL_DB_USER = "admin" # Tu usuario de Postgres local + +# Nombre del archivo temporal +FILENAME = f"backup_neon_{datetime.now().strftime('%Y%m%d_%H%M%S')}.sql" + +def run_command(command, env=None, description=""): + try: + print(f"⏳ {description}...") + subprocess.run(command, check=True, capture_output=True, text=True, env=env) + return True + except subprocess.CalledProcessError as e: + print(f"❌ Error en {description}: {e.stderr}") + return False + +def create_backup(): + # 1. DESCARGAR DE NEON + dump_cmd = [ + "pg_dump", + "--dbname", NEON_DB_URL, + "--file", FILENAME, + "--clean", + "--if-exists", + "--no-owner" # Evita errores de permisos al restaurar en otra DB + ] + + if not run_command(dump_cmd, description="Descargando backup de Neon"): + return +''' + # 2. CREAR LA BASE DE DATOS LOCAL SI NO EXISTE + # Conectamos a 'postgres' (que siempre existe) para crear la nuestra + create_db_script = r"SELECT 'CREATE DATABASE {LOCAL_DB_NAME}' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '{LOCAL_DB_NAME}')\gexec" + #create_cmd = ["psql", "-d", "postgres", "-c", create_db_script] + create_cmd = [ + "psql", "-h", "localhost", "-U", LOCAL_DB_USER, "-d", "postgres", "-c", create_db_script +] + run_command(create_cmd, description=f"Verificando que la DB '{LOCAL_DB_NAME}' exista") + + # 3. RESTAURAR EN LOCAL + #restore_cmd = ["psql","-d", LOCAL_DB_NAME,"f", FILENAME] + #restore_cmd = ["psql", "-h", "localhost", "-U", LOCAL_DB_USER, "-d", LOCAL_DB_NAME, "-f", FILENAME] + + restore_cmd = ["psql", "-h", "localhost", "-U", LOCAL_DB_USER, "-d", LOCAL_DB_NAME, "-f", FILENAME] + + if run_command(restore_cmd, description="Restaurando datos en la DB local"): + print(f"✅ ¡Todo listo! Tu DB local '{LOCAL_DB_NAME}' está sincronizada.") + # Opcional: borrar el archivo .sql después de restaurar para no llenar el disco + # os.remove(FILENAME) + else: + print("⚠️ El backup se descargó pero no se pudo restaurar en local.") +''' +if __name__ == "__main__": + create_backup() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 57f896f..37879e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,9 @@ sqlparse==0.5.5 tzdata==2025.3 tzlocal==5.3.1 urllib3==2.6.3 +psycopg2-binary==2.9.10 Pillow==12.2.0 -whitenoise==6.4.0 \ No newline at end of file +whitenoise==6.4.0 +gunicorn==21.2.0 +setuptools==79.0.1 +resend==2.30.0 \ No newline at end of file diff --git a/static/css/base.css b/static/css/base.css index fc2161c..4bfc86e 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -62,6 +62,8 @@ font-size: 13px !important; color: var(--text-muted) !important; font-weight: 300 !important; + margin-right: 20px !important; + align-self: center !important; } /* Selector de idioma */ diff --git a/static/css/details.css b/static/css/details.css index 0a9792d..4c2bea8 100644 --- a/static/css/details.css +++ b/static/css/details.css @@ -28,6 +28,19 @@ height: fit-content; } +.poster-container { + width: 100%; + border-radius: 8px; + overflow: hidden; + box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3); +} + +.details-poster { + width: 100%; + height: auto; + display: block; +} + .side-meta { display: flex; flex-direction: column; @@ -136,9 +149,196 @@ box-shadow: 0 0 20px var(--cyan-glow); } +/* Sistema de Ressenyes */ + +.community-reviews-section { + margin-top: 40px; + padding-top: 20px; + border-top: 1px solid rgba(255, 255, 255, 0.1); +} + +.rating-summary { + display: flex; + align-items: center; + gap: 10px; + font-size: 1.2rem; + margin-bottom: 25px; +} + +.rating-summary .stars-avg { + color: #f5c518; + font-weight: bold; + font-size: 1.5rem; +} + +.rating-summary .count { + color: rgba(255, 255, 255, 0.6); + font-size: 1rem; +} + +.review-form-container { + background: rgba(255, 255, 255, 0.03); + padding: 20px; + border-radius: 8px; + margin-bottom: 30px; +} + +.star-rating-input { + display: flex; + flex-direction: row-reverse; + justify-content: flex-end; + gap: 5px; + font-size: 2rem; + margin-bottom: 15px; +} + +.star-rating-input input { + display: none; +} + +.star-rating-input label { + color: rgba(255, 255, 255, 0.2); + cursor: pointer; + transition: color 0.2s; +} + +.star-rating-input label:hover, +.star-rating-input label:hover ~ label, +.star-rating-input input:checked ~ label { + color: #f5c518; +} + +.review-textarea { + width: 100%; + background: rgba(0, 0, 0, 0.3); + border: 1px solid rgba(255, 255, 255, 0.1); + color: white; + padding: 15px; + border-radius: 6px; + resize: vertical; + min-height: 100px; +} + +.review-textarea:focus { + outline: none; + border-color: #00ffff; +} + +.review-card { + background: rgba(255, 255, 255, 0.02); + border-left: 3px solid #00ffff; + padding: 15px 20px; + margin-bottom: 15px; + border-radius: 4px; +} + +.review-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 8px; +} + +.review-user { + font-weight: bold; + color: #fff; +} + +.review-stars { + color: #f5c518; +} + +.review-date { + font-size: 0.8rem; + color: rgba(255, 255, 255, 0.5); + margin-bottom: 10px; +} + +.review-text { + line-height: 1.5; + color: rgba(255, 255, 255, 0.9); + margin: 0; +} + +.star-label { + color: rgba(255, 255, 255, 0.2); + cursor: pointer; + transition: color 0.2s ease-in-out; +} + +.star-rating-input label:hover, +.star-rating-input label:hover ~ label, +.star-rating-input input:checked ~ label { + color: #f5c518 !important; +} + /* Responsive */ @media (max-width: 900px) { - .details-wrapper { - grid-template-columns: 1fr; + .details-wrapper { + grid-template-columns: 1fr; } +} + +.api-buttons-container { + display: flex; + flex-wrap: wrap; + gap: 10px; + margin-top: 5px; +} + +.api-btn { + background: rgba(102, 252, 241, 0.05); + border: 1px solid var(--cyan-border); + color: var(--tp); + padding: 8px 16px; + border-radius: 6px; + cursor: pointer; + font-family: 'DM Sans', sans-serif; + font-size: 13px; + font-weight: 600; + transition: all 0.3s ease; + display: flex; + align-items: center; + gap: 8px; +} + +.api-btn:hover { + background: rgba(102, 252, 241, 0.15); + border-color: var(--cyan); + box-shadow: 0 0 10px var(--cyan-glow); +} + +.api-btn.clicked { + background: var(--cyan); + color: #000; + border-color: var(--cyan); +} + +.api-stats { + font-size: 11px; + opacity: 0.7; + font-weight: normal; +} + +.toast-notification { + position: fixed; + bottom: 30px; + right: 30px; + background: var(--cyan); + color: #000; + padding: 12px 24px; + border-radius: 8px; + font-family: 'DM Sans', sans-serif; + font-weight: bold; + box-shadow: 0 5px 20px rgba(0,0,0,0.5); + z-index: 9999; + opacity: 0; + transform: translateY(20px); + transition: opacity 0.3s, transform 0.3s; + pointer-events: none; +} + +.toast-notification.show { + opacity: 1; + transform: translateY(0); } \ No newline at end of file diff --git a/static/css/global.css b/static/css/global.css index b4da016..c660432 100644 --- a/static/css/global.css +++ b/static/css/global.css @@ -28,6 +28,11 @@ body { z-index: -1; } +.hidden-link { + text-decoration: none; + color: inherit; +} + /* Header / Navbar */ .header { display: flex; diff --git a/static/css/home/filter.css b/static/css/home/filter.css index 48a6e20..a63362e 100644 --- a/static/css/home/filter.css +++ b/static/css/home/filter.css @@ -25,7 +25,8 @@ .genre-filter, .director-filter, -.age-rating-filter { +.age-rating-filter, +.platform-filter { display: flex; flex-direction: column; gap: 0.5rem; @@ -138,5 +139,5 @@ align-items: stretch; } .filter-buttons { justify-content: space-between; margin-top: .5rem; } - .genre-filter, .director-filter, .age-rating-filter { min-width: 100%; } + .genre-filter, .director-filter, .age-rating-filter, .platform-filter { min-width: 100%; } } \ No newline at end of file diff --git a/static/css/home/home.css b/static/css/home/home.css index e74904b..9516acb 100644 --- a/static/css/home/home.css +++ b/static/css/home/home.css @@ -38,124 +38,244 @@ padding: 1rem 0; } -/* Movie card */ +/* Movie card - Poster based design */ .movie-card { + position: relative; background: var(--bg-glass); border: 1px solid var(--border-glass); border-radius: 8px; overflow: hidden; transition: transform .25s, border-color .25s, box-shadow .25s; - display: flex; - flex-direction: column; - height: 100%; + aspect-ratio: 2/3; + min-height: 360px; } .movie-card:hover { - transform: translateY(-6px); + transform: translateY(-6px) scale(1.02); border-color: var(--border-glass-hover); - box-shadow: 0 12px 32px rgba(102, 252, 241, .07); + box-shadow: 0 16px 40px rgba(102, 252, 241, .15); + z-index: 10; } -/* Card header */ -.card-header { - padding: 1.25rem 1.25rem 1rem; - background: transparent; +/* Poster container */ +.card-poster { + position: relative; + width: 100%; + height: 100%; + overflow: hidden; +} + +.card-poster img { + width: 100%; + height: 100%; + object-fit: cover; + transition: transform .4s ease; +} + +.movie-card:hover .card-poster img { + transform: scale(1.08); +} + +.no-poster { + width: 100%; + height: 100%; + background: linear-gradient(135deg, rgba(102, 252, 241, .1) 0%, rgba(11, 12, 16, 1) 100%); display: flex; - justify-content: space-between; - align-items: flex-start; - gap: 1rem; - border-bottom: 1px solid var(--border-glass); + align-items: center; + justify-content: center; } -.movie-title { +.no-poster span { + font-family: 'Syne', sans-serif; + font-size: 4rem; + font-weight: 700; + color: var(--neon-cyan); + opacity: .3; +} + +/* Title overlay (always visible) */ +.card-title-overlay { + position: absolute; + bottom: 0; + left: 0; + right: 0; + padding: 3rem 1rem 1rem; + background: linear-gradient(to top, rgba(11, 12, 16, .95) 0%, rgba(11, 12, 16, .6) 50%, transparent 100%); + pointer-events: none; +} + +.card-title-overlay .movie-title { font-family: 'Syne', sans-serif; font-size: 14px; font-weight: 600; - margin: 0; + margin: 0 0 .25rem 0; color: var(--text-primary); line-height: 1.3; letter-spacing: -.01em; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; } -.movie-year { +.card-title-overlay .movie-year { font-size: 11px; - color: var(--text-muted); + color: var(--neon-cyan); font-weight: 400; - padding: 3px 8px; - background: rgba(11, 12, 16, .6); - border: 1px solid var(--border-glass); - border-radius: 4px; - white-space: nowrap; + opacity: .8; font-family: 'DM Sans', sans-serif; } -/* Card body */ -.card-body { - padding: 1rem 1.25rem; - flex: 1; +/* Hover overlay */ +.card-hover-overlay { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: linear-gradient(to top, rgba(11, 12, 16, .98) 0%, rgba(11, 12, 16, .92) 100%); + padding: 1rem; + opacity: 0; + visibility: hidden; + transition: opacity .25s ease, visibility .25s ease; + overflow-y: auto; display: flex; flex-direction: column; - gap: .6rem; } -.movie-info { - font-size: 13px; - color: var(--text-muted); +.movie-card:hover .card-hover-overlay { + opacity: 1; + visibility: visible; +} + +.card-hover-content { + display: flex; + flex-direction: column; + gap: .5rem; + margin-top: auto; + padding-top: 2rem; +} + +.hover-title { + font-family: 'Syne', sans-serif; + font-size: 15px; + font-weight: 700; margin: 0; - line-height: 1.4; + color: var(--text-primary); + line-height: 1.2; +} + +.hover-year { + font-size: 11px; + color: var(--neon-cyan); + font-weight: 500; + font-family: 'DM Sans', sans-serif; +} + +.hover-info { + margin-top: .25rem; +} + +.hover-info p { + font-size: 12px; + color: var(--text-muted); + margin: .15rem 0; + line-height: 1.3; font-family: 'DM Sans', sans-serif; } -.movie-info strong { +.hover-info strong { color: var(--neon-cyan); font-weight: 400; - margin-right: .4rem; + margin-right: .35rem; text-transform: uppercase; - font-size: 10px; + font-size: 9px; letter-spacing: .08em; - opacity: .7; + opacity: .8; } -.movie-meta { +.hover-meta { display: flex; align-items: center; - gap: 1rem; + gap: .75rem; margin: .25rem 0; } +.hover-synopsis { + font-size: 11px; + color: var(--text-muted); + line-height: 1.5; + margin: .25rem 0 0 0; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; + font-family: 'DM Sans', sans-serif; + font-weight: 300; + opacity: .9; +} + +/* Badges */ .rating-badge { display: flex; align-items: center; - gap: .4rem; - font-size: 13px; + gap: .3rem; + font-size: 12px; font-weight: 600; color: #f5c518; font-family: 'DM Sans', sans-serif; } .age-badge { - font-size: 10px; + font-size: 9px; font-weight: 500; background: rgba(11, 12, 16, .6); color: var(--text-muted); - padding: 2px 8px; + padding: 2px 7px; border-radius: 4px; text-transform: uppercase; border: 1px solid var(--border-glass); font-family: 'DM Sans', sans-serif; } -.movie-synopsis { - font-size: 12px; - color: var(--text-muted); - line-height: 1.6; - margin-top: .25rem; - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - overflow: hidden; +/* Platform badges on hover */ +.hover-platforms { + margin-top: .5rem; + padding-top: .5rem; + border-top: 1px solid rgba(102, 252, 241, .15); + display: flex; + flex-direction: column; + gap: .3rem; +} + +.hover-platforms > span { + font-size: 9px; + font-weight: 400; + color: var(--neon-cyan); + text-transform: uppercase; + letter-spacing: .08em; + opacity: .7; font-family: 'DM Sans', sans-serif; - font-weight: 300; +} + +.platforms-list { + display: flex; + flex-wrap: wrap; + gap: .3rem; +} + +.platform-badge { + font-size: 9px; + font-weight: 500; + padding: 2px 7px; + border-radius: 4px; + background: rgba(102, 252, 241, .06); + color: var(--neon-cyan); + border: 1px solid rgba(102, 252, 241, .2); + font-family: 'DM Sans', sans-serif; + letter-spacing: .04em; + white-space: nowrap; } /* Empty state */ diff --git a/users/templates/users/types/user_technical.html b/tests/__init__.py similarity index 100% rename from users/templates/users/types/user_technical.html rename to tests/__init__.py diff --git a/tests/test_forms.py b/tests/test_forms.py new file mode 100644 index 0000000..b631602 --- /dev/null +++ b/tests/test_forms.py @@ -0,0 +1,105 @@ +from django.test import TestCase +from django.urls import reverse +from django.contrib.auth.forms import UserCreationForm, UserChangeForm +from django.core.files.uploadedfile import SimpleUploadedFile +from PIL import Image +import io +from web_app.models import CustomUser, API +from web_app.forms import CustomUserCreationForm, CustomUserChangeForm + + +def create_test_image(format='JPEG', extension='jpg'): + img = Image.new('RGB', (100, 100), color='red') + buffer = io.BytesIO() + img.save(buffer, format=format) + buffer.seek(0) + return SimpleUploadedFile( + f'test.{extension}', + buffer.read(), + content_type=f'image/{format.lower()}' + ) + + +class CustomUserCreationFormTest(TestCase): + def test_password_does_not_match(self): + """Comprueba que contraseñas distintas invalidan el formulario.""" + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password456', + }) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['password2'], ["Las contraseñas no coinciden"]) + + def test_password_matches(self): + """Comprueba que contraseñas iguales permiten validar el formulario.""" + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + }) + self.assertTrue(form.is_valid()) + + def test_terms_not_accepted(self): + """Comprueba que sin aceptar términos el formulario es inválido.""" + form = CustomUserCreationForm({ + 'username': 'testuser', + 'email': 'test@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': False, + }) + self.assertFalse(form.is_valid()) + self.assertIn('terms_accepted', form.errors) + + +class CustomUserChangeFormTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user( + username='testuser', password='password123' + ) + + def test_succes_avatar(self): + """Comprueba que un avatar JPG válido es aceptado.""" + img = create_test_image(format='JPEG', extension='jpg') + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) + self.assertTrue(form.is_valid()) + + def test_valid_png_avatar(self): + """Comprueba que un avatar PNG válido es aceptado.""" + img = create_test_image(format='PNG', extension='png') + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) + self.assertTrue(form.is_valid()) + + def test_wrong_file_type_avatar(self): + """Comprueba que un archivo de texto es rechazado como avatar.""" + txt_file = SimpleUploadedFile('file.txt', b'file_content', content_type='text/plain') + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': txt_file}, + instance=self.user + ) + self.assertFalse(form.is_valid()) + self.assertIn('avatar', form.errors) + + def test_wrong_extension_avatar(self): + """Comprueba que una imagen GIF con extensión .gif es rechazada.""" + img = create_test_image(format='PNG', extension='gif') + form = CustomUserChangeForm( + {'username': 'testuser', 'type': 'Consumer'}, + files={'avatar': img}, + instance=self.user + ) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['avatar'], ["Solo se permiten archivos JPG o PNG."]) diff --git a/tests/test_models.py b/tests/test_models.py new file mode 100644 index 0000000..dcba662 --- /dev/null +++ b/tests/test_models.py @@ -0,0 +1,295 @@ +from django.test import TestCase +from django.utils import timezone +from web_app.models import API, Director, Genre, AgeRating, Contingut, Movie, Series, CustomUser, UserProfile, SyncLog + + +class APITest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + + def test_api_creation(self): + self.assertEqual(self.api.port, 8000) + self.assertEqual(self.api.name, 'Netflix') + + def test_api_str_with_name(self): + self.assertEqual(str(self.api), 'Netflix') + + def test_api_str_without_name(self): + api_no_name = API.objects.create(port=9000) + self.assertEqual(str(api_no_name), '9000') + + def test_api_port_unique(self): + with self.assertRaises(Exception): + API.objects.create(port=8000, name='Duplicate') + + +class DirectorTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.director = Director.objects.create( + director_id=1, + api=self.api, + name='Christopher Nolan', + birth_date=timezone.now(), + country='UK' + ) + + def test_director_creation(self): + self.assertEqual(self.director.name, 'Christopher Nolan') + self.assertEqual(self.director.api, self.api) + + def test_director_str(self): + self.assertEqual(str(self.director), 'Christopher Nolan') + + def test_director_unique_together(self): + with self.assertRaises(Exception): + Director.objects.create( + director_id=1, + api=self.api, + name='Duplicate', + birth_date=timezone.now(), + country='US' + ) + + +class GenreTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8001, name='HBO') + self.genre = Genre.objects.create( + genre_id=1, + api=self.api, + name='Sci-Fi', + description='Science fiction genre' + ) + + def test_genre_creation(self): + self.assertEqual(self.genre.name, 'Sci-Fi') + self.assertEqual(self.genre.description, 'Science fiction genre') + + def test_genre_str(self): + self.assertEqual(str(self.genre), 'Sci-Fi') + + def test_genre_unique_together(self): + with self.assertRaises(Exception): + Genre.objects.create( + genre_id=1, + api=self.api, + name='Duplicate', + description='Test' + ) + + +class AgeRatingTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8002, name='Disney') + self.age_rating = AgeRating.objects.create( + age_rating_id=1, + api=self.api, + codi='PG-13', + age=13 + ) + + def test_age_rating_creation(self): + self.assertEqual(self.age_rating.codi, 'PG-13') + self.assertEqual(self.age_rating.age, 13) + + def test_age_rating_str(self): + self.assertEqual(str(self.age_rating), 'PG-13') + + def test_age_rating_description_property(self): + self.assertEqual(self.age_rating.description, 'PG-13') + + def test_age_rating_unique_together(self): + with self.assertRaises(Exception): + AgeRating.objects.create( + age_rating_id=1, + api=self.api, + codi='Duplicate', + age=13 + ) + + +class ContingutTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, codi='PG', age=10 + ) + self.contingut = Contingut.objects.create( + titol='Inception', + data_estrena=2010, + director=self.director, + genere=self.genre, + age_rating=self.age_rating, + apis=[self.api], + rating=8.8 + ) + + def test_contingut_creation(self): + self.assertEqual(self.contingut.titol, 'Inception') + self.assertEqual(self.contingut.data_estrena, 2010) + self.assertEqual(self.contingut.rating, 8.8) + + def test_contingut_str(self): + self.assertEqual(str(self.contingut), 'Inception') + + +class MovieTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, codi='PG', age=10 + ) + self.contingut1 = Contingut.objects.create( + titol='Inception', data_estrena=2010, + director=self.director, genere=self.genre, age_rating=self.age_rating, + apis=[self.api], rating=8.8 + ) + self.movie = Movie.objects.create(contingut=self.contingut1) + + def test_movie_creation(self): + self.assertEqual(self.movie.contingut, self.contingut1) + + def test_movie_str(self): + self.assertEqual(str(self.movie), 'Inception') + + def test_movie_title_property(self): + self.assertEqual(self.movie.title, 'Inception') + + def test_movie_year_property(self): + self.assertEqual(self.movie.year, 2010) + + def test_movie_genre_property(self): + self.assertEqual(self.movie.genre, self.genre) + + def test_movie_director_property(self): + self.assertEqual(self.movie.director, self.director) + + def test_movie_age_rating_property(self): + self.assertEqual(self.movie.age_rating, self.age_rating) + + def test_movie_synopsis_property(self): + self.assertIsNone(self.movie.synopsis) + + def test_movie_rating_property(self): + self.assertEqual(self.movie.rating, 8.8) + + +class SeriesTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=2, api=self.api, name='Drama') + self.director = Director.objects.create( + director_id=2, api=self.api, name='Series Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=2, api=self.api, codi='TV-MA', age=17 + ) + self.contingut2 = Contingut.objects.create( + titol='Breaking Bad', data_estrena=2008, + director=self.director, genere=self.genre, age_rating=self.age_rating, + apis=[self.api], rating=9.5 + ) + self.series = Series.objects.create(contingut=self.contingut2, num_temporades=5) + + def test_series_creation(self): + self.assertEqual(self.series.contingut, self.contingut2) + self.assertEqual(self.series.num_temporades, 5) + + def test_series_str(self): + self.assertEqual(str(self.series), 'Breaking Bad') + + def test_series_title_property(self): + self.assertEqual(self.series.title, 'Breaking Bad') + + def test_series_year_property(self): + self.assertEqual(self.series.year, 2008) + + def test_series_start_year_property(self): + self.assertEqual(self.series.start_year, 2008) + + def test_series_end_year_property(self): + self.assertIsNone(self.series.end_year) + + def test_series_genre_property(self): + self.assertEqual(self.series.genre, self.genre) + + def test_series_total_seasons_property(self): + self.assertEqual(self.series.total_seasons, 5) + + +class CustomUserTest(TestCase): + def test_user_creation(self): + user = CustomUser.objects.create_user(username='testuser', password='password123', email='test@mail.com') + self.assertEqual(user.username, 'testuser') + self.assertEqual(user.email, 'test@mail.com') + self.assertTrue(user.check_password('password123')) + + def test_user_str(self): + user = CustomUser.objects.create_user(username='testuser2', password='password123') + self.assertEqual(str(user), 'testuser2') + + def test_user_type_default(self): + user = CustomUser.objects.create_user(username='testuser3', password='password123') + self.assertEqual(user.type, 'Consumer') + + +class UserProfileTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='profileuser', password='password123') + self.profile = self.user.profile + + def test_profile_creation(self): + self.assertEqual(self.profile.user, self.user) + self.assertEqual(str(self.profile), 'Perfil de profileuser') + + def test_profile_preferits(self): + api = API.objects.create(port=8003, name='Prime') + director = Director.objects.create( + director_id=3, api=api, name='Dir', + birth_date=timezone.now(), country='US' + ) + age_rating = AgeRating.objects.create( + age_rating_id=3, api=api, codi='G', age=0 + ) + contingut = Contingut.objects.create( + titol='Fav Content', director=director, + age_rating=age_rating, apis=[api] + ) + self.profile.preferits.add(contingut) + self.assertIn(contingut, self.profile.preferits.all()) + + +class SyncLogTest(TestCase): + def test_sync_log_creation(self): + log = SyncLog.objects.create( + status='completed', + summary='Test sync', + records_created=10, + records_updated=5 + ) + self.assertEqual(log.status, 'completed') + self.assertEqual(log.records_created, 10) + self.assertEqual(log.records_updated, 5) + self.assertIsNotNone(log.start_time) + + def test_sync_log_str(self): + log = SyncLog.objects.create( + status='completed', + summary='Test sync', + records_created=10, + records_updated=5 + ) + expected = f"Sync {log.start_time.strftime('%Y-%m-%d %H:%M')} - completed" + self.assertEqual(str(log), expected) diff --git a/tests/test_reports.py b/tests/test_reports.py new file mode 100644 index 0000000..6749e39 --- /dev/null +++ b/tests/test_reports.py @@ -0,0 +1,107 @@ +from django.test import TestCase +from users.services import ( + get_content_analytics, format_analytics_for_csv, _strip_pii, PII_COLUMNS, + GDPR_ANONYMIZE_FIELDS, anonymize_user_id, validate_gdpr_compliance, +) + + +class PIIAnonymizationTest(TestCase): + + def test_get_content_analytics_returns_no_pii_fields(self): + data = get_content_analytics() + for row in data: + for col in row: + self.assertNotIn(col, PII_COLUMNS, + f"PII column '{col}' found in analytics data") + + def test_format_analytics_never_contains_pii(self): + rows = [ + { + 'title': 'Test', + 'username': 'john_doe', + 'email': 'john@example.com', + 'ip_address': '192.168.1.1', + } + ] + result = format_analytics_for_csv(rows, is_b2b_report=False) + for row in result: + self.assertNotIn('username', row) + self.assertNotIn('email', row) + self.assertNotIn('ip_address', row) + self.assertIn('title', row) + + def test_b2b_mode_anonymizes_gdpr_fields(self): + rows = [ + {'title': 'Test', 'username': 'john_doe', 'email': 'john@example.com', + 'first_name': 'John', 'last_name': 'Doe'} + ] + result = format_analytics_for_csv(rows, is_b2b_report=True) + row = result[0] + self.assertTrue(row['username'].startswith('UID_')) + self.assertEqual(len(row['username']), 16) + self.assertTrue(row['email'].startswith('UID_')) + self.assertTrue(row['first_name'].startswith('UID_')) + self.assertTrue(row['last_name'].startswith('UID_')) + + def test_strip_pii_removes_all_sensitive_fields(self): + row = {'title': 'Movie', 'username': 'user', 'email': 'a@b.com', 'location': 'NYC'} + clean = _strip_pii(row) + self.assertIn('title', clean) + self.assertNotIn('username', clean) + self.assertNotIn('email', clean) + self.assertNotIn('location', clean) + + def test_pii_columns_contains_expected_fields(self): + self.assertIn('username', PII_COLUMNS) + self.assertIn('email', PII_COLUMNS) + has_ip = 'ip_address' in PII_COLUMNS or 'id_address' in PII_COLUMNS + self.assertTrue(has_ip) + + +class GDPRComplianceTest(TestCase): + + def test_anonymize_user_id_is_deterministic(self): + uid1 = anonymize_user_id('john_doe') + uid2 = anonymize_user_id('john_doe') + self.assertEqual(uid1, uid2) + + def test_anonymize_user_id_produces_different_ids_for_different_inputs(self): + uid1 = anonymize_user_id('john_doe') + uid2 = anonymize_user_id('jane_doe') + self.assertNotEqual(uid1, uid2) + + def test_anonymize_user_id_prefix(self): + uid = anonymize_user_id('test_user') + self.assertTrue(uid.startswith('UID_')) + + def test_validate_gdpr_compliance_passes_for_clean_data(self): + data = [{'title': 'Movie', 'views': 10}] + validate_gdpr_compliance(data) + + def test_validate_gdpr_compliance_raises_on_pii_columns(self): + data = [{'title': 'Movie', 'username': 'john_doe'}] + with self.assertRaises(ValueError) as ctx: + validate_gdpr_compliance(data) + self.assertIn('GDPR violation', str(ctx.exception)) + + def test_validate_gdpr_compliance_raises_on_email_in_values(self): + data = [{'title': 'Movie', 'note': 'contact john@example.com for info'}] + with self.assertRaises(ValueError) as ctx: + validate_gdpr_compliance(data) + self.assertIn('GDPR violation', str(ctx.exception)) + + def test_validate_gdpr_compliance_b2b_raises_on_non_anonymized(self): + data = [{'username': 'john_doe'}] + with self.assertRaises(ValueError) as ctx: + validate_gdpr_compliance(data, is_b2b_report=True) + self.assertIn('GDPR violation', str(ctx.exception)) + + def test_validate_gdpr_compliance_b2b_passes_with_uid_prefix(self): + data = [{'username': 'UID_abc123def456'}] + validate_gdpr_compliance(data, is_b2b_report=True) + + def test_gdpr_anonymize_fields_contains_expected(self): + self.assertIn('username', GDPR_ANONYMIZE_FIELDS) + self.assertIn('email', GDPR_ANONYMIZE_FIELDS) + self.assertIn('first_name', GDPR_ANONYMIZE_FIELDS) + self.assertIn('last_name', GDPR_ANONYMIZE_FIELDS) diff --git a/tests/test_views.py b/tests/test_views.py new file mode 100644 index 0000000..d2a06f1 --- /dev/null +++ b/tests/test_views.py @@ -0,0 +1,758 @@ +from django.test import TestCase +from django.urls import reverse +from django.utils import timezone +from django.contrib.auth import get_user_model +from web_app.models import API, Director, Genre, AgeRating, Contingut, Movie, Series, UserProfile +import io +from PIL import Image + + +CustomUser = get_user_model() + + +def create_test_image(): + img = Image.new('RGB', (100, 100), color='red') + buffer = io.BytesIO() + img.save(buffer, format='JPEG') + buffer.seek(0) + return buffer + + +def create_contingut(api=None, genre=None, director=None, age_rating=None, title='Test', year=2020): + """Helper para crear Contingut con datos por defecto.""" + return Contingut.objects.create( + api_content_id=100 + Contingut.objects.count(), + titol=title, + data_estrena=year, + director=director, + genere=genre, + age_rating=age_rating, + api=api + ) + + +class HomeViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8000, name='Netflix') + self.genre = Genre.objects.create(genre_id=1, api=self.api, name='Action') + self.director = Director.objects.create( + director_id=1, api=self.api, name='Director', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=1, api=self.api, codi='PG', age=10 + ) + self.contingut_movie = create_contingut( + api=self.api, genre=self.genre, director=self.director, + age_rating=self.age_rating, title='Movie One', year=2020 + ) + self.movie = Movie.objects.create(contingut=self.contingut_movie) + self.contingut_series = create_contingut( + api=self.api, genre=self.genre, director=self.director, + age_rating=self.age_rating, title='Series One', year=2020 + ) + self.series = Series.objects.create(contingut=self.contingut_series, num_temporades=3) + + # ------------------------------------------------------------------ # + # HOME - BÁSICO # + # ------------------------------------------------------------------ # + + def test_home_status_code(self): + """Comprueba que la vista home responde con 200 OK.""" + response = self.client.get(reverse('home')) + self.assertEqual(response.status_code, 200) + + def test_home_uses_correct_template(self): + """Comprueba que se renderiza el template correcto.""" + response = self.client.get(reverse('home')) + self.assertTemplateUsed(response, 'home/home.html') + + def test_home_shows_movies_and_series(self): + """Comprueba que el context contiene 'items', 'genres' y 'directors'.""" + response = self.client.get(reverse('home')) + self.assertIn('items', response.context) + self.assertIn('genres', response.context) + self.assertIn('directors', response.context) + + def test_home_empty_results(self): + """Comprueba que home funciona aunque no haya películas ni series.""" + Movie.objects.all().delete() + Series.objects.all().delete() + response = self.client.get(reverse('home')) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.context['items']), 0) + + # ------------------------------------------------------------------ # + # HOME - FILTROS # + # ------------------------------------------------------------------ # + + def test_home_search_filter(self): + """Comprueba que el filtro por query 'q' devuelve solo los resultados coincidentes.""" + response = self.client.get(reverse('home'), {'q': 'Movie One'}) + titles = [item.title for item in response.context['items']] + self.assertIn('Movie One', titles) + self.assertNotIn('Series One', titles) + + def test_home_search_no_results(self): + """Comprueba que una búsqueda sin resultados devuelve lista vacía.""" + response = self.client.get(reverse('home'), {'q': 'Inexistente'}) + self.assertEqual(len(response.context['items']), 0) + + def test_home_genre_filter(self): + """Comprueba que el filtro por género devuelve películas y series de ese género.""" + response = self.client.get(reverse('home'), {'genre': 'Action'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_genre_filter_no_results(self): + """Comprueba que un género inexistente no devuelve resultados.""" + response = self.client.get(reverse('home'), {'genre': 'Fantasía'}) + self.assertEqual(len(response.context['items']), 0) + + def test_home_director_filter(self): + """Comprueba que el filtro por director devuelve contenido de ese director.""" + response = self.client.get(reverse('home'), {'director': 'Director'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_age_rating_filter(self): + """Comprueba que el filtro por clasificación por edades funciona correctamente.""" + response = self.client.get(reverse('home'), {'age_rating': 'PG'}) + self.assertEqual(len(response.context['items']), 2) + + # ------------------------------------------------------------------ # + # HOME - FILTRO POR PLATAFORMA # + # ------------------------------------------------------------------ # + + def test_home_platform_filter(self): + """Comprueba que el filtro por plataforma (API port) devuelve solo contenido de esa API.""" + response = self.client.get(reverse('home'), {'platform': '8000'}) + self.assertEqual(len(response.context['items']), 2) + + def test_home_platform_filter_no_results(self): + """Comprueba que un port inexistente no devuelve resultados.""" + response = self.client.get(reverse('home'), {'platform': '9999'}) + self.assertEqual(len(response.context['items']), 0) + + # ------------------------------------------------------------------ # + # HOME - PAGINACIÓN # + # ------------------------------------------------------------------ # + + def test_home_pagination_page_1(self): + """Comprueba que la página 1 tiene como máximo 20 items y hay siguiente página.""" + for i in range(25): + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title=f'Extra Movie {i}', year=2020 + ) + Movie.objects.create(contingut=cont) + response = self.client.get(reverse('home')) + page_obj = response.context['items'] + self.assertTrue(page_obj.has_next()) + self.assertEqual(page_obj.number, 1) + + def test_home_pagination_page_2(self): + """Comprueba que se puede acceder a la segunda página de resultados.""" + for i in range(25): + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title=f'Extra Movie {i}', year=2020 + ) + Movie.objects.create(contingut=cont) + response = self.client.get(reverse('home'), {'page': 2}) + page_obj = response.context['items'] + self.assertTrue(page_obj.has_previous()) + self.assertEqual(page_obj.number, 2) + + def test_home_content_type_assigned(self): + """Comprueba que cada item tiene el atributo content_type ('movie' o 'series').""" + response = self.client.get(reverse('home')) + for item in response.context['items']: + self.assertIn(item.content_type, ['movie', 'series']) + + +class RegisterViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=9000, name='RegAPI') + + # ------------------------------------------------------------------ # + # REGISTER - BÁSICO # + # ------------------------------------------------------------------ # + + def test_register_get_status_code(self): + """Comprueba que el GET a register responde 200.""" + response = self.client.get(reverse('register')) + self.assertEqual(response.status_code, 200) + + def test_register_uses_correct_template(self): + """Comprueba que se usa el template de registro correcto.""" + response = self.client.get(reverse('register')) + self.assertTemplateUsed(response, 'identify/register.html') + + def test_register_success(self): + """Comprueba que un registro válido crea el usuario y redirige a home.""" + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + }) + self.assertRedirects(response, reverse('home')) + self.assertTrue(CustomUser.objects.filter(username='newuser').exists()) + + # ------------------------------------------------------------------ # + # REGISTER - ERRORES # + # ------------------------------------------------------------------ # + + def test_register_invalid_passwords(self): + """Comprueba que contraseñas distintas no crean el usuario.""" + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'different', + 'terms_accepted': True, + }) + self.assertEqual(response.status_code, 200) + self.assertFalse(CustomUser.objects.filter(username='newuser').exists()) + + def test_register_terms_not_accepted(self): + """Comprueba que sin aceptar términos no se crea el usuario.""" + response = self.client.post(reverse('register'), { + 'username': 'newuser', + 'email': 'new@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': False, + }) + self.assertEqual(response.status_code, 200) + self.assertFalse(CustomUser.objects.filter(username='newuser').exists()) + + def test_register_duplicate_username(self): + """Comprueba que un username duplicado no permite el registro.""" + CustomUser.objects.create_user(username='existing', password='password123') + response = self.client.post(reverse('register'), { + 'username': 'existing', + 'email': 'other@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + }) + self.assertEqual(response.status_code, 200) + self.assertEqual(CustomUser.objects.filter(username='existing').count(), 1) + + # ------------------------------------------------------------------ # + # REGISTER - CON PLATAFORMAS # + # ------------------------------------------------------------------ # + + def test_register_with_platforms(self): + """Comprueba que las plataformas seleccionadas se guardan como suscripciones.""" + response = self.client.post(reverse('register'), { + 'username': 'platformuser', + 'email': 'plat@mail.com', + 'password': 'password123', + 'password2': 'password123', + 'terms_accepted': True, + 'platforms': [self.api.id], + }) + self.assertRedirects(response, reverse('home')) + user = CustomUser.objects.get(username='platformuser') + self.assertIn(self.api, user.subscriptions.all()) + + +class UserSettingViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='testuser', password='password123') + + def test_user_setting_redirects_if_not_authenticated(self): + """Comprueba que redirige a /login/ si el usuario no está autenticado.""" + response = self.client.get(reverse('user_setting')) + self.assertRedirects(response, '/login/', fetch_redirect_response=False) + + +class MovieDetailViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8001, name='HBO') + self.director = Director.objects.create( + director_id=2, api=self.api, name='Dir', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=2, api=self.api, codi='PG-13', age=13 + ) + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Test Movie', year=2021 + ) + self.movie = Movie.objects.create(contingut=self.contingut) + self.user = CustomUser.objects.create_user(username='movieuser', password='password123') + + def test_movie_detail_status_code(self): + """Comprueba que la vista de detalle de película responde 200.""" + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertEqual(response.status_code, 200) + + def test_movie_detail_template(self): + """Comprueba que se usa el template de detalle de película.""" + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertTemplateUsed(response, 'Details/details_movie.html') + + def test_movie_detail_context(self): + """Comprueba que el contexto contiene 'content' y 'is_favorite'.""" + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertIn('content', response.context) + self.assertIn('is_favorite', response.context) + + def test_movie_detail_404(self): + """Comprueba que un ID inexistente devuelve 404.""" + response = self.client.get(reverse('movie_detail', args=[99999])) + self.assertEqual(response.status_code, 404) + + def test_movie_detail_not_favorite_for_anonymous(self): + """Comprueba que un usuario anónimo ve is_favorite=False.""" + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertFalse(response.context['is_favorite']) + + def test_movie_detail_favorite_for_authenticated(self): + """Comprueba que un usuario autenticado con la peli en favoritos ve is_favorite=True.""" + self.client.login(username='movieuser', password='password123') + self.user.profile.preferits.add(self.movie.contingut) + response = self.client.get(reverse('movie_detail', args=[self.movie.id])) + self.assertTrue(response.context['is_favorite']) + + +class SeriesDetailViewTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8002, name='Prime') + self.director = Director.objects.create( + director_id=3, api=self.api, name='Dir2', + birth_date=timezone.now(), country='UK' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=3, api=self.api, codi='TV-MA', age=17 + ) + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Test Series', year=2019 + ) + self.series = Series.objects.create(contingut=self.contingut, num_temporades=4) + self.user = CustomUser.objects.create_user(username='seriesuser', password='password123') + + def test_series_detail_status_code(self): + """Comprueba que la vista de detalle de serie responde 200.""" + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertEqual(response.status_code, 200) + + def test_series_detail_template(self): + """Comprueba que se usa el template de detalle de serie.""" + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertTemplateUsed(response, 'Details/details_serie.html') + + def test_series_detail_context(self): + """Comprueba que el contexto contiene 'content' y 'is_favorite'.""" + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertIn('content', response.context) + self.assertIn('is_favorite', response.context) + + def test_series_detail_404(self): + """Comprueba que un ID inexistente devuelve 404.""" + response = self.client.get(reverse('series_detail', args=[99999])) + self.assertEqual(response.status_code, 404) + + def test_series_detail_not_favorite_for_anonymous(self): + """Comprueba que un usuario anónimo ve is_favorite=False.""" + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertFalse(response.context['is_favorite']) + + def test_series_detail_favorite_for_authenticated(self): + """Comprueba que un usuario autenticado con la serie en favoritos ve is_favorite=True.""" + self.client.login(username='seriesuser', password='password123') + self.user.profile.preferits.add(self.series.contingut) + response = self.client.get(reverse('series_detail', args=[self.series.id])) + self.assertTrue(response.context['is_favorite']) + + +class ApiUserProfileTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user( + username='apiuser', password='password123', + email='api@mail.com', first_name='John', last_name='Doe' + ) + + def test_api_profile_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.get(reverse('api_user_profile')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_api_profile_returns_json(self): + """Comprueba que la respuesta es JSON válido.""" + self.client.login(username='apiuser', password='password123') + response = self.client.get(reverse('api_user_profile')) + self.assertEqual(response.status_code, 200) + self.assertEqual(response['Content-Type'], 'application/json') + + def test_api_profile_data(self): + """Comprueba que el JSON contiene los datos personales del usuario.""" + self.client.login(username='apiuser', password='password123') + data = self.client.get(reverse('api_user_profile')).json() + self.assertEqual(data['personal_info']['username'], 'apiuser') + self.assertEqual(data['personal_info']['email'], 'api@mail.com') + self.assertEqual(data['personal_info']['first_name'], 'John') + self.assertEqual(data['personal_info']['last_name'], 'Doe') + + +class ToggleMovieFavoriteTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8003, name='Disney') + self.director = Director.objects.create( + director_id=4, api=self.api, name='Dir3', + birth_date=timezone.now(), country='ES' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=4, api=self.api, codi='G', age=0 + ) + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Fav Movie', year=2022 + ) + self.movie = Movie.objects.create(contingut=self.contingut) + self.user = CustomUser.objects.create_user(username='favuser', password='password123') + + def test_toggle_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_toggle_add_favorite(self): + """Comprueba que POST añade la película a favoritos y devuelve status 'added'.""" + self.client.login(username='favuser', password='password123') + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 200) + data = response.json() + self.assertEqual(data['status'], 'added') + self.assertIn(self.movie.contingut, self.user.profile.preferits.all()) + + def test_toggle_remove_favorite(self): + """Comprueba que POST quita la película de favoritos y devuelve status 'removed'.""" + self.client.login(username='favuser', password='password123') + self.user.profile.preferits.add(self.movie.contingut) + response = self.client.post(reverse('toggle_movie_favorite', args=[self.movie.id])) + data = response.json() + self.assertEqual(data['status'], 'removed') + self.assertNotIn(self.movie.contingut, self.user.profile.preferits.all()) + + def test_toggle_get_method_not_allowed(self): + """Comprueba que GET devuelve 405 (solo se permite POST).""" + self.client.login(username='favuser', password='password123') + response = self.client.get(reverse('toggle_movie_favorite', args=[self.movie.id])) + self.assertEqual(response.status_code, 405) + + def test_toggle_404_for_nonexistent(self): + """Comprueba que un ID de película inexistente devuelve 404.""" + self.client.login(username='favuser', password='password123') + response = self.client.post(reverse('toggle_movie_favorite', args=[99999])) + self.assertEqual(response.status_code, 404) + + +class ToggleSeriesFavoriteTest(TestCase): + def setUp(self): + self.api = API.objects.create(port=8004, name='Apple') + self.director = Director.objects.create( + director_id=5, api=self.api, name='Dir4', + birth_date=timezone.now(), country='FR' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=5, api=self.api, codi='PG', age=7 + ) + self.contingut = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Fav Series', year=2021 + ) + self.series = Series.objects.create(contingut=self.contingut, num_temporades=2) + self.user = CustomUser.objects.create_user(username='favseriesuser', password='password123') + + def test_toggle_series_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_toggle_series_add_favorite(self): + """Comprueba que POST añade la serie a favoritos y devuelve status 'added'.""" + self.client.login(username='favseriesuser', password='password123') + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + data = response.json() + self.assertEqual(data['status'], 'added') + self.assertIn(self.series.contingut, self.user.profile.preferits.all()) + + def test_toggle_series_remove_favorite(self): + """Comprueba que POST quita la serie de favoritos y devuelve status 'removed'.""" + self.client.login(username='favseriesuser', password='password123') + self.user.profile.preferits.add(self.series.contingut) + response = self.client.post(reverse('toggle_series_favorite', args=[self.series.id])) + data = response.json() + self.assertEqual(data['status'], 'removed') + self.assertNotIn(self.series.contingut, self.user.profile.preferits.all()) + + def test_toggle_series_get_method_not_allowed(self): + """Comprueba que GET devuelve 405 (solo se permite POST).""" + self.client.login(username='favseriesuser', password='password123') + response = self.client.get(reverse('toggle_series_favorite', args=[self.series.id])) + self.assertEqual(response.status_code, 405) + + +class TermsAndPrivacyViewsTest(TestCase): + def test_terms_use_status_code(self): + """Comprueba que la vista de términos responde 200.""" + response = self.client.get(reverse('terms_use')) + self.assertEqual(response.status_code, 200) + + def test_terms_use_template(self): + """Comprueba que se usa el template de términos de uso.""" + response = self.client.get(reverse('terms_use')) + self.assertTemplateUsed(response, 'footer_legal/terms_use.html') + + def test_privacy_policy_status_code(self): + """Comprueba que la vista de política de privacidad responde 200.""" + response = self.client.get(reverse('privacy_policy')) + self.assertEqual(response.status_code, 200) + + def test_privacy_policy_template(self): + """Comprueba que se usa el template de política de privacidad.""" + response = self.client.get(reverse('privacy_policy')) + self.assertTemplateUsed(response, 'footer_legal/privacy_policy.html') + + +class UserProfileViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='profileuser', password='password123', email='prof@mail.com') + + def test_profile_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.get(reverse('profile')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_profile_get_status_code(self): + """Comprueba que GET responde 200 con el formulario pre-rellenado.""" + self.client.login(username='profileuser', password='password123') + response = self.client.get(reverse('profile')) + self.assertEqual(response.status_code, 200) + + def test_profile_template(self): + """Comprueba que se usa el template de perfil correcto.""" + self.client.login(username='profileuser', password='password123') + response = self.client.get(reverse('profile')) + self.assertTemplateUsed(response, 'users/profile/profile.html') + + def test_profile_post_updates_user(self): + """Comprueba que POST actualiza los campos del usuario correctamente.""" + self.client.login(username='profileuser', password='password123') + response = self.client.post(reverse('profile'), { + 'username': 'profileuser', + 'first_name': 'Updated', + 'last_name': 'Name', + 'email': 'prof@mail.com', + 'type': 'Consumer', + }) + self.user.refresh_from_db() + self.assertEqual(self.user.first_name, 'Updated') + self.assertEqual(self.user.last_name, 'Name') + + def test_profile_post_with_avatar(self): + """Comprueba que se puede subir un avatar válido junto con otros campos.""" + self.client.login(username='profileuser', password='password123') + img_buffer = create_test_image() + from django.core.files.uploadedfile import SimpleUploadedFile + img = SimpleUploadedFile('avatar.jpg', img_buffer.read(), content_type='image/jpeg') + response = self.client.post(reverse('profile'), { + 'username': 'profileuser', + 'first_name': 'WithAvatar', + 'email': 'prof@mail.com', + 'type': 'Consumer', + }, files={'avatar': img}) + self.user.refresh_from_db() + self.assertEqual(self.user.first_name, 'WithAvatar') + + +class UserHistoryViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='histuser', password='password123') + self.api = API.objects.create(port=8005, name='Hist') + self.director = Director.objects.create( + director_id=6, api=self.api, name='Dir5', + birth_date=timezone.now(), country='US' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=6, api=self.api, codi='R', age=18 + ) + cont = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='History Movie', year=2019 + ) + Movie.objects.create(contingut=cont) + + def test_history_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_history_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 200) + + def test_history_template(self): + """Comprueba que se usa el template de historial correcto.""" + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertTemplateUsed(response, 'users/parts/history.html') + + def test_history_shows_movies(self): + """Comprueba que el contexto contiene 'movies' con las películas existentes.""" + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertIn('movies', response.context) + self.assertGreaterEqual(response.context['movies'].count(), 1) + + def test_history_empty_movies(self): + """Comprueba que funciona aunque no haya películas.""" + Movie.objects.all().delete() + self.client.login(username='histuser', password='password123') + response = self.client.get(reverse('history')) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context['movies'].count(), 0) + + +class UserFollowedViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='followuser', password='password123') + self.api = API.objects.create(port=8006, name='Follow') + self.director = Director.objects.create( + director_id=7, api=self.api, name='Dir6', + birth_date=timezone.now(), country='DE' + ) + self.age_rating = AgeRating.objects.create( + age_rating_id=7, api=self.api, codi='PG', age=10 + ) + self.contingut_movie = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Follow Movie', year=2020 + ) + self.movie = Movie.objects.create(contingut=self.contingut_movie) + self.contingut_series = create_contingut( + api=self.api, director=self.director, age_rating=self.age_rating, + title='Follow Series', year=2020 + ) + self.series = Series.objects.create(contingut=self.contingut_series, num_temporades=1) + + def test_followed_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.get(reverse('followed')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_followed_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertEqual(response.status_code, 200) + + def test_followed_template(self): + """Comprueba que se usa el template de seguidos correcto.""" + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertTemplateUsed(response, 'users/parts/followed.html') + + def test_followed_shows_favorites(self): + """Comprueba que el contexto muestra los contenidos marcados como favoritos.""" + self.client.login(username='followuser', password='password123') + self.user.profile.preferits.add(self.contingut_movie) + self.user.profile.preferits.add(self.contingut_series) + response = self.client.get(reverse('followed')) + self.assertIn(self.movie, response.context['movies']) + self.assertIn(self.series, response.context['series_list']) + + def test_followed_empty_favorites(self): + """Comprueba que funciona aunque el usuario no tenga favoritos.""" + self.client.login(username='followuser', password='password123') + response = self.client.get(reverse('followed')) + self.assertEqual(response.context['movies'].count(), 0) + self.assertEqual(response.context['series_list'].count(), 0) + + +class UserSubscriptionViewTest(TestCase): + def setUp(self): + self.user = CustomUser.objects.create_user(username='subuser', password='password123') + self.api1 = API.objects.create(port=8007, name='Sub1') + self.api2 = API.objects.create(port=8008, name='Sub2') + + def test_subscription_redirects_if_not_authenticated(self): + """Comprueba que redirige a login si no está autenticado.""" + response = self.client.get(reverse('suscription')) + self.assertEqual(response.status_code, 302) + self.assertIn('/login/', response.url) + + def test_subscription_get_status_code(self): + """Comprueba que GET responde 200 para usuario autenticado.""" + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertEqual(response.status_code, 200) + + def test_subscription_template(self): + """Comprueba que se usa el template de suscripciones correcto.""" + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertTemplateUsed(response, 'users/parts/subscription.html') + + def test_subscription_get_shows_apis(self): + """Comprueba que el contexto contiene 'all_apis' ordenadas por port.""" + self.client.login(username='subuser', password='password123') + response = self.client.get(reverse('suscription')) + self.assertIn('all_apis', response.context) + self.assertEqual(response.context['all_apis'].count(), 2) + + def test_subscription_user_subscription_ids(self): + """Comprueba que el contexto incluye los IDs de las suscripciones del usuario.""" + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1) + response = self.client.get(reverse('suscription')) + self.assertIn(self.api1.id, response.context['user_subscription_ids']) + self.assertNotIn(self.api2.id, response.context['user_subscription_ids']) + + def test_subscription_post_updates_subscriptions(self): + """Comprueba que POST actualiza las suscripciones del usuario correctamente.""" + self.client.login(username='subuser', password='password123') + response = self.client.post(reverse('suscription'), { + 'subscriptions': [self.api1.id], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertIn(self.api1, self.user.subscriptions.all()) + self.assertNotIn(self.api2, self.user.subscriptions.all()) + + def test_subscription_post_clears_subscriptions(self): + """Comprueba que enviar lista vacía limpia todas las suscripciones.""" + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1, self.api2) + response = self.client.post(reverse('suscription'), { + 'subscriptions': [], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertEqual(self.user.subscriptions.count(), 0) + + def test_subscription_post_switches_selection(self): + """Comprueba que cambiar la selección reemplaza las suscripciones anteriores.""" + self.client.login(username='subuser', password='password123') + self.user.subscriptions.add(self.api1) + response = self.client.post(reverse('suscription'), { + 'subscriptions': [self.api2.id], + }) + self.assertRedirects(response, reverse('suscription')) + self.user.refresh_from_db() + self.assertNotIn(self.api1, self.user.subscriptions.all()) + self.assertIn(self.api2, self.user.subscriptions.all()) diff --git a/users/middleware.py b/users/middleware.py new file mode 100644 index 0000000..aca1913 --- /dev/null +++ b/users/middleware.py @@ -0,0 +1,46 @@ +from django.shortcuts import redirect +from django.urls import resolve, reverse + +class AdminRedirectMiddleware: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if request.user.is_authenticated and getattr(request.user, 'type', None) == 'Staff Admin': + + try: + current_url_name = resolve(request.path_info).url_name + except Exception: + current_url_name = None + + exempt_url_names = [ + 'staff_admin_panel', + 'gestion_usuarios', + 'crear_usuario_admin', + 'logout', + 'eliminar_usuario', + 'gestion_cartelleres', + 'editar_cartellera', + ] + + if current_url_name not in exempt_url_names and not request.path.startswith('/static/'): + return redirect(reverse('staff_admin_panel')) + if request.user.is_authenticated and getattr(request.user, 'type', None) == 'Admin': + try: + current_url_name = resolve(request.path_info).url_name + except Exception: + current_url_name = None + + exempt_url_names = [ + 'admin_dashboard', + 'admin_dashboard_overview', + 'admin_dashboard_genres', + 'admin_dashboard_age_ratings', + 'admin_dashboard_directors', + 'export_analytics_csv', + 'logout', + ] + + if current_url_name not in exempt_url_names and not request.path.startswith('/static/'): + return redirect(reverse('admin_dashboard')) + return self.get_response(request) \ No newline at end of file diff --git a/users/services.py b/users/services.py new file mode 100644 index 0000000..c84f3df --- /dev/null +++ b/users/services.py @@ -0,0 +1,175 @@ +import hashlib +import hmac +import re +from django.db.models import Count, Q +from web_app.models import Contingut, Visualitzacio, Preferits, API, Genre, AgeRating, Director +from django.utils import timezone +from django.conf import settings + +PII_COLUMNS = frozenset({ + 'username', 'email', 'ip_address', 'id_address', + 'first_name', 'last_name', 'location', 'bio', + 'avatar', 'password', +}) + +GDPR_ANONYMIZE_FIELDS = frozenset({ + 'username', 'email', 'first_name', 'last_name', + 'user_id', 'ip_address', 'id_address', +}) + +EMAIL_RE = re.compile(r'[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}') + +def anonymize_user_id(identifier, salt=None): + salt = salt or settings.SECRET_KEY + h = hmac.new(salt.encode(), str(identifier).encode(), hashlib.sha256) + return f"UID_{h.hexdigest()[:12]}" + +def _strip_pii(row): + return {k: v for k, v in row.items() if k not in PII_COLUMNS} + +def validate_gdpr_compliance(data_list, is_b2b_report=False): + for row in data_list: + for key, value in row.items(): + if key in PII_COLUMNS: + if is_b2b_report and key in GDPR_ANONYMIZE_FIELDS and isinstance(value, str) and value.startswith('UID_'): + continue + raise ValueError(f"GDPR violation: PII column '{key}' found in report data") + if isinstance(value, str) and EMAIL_RE.search(value): + raise ValueError(f"GDPR violation: email pattern found in field '{key}': {value}") + if is_b2b_report: + for field in GDPR_ANONYMIZE_FIELDS & row.keys(): + if not isinstance(row[field], str) or not row[field].startswith('UID_'): + raise ValueError( + f"GDPR violation: field '{field}' in B2B report is not anonymized: {row[field]}" + ) + +def get_content_analytics(start_date=None, end_date=None, platform_ids=None): + # 1. FIX ARQUITECTURA: Cambiamos 'api' por 'apis' y usamos prefetch_related + queryset = Contingut.objects.select_related('genere', 'age_rating', 'director').prefetch_related('apis') + + if start_date and not end_date: + end_date = timezone.now().date() + + # Filtros base del contenido (ej. filtrar por plataformas) + base_filters = Q() + if platform_ids: + base_filters &= Q(apis__in=platform_ids) + + # 2. FIX ANALÍTICAS: Los filtros de fecha van dentro de la agregación, no en el WHERE global + view_filters = Q() + fav_filters = Q() + + if start_date and end_date: + view_filters = Q(visualitzacions__data_visualitzacio__range=(start_date, end_date)) + fav_filters = Q(preferits__afegit_a__range=(start_date, end_date)) + elif end_date: + view_filters = Q(visualitzacions__data_visualitzacio__lte=end_date) + fav_filters = Q(preferits__afegit_a__lte=end_date) + + # 3. FIX DUPLICADOS: .distinct() es vital al filtrar por ManyToMany (apis__in) + analytics_data = queryset.filter(base_filters).distinct().annotate( + total_views=Count('visualitzacions', filter=view_filters, distinct=True), + total_favorites=Count('preferits', filter=fav_filters, distinct=True) + ) + + results = [] + for item in analytics_data: + # 4. FIX PRESENTACIÓN: Formateamos las múltiples plataformas en un string + plataformas = ", ".join([api.name or str(api.port) for api in item.apis.all()]) if item.apis.exists() else 'N/A' + + results.append( + { + 'title': item.titol, + 'genre': item.genere.name if item.genere else 'N/A', + 'age_rating': item.age_rating.codi if item.age_rating else 'N/A', + 'year': item.data_estrena, + 'director': item.director.name if item.director else 'N/A', + 'platform': plataformas, + 'views': item.total_views, + 'favorites': item.total_favorites, + } + ) + return results + +def format_analytics_for_csv(data_list, is_b2b_report=False): + formatted_data = [] + for row in data_list: + safe_row = _strip_pii(row) + + if is_b2b_report: + for field in GDPR_ANONYMIZE_FIELDS & row.keys(): + safe_row[field] = anonymize_user_id(row[field]) + + formatted_data.append(safe_row) + + return formatted_data + +def get_genre_distribution(start_date=None, end_date=None, platform_ids=None): + if start_date and not end_date: + end_date = timezone.now().date() + + base_filters = Q() + if platform_ids: + base_filters &= Q(apis__in=platform_ids) + + view_filters = Q() + if start_date and end_date: + view_filters = Q(visualitzacions__data_visualitzacio__range=(start_date, end_date)) + elif end_date: + view_filters = Q(visualitzacions__data_visualitzacio__lte=end_date) + + # Añadimos el distinct() al sub-query para evitar multiplicar cálculos + data = Genre.objects.filter(contingut__in=Contingut.objects.filter(base_filters).distinct()).annotate( + total_views=Count('contingut__visualitzacions', filter=Q(contingut__in=Contingut.objects.filter(view_filters)), distinct=True) + ).order_by('-total_views') + + return { + 'labels': [g.name for g in data], + 'values': [g.total_views for g in data] + } + +def get_age_rating_distribution(start_date=None, end_date=None, platform_ids=None): + if start_date and not end_date: + end_date = timezone.now().date() + + base_filters = Q() + if platform_ids: + base_filters &= Q(apis__in=platform_ids) + + view_filters = Q() + if start_date and end_date: + view_filters = Q(visualitzacions__data_visualitzacio__range=(start_date, end_date)) + elif end_date: + view_filters = Q(visualitzacions__data_visualitzacio__lte=end_date) + + data = AgeRating.objects.filter(contingut__in=Contingut.objects.filter(base_filters).distinct()).annotate( + total_views=Count('contingut__visualitzacions', filter=Q(contingut__in=Contingut.objects.filter(view_filters)), distinct=True) + ).order_by('-total_views') + + return { + 'labels': [ar.codi for ar in data], + 'values': [ar.total_views for ar in data] + } + +def get_director_top_list(start_date=None, end_date=None, platform_ids=None): + if start_date and not end_date: + end_date = timezone.now().date() + + base_filters = Q() + if platform_ids: + base_filters &= Q(apis__in=platform_ids) + + view_filters = Q() + if start_date and end_date: + view_filters = Q(visualitzacions__data_visualitzacio__range=(start_date, end_date)) + elif end_date: + view_filters = Q(visualitzacions__data_visualitzacio__lte=end_date) + + data = Director.objects.filter(contingut__in=Contingut.objects.filter(base_filters).distinct()).annotate( + total_views=Count('contingut__visualitzacions', filter=Q(contingut__in=Contingut.objects.filter(view_filters)), distinct=True) + ).order_by('-total_views')[:10] + + return { + 'labels': [d.name for d in data], + 'values': [d.total_views for d in data] + } \ No newline at end of file diff --git a/users/static/users/css/admin_management.css b/users/static/users/css/admin_management.css new file mode 100644 index 0000000..2dd0695 --- /dev/null +++ b/users/static/users/css/admin_management.css @@ -0,0 +1,229 @@ +/* Variables basadas en style_gide.md */ +:root { + --deep-black: #0B0C10; + --glass-surface: #1F2833; + --neon-cyan: #66FCF1; + --text-primary: #E0E6ED; + --text-muted: #8A8D91; +} + +.admin-container { + padding: 24px; + color: var(--text-primary); +} + +/* --- HEADER & TITLES --- */ +.admin-header { + display: flex; + justify-content: space-between; + align-items: flex-end; /* Alinea el botón con la base del texto */ + margin-bottom: 32px; +} + +.title-neon { + font-family: 'Syne', sans-serif; + font-weight: bold; + color: var(--text-primary); + text-transform: uppercase; + letter-spacing: -0.03em; + margin: 0; +} + +.subtitle { + color: var(--text-muted); + font-size: 14px; + margin-top: 4px; +} + +/* --- FILTER SECTION (ALINEACIÓN HORIZONTAL) --- */ +.filter-form { + display: flex; + align-items: center; + gap: 16px; +} + +/* Specificity override: beats home filter.css .filter-group */ +.filter-form .filter-group { + width: auto; + flex-wrap: nowrap; + display: flex; + align-items: center; + gap: 10px; + background: rgba(255, 255, 255, 0.03); + padding: 6px 12px; + border-radius: 6px; + border: 1px solid rgba(102, 252, 241, 0.1); + margin: 0; + max-width: unset; + height: 50px; +} + +.filter-form .filter-group.flex-grow-1 { + flex: 1; +} + +.filter-form .filter-group i { + color: var(--neon-cyan); +} + +.filter-form .filter-group select { + background: transparent; + border: none; + color: var(--text-primary); + font-family: 'DM Sans', sans-serif; + font-size: 14px; + outline: none; + cursor: pointer; + padding: 0; + width: auto; + background-image: none; + appearance: auto; +} + +.filter-form .filter-group select option { + background: var(--glass-surface); +} + +/* Compact filter card — overrides .glass-card padding */ +.filter-section { + padding: 10px 16px !important; + margin-bottom: 16px !important; +} + +/* Override margins from global.css + filter.css .search-principal-container */ +.filter-form .search-principal-container { + margin-top: 0 !important; + margin-bottom: 0 !important; + margin-left: 0 !important; + margin-right: 0 !important; + max-width: unset !important; + width: 100%; + display: flex; + align-items: center; +} + +/* --- GLASS CARDS --- */ +.glass-card { + background: var(--glass-surface); + border: 1px solid rgba(102, 252, 241, 0.08); + border-radius: 8px; + padding: 20px; + margin-bottom: 24px; + transition: all 0.3s ease; +} + +.glass-card:hover { + border-color: rgba(102, 252, 241, 0.22); + box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4); +} + +/* --- BUTTONS --- */ +.btn-neon { + border: 1px solid var(--neon-cyan); + color: var(--neon-cyan); + background: transparent; + padding: 10px 24px; + border-radius: 6px; + text-decoration: none; + font-family: 'DM Sans', sans-serif; + font-weight: 500; + font-size: 14px; + transition: all 0.3s ease; + white-space: nowrap; +} + +.btn-neon:hover { + background: var(--neon-cyan); + color: var(--deep-black); + box-shadow: 0 0 20px rgba(102, 252, 241, 0.3); +} + +.btn-ghost { + background: transparent; + border: 1px solid var(--text-muted); + color: var(--text-muted); + padding: 8px 18px; + border-radius: 6px; + font-family: 'DM Sans', sans-serif; + font-size: 14px; + cursor: pointer; + transition: all 0.2s ease; +} + +.btn-ghost:hover { + border-color: var(--text-primary); + color: var(--text-primary); +} + +/* --- TABLE STYLES --- */ +.table-sync { + width: 100%; + border-collapse: separate; + border-spacing: 0 8px; /* Crea el efecto de filas flotantes */ +} + +.table-sync thead th { + text-align: left; + color: var(--neon-cyan); + font-size: 11px; + text-transform: uppercase; + letter-spacing: 0.1em; + padding: 0 16px 12px 16px; + border: none; +} + +.table-sync tbody tr { + background: rgba(255, 255, 255, 0.02); + transition: background 0.2s ease; +} + +.table-sync tbody tr:hover { + background: rgba(255, 255, 255, 0.04); +} + +.table-sync tbody td { + padding: 16px; + border: none; +} + +/* Bordes redondeados para las filas */ +.table-sync tbody tr td:first-child { border-radius: 8px 0 0 8px; } +.table-sync tbody tr td:last-child { border-radius: 0 8px 8px 0; } + +.user-name { + font-family: 'DM Sans', sans-serif; + font-weight: 500; + color: var(--text-primary); +} + +.user-email { + font-size: 13px; +} + +/* Badge de Rol */ +.badge-neon { + border: 1px solid rgba(102, 252, 241, 0.4); + color: var(--neon-cyan); + padding: 4px 10px; + border-radius: 4px; + font-size: 10px; + font-weight: bold; + text-transform: uppercase; +} + +/* Botón de eliminar */ +.btn-delete { + background: transparent; + border: none; + color: #ff4d4d; + cursor: pointer; + font-size: 14px; + font-style: italic; /* Mantiene el estilo de tu imagen */ + transition: all 0.2s; + text-decoration: none; +} + +.btn-delete:hover { + color: #ff8080; + text-shadow: 0 0 8px rgba(255, 77, 77, 0.4); +} \ No newline at end of file diff --git a/users/static/users/css/profile.css b/users/static/users/css/user_profile.css similarity index 100% rename from users/static/users/css/profile.css rename to users/static/users/css/user_profile.css diff --git a/users/templates/users/base_profile.html b/users/templates/users/base_profile.html index 1491e69..6183b08 100644 --- a/users/templates/users/base_profile.html +++ b/users/templates/users/base_profile.html @@ -26,11 +26,17 @@
{{ user.email }}
- -
{% endblock %} \ No newline at end of file diff --git a/users/templates/users/parts/create_user.html b/users/templates/users/parts/create_user.html new file mode 100644 index 0000000..d4cd96b --- /dev/null +++ b/users/templates/users/parts/create_user.html @@ -0,0 +1,183 @@ +{% extends 'users/types/staff_admin.html' %} +{% load i18n %} +{% load static %} + +{% block extra_css %} +{{ block.super }} + + + +{% endblock %} + +{% block staff_admin_content %} +
+
+

{% trans 'Registrar Nuevo Miembro' %}

+
+ +
+
+ {% csrf_token %} + +
+ {% for field in form %} + {% if field.name != 'subscriptions' %} +
+
+ + + {{ field }} + + {% if field.help_text %} + + {{ field.help_text|safe }} + + {% endif %} + + {% if field.errors %} + {% for error in field.errors %} +
+ {{ error }} +
+ {% endfor %} + {% endif %} +
+
+ {% endif %} + {% endfor %} + +
+ +
+
+ +
+ + + {% trans 'Cancelar' %} + +
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/users/templates/users/parts/dashboard_age_ratings.html b/users/templates/users/parts/dashboard_age_ratings.html new file mode 100644 index 0000000..85c41eb --- /dev/null +++ b/users/templates/users/parts/dashboard_age_ratings.html @@ -0,0 +1,78 @@ +{% extends 'users/types/user_admin.html' %} + +{% block parts_content %} +
+ {% include 'users/parts/filter_form.html' %} +
+
+
+
+
Age Rating Distribution
+
+
+
+ +
+
+
+
+
+
+
+
Age Rating Table
+
+
+
+ + + + + + + + + {% for label, value in age_stats.items %} + + + + + {% endfor %} + +
RatingViews
{{ label }}{{ value }}
+
+
+
+
+
+
+ + +{% endblock %} diff --git a/users/templates/users/parts/dashboard_directors.html b/users/templates/users/parts/dashboard_directors.html new file mode 100644 index 0000000..ab4abc3 --- /dev/null +++ b/users/templates/users/parts/dashboard_directors.html @@ -0,0 +1,77 @@ +{% extends 'users/types/user_admin.html' %} + +{% block parts_content %} +
+ {% include 'users/parts/filter_form.html' %} +
+
+
+
+
Top Directors
+
+
+
+ +
+
+
+
+
+
+
+
Top Directors Table
+
+
+
+ + + + + + + + + {% for label, value in director_stats.items %} + + + + + {% endfor %} + +
DirectorViews
{{ label }}{{ value }}
+
+
+
+
+
+
+ + +{% endblock %} diff --git a/users/templates/users/parts/dashboard_genres.html b/users/templates/users/parts/dashboard_genres.html new file mode 100644 index 0000000..ab8fc21 --- /dev/null +++ b/users/templates/users/parts/dashboard_genres.html @@ -0,0 +1,73 @@ +{% extends 'users/types/user_admin.html' %} + +{% block parts_content %} +
+ {% include 'users/parts/filter_form.html' %} +
+
+
+
+
Genre Distribution
+
+
+
+ +
+
+
+
+
+
+
+
Top Genres Data
+
+
+
+ + + + + + + + + {% for label, value in genre_stats.items %} + + + + + {% endfor %} + +
GenreViews
{{ label }}{{ value }}
+
+
+
+
+
+
+ + +{% endblock %} diff --git a/users/templates/users/parts/dashboard_overview.html b/users/templates/users/parts/dashboard_overview.html new file mode 100644 index 0000000..f66f0f2 --- /dev/null +++ b/users/templates/users/parts/dashboard_overview.html @@ -0,0 +1,52 @@ +{% extends 'users/types/user_admin.html' %} + +{% block parts_content %} +
+ {% include 'users/parts/filter_form.html' %} +
+
+
Global Content Analytics Summary
+ + Export CSV + +
+
+
+ + + + + + + + + + + + + + + {% for item in content_list %} + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
TitleGenreAge RatingYearDirectorPlatformViewsFavorites
{{ item.title }}{{ item.genre }}{{ item.age_rating }}{{ item.year }}{{ item.director }}{{ item.platform }}{{ item.views }}{{ item.favorites }}
No content found.
+
+
+
+
+{% endblock %} diff --git a/users/templates/users/parts/editar_cartellera.html b/users/templates/users/parts/editar_cartellera.html new file mode 100644 index 0000000..a4d0e6a --- /dev/null +++ b/users/templates/users/parts/editar_cartellera.html @@ -0,0 +1,109 @@ +{% extends 'users/types/staff_admin.html' %} +{% load i18n %} +{% load static %} + +{% block extra_css %} + {{ block.super }} + +{% endblock %} + +{% block staff_admin_content %} +
+
+
+

{% trans 'Editar Cartellera' %}

+

{{ contingut.titol }}

+
+ + {% trans 'Tornar' %} + +
+ +
+
+
+
{% trans 'Pòster Actual' %}
+ {% if contingut.poster_path %} + {{ contingut.titol }} + {% else %} +
+ +

{% trans 'Sense pòster' %}

+
+ {% endif %} +
+
+
+
+
{% trans 'Informació del Contingut' %}
+ + + + + + + + + + + + + + + + + + + + + + + +
{% trans 'Títol' %}{{ contingut.titol }}
{% trans 'Any' %}{{ contingut.data_estrena|default:'-' }}
{% trans 'Plataforma' %}{{ contingut.api.name|default:'-' }}
{% trans 'Gènere' %}{{ contingut.genere.name|default:'-' }}
{% trans 'Director' %}{{ contingut.director.name|default:'-' }}
+ +
+ {% csrf_token %} +
+ + +
+ {% trans 'Introdueix una URL vàlida d\'una imatge de pòster. Deixa el camp buit per eliminar el pòster.' %} +
+
+
+ + + {% trans 'Cancel·lar' %} + +
+
+
+ +
+
{% trans 'Previsualització' %}
+
+

{% trans 'Escriu una URL de pòster i fes clic a "Guardar Canvis" per veure\'l actualitzat' %}

+
+
+
+
+
+ + +{% endblock %} diff --git a/users/templates/users/parts/filter_form.html b/users/templates/users/parts/filter_form.html new file mode 100644 index 0000000..3603afe --- /dev/null +++ b/users/templates/users/parts/filter_form.html @@ -0,0 +1,14 @@ +
+
+ + +
+
+ + +
+
+ + Limpiar +
+
diff --git a/users/templates/users/parts/gestion_cartelleres.html b/users/templates/users/parts/gestion_cartelleres.html new file mode 100644 index 0000000..e2f041c --- /dev/null +++ b/users/templates/users/parts/gestion_cartelleres.html @@ -0,0 +1,113 @@ +{% extends 'users/types/staff_admin.html' %} +{% load i18n %} +{% load static %} + +{% block extra_css %} + {{ block.super }} + + +{% endblock %} + +{% block staff_admin_content %} +
+
+
+

{% trans 'Editar Cartelleres' %}

+

{% trans 'Revisa i modifica les cartelleres (posters) de cada contingut' %}

+
+
+ +
+
+
+ + +
+
+
+ + + + + + + +
+
+ + + {% trans 'Netejar' %} + +
+
+ +
+
+ + + + + + + + + + + + + {% for c in contenidos %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
{% trans 'Pòster' %}{% trans 'Títol' %}{% trans 'Plataforma' %}{% trans 'Any' %}{% trans 'Poster Path' %}{% trans 'Accions' %}
+ {% if c.poster_path %} + {{ c.titol }} + {% else %} +
+ +
+ {% endif %} + 		{{ c.titol }} + {% for api in c.apis.all %} + {{ api.name|default:api.port }}{% if not forloop.last %}, {% endif %} + {% empty %} + - + {% endfor %} + {{ c.data_estrena|default:'-' }} + {{ c.poster_path|default:'-' }} + + + {% trans 'Editar' %} + +
+ + {% trans 'No s\'han trobat continguts amb aquests criteris.' %} +
+
+
+ + {% if contenidos.paginator.num_pages > 1 %} + {% include 'home/home_parts/paginator.html' with items=contenidos %} + {% endif %} +
+{% endblock %} diff --git a/users/templates/users/parts/users_table.html b/users/templates/users/parts/users_table.html new file mode 100644 index 0000000..8eace24 --- /dev/null +++ b/users/templates/users/parts/users_table.html @@ -0,0 +1,90 @@ +{% extends 'users/types/staff_admin.html' %} +{% load i18n %} +{% load static %} + +{% block extra_css %} + {{ block.super }} + + +{% endblock %} + +{% block staff_admin_content %} +
+
+
+

{% trans 'Gestión de Usuarios' %}

+

{% trans 'Control de acceso y roles de la plataforma' %}

+
+ + {% trans 'Añadir Usuario' %} + +
+ +
+
+
+ + +
+ +
+
+ +
+
+ + + + + + + + + + + {% for u in users %} + + + + + + + {% empty %} + + + + {% endfor %} + +
{% trans 'Usuario' %}{% trans 'Email' %}{% trans 'Rol' %}{% trans 'Acciones' %}
+
+ + {{ u.username }} +
+ 		{{ u.email }} + {{ u.type }} + +
+ {% csrf_token %} + +
+
+ + {% trans 'No se han encontrado usuarios con estos criterios.' %} +
+
+
+ + {% if users.paginator.num_pages > 1 %} + {% include 'home/home_parts/paginator.html' with items=users %} + {% endif %} +
+{% endblock %} \ No newline at end of file diff --git a/users/templates/users/profile/profile.html b/users/templates/users/profile/user_profile.html similarity index 94% rename from users/templates/users/profile/profile.html rename to users/templates/users/profile/user_profile.html index e74df6d..2506275 100644 --- a/users/templates/users/profile/profile.html +++ b/users/templates/users/profile/user_profile.html @@ -3,7 +3,7 @@ {% load static %} {% block extra_css %} {{ block.super }} - + {% endblock %} {% block parts_content %} diff --git a/users/templates/users/settings/user_settings.html b/users/templates/users/settings/user_settings.html index 6a438a0..fabc638 100644 --- a/users/templates/users/settings/user_settings.html +++ b/users/templates/users/settings/user_settings.html @@ -3,47 +3,54 @@ {% load i18n %} {% block content_user_setings %} -
- - -
- -
-
{% trans "Bio" %}
-

- {% if user.bio %} - {{ user.bio }} - {% else %} - {% trans "Write a few words about you" %} - {% endif %} -

-
- -
-
{% trans "Member since" %}
-

{{ user.date_joined|date:"d/m/Y" }}

-
+ {% if user.type == 'Consumer' %} +
+ + +
+ +
+
{% trans "Bio" %}
+

+ {% if user.bio %} + {{ user.bio }} + {% else %} + {% trans "Write a few words about you" %} + {% endif %} +

+
+ +
+
{% trans "Member since" %}
+

{{ user.date_joined|date:"d/m/Y" }}

+
+ +
+
{% trans "Last access" %}
+

{{ user.last_login|date:"d/m/Y" }}

+
+ +
+
{% trans "Location" %}
+

+ {% if user.location %} + {{ user.location }} + {% else %} + {% trans "Add your location" %} + {% endif %} +

+
-
-
{% trans "Last access" %}
-

{{ user.last_login|date:"d/m/Y" }}

- -
-
{% trans "Location" %}
-

- {% if user.location %} - {{ user.location }} - {% else %} - {% trans "Add your location" %} - {% endif %} -

-
- -
+ + {% endif %} + {% if user.type == 'Consumer' %}
+ {% else %} +
+ {% endif %} {% block user_content %}{% endblock %}
diff --git a/users/templates/users/types/staff_admin.html b/users/templates/users/types/staff_admin.html new file mode 100644 index 0000000..a721f57 --- /dev/null +++ b/users/templates/users/types/staff_admin.html @@ -0,0 +1,21 @@ +{% extends 'users/settings/user_settings.html' %} +{% load i18n %} + +{% block content_staff_admin %} + + + +
+ {% block staff_admin_content %}{% endblock %} +
+ +{% endblock %} diff --git a/users/templates/users/types/user_admin.html b/users/templates/users/types/user_admin.html index e69de29..5883179 100644 --- a/users/templates/users/types/user_admin.html +++ b/users/templates/users/types/user_admin.html @@ -0,0 +1,33 @@ +{% extends 'users/settings/user_settings.html' %} +{% load i18n %} + +{% block content_admin %} + + + + + + + +
+ {% block parts_content %}{% endblock %} +
+ +{% endblock %} diff --git a/users/templates/users/types/user_client.html b/users/templates/users/types/user_client.html index 86aa202..b916452 100644 --- a/users/templates/users/types/user_client.html +++ b/users/templates/users/types/user_client.html @@ -1,13 +1,13 @@ {% extends 'users/settings/user_settings.html' %} {% load i18n %} -{% block user_content %} +{% block content_user %}