Merge branch 'enext' into organizer-creation

Author: mariobehling

app/eventyay/cfp/templates/cfp/event/invitation.html

@@ -30,7 +30,7 @@ <h2>{% translate "Accept invitation?" %}</h2>
         </p>
 
         {% if submission.abstract %}
-            <div class="card ml-auto mr-auto col-md-9">
+            <div class="card ml-auto mr-auto p-0 col-md-9">
                 <div class="card-header">{% translate "Abstract:" %} {{ submission.title }}</div>
                 <div class="card-body mt-0 mb-0 mr-3 ml-3">
                     <p class="card-text">{{ submission.abstract|rich_text }}</p>

app/eventyay/config/settings.py

@@ -18,6 +18,7 @@
 from pathlib import Path
 from urllib.parse import urlparse
 import django.conf.locale
+from django.contrib.messages import constants as messages  # NOQA
 from django.utils.translation import gettext_lazy as _
 from django.utils.crypto import get_random_string
 from kombu import Queue
@@ -91,16 +92,6 @@ def instance_name(request):
 # URL settings
 ROOT_URLCONF = 'eventyay.multidomain.maindomain_urlconf'
 
-
-HAS_CELERY = config.has_option('celery', 'broker')
-if HAS_CELERY:
-    CELERY_BROKER_URL = config.get('celery', 'broker') if not DEBUG else 'redis://localhost:6379/2'
-    CELERY_RESULT_BACKEND = config.get('celery', 'backend') if not DEBUG else 'redis://localhost:6379/1'
-    CELERY_TASK_ALWAYS_EAGER = False
-else:
-    CELERY_TASK_ALWAYS_EAGER = True
-
-
 AUTH_USER_MODEL = 'base.User'
 _LIBRARY_APPS = (
     'bootstrap3',
@@ -740,45 +731,80 @@ def instance_name(request):
         'LOCATION': config.get('memcached', 'location'),
     }
 
-HAS_REDIS = config.has_option('redis', 'location')
-if HAS_REDIS:
-    redis_options = {
-        'CLIENT_CLASS': 'django_redis.client.DefaultClient',
-        'REDIS_CLIENT_KWARGS': {'health_check_interval': 30},
-    }
-    redis_tls_config = build_redis_tls_config(config)
-    if redis_tls_config is not None:
-        redis_options['CONNECTION_POOL_KWARGS'] = redis_tls_config
-        redis_options['REDIS_CLIENT_KWARGS'].update(redis_tls_config)
-
-    if config.has_option('redis', 'password'):
-        redis_options['PASSWORD'] = config.get('redis', 'password')
-
-    CACHES['redis'] = {
-        'BACKEND': 'django_redis.cache.RedisCache',
-        'LOCATION': config.get('redis', 'location') if not DEBUG else 'redis://localhost:6379/0',
-        'OPTIONS': redis_options,
-    }
-    CACHES['redis_sessions'] = {
-        'BACKEND': 'django_redis.cache.RedisCache',
-        'LOCATION': config.get('redis', 'location') if not DEBUG else 'redis://localhost:6379/0',
-        'TIMEOUT': 3600 * 24 * 30,
-        'OPTIONS': redis_options,
-    }
-    REDIS_USE_PUBSUB = config.getboolean('redis', 'use_pubsub', fallback=True)
-    if not HAS_MEMCACHED:
-        CACHES['default'] = CACHES['redis']
-        REAL_CACHE_USED = True
-    if config.getboolean('redis', 'sessions', fallback=False):
-        SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
-        SESSION_CACHE_ALIAS = 'redis_sessions'
+# Redis Configuration
+redis_connection_kwargs = {
+    "retry": Retry(ExponentialBackoff(), 3),
+    "health_check_interval": 30,
+}
+
+REDIS_URL = config.get('redis', 'location')
+HAS_REDIS = bool(REDIS_URL)
+REDIS_HOSTS = [{
+    "address": REDIS_URL,
+    **redis_connection_kwargs,
+}]
+
+REDIS_USE_PUBSUB = True
+
+redis_options = {
+    'CLIENT_CLASS': 'django_redis.client.DefaultClient',
+    'REDIS_CLIENT_KWARGS': {'health_check_interval': 30},
+}
+redis_tls_config = build_redis_tls_config(config)
+if redis_tls_config is not None:
+    redis_options['CONNECTION_POOL_KWARGS'] = redis_tls_config
+    redis_options['REDIS_CLIENT_KWARGS'].update(redis_tls_config)
+
+if config.has_option('redis', 'password'):
+    redis_options['PASSWORD'] = config.get('redis', 'password')
+
+CACHES['redis'] = {
+    'BACKEND': 'django_redis.cache.RedisCache',
+    'LOCATION': REDIS_URL,
+    'OPTIONS': redis_options,
+}
+CACHES['redis_sessions'] = {
+    'BACKEND': 'django_redis.cache.RedisCache',
+    'LOCATION': REDIS_URL,
+    'TIMEOUT': 3600 * 24 * 30,
+    'OPTIONS': redis_options,
+}
+
+# Channels (WebSocket) configuration
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": (
+            "channels_redis.pubsub.RedisPubSubChannelLayer"
+            if REDIS_USE_PUBSUB
+            else "channels_redis.core.RedisChannelLayer"
+        ),
+        "CONFIG": {
+            "hosts": REDIS_HOSTS,
+            "prefix": "eventyay:{}:asgi:".format(
+                _config.get("redis", "db", fallback="0")
+            ),
+            "capacity": 10000,
+        },
+    },
+}
+
+if not HAS_MEMCACHED:
+    CACHES['default'] = CACHES['redis']
+    REAL_CACHE_USED = True
+if config.getboolean('redis', 'sessions', fallback=False):
+    SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
+    SESSION_CACHE_ALIAS = 'redis_sessions'
 
 if not SESSION_ENGINE:
     if REAL_CACHE_USED:
         SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
     else:
         SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 
+# Celery configuration
+CELERY_BROKER_URL = config.get('celery', 'broker')
+CELERY_RESULT_BACKEND = config.get('celery', 'backend')
+CELERY_TASK_ALWAYS_EAGER = False if not DEBUG else True
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 CELERY_TASK_DEFAULT_QUEUE = "default"
@@ -791,12 +817,11 @@ def instance_name(request):
 )
 CELERY_BEAT_SCHEDULER = 'django_celery_beat.schedulers:DatabaseScheduler'
 CELERY_TASK_TRACK_STARTED = True
-CELERY_TASK_ROUTES = (
-    [
-        ('eventyay.base.services.notifications.*', {'queue': 'notifications'}),
-        ('eventyay.api.webhooks.*', {'queue': 'notifications'}),
-    ],
-)
+CELERY_TASK_ROUTES = {
+    'eventyay.base.services.notifications.*': {'queue': 'notifications'},
+    'eventyay.api.webhooks.*': {'queue': 'notifications'},
+}
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.1/howto/static-files/
@@ -875,7 +900,13 @@ def instance_name(request):
 CSP_DEFAULT_SRC = ("'self'", "'unsafe-eval'")
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
-MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage"
+MESSAGE_TAGS = {
+    messages.INFO: 'alert-info',
+    messages.ERROR: 'alert-danger',
+    messages.WARNING: 'alert-warning',
+    messages.SUCCESS: 'alert-success',
+}
+MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
 
 # Template configuration
 template_loaders = (

app/eventyay/control/forms/filter.py

@@ -891,6 +891,100 @@ def filter_qs(self, qs):
         return qs
 
 
+class AttendeeFilterForm(FilterForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._checkin_status = None
+
+    query = forms.CharField(
+        label=_('Name or email'),
+        required=False,
+        widget=forms.TextInput(attrs={'placeholder': _('Name or email')}),
+    )
+
+    event_query = forms.CharField(
+        label=_('Event name'),
+        required=False,
+        widget=forms.TextInput(attrs={'placeholder': _('Event name')}),
+    )
+
+    event_status = forms.ChoiceField(
+        label=_('Event filter'),
+        choices=(
+            ('', _('All events')),
+            ('ongoing', _('Ongoing events')),
+            ('recent', _('Recent events')),
+        ),
+        required=False,
+    )
+
+    checkin_status = forms.ChoiceField(
+        label=_('Check-in status'),
+        choices=(
+            ('', _('All attendees')),
+            ('present', _('Present')),
+            ('left', _('Checked in but left')),
+            ('checked_in', _('Checked in')),
+            ('not_checked_in', _('Not checked in')),
+        ),
+        required=False,
+    )
+
+    ordering = forms.CharField(required=False, widget=forms.HiddenInput())
+
+    def filter_qs(self, qs):
+        fdata = self.cleaned_data
+
+        # Search by attendee name or email
+        if fdata.get('query'):
+            qs = qs.filter(
+                Q(attendee_name_cached__icontains=fdata['query'])
+                | Q(order__email__icontains=fdata['query'])
+                | Q(attendee_email__icontains=fdata['query'])
+            )
+
+        # Search by event name
+        if fdata.get('event_query'):
+            qs = qs.filter(
+                Q(order__event__name__icontains=fdata['event_query'])
+                | Q(order__event__slug__icontains=fdata['event_query'])
+            )
+
+        # Event status filter
+        if fdata.get('event_status'):
+            now_ = now()
+            if fdata['event_status'] == 'ongoing':
+                qs = qs.filter(
+                    Q(order__event__date_from__lte=now_)
+                    & (Q(order__event__date_to__gte=now_) | Q(order__event__date_to__isnull=True))
+                )
+            elif fdata['event_status'] == 'recent':
+                qs = qs.filter(
+                    Q(order__event__date_to__lt=now_)
+                    | (Q(order__event__date_to__isnull=True) & Q(order__event__date_from__lt=now_))
+                )
+
+        # Check-in status filter
+        checkin_status = fdata.get('checkin_status')
+        if checkin_status:
+            qs = qs.annotate(
+                entry_time=Max('checkins__datetime', filter=Q(checkins__type=Checkin.TYPE_ENTRY)),
+                exit_time=Max('checkins__datetime', filter=Q(checkins__type=Checkin.TYPE_EXIT)),
+            )
+            if checkin_status == 'present':
+                qs = qs.filter(entry_time__isnull=False).filter(
+                    Q(exit_time__isnull=True) | Q(exit_time__lt=F('entry_time'))
+                )
+            elif checkin_status == 'left':
+                qs = qs.filter(exit_time__isnull=False, exit_time__gt=F('entry_time'))
+            elif checkin_status == 'checked_in':
+                qs = qs.filter(entry_time__isnull=False)
+            elif checkin_status == 'not_checked_in':
+                qs = qs.filter(entry_time__isnull=True)
+
+        return qs
+
+
 class SubmissionFilterForm(forms.Form):
     query = forms.CharField(
         label=_('Title or speaker'),

app/eventyay/control/navigation.py

@@ -588,6 +588,12 @@ def get_admin_navigation(request):
             'active': 'organizers' in url.url_name,
             'icon': 'group',
         },
+        {
+            'label': _('All Attendees'),
+            'url': reverse('control:admin.attendees'),
+            'active': 'attendees' in url.url_name,
+            'icon': 'ticket',
+        },
         {
             'label': _('All Sessions'),
             'url': reverse('control:admin.submissions'),