diff --git a/JugarAlPadel/gestion_reservas/db.sqlite3 b/JugarAlPadel/gestion_reservas/db.sqlite3 index 9a7d650..42a7b85 100644 Binary files a/JugarAlPadel/gestion_reservas/db.sqlite3 and b/JugarAlPadel/gestion_reservas/db.sqlite3 differ diff --git a/JugarAlPadel/gestion_reservas/eventos/migrations/0001_initial.py b/JugarAlPadel/gestion_reservas/eventos/migrations/0001_initial.py index 12235fa..b700884 100644 --- a/JugarAlPadel/gestion_reservas/eventos/migrations/0001_initial.py +++ b/JugarAlPadel/gestion_reservas/eventos/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2 on 2024-09-30 14:19 +# Generated by Django 4.2 on 2024-09-30 17:28 from django.db import migrations, models import django.db.models.deletion diff --git a/JugarAlPadel/gestion_reservas/eventos/migrations/0002_initial.py b/JugarAlPadel/gestion_reservas/eventos/migrations/0002_initial.py index 366780f..f7eff3e 100644 --- a/JugarAlPadel/gestion_reservas/eventos/migrations/0002_initial.py +++ b/JugarAlPadel/gestion_reservas/eventos/migrations/0002_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2 on 2024-09-30 14:19 +# Generated by Django 4.2 on 2024-09-30 17:28 from django.conf import settings from django.db import migrations, models diff --git a/JugarAlPadel/gestion_reservas/eventos/models.py b/JugarAlPadel/gestion_reservas/eventos/models.py index 65c3ab7..9cde301 100644 --- a/JugarAlPadel/gestion_reservas/eventos/models.py +++ b/JugarAlPadel/gestion_reservas/eventos/models.py @@ -23,4 +23,4 @@ class Reserva(models.Model): fecha_reserva = models.DateTimeField(auto_now_add=True) def __str__(self): - return f'{self.usuario.username} - {self.evento.nombre}' + return f'{self.usuario.email} - {self.evento.nombre}' diff --git a/JugarAlPadel/gestion_reservas/eventos/urls.py b/JugarAlPadel/gestion_reservas/eventos/urls.py index 852d6c0..cd7493c 100644 --- a/JugarAlPadel/gestion_reservas/eventos/urls.py +++ b/JugarAlPadel/gestion_reservas/eventos/urls.py @@ -4,5 +4,6 @@ from . import views urlpatterns = [ path('', views.lista_eventos, name='lista_eventos'), - path('reservar//', views.reservar_evento, name='reservar_evento'), + path('reservar//', + views.reservar_evento, name='reservar_evento'), ] diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py index 8a71a28..d5f058f 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py @@ -21,7 +21,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent # See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-yft$kjzba+%i*%^n2u-i(3+tgvjitx%3we3y9l1pts$h3r#)ow' +SECRET_KEY = 'hey' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.environ["DEBUG"] == 'True' @@ -142,8 +142,12 @@ LOGIN_REDIRECT_URL = 'principal' LOGOUT_REDIRECT_URL = 'principal' AUTH_USER_MODEL = "reymotausers.ReyMotaUser" + +AACCOUNT_AUTHENTICATION_METHOD = 'email' +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_UNIQUE_EMAIL = True ACCOUNT_USER_MODEL_USERNAME_FIELD = None -ACCOUNT_USERNAME_REQUIRED=False +ACCOUNT_USERNAME_REQUIRED = False MEDIA_ROOT = BASE_DIR / "mediafiles" MEDIA_URL = '/media/' diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py index 8c53567..cb4a529 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/urls.py @@ -19,6 +19,6 @@ from django.urls import path, include urlpatterns = [ - path('admin/', admin.site.urls), + path('obreros/', admin.site.urls), path("", include('eventos.urls')), # new ] diff --git a/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py b/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py index b8c6372..89bcdbd 100644 --- a/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py +++ b/JugarAlPadel/gestion_reservas/reymotausers/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2 on 2024-09-30 14:19 +# Generated by Django 4.2 on 2024-09-30 17:28 from django.db import migrations, models diff --git a/JugarAlPadel/gestion_reservas/reymotausers/tests.py b/JugarAlPadel/gestion_reservas/reymotausers/tests.py index 7ce503c..5ed29fe 100644 --- a/JugarAlPadel/gestion_reservas/reymotausers/tests.py +++ b/JugarAlPadel/gestion_reservas/reymotausers/tests.py @@ -1,3 +1,42 @@ +from django.contrib.auth import get_user_model from django.test import TestCase -# Create your tests here. + +class UsersManagersTests(TestCase): + + def test_create_user(self): + User = get_user_model() + user = User.objects.create_user(email="normal@user.com", password="foo") + self.assertEqual(user.email, "normal@user.com") + self.assertTrue(user.is_active) + self.assertFalse(user.is_staff) + self.assertFalse(user.is_superuser) + try: + # username is None for the AbstractUser option + # username does not exist for the AbstractBaseUser option + self.assertIsNone(user.username) + except AttributeError: + pass + with self.assertRaises(TypeError): + User.objects.create_user() + with self.assertRaises(TypeError): + User.objects.create_user(email="") + with self.assertRaises(ValueError): + User.objects.create_user(email="", password="foo") + + def test_create_superuser(self): + User = get_user_model() + admin_user = User.objects.create_superuser(email="super@user.com", password="foo") + self.assertEqual(admin_user.email, "super@user.com") + self.assertTrue(admin_user.is_active) + self.assertTrue(admin_user.is_staff) + self.assertTrue(admin_user.is_superuser) + try: + # username is None for the AbstractUser option + # username does not exist for the AbstractBaseUser option + self.assertIsNone(admin_user.username) + except AttributeError: + pass + with self.assertRaises(ValueError): + User.objects.create_superuser( + email="super@user.com", password="foo", is_superuser=False) \ No newline at end of file