diff --git a/apps/emails/admin.py b/apps/emails/admin.py index 15397f5..297ff60 100644 --- a/apps/emails/admin.py +++ b/apps/emails/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin -from .models import Email +from .models import Email, EmailQueue admin.site.register(Email) +admin.site.register(EmailQueue) diff --git a/apps/emails/migrations/0002_alter_email_extras_emailqueue_email_queue.py b/apps/emails/migrations/0002_alter_email_extras_emailqueue_email_queue.py index 406e20d..8ea7983 100644 --- a/apps/emails/migrations/0002_alter_email_extras_emailqueue_email_queue.py +++ b/apps/emails/migrations/0002_alter_email_extras_emailqueue_email_queue.py @@ -1,6 +1,7 @@ -# Generated by Django 5.2.6 on 2025-09-06 13:25 +# Generated by Django 5.2.6 on 2025-09-06 13:55 import django.db.models.deletion +import uuid from django.conf import settings from django.db import migrations, models @@ -21,11 +22,16 @@ class Migration(migrations.Migration): migrations.CreateModel( name='EmailQueue', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True, db_index=True)), + ('updated_at', models.DateTimeField(auto_now=True, db_index=True)), ('title', models.CharField(max_length=255, verbose_name='title')), ('last_sent', models.DateTimeField(auto_now_add=True, verbose_name='last sent')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), ], + options={ + 'abstract': False, + }, ), migrations.AddField( model_name='email', diff --git a/apps/emails/models.py b/apps/emails/models.py index 0ab5dd2..e9d5f12 100644 --- a/apps/emails/models.py +++ b/apps/emails/models.py @@ -11,7 +11,7 @@ class EmailQueueQuerySet(models.query.QuerySet): pass -class EmailQueue(models.Model): +class EmailQueue(BaseModel): title = models.CharField(_('title'), max_length=255) user = models.ForeignKey(User, verbose_name=_('user'), on_delete=models.CASCADE) last_sent = models.DateTimeField(_('last sent'), auto_now_add=True) diff --git a/celery.sh b/celery.sh index 6d5b414..88d5af7 100755 --- a/celery.sh +++ b/celery.sh @@ -5,4 +5,4 @@ while ! nc -z $DB_HOST 5432 ; do done #python3 manage.py collectstatic --noinput #python3 manage.py migrate -celery -A main worker --loglevel=info \ No newline at end of file +celery -A main worker --loglevel=info -B