Manejo de errores en login catador

cata_system/settings.py

@@ -32,6 +32,11 @@ DEBUG = True
 
 ALLOWED_HOSTS = []
 
+# SESSIONS TIMEOUT
+SESSION_COOKIE_AGE = 30 * 60
+
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+
 
 # Application definition
 

tecnicas/controllers/__init__.py

@@ -7,4 +7,5 @@ from .estilo_palabras_controller import EstiloPalabrasController
 from .palabras_controller import PalabrasController
 from .sesion_controller import SesionController
 from .calificacion_controller import CalificacionController
-from .detalles_sesion_controller import DetallesSesionController
+from .detalles_sesion_controller import DetallesSesionController
+from .login_tester_controller import LoginTesterController

tecnicas/controllers/login_tester_controller.py

@@ -0,0 +1,62 @@
+from ..models import Catador, SesionSensorial, Participacion
+from ..utils import controller_error
+from django.db import transaction
+
+
+class LoginTesterController():
+    tester: Catador
+    session: SesionSensorial
+    taster_participation: Participacion
+
+    def __init__(self):
+        self.tester = Catador()
+        self.session = SesionSensorial()
+
+    def existCredential(self, user_tester: str, code_session: str):
+        try:
+            self.tester = Catador.objects.get(usuarioCatador=user_tester)
+            self.session = SesionSensorial.objects.get(
+                codigo_sesion=code_session)
+
+            return True
+        except (Catador.DoesNotExist, SesionSensorial.DoesNotExist):
+            return controller_error("Credenciales inválidas")
+
+    def validateEntry(self):
+        if not self.tester.nombre or not self.session.codigo_sesion:
+            return controller_error("Credenciales no definidas")
+
+        if not self.session.activo:
+            return controller_error("La sesión no está activa actualmente")
+
+        if self.session.tecnica.repecion > 1:
+            try:
+                self.taster_participation = Participacion.objects.get(
+                    tecnica=self.session.tecnica, catador=self.tester)
+                return self.taster_participation
+            except Participacion.DoesNotExist:
+                return controller_error("No tienes permitido entrar a esta sesión")
+        else:
+            try:
+                self.taster_participation = Participacion.objects.get(
+                    tecnica=self.session.tecnica, catador=self.tester)
+                return self.taster_participation
+            except Participacion.DoesNotExist:
+                with transaction.atomic():
+                    code_session = self.session.codigo_sesion
+                    self.session = SesionSensorial.objects.select_for_update().get(
+                        codigo_sesion=code_session)
+
+                    max_testers = self.session.tecnica.limite_catadores
+                    current_num_testers = Participacion.objects.filter(
+                        tecnica=self.session.tecnica).count()
+
+                    if current_num_testers >= max_testers:
+                        return controller_error("La sesión ha alcanzado el número máximo de catadores")
+
+                    self.taster_participation = Participacion.objects.create(
+                        tecnica=self.session.tecnica,
+                        catador=self.tester
+                    )
+
+                    return self.taster_participation

tecnicas/migrations/0015_alter_sesionsensorial_codigo_sesion.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.1 on 2025-09-18 01:05
+
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0014_alter_sesionsensorial_codigo_sesion_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+    ]

tecnicas/migrations/0016_alter_sesionsensorial_codigo_sesion_participacion.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-09-18 19:49
+
+import django.db.models.deletion
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0015_alter_sesionsensorial_codigo_sesion'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+        migrations.CreateModel(
+            name='Participacion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('activo', models.BooleanField(default=False)),
+                ('finalizado', models.BooleanField(default=True)),
+                ('catador', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='catador_participacion', to='tecnicas.catador')),
+                ('tecnica', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_participacion', to='tecnicas.tecnica')),
+            ],
+        ),
+    ]

tecnicas/migrations/0017_alter_sesionsensorial_codigo_sesion_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.1 on 2025-09-18 19:57
+
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0016_alter_sesionsensorial_codigo_sesion_participacion'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+        migrations.DeleteModel(
+            name='Participacion',
+        ),
+    ]

tecnicas/migrations/0018_alter_sesionsensorial_codigo_sesion_participacion.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-09-18 19:58
+
+import django.db.models.deletion
+import shortuuid.main
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tecnicas', '0017_alter_sesionsensorial_codigo_sesion_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sesionsensorial',
+            name='codigo_sesion',
+            field=models.CharField(default=shortuuid.main.ShortUUID.uuid, editable=False, max_length=22, primary_key=True, serialize=False),
+        ),
+        migrations.CreateModel(
+            name='Participacion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('activo', models.BooleanField(default=False)),
+                ('finalizado', models.BooleanField(default=True)),
+                ('catador', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='catador_participacion', to='tecnicas.catador')),
+                ('tecnica', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tecnica_participacion', to='tecnicas.tecnica')),
+            ],
+        ),
+    ]

tecnicas/models/__init__.py

@@ -25,4 +25,6 @@ from .dato_valor import ValorDecimal
 from .dato_valor import ValorBooleano
 
 from .orden import Orden
-from .orden import Posicion
+from .orden import Posicion
+
+from .participacion import Participacion

tecnicas/models/participacion.py

@@ -0,0 +1,15 @@
+from django.db import models
+from .tecnica import Tecnica
+from .catador import Catador
+
+
+class Participacion(models.Model):
+    tecnica = models.ForeignKey(
+        Tecnica, on_delete=models.CASCADE, related_name="tecnica_participacion")
+    catador = models.ForeignKey(
+        Catador, on_delete=models.CASCADE, related_name="catador_participacion")
+    activo = models.BooleanField(default=False)
+    finalizado = models.BooleanField(default=True)
+
+    def __str__(self):
+        return f"{self.catador.usuarioCatador} {'activo' if self.activo else 'no activo'}"

tecnicas/pato.py

@@ -1,42 +0,0 @@
-from django.db import models
-
-class Presentador(models.Model):
-    nombre = models.CharField(max_length=255)
-    apellido = models.CharField(max_length=255)
-    nombre_usuario = models.CharField(max_length=255)
-    contrasena = models.CharField(max_length=255)
-
-class Palabra(models.Model):
-    nombre_palabra = models.CharField(max_length=255, unique=True)
-
-class Vocabualario(models.Model):
-    nomre_vocabulario = models.CharField(max_length=255, unique=True)
-    palabras = models.ManyToManyField(Palabra)
-
-class EstiloPalabra(models.Model):
-    nombre_estilo = models.CharField(max_length=255, unique=True)
-
-class EsAtributo(models.Model):
-    id_estilo = models.ForeignKey(EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_esatributo")
-
-class ListaPalabra(models.Model):
-    id_palabra = models.ForeignKey(Palabra, on_delete=models.CASCADE, related_name="palabra_listapalabras")
-    id_atributos = models.ForeignKey(EsAtributo, on_delete=models.CASCADE, related_name="atributo_listapalabras")
-
-class EsVocabulario(models.Model):
-    id_estilo = models.ForeignKey(EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_esvacabulario")
-    id_vocabulario = models.ForeignKey(Vocabualario, on_delete=models.CASCADE, related_name="vocabulario_esvocabulario")
-
-class Tecnica(models.Model):
-    nombre_tecnica = models.CharField(max_length=255)
-    maximas_repeticiones = models.IntegerField(default=0)
-    repecion = models.IntegerField(default=0)
-    limite_catadores = models.IntegerField()
-    instrucciones = models.CharField(max_length=255)
-    id_estilo = models.ForeignKey(EstiloPalabra, on_delete=models.CASCADE, related_name="estilo_tecnica")
-
-class SesionSensorial(models.Model):
-    fechaCreacion = models.DateTimeField("date published")
-    activo = models.BooleanField(default=False)
-    creadoPor = models.ForeignKey(Presentador, on_delete=models.CASCADE, related_name="presentador_sesion")
-    tecnica = models.ForeignKey(Tecnica, on_delete=models.CASCADE, related_name="sesion_tecnica")

tecnicas/templates/tecnicas/cata-login.html

@@ -4,20 +4,32 @@
 
 {% block content %}
 <article class="w-full h-full flex flex-col justify-center items-center bg-gray-600">
-    <form action="./auth" method="post" class="bg-gray-200 w-xl p-8 rounded-xl">
+    <form action="" method="post" class="bg-gray-200 w-xl p-8 rounded-xl">
+        {% csrf_token %}
         <header class="text-center">
             <h1 class="text-5xl font-bold">Cateo System</h1>
             <p class="text-2xl font-medium mt-3">Catadores</p>
         </header>
-        <section class="flex flex-col gap-6 items-center w-full mt-5">
+
+        {% if error %}
+        <article class="bg-red-600 p-4 text-white rounded-xl ct-notification-error">
+            <p class="block font-sans text-white text-xl antialiased font-bold uppercase tracking-wider text-center">
+                {{ error }}
+            </p>
+        </article>
+        {% endif %}
+
+        <article class="flex flex-col gap-6 items-center w-full mt-5">
             <label for="id">
-                <input type="text" name="id" id="id" placeholder="Codigo de sesion"
-                    class="placeholder:text-gray-100 placeholder:text-xl bg-gray-400 py-3 px-6 rounded-xl w-sm border-b-2 border-blue-700" required>
+                <input type="text" name="code_session" id="id" placeholder="Codigo de sesion"
+                    class="placeholder:text-gray-100 placeholder:text-xl bg-gray-400 py-3 px-6 rounded-xl w-sm border-b-2 border-blue-700"
+                    required>
             </label>
 
             <label for="id">
-                <input type="text" name="id" id="id" placeholder="Nombre de usuario"
-                    class="placeholder:text-gray-100 placeholder:text-xl bg-gray-400 py-3 px-6 rounded-xl w-sm border-b-2 border-blue-700" required>
+                <input type="text" name="user_tester" id="id" placeholder="Nombre de usuario"
+                    class="placeholder:text-gray-100 placeholder:text-xl bg-gray-400 py-3 px-6 rounded-xl w-sm border-b-2 border-blue-700"
+                    required>
             </label>
 
             <section class="flex flex-row flex-wrap gap-4 w-f ull justify-center">
@@ -25,7 +37,16 @@
                     class="text-white bg-blue-600 hover:bg-blue-700 active:outline-none active:ring-4 active:ring-blue-300 font-medium rounded-xl text-xl px-8 py-2 text-center uppercase">Ingresar</button>
             </section>
 
-        </section>
+        </article>
     </form>
 </article>
+{% endblock %}
+
+{% block extra_js %}
+<script>
+    const error = document.querySelector(".ct-notification-error")
+    setTimeout(() => {
+        error.classList.add("hidden")
+    }, 2500)
+</script>
 {% endblock %}

tecnicas/urls.py

@@ -13,7 +13,7 @@ urlpatterns = [
          name="autenticacion"),
 
     path("catador-login",
-         views.catadorLogin,
+         views.testerLogin,
          name="catador_login"),
 
 

tecnicas/views/__init__.py

@@ -1,5 +1,5 @@
 from .autentication import autentication
-from .login_catador import catadorLogin
+from .login_tester import testerLogin
 from .main_panel import mainPanel
 
 from .sessions_management.sessions_panel import sesionsPanel

tecnicas/views/login_catador.py

@@ -1,4 +0,0 @@
-from django.shortcuts import render
-
-def catadorLogin(req):
-    return render(req, "tecnicas/cata-login.html")

tecnicas/views/login_tester.py

@@ -0,0 +1,34 @@
+from django.http import HttpRequest
+from django.shortcuts import render
+from ..utils import general_error
+from ..controllers import LoginTesterController
+
+
+def testerLogin(req: HttpRequest):
+    if req.method == "GET":
+        return render(req, "tecnicas/cata-login.html")
+    elif req.method == "POST":
+        tester_user = req.POST.get("user_tester")
+        session_code = req.POST.get("code_session")
+        if not tester_user or not session_code:
+            return general_error("Se esperan credenciales")
+
+        login_controller = LoginTesterController()
+
+        existCredentials = login_controller.existCredential(
+            tester_user, session_code)
+        if isinstance(existCredentials, dict):
+            context = {"error": existCredentials["error"]}
+            return render(req, "tecnicas/cata-login.html", context)
+
+        taster_participation = login_controller.validateEntry()
+        if isinstance(taster_participation, dict):
+            context = {"error": taster_participation["error"]}
+            return render(req, "tecnicas/cata-login.html", context)
+
+        req.session["cata_username"] = tester_user
+        req.session["code_session"] = session_code
+
+        req.session.set_expiry(20*60)
+    else:
+        return render(req, "tecnicas/cata-login.html")