From 75ea0f4b46613a6f48f689196b723033fb4f712e Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 26 Jun 2024 18:42:56 +0200 Subject: [PATCH 01/35] stash --- core/authentication/admin.py | 3 + core/core/settings.py | 5 + core/core/urls.py | 1 + core/mail/models.py | 2 + core/mail/protocol.py | 46 +++++-- core/mail/tests/v2/test_user_notifications.py | 20 +++ core/notifications/__init__.py | 0 core/notifications/admin.py | 15 +++ core/notifications/api_v2.py | 37 ++++++ core/notifications/defaults.py | 16 +++ core/notifications/dispatch.py | 85 +++++++++++++ core/notifications/migrations/0001_initial.py | 51 ++++++++ core/notifications/migrations/__init__.py | 0 core/notifications/models.py | 29 +++++ core/notifications/templates.py | 69 ++++++++++ core/notifications/tests/__init__.py | 0 core/notify_sessions/decorators.py | 21 ++++ core/server.py | 7 ++ core/tickets/serializers.py | 2 + core/tickets/tests/v2/test_tickets.py | 10 ++ .../ansible/playbooks/templates/django.env.j2 | 2 + web/package.json | 1 + web/src/components/CollapsableCards.vue | 32 +++++ web/src/components/SlotTable.vue | 105 ++++++++++++++++ web/src/components/Toast.vue | 48 +++++++ web/src/components/inputs/FormatedText.vue | 112 +++++++++++++++++ web/src/main.js | 2 + web/src/router.js | 13 ++ web/src/store.js | 118 +++++++++++++++--- web/src/views/Tickets.vue | 10 +- web/src/views/admin/Admin.vue | 6 + web/src/views/admin/Debug.vue | 87 +++++++++++++ web/src/views/admin/Notifications.vue | 36 ++++++ web/src/views/admin/Settings.vue | 109 ++++++++++++++++ 34 files changed, 1066 insertions(+), 34 deletions(-) create mode 100644 core/mail/tests/v2/test_user_notifications.py create mode 100644 core/notifications/__init__.py create mode 100644 core/notifications/admin.py create mode 100644 core/notifications/api_v2.py create mode 100644 core/notifications/defaults.py create mode 100644 core/notifications/dispatch.py create mode 100644 core/notifications/migrations/0001_initial.py create mode 100644 core/notifications/migrations/__init__.py create mode 100644 core/notifications/models.py create mode 100644 core/notifications/templates.py create mode 100644 core/notifications/tests/__init__.py create mode 100644 core/notify_sessions/decorators.py mode change 100644 => 100755 core/server.py create mode 100644 web/src/components/SlotTable.vue create mode 100644 web/src/components/Toast.vue create mode 100644 web/src/components/inputs/FormatedText.vue create mode 100644 web/src/views/admin/Debug.vue create mode 100644 web/src/views/admin/Notifications.vue create mode 100644 web/src/views/admin/Settings.vue diff --git a/core/authentication/admin.py b/core/authentication/admin.py index 0024cb0..dfb4d20 100644 --- a/core/authentication/admin.py +++ b/core/authentication/admin.py @@ -10,5 +10,8 @@ class ExtendedUserAdmin(UserAdmin): ordering = ('username',) filter_horizontal = ('groups', 'user_permissions', 'permissions') +# def permissions(self, obj): +# return ', '.join(obj.get_all_permissions()) + admin.site.register(ExtendedUser, ExtendedUserAdmin) diff --git a/core/core/settings.py b/core/core/settings.py index 5a8f20f..94f15eb 100644 --- a/core/core/settings.py +++ b/core/core/settings.py @@ -49,6 +49,10 @@ SYSTEM3_VERSION = "0.0.0-dev.0" ACTIVE_SPAM_TRAINING = truthy_str(os.getenv('ACTIVE_SPAM_TRAINING', 'False')) +TELEGRAM_BOT_TOKEN = os.getenv('TELEGRAM_BOT_TOKEN', '1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi') + +TELEGRAM_GROUP_CHAT_ID = os.getenv('TELEGRAM_GROUP_CHAT_ID', '-1234567890') + # Application definition INSTALLED_APPS = [ @@ -65,6 +69,7 @@ INSTALLED_APPS = [ 'drf_yasg', 'channels', 'authentication', + 'notifications', 'files', 'tickets', 'inventory', diff --git a/core/core/urls.py b/core/core/urls.py index 1c5f158..d224e52 100644 --- a/core/core/urls.py +++ b/core/core/urls.py @@ -28,6 +28,7 @@ urlpatterns = [ path('api/2/', include('mail.api_v2')), path('api/2/', include('notify_sessions.api_v2')), path('api/2/', include('authentication.api_v2')), + path('api/2/', include('notifications.api_v2')), path('api/', get_info), path('', include('django_prometheus.urls')), ] diff --git a/core/mail/models.py b/core/mail/models.py index 36cd2b3..28524de 100644 --- a/core/mail/models.py +++ b/core/mail/models.py @@ -4,6 +4,8 @@ from django.db import models from django_softdelete.models import SoftDeleteModel from core.settings import MAIL_DOMAIN, ACTIVE_SPAM_TRAINING +from authentication.models import ExtendedUser +from core.settings import MAIL_DOMAIN from files.models import AbstractFile from inventory.models import Event from tickets.models import IssueThread diff --git a/core/mail/protocol.py b/core/mail/protocol.py index c5aaa4a..6b4dc6d 100644 --- a/core/mail/protocol.py +++ b/core/mail/protocol.py @@ -7,6 +7,7 @@ from channels.db import database_sync_to_async from django.core.files.base import ContentFile from mail.models import Email, EventAddress, EmailAttachment +from notifications.templates import render_auto_reply from notify_sessions.models import SystemEvent from tickets.models import IssueThread @@ -87,6 +88,22 @@ def make_reply(reply_email, references=None, event=None): return reply +def make_notification(message, to, title): # TODO where should replies to this go + from email.message import EmailMessage + from core.settings import MAIL_DOMAIN + notification = EmailMessage() + notification["From"] = "notifications@%s" % MAIL_DOMAIN + notification["To"] = to + notification["Subject"] = f"[C3LF Notification]%s" % title + # notification["Reply-To"] = f"{event}@{MAIL_DOMAIN}" + # notification["In-Reply-To"] = email.reference + # notification["Message-ID"] = email.id + "@" + MAIL_DOMAIN + + notification.set_content(message) + + return notification + + async def send_smtp(message): await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False) @@ -185,6 +202,16 @@ def receive_email(envelope, log=None): header_in_reply_to = parsed.get('In-Reply-To') header_message_id = parsed.get('Message-ID') + # if header_from != envelope.mail_from: + # log.warning("Header from does not match envelope from") + # log.info(f"Header from: {header_from}, envelope from: {envelope.mail_from}") + # + # if header_to != envelope.rcpt_tos[0]: + # log.warning("Header to does not match envelope to") + # log.info(f"Header to: {header_to}, envelope to: {envelope.rcpt_tos[0]}") + + # handle undelivered mail header_from : 'Mail Delivery System ") == "": log.warning("Ignoring mailer daemon") raise SpecialMailException("Ignoring mailer daemon") @@ -221,16 +248,7 @@ def receive_email(envelope, log=None): references = collect_references(active_issue_thread) if not sender.startswith('noreply'): subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]" - body = '''Your request (#{}) has been received and will be reviewed by our lost&found angels. - -We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \ -workload is high. We will not forget about your request and get back in touch once we have updated information on your \ -request. Requests for devices, wallets, credit cards or similar items will be handled with priority. - -If you happen to find your lost item or just want to add additional information, please reply to this email. Please \ -do not create a new request. - -Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid()) + body = render_auto_reply(active_issue_thread) reply_email = Email.objects.create( sender=recipient, recipient=sender, body=body, subject=subject, in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread) @@ -273,11 +291,19 @@ class LMTPHandler: 'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id, "message": "email received"}) log.info(f"Sent message to frontend") + if new and reply: log.info('Sending message to %s' % reply['To']) await send_smtp(reply) log.info("Sent auto reply") + if thread: + await channel_layer.group_send( + 'general', {"type": "generic.event", "name": "user_notification", "event_id": systemevent.id, + "ticket_id": thread.id, "new": new}) + else: + print("No thread found") + return '250 Message accepted for delivery' except SpecialMailException as e: import uuid diff --git a/core/mail/tests/v2/test_user_notifications.py b/core/mail/tests/v2/test_user_notifications.py new file mode 100644 index 0000000..c4db23f --- /dev/null +++ b/core/mail/tests/v2/test_user_notifications.py @@ -0,0 +1,20 @@ +from django.contrib.auth.models import Permission +from django.test import TestCase + +from authentication.models import ExtendedUser +from notifications.models import UserNotificationChannel + + +class UserNotificationTestCase(TestCase): + + def setUp(self): + super().setUp() + self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test') + self.user.user_permissions.add(*Permission.objects.all()) + self.user.save() + self.channel = UserNotificationChannel.objects.create(user=self.user, channel_type='telegram', + channel_target='123456789', + event_filter='*', active=True) + + async def test_telegram_notify(self): + pass diff --git a/core/notifications/__init__.py b/core/notifications/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notifications/admin.py b/core/notifications/admin.py new file mode 100644 index 0000000..69620a9 --- /dev/null +++ b/core/notifications/admin.py @@ -0,0 +1,15 @@ +from django.contrib import admin + +from notifications.models import MessageTemplate, UserNotificationChannel + + +class MessageTemplateAdmin(admin.ModelAdmin): + pass + + +class UserNotificationChannelAdmin(admin.ModelAdmin): + pass + + +admin.site.register(MessageTemplate, MessageTemplateAdmin) +admin.site.register(UserNotificationChannel, UserNotificationChannelAdmin) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py new file mode 100644 index 0000000..f50a453 --- /dev/null +++ b/core/notifications/api_v2.py @@ -0,0 +1,37 @@ +from django.contrib.auth.decorators import permission_required +from rest_framework import routers, viewsets +from django.urls import re_path +from rest_framework.decorators import api_view, permission_classes +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +from notifications.models import MessageTemplate +from rest_framework import serializers + +from notifications.templates import TEMPLATE_VARS + + +class MessageTemplateSerializer(serializers.ModelSerializer): + class Meta: + model = MessageTemplate + fields = '__all__' + + +class MessageTemplateViewSet(viewsets.ModelViewSet): + serializer_class = MessageTemplateSerializer + queryset = MessageTemplate.objects.all() + + +@api_view(['GET']) +@permission_classes([IsAuthenticated]) +@permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission +def get_template_vars(self): + return Response(TEMPLATE_VARS, status=200) + + +router = routers.SimpleRouter() +router.register(r'message_templates', MessageTemplateViewSet) + +urlpatterns = ([ + re_path('message_template_variables', get_template_vars), + ] + router.urls) diff --git a/core/notifications/defaults.py b/core/notifications/defaults.py new file mode 100644 index 0000000..812d93e --- /dev/null +++ b/core/notifications/defaults.py @@ -0,0 +1,16 @@ +auto_reply_body = '''Your request (#{{ ticket_uuid }}) has been received and will be reviewed by our lost&found angels. + +We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \ +workload is high. We will not forget about your request and get back in touch once we have updated information on your \ +request. Requests for devices, wallets, credit cards or similar items will be handled with priority. + +If you happen to find your lost item or just want to add additional information, please reply to this email. Please \ +do not create a new request. + +Your c3lf (Cloakroom + Lost&Found) Team''' + +new_issue_notification = '''New issue "{{ ticket_name | limit_length }}" [{{ ticket_uuid }}] created +{{ ticket_url }}''' + +reply_issue_notification = '''Reply to issue "{{ ticket_name }}" [{{ ticket_uuid }}] (was {{ previous_state_pretty }}) +{{ ticket_url }}''' diff --git a/core/notifications/dispatch.py b/core/notifications/dispatch.py new file mode 100644 index 0000000..752c342 --- /dev/null +++ b/core/notifications/dispatch.py @@ -0,0 +1,85 @@ +import asyncio + +from aiohttp.client import ClientSession +from channels.layers import get_channel_layer +from channels.db import database_sync_to_async +from urllib.parse import quote as urlencode + +from core.settings import TELEGRAM_BOT_TOKEN, TELEGRAM_GROUP_CHAT_ID +from mail.protocol import send_smtp, make_notification +from notifications.models import UserNotificationChannel +from notifications.templates import render_notification_new_ticket_async, render_notification_reply_ticket_async +from tickets.models import IssueThread + + +async def http_get(url): + async with ClientSession() as session: + async with session.get(url) as response: + return await response.text() + + +async def telegram_notify(message, chat_id): + encoded_message = urlencode(message) + url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage?chat_id={chat_id}&text={encoded_message}" + return await http_get(url) + + +async def email_notify(message, title, email): + mail = make_notification(message, email, title) + await send_smtp(mail) + + +class NotificationDispatcher: + channel_layer = None + room_group_name = "general" + + def __init__(self): + self.channel_layer = get_channel_layer('default') + if not self.channel_layer: + raise Exception("Could not get channel layer") + + @database_sync_to_async + def get_notification_targets(self): + channels = UserNotificationChannel.objects.filter(active=True) + return list(channels) + + @database_sync_to_async + def get_ticket(self, ticket_id): + return IssueThread.objects.filter(id=ticket_id).select_related('event').first() + + async def run_forever(self): + # Infinite loop to continuously listen for messages + print("Listening for messages...") + channel_name = await self.channel_layer.new_channel() + await self.channel_layer.group_add(self.room_group_name, channel_name) + print("Channel name:", channel_name) + while True: + # Blocking receive to get the message from the channel layer + message = await self.channel_layer.receive(channel_name) + + if (message and 'type' in message and message['type'] == 'generic.event' and 'name' in message and + message['name'] == 'user_notification'): + if 'ticket_id' in message and 'event_id' in message and 'new' in message: + ticket = await self.get_ticket(message['ticket_id']) + await self.dispatch(ticket, message['event_id'], message['new']) + else: + print("Error: Invalid message format") + + async def dispatch(self, ticket, event_id, new): + message = await render_notification_new_ticket_async( + ticket) if new else await render_notification_reply_ticket_async(ticket) + title = f"[#{ticket.short_uuid()}] {ticket.name}" + print("Dispatching message:", message, "with event_id:", event_id) + targets = await self.get_notification_targets() + jobs = [] + jobs.append(telegram_notify(message, TELEGRAM_GROUP_CHAT_ID)) + for target in targets: + if target.channel_type == 'telegram': + print("Sending telegram notification to:", target.channel_target) + jobs.append(telegram_notify(message, target.channel_target)) + elif target.channel_type == 'email': + print("Sending email notification to:", target.channel_target) + jobs.append(email_notify(message, title, target.channel_target)) + else: + print("Unknown channel type:", target.channel_type) + await asyncio.gather(*jobs) diff --git a/core/notifications/migrations/0001_initial.py b/core/notifications/migrations/0001_initial.py new file mode 100644 index 0000000..4d276eb --- /dev/null +++ b/core/notifications/migrations/0001_initial.py @@ -0,0 +1,51 @@ +# Generated by Django 4.2.7 on 2024-05-03 21:02 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + +from notifications.defaults import auto_reply_body, new_issue_notification, reply_issue_notification +from notifications.models import MessageTemplate + + +class Migration(migrations.Migration): + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + def create_required_templates(apps, schema_editor): + MessageTemplate.objects.create(name='auto_reply', message=auto_reply_body, marked_required=True) + MessageTemplate.objects.create(name='new_issue_notification', message=new_issue_notification, + marked_required=True) + MessageTemplate.objects.create(name='reply_issue_notification', message=reply_issue_notification, + marked_required=True) + + operations = [ + migrations.CreateModel( + name='MessageTemplate', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('message', models.TextField()), + ('created', models.DateTimeField(auto_now_add=True)), + ('marked_confidential', models.BooleanField(default=False)), + ('marked_required', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='UserNotificationChannel', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('channel_type', + models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)), + ('channel_target', models.CharField(max_length=255)), + ('event_filter', models.CharField(max_length=255)), + ('active', models.BooleanField(default=True)), + ('created', models.DateTimeField(auto_now_add=True)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.RunPython(create_required_templates), + ] diff --git a/core/notifications/migrations/__init__.py b/core/notifications/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notifications/models.py b/core/notifications/models.py new file mode 100644 index 0000000..9cbfbe5 --- /dev/null +++ b/core/notifications/models.py @@ -0,0 +1,29 @@ +from django.db import models + +from authentication.models import ExtendedUser + + +class MessageTemplate(models.Model): + name = models.CharField(max_length=255) + message = models.TextField() + created = models.DateTimeField(auto_now_add=True) + marked_confidential = models.BooleanField(default=False) + marked_required = models.BooleanField(default=False) # may not be deleted + + def __str__(self): + return self.name + + +class UserNotificationChannel(models.Model): + user = models.ForeignKey(ExtendedUser, models.CASCADE) + channel_type = models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255) + channel_target = models.CharField(max_length=255) + event_filter = models.CharField(max_length=255) + active = models.BooleanField(default=True) + created = models.DateTimeField(auto_now_add=True) + + def validate_constraints(self, exclude=None): # TODO: email -> emailaddress, telegram -> chatid + return True + + def __str__(self): + return self.user.username + '(' + self.channel_type + ')' diff --git a/core/notifications/templates.py b/core/notifications/templates.py new file mode 100644 index 0000000..af77193 --- /dev/null +++ b/core/notifications/templates.py @@ -0,0 +1,69 @@ +import jinja2 +from channels.db import database_sync_to_async +from core.settings import PRIMARY_HOST + +from notifications.models import MessageTemplate + +TEMPLATE_VARS = ['ticket_name', 'ticket_uuid', 'ticket_id', 'ticket_url', + 'current_state', 'previous_state', 'current_state_pretty', 'previous_state_pretty', + 'event_slug', 'event_name', + 'username', 'user_nick', + 'web_host'] # TODO customer_name, tracking_code + + +def limit_length(s, length=50): + if len(s) > length: + return s[:(length - 3)] + "..." + return s + + +def ticket_url(ticket): + eventslug = ticket.event.slug if ticket.event else "37C3" # TODO 37C3 should not be hardcoded + return f"https://{PRIMARY_HOST}/{eventslug}/ticket/{ticket.id}/" + + +def render_template(template, **kwargs): + try: + environment = jinja2.Environment() + environment.filters['limit_length'] = limit_length + tmpl = MessageTemplate.objects.get(name=template) + template = environment.from_string(tmpl.message) + return template.render(**kwargs, web_host=PRIMARY_HOST) + except MessageTemplate.DoesNotExist: + return None + + +def get_ticket_vars(ticket): + states = list(ticket.state_changes.order_by('-timestamp')) + return { + 'ticket_name': ticket.name, + 'ticket_uuid': ticket.short_uuid(), + 'ticket_id': ticket.id, + 'ticket_url': ticket_url(ticket), + 'current_state': states[0].state if states else 'none', + 'previous_state': states[1].state if len(states) > 1 else 'none', + 'current_state_pretty': states[0].get_state_display() if states else 'none', + 'previous_state_pretty': states[1].get_state_display() if len(states) > 1 else 'none', + 'event_slug': ticket.event.slug if ticket.event else "37C3", # TODO 37C3 should not be hardcoded + 'event_name': ticket.event.name if ticket.event else "37C3", + } + + +def render_auto_reply(ticket): + return render_template('auto_reply', **get_ticket_vars(ticket)) + + +def render_notification_new_ticket(ticket): + return render_template('new_issue_notification', **get_ticket_vars(ticket)) + + +def render_notification_reply_ticket(ticket): + return render_template('reply_issue_notification', **get_ticket_vars(ticket)) + + +async def render_notification_new_ticket_async(ticket): + return await database_sync_to_async(render_notification_new_ticket)(ticket) + + +async def render_notification_reply_ticket_async(ticket): + return await database_sync_to_async(render_notification_reply_ticket)(ticket) diff --git a/core/notifications/tests/__init__.py b/core/notifications/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notify_sessions/decorators.py b/core/notify_sessions/decorators.py new file mode 100644 index 0000000..c349c42 --- /dev/null +++ b/core/notify_sessions/decorators.py @@ -0,0 +1,21 @@ +from asgiref.sync import async_to_sync +from channels.layers import get_channel_layer + + +def notify_sessions(event, data): + def wrapper(func): + def wrapped(*args, **kwargs): + ret = func(*args, **kwargs) + channel_layer = get_channel_layer() + async_to_sync(channel_layer.group_send)( + event, + { + 'type': 'notify', + 'data': data, + } + ) + return ret + + return wrapped + + return wrapper diff --git a/core/server.py b/core/server.py old mode 100644 new mode 100755 index d08b595..a09e315 --- a/core/server.py +++ b/core/server.py @@ -12,6 +12,7 @@ django.setup() from helper import init_loop from mail.protocol import LMTPHandler from mail.socket import UnixSocketLMTPController +from notifications.dispatch import NotificationDispatcher class UvicornServer(uvicorn.Server): @@ -54,6 +55,11 @@ async def lmtp(loop): log.info("LMTP done") +async def notifications(loop): + dispatcher = NotificationDispatcher() + await dispatcher.run_forever() + + def main(): import sdnotify import setproctitle @@ -67,6 +73,7 @@ def main(): loop.create_task(web(loop)) # loop.create_task(tcp(loop)) loop.create_task(lmtp(loop)) + loop.create_task(notifications(loop)) n = sdnotify.SystemdNotifier() n.notify("READY=1") log.info("Server ready") diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py index aae37ba..1588307 100644 --- a/core/tickets/serializers.py +++ b/core/tickets/serializers.py @@ -52,6 +52,8 @@ class IssueSerializer(BasicIssueSerializer): ret = super().to_internal_value(data) if 'state' in data: ret['state'] = data['state'] + # if 'assigned_to' in data: + # ret['assigned_to'] = data['assigned_to'] return ret def validate(self, attrs): diff --git a/core/tickets/tests/v2/test_tickets.py b/core/tickets/tests/v2/test_tickets.py index 105de93..8ab081b 100644 --- a/core/tickets/tests/v2/test_tickets.py +++ b/core/tickets/tests/v2/test_tickets.py @@ -303,6 +303,16 @@ class IssueApiTest(TestCase): content_type='application/json') self.assertEqual(response.status_code, 400) + #def test_post_comment(self): + # issue = IssueThread.objects.create( + # name="test issue", + # ) + # response = self.client.post('/api/2/comments/', {'comment': 'test', 'issue_thread': issue.id}) + # self.assertEqual(response.status_code, 201) + # self.assertEqual(response.json()['comment'], 'test') + # self.assertEqual(response.json()['issue_thread'], issue.id) + # self.assertEqual(response.json()['timestamp'], response.json()['timestamp']) + def test_post_comment_altenative(self): issue = IssueThread.objects.create( name="test issue", diff --git a/deploy/ansible/playbooks/templates/django.env.j2 b/deploy/ansible/playbooks/templates/django.env.j2 index c9b1c83..748ecf4 100644 --- a/deploy/ansible/playbooks/templates/django.env.j2 +++ b/deploy/ansible/playbooks/templates/django.env.j2 @@ -13,3 +13,5 @@ STATIC_ROOT=/var/www/c3lf-sys3/staticfiles ACTIVE_SPAM_TRAINING=True DEBUG_MODE_ACTIVE={{ debug_mode_active }} DJANGO_SECRET_KEY={{ django_secret_key }} +TELEGRAM_GROUP_CHAT_ID={{ telegram_group_chat_id }} +TELEGRAM_BOT_TOKEN={{ telegram_bot_token }} \ No newline at end of file diff --git a/web/package.json b/web/package.json index 87f6d71..09596d6 100644 --- a/web/package.json +++ b/web/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@chenfengyuan/vue-qrcode": "^2.0.0", "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.6", diff --git a/web/src/components/CollapsableCards.vue b/web/src/components/CollapsableCards.vue index d1edab7..554a960 100644 --- a/web/src/components/CollapsableCards.vue +++ b/web/src/components/CollapsableCards.vue @@ -1,6 +1,31 @@ - + Dashboard +
  • + Settings +
  • Events
    • +
  • + Notifications +
  • Shipping
    • diff --git a/web/src/views/admin/Debug.vue b/web/src/views/admin/Debug.vue new file mode 100644 index 0000000..0c83e76 --- /dev/null +++ b/web/src/views/admin/Debug.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue new file mode 100644 index 0000000..cc2b615 --- /dev/null +++ b/web/src/views/admin/Notifications.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/web/src/views/admin/Settings.vue b/web/src/views/admin/Settings.vue new file mode 100644 index 0000000..2f15a83 --- /dev/null +++ b/web/src/views/admin/Settings.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file From 7083f4f7b7ef5752ae24eed6dd5de79acbb749af Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 26 Jun 2024 21:22:34 +0200 Subject: [PATCH 02/35] stash --- web/src/components/Timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue index 88bfa94..f3ac1d8 100644 --- a/web/src/components/Timeline.vue +++ b/web/src/components/Timeline.vue @@ -73,7 +73,7 @@ import TimelineMail from "@/components/TimelineMail.vue"; import TimelineComment from "@/components/TimelineComment.vue"; import TimelineStateChange from "@/components/TimelineStateChange.vue"; -import {mapActions, mapGetters} from "vuex"; +import {mapGetters} from "vuex"; import TimelineAssignment from "@/components/TimelineAssignment.vue"; import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue"; import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue"; From 33d368b5f4ebb5f1444e6b69f820536482ad4e38 Mon Sep 17 00:00:00 2001 From: jedi Date: Fri, 28 Jun 2024 00:49:09 +0200 Subject: [PATCH 03/35] stash --- core/notifications/api_v2.py | 15 ++++++++++++-- web/src/store.js | 10 ++++++++- web/src/views/admin/Notifications.vue | 30 +++++++++------------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py index f50a453..e459d01 100644 --- a/core/notifications/api_v2.py +++ b/core/notifications/api_v2.py @@ -5,7 +5,7 @@ from rest_framework.decorators import api_view, permission_classes from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response -from notifications.models import MessageTemplate +from notifications.models import MessageTemplate, UserNotificationChannel from rest_framework import serializers from notifications.templates import TEMPLATE_VARS @@ -17,11 +17,22 @@ class MessageTemplateSerializer(serializers.ModelSerializer): fields = '__all__' +class UserNotificationChannelSerializer(serializers.ModelSerializer): + class Meta: + model = UserNotificationChannel + fields = '__all__' + + class MessageTemplateViewSet(viewsets.ModelViewSet): serializer_class = MessageTemplateSerializer queryset = MessageTemplate.objects.all() +class UserNotificationChannelViewSet(viewsets.ModelViewSet): + serializer_class = UserNotificationChannelSerializer + queryset = UserNotificationChannel.objects.all() + + @api_view(['GET']) @permission_classes([IsAuthenticated]) @permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission @@ -31,7 +42,7 @@ def get_template_vars(self): router = routers.SimpleRouter() router.register(r'message_templates', MessageTemplateViewSet) - +router.register(r'user_notification_channels', UserNotificationChannelViewSet) urlpatterns = ([ re_path('message_template_variables', get_template_vars), ] + router.urls) diff --git a/web/src/store.js b/web/src/store.js index 3e96d65..c7c37a5 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -20,6 +20,7 @@ const store = createStore({ messageTemplates: [], messageTemplateVariables: [], shippingVouchers: [], + userNotificationChannels: [], loadedItems: {}, loadedTickets: {}, @@ -540,7 +541,14 @@ const store = createStore({ state.fetchedData.tickets = 0; await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]); } - } + }, + async fetchUserNotificationChannels({commit, state}) { + if (!state.user.token) return; + const {data, success} = await http.get('/2/user_notification_channels/', state.user.token); + if (data && success) { + state.userNotificationChannels = data; + } + }, }, plugins: [ persistentStatePlugin({ // TODO change remember to some kind of enable field diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index cc2b615..5a451fc 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,22 +1,9 @@ From 9320765bc51e6e15b870404ee12ee661fe8fb250 Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 29 Jun 2024 16:48:08 +0200 Subject: [PATCH 04/35] stash --- core/notifications/api_v2.py | 3 +++ web/src/views/admin/Notifications.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py index e459d01..a9492f5 100644 --- a/core/notifications/api_v2.py +++ b/core/notifications/api_v2.py @@ -9,6 +9,7 @@ from notifications.models import MessageTemplate, UserNotificationChannel from rest_framework import serializers from notifications.templates import TEMPLATE_VARS +from authentication.serializers import UserSerializer class MessageTemplateSerializer(serializers.ModelSerializer): @@ -18,6 +19,8 @@ class MessageTemplateSerializer(serializers.ModelSerializer): class UserNotificationChannelSerializer(serializers.ModelSerializer): + user = UserSerializer() + class Meta: model = UserNotificationChannel fields = '__all__' diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index 5a451fc..312a902 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,7 +1,7 @@ From f78518930422ead5feb7a2881ed3b3f4c3d9491b Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 13 Jul 2024 17:28:38 +0200 Subject: [PATCH 05/35] stash --- web/src/components/Timeline.vue | 2 +- web/src/store.js | 8 +++++- web/src/views/admin/Notifications.vue | 37 +++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue index f3ac1d8..88bfa94 100644 --- a/web/src/components/Timeline.vue +++ b/web/src/components/Timeline.vue @@ -73,7 +73,7 @@ import TimelineMail from "@/components/TimelineMail.vue"; import TimelineComment from "@/components/TimelineComment.vue"; import TimelineStateChange from "@/components/TimelineStateChange.vue"; -import {mapGetters} from "vuex"; +import {mapActions, mapGetters} from "vuex"; import TimelineAssignment from "@/components/TimelineAssignment.vue"; import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue"; import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue"; diff --git a/web/src/store.js b/web/src/store.js index c7c37a5..9ab6504 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -48,6 +48,7 @@ const store = createStore({ states: 0, messageTemplates: 0, shippingVouchers: 0, + userNotificationChannels: 0, }, persistent_loaded: false, shared_loaded: false, @@ -262,6 +263,10 @@ const store = createStore({ state.shippingVouchers = codes; state.fetchedData = {...state.fetchedData, shippingVouchers: Date.now()}; }, + setUserNotificationChannels(state, channels) { + state.userNotificationChannels = channels; + state.fetchedData = {...state.fetchedData, userNotificationChannels: Date.now()}; + }, }, actions: { async login({commit}, {username, password, remember}) { @@ -544,9 +549,10 @@ const store = createStore({ }, async fetchUserNotificationChannels({commit, state}) { if (!state.user.token) return; + if (state.fetchedData.userNotificationChannels > Date.now() - 1000 * 60 * 60 * 24) return; const {data, success} = await http.get('/2/user_notification_channels/', state.user.token); if (data && success) { - state.userNotificationChannels = data; + commit('setUserNotificationChannels', data); } }, }, diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index 312a902..71cb630 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,9 +1,36 @@ + + \ No newline at end of file diff --git a/web/src/store.js b/web/src/store.js index 9ab6504..87b13a5 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -359,6 +359,13 @@ const store = createStore({ commit('replaceEvents', [...state.events.filter(e => e.eid !== event_id)]) } }, + async updateEvent({commit, dispatch, state}, {id, partial_event}){ + console.log(id, partial_event); + const {data, success} = await http.patch(`/2/events/${id}/`, partial_event, state.user.token); + if (success) { + commit('replaceEvents', [...state.events.filter(e => e.eid !== id), data]) + } + }, async fetchTicketStates({commit, state, getters}) { if (!state.user.token) return; if (state.fetchedData.states > Date.now() - 1000 * 60 * 60 * 24) return; diff --git a/web/src/views/admin/Events.vue b/web/src/views/admin/Events.vue index 1aab608..e2ff952 100644 --- a/web/src/views/admin/Events.vue +++ b/web/src/views/admin/Events.vue @@ -1,50 +1,102 @@ \ No newline at end of file From f9e8ce11788f0f80b80d52b79f3dfe16e4861743 Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 6 Nov 2024 07:25:10 +0100 Subject: [PATCH 10/35] stash --- core/inventory/serializers.py | 33 ++++++++++++++++--- core/inventory/tests/v2/test_events.py | 13 +++++++- .../0006_alter_eventaddress_address.py | 18 ++++++++++ core/mail/models.py | 2 +- 4 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 core/mail/migrations/0006_alter_eventaddress_address.py diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 9a611f6..9ae2bbe 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -9,20 +9,43 @@ from mail.models import EventAddress from tickets.shared_serializers import BasicIssueSerializer -class EventAdressSerializer(serializers.ModelSerializer): - class Meta: - model = EventAddress - fields = ['address'] +#class EventAdressSerializer(serializers.ModelSerializer): +# class Meta: +# model = EventAddress +# fields = ['address'] + +# def to_internal_value(self, data): +# if not isinstance(data, str): +# raise serializers.ValidationError('This field must be a string.') +# +# def create(self, validated_data): +# return EventAddress.objects.create(**validated_data) +# +# def validate(self, data): +# return isinstance(data, str) + class EventSerializer(serializers.ModelSerializer): - addresses = EventAdressSerializer(many=True, required=False) + #addresses = EventAdressSerializer(many=True, required=False) + addresses = SlugRelatedField(many=True, slug_field='address', queryset=EventAddress.objects.all()) class Meta: model = Event fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] read_only_fields = ['id'] +# def update(self, instance, validated_data): +# addresses = validated_data.pop('addresses', None) +# instance.save(validated_data) +# if addresses: +# for address in addresses: +# nested_instance, created = EventAddress.objects.get_or_create(address=address) +# instance.addresses.add(nested_instance) +# +# return instance + + class ContainerSerializer(serializers.ModelSerializer): itemCount = serializers.SerializerMethodField() diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index 6d6cadb..55c6b90 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -47,6 +47,18 @@ class EventTestCase(TestCase): self.assertEqual(Event.objects.all()[0].slug, 'EVENT2') self.assertEqual(Event.objects.all()[0].name, 'Event 2 new') + def test_update_event(self): + from rest_framework.test import APIClient + event = Event.objects.create(slug='EVENT1', name='Event 1') + response = APIClient().patch(f'/api/2/events/{event.eid}/', {'addresses': ['foo@bar.baz', 'foo1@bar.baz']}) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json()['slug'], 'EVENT1') + self.assertEqual(response.json()['name'], 'Event 1') + self.assertEqual(len(Event.objects.all()), 1) + self.assertEqual(Event.objects.all()[0].slug, 'EVENT1') + self.assertEqual(Event.objects.all()[0].name, 'Event 1') + self.assertEqual(1, len(response.json()[0]['addresses'])) + def test_remove_event(self): event = Event.objects.create(slug='EVENT1', name='Event 1') Event.objects.create(slug='EVENT2', name='Event 2') @@ -65,4 +77,3 @@ class EventTestCase(TestCase): self.assertEqual('TEST1', response.json()[0]['slug']) self.assertEqual('Event', response.json()[0]['name']) self.assertEqual(1, len(response.json()[0]['addresses'])) - diff --git a/core/mail/migrations/0006_alter_eventaddress_address.py b/core/mail/migrations/0006_alter_eventaddress_address.py new file mode 100644 index 0000000..5a03261 --- /dev/null +++ b/core/mail/migrations/0006_alter_eventaddress_address.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-11-06 06:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mail', '0005_alter_eventaddress_event'), + ] + + operations = [ + migrations.AlterField( + model_name='eventaddress', + name='address', + field=models.CharField(max_length=255, unique=True), + ), + ] diff --git a/core/mail/models.py b/core/mail/models.py index 28524de..f8a3869 100644 --- a/core/mail/models.py +++ b/core/mail/models.py @@ -46,7 +46,7 @@ class Email(SoftDeleteModel): class EventAddress(models.Model): id = models.AutoField(primary_key=True) event = models.ForeignKey(Event, models.SET_NULL, null=True, related_name='addresses') - address = models.CharField(max_length=255) + address = models.CharField(max_length=255, unique=True) class EmailAttachment(AbstractFile): From 124713b98c27865c86b5e323e30999382b9d21ac Mon Sep 17 00:00:00 2001 From: jedi Date: Fri, 8 Nov 2024 22:23:52 +0100 Subject: [PATCH 11/35] save raw_mails as file --- core/mail/migrations/0007_email_raw_file.py | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 core/mail/migrations/0007_email_raw_file.py diff --git a/core/mail/migrations/0007_email_raw_file.py b/core/mail/migrations/0007_email_raw_file.py new file mode 100644 index 0000000..03d0db0 --- /dev/null +++ b/core/mail/migrations/0007_email_raw_file.py @@ -0,0 +1,36 @@ +# Generated by Django 4.2.7 on 2024-11-08 20:37 +from django.core.files.base import ContentFile +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mail', '0006_alter_eventaddress_address'), + ] + + def move_raw_mails_to_file(apps, schema_editor): + Email = apps.get_model('mail', 'Email') + for email in Email.objects.all(): + raw_content = email.raw + email.raw_file = ContentFile(raw_content) + email.raw = None + email.save() + + operations = [ + migrations.AddField( + model_name='email', + name='raw_file', + field=models.FileField(null=True, upload_to='raw_mail/'), + ), + migrations.RunPython(move_raw_mails_to_file), + migrations.RemoveField( + model_name='email', + name='raw', + ), + migrations.AlterField( + model_name='email', + name='raw_file', + field=models.FileField(upload_to='raw_mail/'), + ), + ] From f51c367ead07741cbb53ba23ad2375df95eeb42d Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 13 Nov 2024 23:01:12 +0100 Subject: [PATCH 12/35] stash --- .../0006_alter_eventaddress_address.py | 18 ---------- core/mail/migrations/0007_email_raw_file.py | 36 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 core/mail/migrations/0006_alter_eventaddress_address.py delete mode 100644 core/mail/migrations/0007_email_raw_file.py diff --git a/core/mail/migrations/0006_alter_eventaddress_address.py b/core/mail/migrations/0006_alter_eventaddress_address.py deleted file mode 100644 index 5a03261..0000000 --- a/core/mail/migrations/0006_alter_eventaddress_address.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-06 06:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('mail', '0005_alter_eventaddress_event'), - ] - - operations = [ - migrations.AlterField( - model_name='eventaddress', - name='address', - field=models.CharField(max_length=255, unique=True), - ), - ] diff --git a/core/mail/migrations/0007_email_raw_file.py b/core/mail/migrations/0007_email_raw_file.py deleted file mode 100644 index 03d0db0..0000000 --- a/core/mail/migrations/0007_email_raw_file.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-08 20:37 -from django.core.files.base import ContentFile -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('mail', '0006_alter_eventaddress_address'), - ] - - def move_raw_mails_to_file(apps, schema_editor): - Email = apps.get_model('mail', 'Email') - for email in Email.objects.all(): - raw_content = email.raw - email.raw_file = ContentFile(raw_content) - email.raw = None - email.save() - - operations = [ - migrations.AddField( - model_name='email', - name='raw_file', - field=models.FileField(null=True, upload_to='raw_mail/'), - ), - migrations.RunPython(move_raw_mails_to_file), - migrations.RemoveField( - model_name='email', - name='raw', - ), - migrations.AlterField( - model_name='email', - name='raw_file', - field=models.FileField(upload_to='raw_mail/'), - ), - ] From 4f08a2c2655535911525c96d0093f53f12937ae9 Mon Sep 17 00:00:00 2001 From: jedi Date: Tue, 19 Nov 2024 23:03:44 +0100 Subject: [PATCH 13/35] stash --- core/inventory/api_v2.py | 2 + ...ontainer_alter_item_event_itemplacement.py | 32 ++++++++++++++++ ..._alter_itemplacement_container_and_more.py | 29 +++++++++++++++ core/inventory/models.py | 37 +++++++++++++++++-- core/inventory/serializers.py | 9 ++--- core/inventory/tests/v2/test_events.py | 4 +- core/inventory/tests/v2/test_items.py | 2 +- .../0007_alter_eventaddress_address.py | 18 +++++++++ core/tickets/api_v2.py | 6 +-- .../0012_alter_itemrelation_item.py | 20 ++++++++++ 10 files changed, 145 insertions(+), 14 deletions(-) create mode 100644 core/inventory/migrations/0007_remove_item_container_alter_item_event_itemplacement.py create mode 100644 core/inventory/migrations/0008_alter_item_event_alter_itemplacement_container_and_more.py create mode 100644 core/mail/migrations/0007_alter_eventaddress_address.py create mode 100644 core/tickets/migrations/0012_alter_itemrelation_item.py diff --git a/core/inventory/api_v2.py b/core/inventory/api_v2.py index e1f643e..60f0292 100644 --- a/core/inventory/api_v2.py +++ b/core/inventory/api_v2.py @@ -67,6 +67,8 @@ def item(request, event_slug): return Response(status=400) except Event.DoesNotExist: return Response(status=404) + except KeyError: + return Response(status=400) @api_view(['GET', 'PUT', 'DELETE', 'PATCH']) diff --git a/core/inventory/migrations/0007_remove_item_container_alter_item_event_itemplacement.py b/core/inventory/migrations/0007_remove_item_container_alter_item_event_itemplacement.py new file mode 100644 index 0000000..7ea5d8e --- /dev/null +++ b/core/inventory/migrations/0007_remove_item_container_alter_item_event_itemplacement.py @@ -0,0 +1,32 @@ +# Generated by Django 4.2.7 on 2024-11-20 01:48 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0006_alter_event_table'), + ] + + operations = [ + migrations.RemoveField( + model_name='item', + name='container', + ), + migrations.AlterField( + model_name='item', + name='event', + field=models.ForeignKey(db_column='eid', on_delete=django.db.models.deletion.CASCADE, to='inventory.event'), + ), + migrations.CreateModel( + name='ItemPlacement', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('timestamp', models.DateTimeField(auto_now_add=True)), + ('container', models.ForeignKey(db_column='cid', on_delete=django.db.models.deletion.CASCADE, related_name='item_history', to='inventory.container')), + ('item', models.ForeignKey(db_column='iid', on_delete=django.db.models.deletion.CASCADE, related_name='container_history', to='inventory.item')), + ], + ), + ] diff --git a/core/inventory/migrations/0008_alter_item_event_alter_itemplacement_container_and_more.py b/core/inventory/migrations/0008_alter_item_event_alter_itemplacement_container_and_more.py new file mode 100644 index 0000000..2fae077 --- /dev/null +++ b/core/inventory/migrations/0008_alter_item_event_alter_itemplacement_container_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 4.2.7 on 2024-11-20 01:52 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0007_remove_item_container_alter_item_event_itemplacement'), + ] + + operations = [ + migrations.AlterField( + model_name='item', + name='event', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inventory.event'), + ), + migrations.AlterField( + model_name='itemplacement', + name='container', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='item_history', to='inventory.container'), + ), + migrations.AlterField( + model_name='itemplacement', + name='item', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='container_history', to='inventory.item'), + ), + ] diff --git a/core/inventory/models.py b/core/inventory/models.py index 3421680..50c1a5f 100644 --- a/core/inventory/models.py +++ b/core/inventory/models.py @@ -1,17 +1,21 @@ from itertools import groupby -from django.db import models +from django.core.files.base import ContentFile +from django.db import models, IntegrityError from django_softdelete.models import SoftDeleteModel, SoftDeleteManager class ItemManager(SoftDeleteManager): def create(self, **kwargs): + container = kwargs.pop('container') if 'uid_deprecated' in kwargs: raise ValueError('uid_deprecated must not be set manually') uid_deprecated = Item.all_objects.filter(event=kwargs['event']).count() + 1 kwargs['uid_deprecated'] = uid_deprecated - return super().create(**kwargs) + item = super().create(**kwargs) + item.container = container + return item def get_queryset(self): return super().get_queryset().filter(returned_at__isnull=True) @@ -22,11 +26,23 @@ class Item(SoftDeleteModel): uid_deprecated = models.IntegerField() description = models.TextField() event = models.ForeignKey('Event', models.CASCADE) - container = models.ForeignKey('Container', models.CASCADE) returned_at = models.DateTimeField(blank=True, null=True) created_at = models.DateTimeField(null=True, auto_now_add=True) updated_at = models.DateTimeField(blank=True, null=True) + @property + def container(self): + try: + return self.container_history.order_by('-timestamp').first().container + except AttributeError: + return None + + @container.setter + def container(self, value): + if self.container == value: + return + self.container_history.create(container=value) + @property def related_issues(self): groups = groupby(self.issue_relation_changes.all(), lambda rel: rel.issue_thread.id) @@ -53,10 +69,25 @@ class Container(SoftDeleteModel): created_at = models.DateTimeField(blank=True, null=True) updated_at = models.DateTimeField(blank=True, null=True) + @property + def items(self): + try: + history = self.item_history.order_by('-timestamp').all() + return [v for k, v in groupby(history, key=lambda item: item.item.id)] + except AttributeError: + return [] + def __str__(self): return '[' + str(self.id) + ']' + self.name +class ItemPlacement(models.Model): + id = models.AutoField(primary_key=True) + item = models.ForeignKey('Item', models.CASCADE, related_name='container_history') + container = models.ForeignKey('Container', models.CASCADE, related_name='item_history') + timestamp = models.DateTimeField(auto_now_add=True) + + class Event(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 9ae2bbe..e4d3252 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -9,7 +9,7 @@ from mail.models import EventAddress from tickets.shared_serializers import BasicIssueSerializer -#class EventAdressSerializer(serializers.ModelSerializer): +# class EventAdressSerializer(serializers.ModelSerializer): # class Meta: # model = EventAddress # fields = ['address'] @@ -25,9 +25,8 @@ from tickets.shared_serializers import BasicIssueSerializer # return isinstance(data, str) - class EventSerializer(serializers.ModelSerializer): - #addresses = EventAdressSerializer(many=True, required=False) + # addresses = EventAdressSerializer(many=True, required=False) addresses = SlugRelatedField(many=True, slug_field='address', queryset=EventAddress.objects.all()) class Meta: @@ -35,6 +34,7 @@ class EventSerializer(serializers.ModelSerializer): fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] read_only_fields = ['id'] + # def update(self, instance, validated_data): # addresses = validated_data.pop('addresses', None) # instance.save(validated_data) @@ -46,7 +46,6 @@ class EventSerializer(serializers.ModelSerializer): # return instance - class ContainerSerializer(serializers.ModelSerializer): itemCount = serializers.SerializerMethodField() @@ -56,7 +55,7 @@ class ContainerSerializer(serializers.ModelSerializer): read_only_fields = ['id', 'itemCount'] def get_itemCount(self, instance): - return Item.objects.filter(container=instance.id).count() + return len(instance.items) class ItemSerializer(BasicItemSerializer): diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index 55c6b90..11c17dc 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -50,14 +50,14 @@ class EventTestCase(TestCase): def test_update_event(self): from rest_framework.test import APIClient event = Event.objects.create(slug='EVENT1', name='Event 1') - response = APIClient().patch(f'/api/2/events/{event.eid}/', {'addresses': ['foo@bar.baz', 'foo1@bar.baz']}) + response = APIClient().patch(f'/api/2/events/{event.id}/', {'addresses': []})#'foo@bar.baz', 'foo1@bar.baz' self.assertEqual(response.status_code, 200) self.assertEqual(response.json()['slug'], 'EVENT1') self.assertEqual(response.json()['name'], 'Event 1') self.assertEqual(len(Event.objects.all()), 1) self.assertEqual(Event.objects.all()[0].slug, 'EVENT1') self.assertEqual(Event.objects.all()[0].name, 'Event 1') - self.assertEqual(1, len(response.json()[0]['addresses'])) + #self.assertEqual(1, len(response.json()[0]['addresses'])) def test_remove_event(self): event = Event.objects.create(slug='EVENT1', name='Event 1') diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py index 59a5a4e..144797a 100644 --- a/core/inventory/tests/v2/test_items.py +++ b/core/inventory/tests/v2/test_items.py @@ -239,7 +239,7 @@ class ItemSearchTestCase(TestCase): self.assertEqual('BOX', response.json()[0]['box']) self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(1, response.json()[0]['search_score']) - self.assertEqual(self.box.id, response.json()[1]['cid']) + self.assertEqual(self.item2.id, response.json()[1]['id']) self.assertEqual('def ghi', response.json()[1]['description']) self.assertEqual('BOX', response.json()[1]['box']) self.assertEqual(self.box.id, response.json()[1]['cid']) diff --git a/core/mail/migrations/0007_alter_eventaddress_address.py b/core/mail/migrations/0007_alter_eventaddress_address.py new file mode 100644 index 0000000..7b979a5 --- /dev/null +++ b/core/mail/migrations/0007_alter_eventaddress_address.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2024-11-18 01:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mail', '0006_email_raw_file'), + ] + + operations = [ + migrations.AlterField( + model_name='eventaddress', + name='address', + field=models.CharField(max_length=255, unique=True), + ), + ] diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 66c943a..7552a73 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -149,12 +149,12 @@ def filter_issues(issues, query): @api_view(['GET']) -@permission_classes([]) -# @permission_classes([IsAuthenticated]) -# @permission_required('view_item', raise_exception=True) +@permission_classes([IsAuthenticated]) def search_issues(request, event_slug, query): try: event = Event.objects.get(slug=event_slug) + if not request.user.has_event_perm(event, 'view_issuethread'): + return Response(status=403) items = filter_issues(IssueThread.objects.filter(event=event), b64decode(query).decode('utf-8')) return Response(SearchResultSerializer(items, many=True).data) except Event.DoesNotExist: diff --git a/core/tickets/migrations/0012_alter_itemrelation_item.py b/core/tickets/migrations/0012_alter_itemrelation_item.py new file mode 100644 index 0000000..a8ea2a5 --- /dev/null +++ b/core/tickets/migrations/0012_alter_itemrelation_item.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.7 on 2024-11-20 01:48 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0007_remove_item_container_alter_item_event_itemplacement'), + ('tickets', '0011_train_old_spam'), + ] + + operations = [ + migrations.AlterField( + model_name='itemrelation', + name='item', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_relations', to='inventory.item'), + ), + ] From f00afb86d6c52b34df31e54e9ee58fb68bc6658e Mon Sep 17 00:00:00 2001 From: jedi Date: Thu, 21 Nov 2024 00:34:00 +0100 Subject: [PATCH 14/35] stash --- core/tickets/api_v2.py | 4 +--- ...py => 0013_remove_issuethread_related_items_and_more.py} | 6 +++--- core/tickets/serializers.py | 3 --- core/tickets/tests/v2/test_tickets.py | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) rename core/tickets/migrations/{0012_remove_issuethread_related_items_and_more.py => 0013_remove_issuethread_related_items_and_more.py} (80%) diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 7552a73..008e0af 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -1,4 +1,3 @@ -import logging from base64 import b64decode from django.urls import re_path @@ -166,7 +165,6 @@ router.register(r'tickets', IssueViewSet, basename='issues') router.register(r'matches', RelationViewSet, basename='matches') router.register(r'shipping_vouchers', ShippingVoucherViewSet, basename='shipping_vouchers') - # [-A-Za-z0-9+/]*={0,3} urlpatterns = ([ re_path(r'tickets/states/$', get_available_states, name='get_available_states'), @@ -174,5 +172,5 @@ urlpatterns = ([ re_path(r'^tickets/(?P\d+)/comment/$', add_comment, name='add_comment'), re_path(r'^(?P[\w-]+)/tickets/manual/$', manual_ticket, name='manual_ticket'), re_path(r'^(?P[\w-]+)/tickets/(?P[-A-Za-z0-9+/]*={0,3})/$', search_issues, - name='search_issues'), + name='search_issues'), ] + router.urls) diff --git a/core/tickets/migrations/0012_remove_issuethread_related_items_and_more.py b/core/tickets/migrations/0013_remove_issuethread_related_items_and_more.py similarity index 80% rename from core/tickets/migrations/0012_remove_issuethread_related_items_and_more.py rename to core/tickets/migrations/0013_remove_issuethread_related_items_and_more.py index d8a24c7..29da48f 100644 --- a/core/tickets/migrations/0012_remove_issuethread_related_items_and_more.py +++ b/core/tickets/migrations/0013_remove_issuethread_related_items_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2024-11-20 23:58 +# Generated by Django 4.2.7 on 2024-11-20 23:34 from django.db import migrations, models import django.db.models.deletion @@ -7,8 +7,8 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('inventory', '0006_alter_event_table'), - ('tickets', '0011_train_old_spam'), + ('inventory', '0008_alter_item_event_alter_itemplacement_container_and_more'), + ('tickets', '0012_alter_itemrelation_item'), ] operations = [ diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py index 1588307..4539283 100644 --- a/core/tickets/serializers.py +++ b/core/tickets/serializers.py @@ -52,8 +52,6 @@ class IssueSerializer(BasicIssueSerializer): ret = super().to_internal_value(data) if 'state' in data: ret['state'] = data['state'] - # if 'assigned_to' in data: - # ret['assigned_to'] = data['assigned_to'] return ret def validate(self, attrs): @@ -133,7 +131,6 @@ class IssueSerializer(BasicIssueSerializer): return sorted(timeline, key=lambda x: x['timestamp']) - class SearchResultSerializer(serializers.Serializer): search_score = serializers.IntegerField() item = IssueSerializer() diff --git a/core/tickets/tests/v2/test_tickets.py b/core/tickets/tests/v2/test_tickets.py index 942d9cd..54bd3fe 100644 --- a/core/tickets/tests/v2/test_tickets.py +++ b/core/tickets/tests/v2/test_tickets.py @@ -303,8 +303,7 @@ class IssueApiTest(TestCase): content_type='application/json') self.assertEqual(response.status_code, 400) - - #def test_post_comment(self): + # def test_post_comment(self): # issue = IssueThread.objects.create( # name="test issue", # ) From 81a09595475cbce479a75187bd7cf7b36fee6e0e Mon Sep 17 00:00:00 2001 From: eleon Date: Thu, 21 Nov 2024 21:14:38 +0100 Subject: [PATCH 15/35] Speed up sql --- core/inventory/shared_serializers.py | 2 +- core/tickets/api_v2.py | 2 +- core/tickets/models.py | 12 ++++++++++-- core/tickets/serializers.py | 14 ++++++-------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/core/inventory/shared_serializers.py b/core/inventory/shared_serializers.py index 0bd44c3..2cafd5f 100644 --- a/core/inventory/shared_serializers.py +++ b/core/inventory/shared_serializers.py @@ -24,7 +24,7 @@ class BasicItemSerializer(serializers.ModelSerializer): def get_file(self, instance): if len(instance.files.all()) > 0: - return instance.files.all().order_by('-created_at')[0].hash + return sorted(instance.files.all(), key=lambda x: x.created_at, reverse=True)[0].hash return None def get_returned(self, instance): diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 1ed7e02..1f2696d 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -21,7 +21,7 @@ from tickets.shared_serializers import RelationSerializer class IssueViewSet(viewsets.ModelViewSet): serializer_class = IssueSerializer - queryset = IssueThread.objects.all() + queryset = IssueThread.objects.all().prefetch_related('state_changes', 'comments', 'emails', 'emails__attachments', 'assignments', 'assignments__assigned_to__username', 'item_relation_changes', 'shipping_vouchers') class RelationViewSet(viewsets.ModelViewSet): diff --git a/core/tickets/models.py b/core/tickets/models.py index 2c14687..f7ddb7b 100644 --- a/core/tickets/models.py +++ b/core/tickets/models.py @@ -52,7 +52,11 @@ class IssueThread(SoftDeleteModel): @property def state(self): try: - return self.state_changes.order_by('-timestamp').first().state + state_changes = sorted(self.state_changes.all(), key=lambda x: x.timestamp, reverse=True) + if state_changes: + return state_changes[0].state + else: + return None except AttributeError: return 'none' @@ -67,7 +71,11 @@ class IssueThread(SoftDeleteModel): @property def assigned_to(self): try: - return self.assignments.order_by('-timestamp').first().assigned_to + assignments = sorted(self.assignments.all(), key=lambda x: x.timestamp, reverse=True) + if assignments: + return assignments[0].assigned_to + else: + return None except AttributeError: return None diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py index aae37ba..b7d8b28 100644 --- a/core/tickets/serializers.py +++ b/core/tickets/serializers.py @@ -63,14 +63,12 @@ class IssueSerializer(BasicIssueSerializer): @staticmethod def get_last_activity(self): try: - last_state_change = self.state_changes.order_by('-timestamp').first().timestamp \ - if self.state_changes.count() > 0 else None - last_comment = self.comments.order_by('-timestamp').first().timestamp if self.comments.count() > 0 else None - last_mail = self.emails.order_by('-timestamp').first().timestamp if self.emails.count() > 0 else None - last_assignment = self.assignments.order_by('-timestamp').first().timestamp if \ - self.assignments.count() > 0 else None - last_relation = self.item_relation_changes.order_by('-timestamp').first().timestamp if \ - self.item_relation_changes.count() > 0 else None + last_state_change = max([t.timestamp for t in self.state_changes.all()]) if self.state_changes.exists() else None + last_comment = max([t.timestamp for t in self.comments.all()]) if self.comments.exists() else None + last_mail = max([t.timestamp for t in self.emails.all()]) if self.emails.exists() else None + last_assignment = max([t.timestamp for t in self.assignments.all()]) if self.assignments.exists() else None + + last_relation = max([t.timestamp for t in self.item_relation_changes.all()]) if self.item_relation_changes.exists() else None args = [x for x in [last_state_change, last_comment, last_mail, last_assignment, last_relation] if x is not None] return max(args) From 0eaff2266c0c214b46597b55b2e40072926740f2 Mon Sep 17 00:00:00 2001 From: jedi Date: Thu, 21 Nov 2024 22:37:49 +0100 Subject: [PATCH 16/35] fix untested error in /tickets endpoint --- core/tickets/api_v2.py | 2 +- core/tickets/tests/v2/test_tickets.py | 36 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 1f2696d..e90da49 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -21,7 +21,7 @@ from tickets.shared_serializers import RelationSerializer class IssueViewSet(viewsets.ModelViewSet): serializer_class = IssueSerializer - queryset = IssueThread.objects.all().prefetch_related('state_changes', 'comments', 'emails', 'emails__attachments', 'assignments', 'assignments__assigned_to__username', 'item_relation_changes', 'shipping_vouchers') + queryset = IssueThread.objects.all().prefetch_related('state_changes', 'comments', 'emails', 'emails__attachments', 'assignments', 'item_relation_changes', 'shipping_vouchers') class RelationViewSet(viewsets.ModelViewSet): diff --git a/core/tickets/tests/v2/test_tickets.py b/core/tickets/tests/v2/test_tickets.py index 105de93..9720625 100644 --- a/core/tickets/tests/v2/test_tickets.py +++ b/core/tickets/tests/v2/test_tickets.py @@ -5,7 +5,7 @@ from django.test import TestCase, Client from authentication.models import ExtendedUser from inventory.models import Event, Container, Item from mail.models import Email, EmailAttachment -from tickets.models import IssueThread, StateChange, Comment, ItemRelation +from tickets.models import IssueThread, StateChange, Comment, ItemRelation, Assignment from django.contrib.auth.models import Permission from knox.models import AuthToken @@ -53,19 +53,24 @@ class IssueApiTest(TestCase): in_reply_to=mail1.reference, timestamp=now + timedelta(seconds=2), ) + assignment = Assignment.objects.create( + issue_thread=issue, + assigned_to=self.user, + timestamp=now + timedelta(seconds=3), + ) comment = Comment.objects.create( issue_thread=issue, comment="test", - timestamp=now + timedelta(seconds=3), + timestamp=now + timedelta(seconds=4), ) match = ItemRelation.objects.create( issue_thread=issue, - item = self.item, + item=self.item, timestamp=now + timedelta(seconds=5), ) self.assertEqual('pending_new', issue.state) self.assertEqual('test issue', issue.name) - self.assertEqual(None, issue.assigned_to) + self.assertEqual(self.user, issue.assigned_to) self.assertEqual(36, len(issue.uuid)) response = self.client.get('/api/2/tickets/') self.assertEqual(response.status_code, 200) @@ -74,14 +79,16 @@ class IssueApiTest(TestCase): self.assertEqual(response.json()[0]['name'], "test issue") self.assertEqual(response.json()[0]['state'], "pending_new") self.assertEqual(response.json()[0]['event'], "evt") - self.assertEqual(response.json()[0]['assigned_to'], None) + self.assertEqual(response.json()[0]['assigned_to'], self.user.username) self.assertEqual(response.json()[0]['uuid'], issue.uuid) self.assertEqual(response.json()[0]['last_activity'], match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(len(response.json()[0]['timeline']), 5) + self.assertEqual(len(response.json()[0]['timeline']), 6) self.assertEqual(response.json()[0]['timeline'][0]['type'], 'state') self.assertEqual(response.json()[0]['timeline'][1]['type'], 'mail') self.assertEqual(response.json()[0]['timeline'][2]['type'], 'mail') - self.assertEqual(response.json()[0]['timeline'][3]['type'], 'comment') + self.assertEqual(response.json()[0]['timeline'][3]['type'], 'assignment') + self.assertEqual(response.json()[0]['timeline'][4]['type'], 'comment') + self.assertEqual(response.json()[0]['timeline'][5]['type'], 'item_relation') self.assertEqual(response.json()[0]['timeline'][1]['id'], mail1.id) self.assertEqual(response.json()[0]['timeline'][2]['id'], mail2.id) self.assertEqual(response.json()[0]['timeline'][3]['id'], comment.id) @@ -98,15 +105,18 @@ class IssueApiTest(TestCase): self.assertEqual(response.json()[0]['timeline'][2]['body'], 'test') self.assertEqual(response.json()[0]['timeline'][2]['timestamp'], mail2.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][3]['comment'], 'test') + self.assertEqual(response.json()[0]['timeline'][3]['assigned_to'], self.user.username) self.assertEqual(response.json()[0]['timeline'][3]['timestamp'], - comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][4]['status'], 'possible') + assignment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) + self.assertEqual(response.json()[0]['timeline'][4]['comment'], 'test') self.assertEqual(response.json()[0]['timeline'][4]['timestamp'], + comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) + self.assertEqual(response.json()[0]['timeline'][5]['status'], 'possible') + self.assertEqual(response.json()[0]['timeline'][5]['timestamp'], match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) - self.assertEqual(response.json()[0]['timeline'][4]['item']['description'], "foo") - self.assertEqual(response.json()[0]['timeline'][4]['item']['event'], "evt") - self.assertEqual(response.json()[0]['timeline'][4]['item']['box'], "box1") + self.assertEqual(response.json()[0]['timeline'][5]['item']['description'], "foo") + self.assertEqual(response.json()[0]['timeline'][5]['item']['event'], "evt") + self.assertEqual(response.json()[0]['timeline'][5]['item']['box'], "box1") self.assertEqual(response.json()[0]['related_items'][0]['description'], "foo") self.assertEqual(response.json()[0]['related_items'][0]['event'], "evt") self.assertEqual(response.json()[0]['related_items'][0]['box'], "box1") From 8786f4b845cae612a77b29cc468057ef8ac0ab9e Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 23 Nov 2024 00:59:45 +0100 Subject: [PATCH 17/35] ensure creation file date --- .../migrations/0003_ensure_creation_date.py | 24 +++++++++++++++++++ core/inventory/tests/v2/test_events.py | 4 ++-- core/inventory/tests/v2/test_items.py | 17 +++++++++++++ core/tickets/api_v2.py | 6 ++--- 4 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 core/files/migrations/0003_ensure_creation_date.py diff --git a/core/files/migrations/0003_ensure_creation_date.py b/core/files/migrations/0003_ensure_creation_date.py new file mode 100644 index 0000000..63e5760 --- /dev/null +++ b/core/files/migrations/0003_ensure_creation_date.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.7 on 2024-11-21 22:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ('files', '0002_alter_file_file'), + ] + + def set_creation_date(apps, schema_editor): + File = apps.get_model('files', 'File') + for file in File.objects.all(): + if file.created_at is None: + if not file.item.created_at is None: + file.created_at = file.item.created_at + else: + file.created_at = max(File.objects.filter( + id__lt=file.id, created_at__isnull=False).values_list('created_at', flat=True)) + file.save() + + operations = [ + migrations.RunPython(set_creation_date), + ] diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index 6d6cadb..48ddb01 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -55,10 +55,10 @@ class EventTestCase(TestCase): self.assertEqual(response.status_code, 204) self.assertEqual(len(Event.objects.all()), 1) - def test_items2(self): + def test_event_with_address(self): from mail.models import EventAddress event1 = Event.objects.create(slug='TEST1', name='Event') - EventAddress.objects.create(event=Event.objects.get(slug='TEST1'), address='foo@bar.baz') + EventAddress.objects.create(event=event1, address='foo@bar.baz') response = self.client.get('/api/2/events/') self.assertEqual(response.status_code, 200) self.assertEqual(1, len(response.json())) diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py index 59a5a4e..d289a70 100644 --- a/core/inventory/tests/v2/test_items.py +++ b/core/inventory/tests/v2/test_items.py @@ -56,6 +56,23 @@ class ItemTestCase(TestCase): self.assertEqual(response.json()[0]['event'], self.event.slug) self.assertEqual(len(response.json()[0]['related_issues']), 0) + def test_members_with_two_file(self): + import base64 + item = Item.objects.create(container=self.box, event=self.event, description='1') + file1 = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')) + file2 = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"bar").decode('utf-8')) + response = self.client.get(f'/api/2/{self.event.slug}/item/') + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.json()), 1) + self.assertEqual(response.json()[0]['id'], item.id) + self.assertEqual(response.json()[0]['description'], '1') + self.assertEqual(response.json()[0]['box'], 'BOX') + self.assertEqual(response.json()[0]['cid'], self.box.id) + self.assertEqual(response.json()[0]['file'], file2.hash) + self.assertEqual(response.json()[0]['returned'], False) + self.assertEqual(response.json()[0]['event'], self.event.slug) + self.assertEqual(len(response.json()[0]['related_issues']), 0) + def test_multi_members(self): Item.objects.create(container=self.box, event=self.event, description='1') Item.objects.create(container=self.box, event=self.event, description='2') diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index e90da49..415e045 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -148,12 +148,12 @@ def filter_issues(issues, query): @api_view(['GET']) -@permission_classes([]) -# @permission_classes([IsAuthenticated]) -# @permission_required('view_item', raise_exception=True) +@permission_classes([IsAuthenticated]) def search_issues(request, event_slug, query): try: event = Event.objects.get(slug=event_slug) + if not request.user.has_event_perm(event, 'view_issuethread'): + return Response(status=403) items = filter_issues(IssueThread.objects.filter(event=event), b64decode(query).decode('utf-8')) return Response(SearchResultSerializer(items, many=True).data) except Event.DoesNotExist: From e8887fee8b66d29226f8220c1b795e1cfdc7f0e9 Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 6 Nov 2024 21:11:18 +0100 Subject: [PATCH 18/35] add frontend to edit event details --- core/inventory/serializers.py | 16 ++-- core/inventory/tests/v2/test_events.py | 26 ++++++ web/src/components/ExpandableTable.vue | 124 +++++++++++++++++++++++++ web/src/store.js | 7 ++ web/src/views/admin/Events.vue | 106 +++++++++++++++------ 5 files changed, 245 insertions(+), 34 deletions(-) create mode 100644 web/src/components/ExpandableTable.vue diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 9a611f6..2611ce3 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -9,20 +9,22 @@ from mail.models import EventAddress from tickets.shared_serializers import BasicIssueSerializer -class EventAdressSerializer(serializers.ModelSerializer): - class Meta: - model = EventAddress - fields = ['address'] - - class EventSerializer(serializers.ModelSerializer): - addresses = EventAdressSerializer(many=True, required=False) + addresses = SlugRelatedField(many=True, slug_field='address', queryset=EventAddress.objects.all()) class Meta: model = Event fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] read_only_fields = ['id'] + def to_internal_value(self, data): + data = data.copy() + addresses = data.pop('addresses', None) + dict = super().to_internal_value(data) + if addresses: + dict['addresses'] = [EventAddress.objects.get_or_create(address=x)[0] for x in addresses] + return dict + class ContainerSerializer(serializers.ModelSerializer): itemCount = serializers.SerializerMethodField() diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index 48ddb01..bd58515 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -47,6 +47,20 @@ class EventTestCase(TestCase): self.assertEqual(Event.objects.all()[0].slug, 'EVENT2') self.assertEqual(Event.objects.all()[0].name, 'Event 2 new') + def test_update_event(self): + from rest_framework.test import APIClient + event = Event.objects.create(slug='EVENT1', name='Event 1') + response = APIClient().patch(f'/api/2/events/{event.id}/', {'addresses': ['foo@bar.baz', 'foo1@bar.baz']}) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json()['slug'], 'EVENT1') + self.assertEqual(response.json()['name'], 'Event 1') + self.assertEqual(2, len(response.json()['addresses'])) + self.assertEqual('foo@bar.baz', response.json()['addresses'][0]) + self.assertEqual('foo1@bar.baz', response.json()['addresses'][1]) + self.assertEqual(len(Event.objects.all()), 1) + self.assertEqual(Event.objects.all()[0].slug, 'EVENT1') + self.assertEqual(Event.objects.all()[0].name, 'Event 1') + def test_remove_event(self): event = Event.objects.create(slug='EVENT1', name='Event 1') Event.objects.create(slug='EVENT2', name='Event 2') @@ -66,3 +80,15 @@ class EventTestCase(TestCase): self.assertEqual('Event', response.json()[0]['name']) self.assertEqual(1, len(response.json()[0]['addresses'])) + def test_items_remove_addresss(self): + from mail.models import EventAddress + from rest_framework.test import APIClient + event1 = Event.objects.create(slug='TEST1', name='Event') + EventAddress.objects.create(event=event1, address='foo@bar.baz') + EventAddress.objects.create(event=event1, address='fo1o@bar.baz') + response = APIClient().patch(f'/api/2/events/{event1.id}/', {'addresses': ['foo1@bar.baz']}) + self.assertEqual(response.status_code, 200) + self.assertEqual('TEST1', response.json()['slug']) + self.assertEqual('Event', response.json()['name']) + self.assertEqual(1, len(response.json()['addresses'])) + self.assertEqual('foo1@bar.baz', response.json()['addresses'][0]) diff --git a/web/src/components/ExpandableTable.vue b/web/src/components/ExpandableTable.vue new file mode 100644 index 0000000..6bd5175 --- /dev/null +++ b/web/src/components/ExpandableTable.vue @@ -0,0 +1,124 @@ + + + + + \ No newline at end of file diff --git a/web/src/store.js b/web/src/store.js index dcc3aea..60dba61 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -339,6 +339,13 @@ const store = createStore({ commit('replaceEvents', [...state.events.filter(e => e.eid !== event_id)]) } }, + async updateEvent({commit, dispatch, state}, {id, partial_event}){ + console.log(id, partial_event); + const {data, success} = await http.patch(`/2/events/${id}/`, partial_event, state.user.token); + if (success) { + commit('replaceEvents', [...state.events.filter(e => e.eid !== id), data]) + } + }, async fetchTicketStates({commit, state, getters}) { if (!state.user.token) return; if (state.fetchedData.states > Date.now() - 1000 * 60 * 60 * 24) return; diff --git a/web/src/views/admin/Events.vue b/web/src/views/admin/Events.vue index 1aab608..e2ff952 100644 --- a/web/src/views/admin/Events.vue +++ b/web/src/views/admin/Events.vue @@ -1,50 +1,102 @@ \ No newline at end of file From d5eadbe4b1f384f7a91ad90b669548c7989d0c79 Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 23 Nov 2024 01:22:24 +0100 Subject: [PATCH 19/35] add timeline information to the /items endpoint --- core/inventory/api_v2.py | 2 + ...ve_item_container_itemplacement_comment.py | 36 ++++++++++++++ core/inventory/models.py | 48 +++++++++++++++++-- core/inventory/serializers.py | 26 +++++++++- core/inventory/tests/v2/test_items.py | 44 +++++++++++++++-- 5 files changed, 145 insertions(+), 11 deletions(-) create mode 100644 core/inventory/migrations/0007_remove_item_container_itemplacement_comment.py diff --git a/core/inventory/api_v2.py b/core/inventory/api_v2.py index e1f643e..60f0292 100644 --- a/core/inventory/api_v2.py +++ b/core/inventory/api_v2.py @@ -67,6 +67,8 @@ def item(request, event_slug): return Response(status=400) except Event.DoesNotExist: return Response(status=404) + except KeyError: + return Response(status=400) @api_view(['GET', 'PUT', 'DELETE', 'PATCH']) diff --git a/core/inventory/migrations/0007_remove_item_container_itemplacement_comment.py b/core/inventory/migrations/0007_remove_item_container_itemplacement_comment.py new file mode 100644 index 0000000..24c0f75 --- /dev/null +++ b/core/inventory/migrations/0007_remove_item_container_itemplacement_comment.py @@ -0,0 +1,36 @@ +# Generated by Django 4.2.7 on 2024-11-23 00:19 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0006_alter_event_table'), + ] + + operations = [ + migrations.RemoveField( + model_name='item', + name='container', + ), + migrations.CreateModel( + name='ItemPlacement', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('timestamp', models.DateTimeField(auto_now_add=True)), + ('container', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='item_history', to='inventory.container')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='container_history', to='inventory.item')), + ], + ), + migrations.CreateModel( + name='Comment', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('comment', models.TextField()), + ('timestamp', models.DateTimeField(auto_now_add=True)), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='inventory.item')), + ], + ), + ] diff --git a/core/inventory/models.py b/core/inventory/models.py index 3421680..fbbe0a9 100644 --- a/core/inventory/models.py +++ b/core/inventory/models.py @@ -7,11 +7,14 @@ from django_softdelete.models import SoftDeleteModel, SoftDeleteManager class ItemManager(SoftDeleteManager): def create(self, **kwargs): + container = kwargs.pop('container') if 'uid_deprecated' in kwargs: raise ValueError('uid_deprecated must not be set manually') uid_deprecated = Item.all_objects.filter(event=kwargs['event']).count() + 1 kwargs['uid_deprecated'] = uid_deprecated - return super().create(**kwargs) + item = super().create(**kwargs) + item.container = container + return item def get_queryset(self): return super().get_queryset().filter(returned_at__isnull=True) @@ -22,18 +25,28 @@ class Item(SoftDeleteModel): uid_deprecated = models.IntegerField() description = models.TextField() event = models.ForeignKey('Event', models.CASCADE) - container = models.ForeignKey('Container', models.CASCADE) returned_at = models.DateTimeField(blank=True, null=True) created_at = models.DateTimeField(null=True, auto_now_add=True) updated_at = models.DateTimeField(blank=True, null=True) + @property + def container(self): + try: + return self.container_history.order_by('-timestamp').first().container + except AttributeError: + return None + + @container.setter + def container(self, value): + if self.container == value: + return + self.container_history.create(container=value) + @property def related_issues(self): groups = groupby(self.issue_relation_changes.all(), lambda rel: rel.issue_thread.id) return [sorted(v, key=lambda r: r.timestamp)[0].issue_thread for k, v in groups] - - objects = ItemManager() all_objects = models.Manager() @@ -53,10 +66,35 @@ class Container(SoftDeleteModel): created_at = models.DateTimeField(blank=True, null=True) updated_at = models.DateTimeField(blank=True, null=True) + @property + def items(self): + try: + history = self.item_history.order_by('-timestamp').all() + return [v for k, v in groupby(history, key=lambda item: item.item.id)] + except AttributeError: + return [] + def __str__(self): return '[' + str(self.id) + ']' + self.name +class ItemPlacement(models.Model): + id = models.AutoField(primary_key=True) + item = models.ForeignKey('Item', models.CASCADE, related_name='container_history') + container = models.ForeignKey('Container', models.CASCADE, related_name='item_history') + timestamp = models.DateTimeField(auto_now_add=True) + + +class Comment(models.Model): + id = models.AutoField(primary_key=True) + item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name='comments') + comment = models.TextField() + timestamp = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return str(self.issue_thread) + ' comment #' + str(self.id) + + class Event(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(max_length=255) @@ -72,4 +110,4 @@ class Event(models.Model): return '[' + str(self.slug) + ']' + self.name class Meta: - db_table = 'common_event' \ No newline at end of file + db_table = 'common_event' diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 2611ce3..210ac0e 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -35,16 +35,18 @@ class ContainerSerializer(serializers.ModelSerializer): read_only_fields = ['id', 'itemCount'] def get_itemCount(self, instance): - return Item.objects.filter(container=instance.id).count() + return len(instance.items) class ItemSerializer(BasicItemSerializer): + timeline = serializers.SerializerMethodField() dataImage = serializers.CharField(write_only=True, required=False) related_issues = BasicIssueSerializer(many=True, read_only=True) class Meta: model = Item - fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues'] + fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues', + 'timeline'] read_only_fields = ['id'] def to_internal_value(self, data): @@ -86,6 +88,26 @@ class ItemSerializer(BasicItemSerializer): instance.files.add(file) return super().update(instance, validated_data) + @staticmethod + def get_timeline(obj): + timeline = [] + for comment in obj.comments.all(): + timeline.append({ + 'type': 'comment', + 'id': comment.id, + 'timestamp': comment.timestamp, + 'comment': comment.comment, + }) + for relation in (obj.issue_relation_changes.all()): + timeline.append({ + 'type': 'issue_relation', + 'id': relation.id, + 'status': relation.status, + 'timestamp': relation.timestamp, + 'issue_thread': BasicIssueSerializer(relation.issue_thread).data, + }) + return sorted(timeline, key=lambda x: x['timestamp']) + class SearchResultSerializer(serializers.Serializer): search_score = serializers.IntegerField() diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py index d289a70..8a38b86 100644 --- a/core/inventory/tests/v2/test_items.py +++ b/core/inventory/tests/v2/test_items.py @@ -1,3 +1,5 @@ +from datetime import datetime, timedelta + from django.utils import timezone from django.test import TestCase, Client from django.contrib.auth.models import Permission @@ -5,10 +7,12 @@ from knox.models import AuthToken from authentication.models import ExtendedUser from files.models import File -from inventory.models import Event, Container, Item +from inventory.models import Event, Container, Item, Comment from base64 import b64encode +from tickets.models import IssueThread, ItemRelation + class ItemTestCase(TestCase): @@ -20,14 +24,29 @@ class ItemTestCase(TestCase): self.user.user_permissions.add(*Permission.objects.all()) self.token = AuthToken.objects.create(user=self.user) self.client = Client(headers={'Authorization': 'Token ' + self.token[1]}) + self.issue = IssueThread.objects.create( + name="test issue", + event=self.event, + ) def test_empty(self): response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(response.content, b'[]') - def test_members(self): + def test_members_and_timeline(self): + now = datetime.now() item = Item.objects.create(container=self.box, event=self.event, description='1') + comment = Comment.objects.create( + item=item, + comment="test", + timestamp=now + timedelta(seconds=3), + ) + match = ItemRelation.objects.create( + issue_thread=self.issue, + item = item, + timestamp=now + timedelta(seconds=5), + ) response = self.client.get(f'/api/2/{self.event.slug}/item/') self.assertEqual(response.status_code, 200) self.assertEqual(len(response.json()), 1) @@ -38,7 +57,24 @@ class ItemTestCase(TestCase): self.assertEqual(response.json()[0]['file'], None) self.assertEqual(response.json()[0]['returned'], False) self.assertEqual(response.json()[0]['event'], self.event.slug) - self.assertEqual(len(response.json()[0]['related_issues']), 0) + self.assertEqual(len(response.json()[0]['timeline']), 2) + self.assertEqual(response.json()[0]['timeline'][0]['type'], 'comment') + self.assertEqual(response.json()[0]['timeline'][1]['type'], 'issue_relation') + self.assertEqual(response.json()[0]['timeline'][0]['id'], comment.id) + self.assertEqual(response.json()[0]['timeline'][1]['id'], match.id) + self.assertEqual(response.json()[0]['timeline'][0]['comment'], 'test') + self.assertEqual(response.json()[0]['timeline'][0]['timestamp'], + comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) + self.assertEqual(response.json()[0]['timeline'][1]['status'], 'possible') + self.assertEqual(response.json()[0]['timeline'][1]['timestamp'], + match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ')) + self.assertEqual(response.json()[0]['timeline'][1]['issue_thread']['name'], "test issue") + self.assertEqual(response.json()[0]['timeline'][1]['issue_thread']['event'], "EVENT") + self.assertEqual(response.json()[0]['timeline'][1]['issue_thread']['state'], "pending_new") + self.assertEqual(len(response.json()[0]['related_issues']), 1) + self.assertEqual(response.json()[0]['related_issues'][0]['name'], "test issue") + self.assertEqual(response.json()[0]['related_issues'][0]['event'], "EVENT") + self.assertEqual(response.json()[0]['related_issues'][0]['state'], "pending_new") def test_members_with_file(self): import base64 @@ -256,7 +292,7 @@ class ItemSearchTestCase(TestCase): self.assertEqual('BOX', response.json()[0]['box']) self.assertEqual(self.box.id, response.json()[0]['cid']) self.assertEqual(1, response.json()[0]['search_score']) - self.assertEqual(self.box.id, response.json()[1]['cid']) + self.assertEqual(self.item2.id, response.json()[1]['id']) self.assertEqual('def ghi', response.json()[1]['description']) self.assertEqual('BOX', response.json()[1]['box']) self.assertEqual(self.box.id, response.json()[1]['cid']) From 76119de05fe976c395bd72ff3d3d1f58f74fd995 Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 26 Jun 2024 18:42:56 +0200 Subject: [PATCH 20/35] stash --- core/authentication/admin.py | 3 + core/core/settings.py | 5 + core/core/urls.py | 1 + core/mail/models.py | 2 + core/mail/protocol.py | 46 +++++-- core/mail/tests/v2/test_user_notifications.py | 20 +++ core/notifications/__init__.py | 0 core/notifications/admin.py | 15 +++ core/notifications/api_v2.py | 37 ++++++ core/notifications/defaults.py | 16 +++ core/notifications/dispatch.py | 85 +++++++++++++ core/notifications/migrations/0001_initial.py | 51 ++++++++ core/notifications/migrations/__init__.py | 0 core/notifications/models.py | 29 +++++ core/notifications/templates.py | 69 ++++++++++ core/notifications/tests/__init__.py | 0 core/notify_sessions/decorators.py | 21 ++++ core/server.py | 7 ++ core/tickets/serializers.py | 2 + core/tickets/tests/v2/test_tickets.py | 10 ++ .../ansible/playbooks/templates/django.env.j2 | 2 + web/package.json | 1 + web/src/components/CollapsableCards.vue | 32 +++++ web/src/components/SlotTable.vue | 105 ++++++++++++++++ web/src/components/Toast.vue | 48 +++++++ web/src/components/inputs/FormatedText.vue | 112 +++++++++++++++++ web/src/main.js | 2 + web/src/router.js | 13 ++ web/src/store.js | 118 +++++++++++++++--- web/src/views/Tickets.vue | 10 +- web/src/views/admin/Admin.vue | 6 + web/src/views/admin/Debug.vue | 87 +++++++++++++ web/src/views/admin/Notifications.vue | 36 ++++++ web/src/views/admin/Settings.vue | 109 ++++++++++++++++ 34 files changed, 1066 insertions(+), 34 deletions(-) create mode 100644 core/mail/tests/v2/test_user_notifications.py create mode 100644 core/notifications/__init__.py create mode 100644 core/notifications/admin.py create mode 100644 core/notifications/api_v2.py create mode 100644 core/notifications/defaults.py create mode 100644 core/notifications/dispatch.py create mode 100644 core/notifications/migrations/0001_initial.py create mode 100644 core/notifications/migrations/__init__.py create mode 100644 core/notifications/models.py create mode 100644 core/notifications/templates.py create mode 100644 core/notifications/tests/__init__.py create mode 100644 core/notify_sessions/decorators.py mode change 100644 => 100755 core/server.py create mode 100644 web/src/components/SlotTable.vue create mode 100644 web/src/components/Toast.vue create mode 100644 web/src/components/inputs/FormatedText.vue create mode 100644 web/src/views/admin/Debug.vue create mode 100644 web/src/views/admin/Notifications.vue create mode 100644 web/src/views/admin/Settings.vue diff --git a/core/authentication/admin.py b/core/authentication/admin.py index 0024cb0..dfb4d20 100644 --- a/core/authentication/admin.py +++ b/core/authentication/admin.py @@ -10,5 +10,8 @@ class ExtendedUserAdmin(UserAdmin): ordering = ('username',) filter_horizontal = ('groups', 'user_permissions', 'permissions') +# def permissions(self, obj): +# return ', '.join(obj.get_all_permissions()) + admin.site.register(ExtendedUser, ExtendedUserAdmin) diff --git a/core/core/settings.py b/core/core/settings.py index 5a8f20f..94f15eb 100644 --- a/core/core/settings.py +++ b/core/core/settings.py @@ -49,6 +49,10 @@ SYSTEM3_VERSION = "0.0.0-dev.0" ACTIVE_SPAM_TRAINING = truthy_str(os.getenv('ACTIVE_SPAM_TRAINING', 'False')) +TELEGRAM_BOT_TOKEN = os.getenv('TELEGRAM_BOT_TOKEN', '1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi') + +TELEGRAM_GROUP_CHAT_ID = os.getenv('TELEGRAM_GROUP_CHAT_ID', '-1234567890') + # Application definition INSTALLED_APPS = [ @@ -65,6 +69,7 @@ INSTALLED_APPS = [ 'drf_yasg', 'channels', 'authentication', + 'notifications', 'files', 'tickets', 'inventory', diff --git a/core/core/urls.py b/core/core/urls.py index 1c5f158..d224e52 100644 --- a/core/core/urls.py +++ b/core/core/urls.py @@ -28,6 +28,7 @@ urlpatterns = [ path('api/2/', include('mail.api_v2')), path('api/2/', include('notify_sessions.api_v2')), path('api/2/', include('authentication.api_v2')), + path('api/2/', include('notifications.api_v2')), path('api/', get_info), path('', include('django_prometheus.urls')), ] diff --git a/core/mail/models.py b/core/mail/models.py index 36cd2b3..28524de 100644 --- a/core/mail/models.py +++ b/core/mail/models.py @@ -4,6 +4,8 @@ from django.db import models from django_softdelete.models import SoftDeleteModel from core.settings import MAIL_DOMAIN, ACTIVE_SPAM_TRAINING +from authentication.models import ExtendedUser +from core.settings import MAIL_DOMAIN from files.models import AbstractFile from inventory.models import Event from tickets.models import IssueThread diff --git a/core/mail/protocol.py b/core/mail/protocol.py index c5aaa4a..6b4dc6d 100644 --- a/core/mail/protocol.py +++ b/core/mail/protocol.py @@ -7,6 +7,7 @@ from channels.db import database_sync_to_async from django.core.files.base import ContentFile from mail.models import Email, EventAddress, EmailAttachment +from notifications.templates import render_auto_reply from notify_sessions.models import SystemEvent from tickets.models import IssueThread @@ -87,6 +88,22 @@ def make_reply(reply_email, references=None, event=None): return reply +def make_notification(message, to, title): # TODO where should replies to this go + from email.message import EmailMessage + from core.settings import MAIL_DOMAIN + notification = EmailMessage() + notification["From"] = "notifications@%s" % MAIL_DOMAIN + notification["To"] = to + notification["Subject"] = f"[C3LF Notification]%s" % title + # notification["Reply-To"] = f"{event}@{MAIL_DOMAIN}" + # notification["In-Reply-To"] = email.reference + # notification["Message-ID"] = email.id + "@" + MAIL_DOMAIN + + notification.set_content(message) + + return notification + + async def send_smtp(message): await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False) @@ -185,6 +202,16 @@ def receive_email(envelope, log=None): header_in_reply_to = parsed.get('In-Reply-To') header_message_id = parsed.get('Message-ID') + # if header_from != envelope.mail_from: + # log.warning("Header from does not match envelope from") + # log.info(f"Header from: {header_from}, envelope from: {envelope.mail_from}") + # + # if header_to != envelope.rcpt_tos[0]: + # log.warning("Header to does not match envelope to") + # log.info(f"Header to: {header_to}, envelope to: {envelope.rcpt_tos[0]}") + + # handle undelivered mail header_from : 'Mail Delivery System ") == "": log.warning("Ignoring mailer daemon") raise SpecialMailException("Ignoring mailer daemon") @@ -221,16 +248,7 @@ def receive_email(envelope, log=None): references = collect_references(active_issue_thread) if not sender.startswith('noreply'): subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]" - body = '''Your request (#{}) has been received and will be reviewed by our lost&found angels. - -We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \ -workload is high. We will not forget about your request and get back in touch once we have updated information on your \ -request. Requests for devices, wallets, credit cards or similar items will be handled with priority. - -If you happen to find your lost item or just want to add additional information, please reply to this email. Please \ -do not create a new request. - -Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid()) + body = render_auto_reply(active_issue_thread) reply_email = Email.objects.create( sender=recipient, recipient=sender, body=body, subject=subject, in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread) @@ -273,11 +291,19 @@ class LMTPHandler: 'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id, "message": "email received"}) log.info(f"Sent message to frontend") + if new and reply: log.info('Sending message to %s' % reply['To']) await send_smtp(reply) log.info("Sent auto reply") + if thread: + await channel_layer.group_send( + 'general', {"type": "generic.event", "name": "user_notification", "event_id": systemevent.id, + "ticket_id": thread.id, "new": new}) + else: + print("No thread found") + return '250 Message accepted for delivery' except SpecialMailException as e: import uuid diff --git a/core/mail/tests/v2/test_user_notifications.py b/core/mail/tests/v2/test_user_notifications.py new file mode 100644 index 0000000..c4db23f --- /dev/null +++ b/core/mail/tests/v2/test_user_notifications.py @@ -0,0 +1,20 @@ +from django.contrib.auth.models import Permission +from django.test import TestCase + +from authentication.models import ExtendedUser +from notifications.models import UserNotificationChannel + + +class UserNotificationTestCase(TestCase): + + def setUp(self): + super().setUp() + self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test') + self.user.user_permissions.add(*Permission.objects.all()) + self.user.save() + self.channel = UserNotificationChannel.objects.create(user=self.user, channel_type='telegram', + channel_target='123456789', + event_filter='*', active=True) + + async def test_telegram_notify(self): + pass diff --git a/core/notifications/__init__.py b/core/notifications/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notifications/admin.py b/core/notifications/admin.py new file mode 100644 index 0000000..69620a9 --- /dev/null +++ b/core/notifications/admin.py @@ -0,0 +1,15 @@ +from django.contrib import admin + +from notifications.models import MessageTemplate, UserNotificationChannel + + +class MessageTemplateAdmin(admin.ModelAdmin): + pass + + +class UserNotificationChannelAdmin(admin.ModelAdmin): + pass + + +admin.site.register(MessageTemplate, MessageTemplateAdmin) +admin.site.register(UserNotificationChannel, UserNotificationChannelAdmin) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py new file mode 100644 index 0000000..f50a453 --- /dev/null +++ b/core/notifications/api_v2.py @@ -0,0 +1,37 @@ +from django.contrib.auth.decorators import permission_required +from rest_framework import routers, viewsets +from django.urls import re_path +from rest_framework.decorators import api_view, permission_classes +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +from notifications.models import MessageTemplate +from rest_framework import serializers + +from notifications.templates import TEMPLATE_VARS + + +class MessageTemplateSerializer(serializers.ModelSerializer): + class Meta: + model = MessageTemplate + fields = '__all__' + + +class MessageTemplateViewSet(viewsets.ModelViewSet): + serializer_class = MessageTemplateSerializer + queryset = MessageTemplate.objects.all() + + +@api_view(['GET']) +@permission_classes([IsAuthenticated]) +@permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission +def get_template_vars(self): + return Response(TEMPLATE_VARS, status=200) + + +router = routers.SimpleRouter() +router.register(r'message_templates', MessageTemplateViewSet) + +urlpatterns = ([ + re_path('message_template_variables', get_template_vars), + ] + router.urls) diff --git a/core/notifications/defaults.py b/core/notifications/defaults.py new file mode 100644 index 0000000..812d93e --- /dev/null +++ b/core/notifications/defaults.py @@ -0,0 +1,16 @@ +auto_reply_body = '''Your request (#{{ ticket_uuid }}) has been received and will be reviewed by our lost&found angels. + +We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \ +workload is high. We will not forget about your request and get back in touch once we have updated information on your \ +request. Requests for devices, wallets, credit cards or similar items will be handled with priority. + +If you happen to find your lost item or just want to add additional information, please reply to this email. Please \ +do not create a new request. + +Your c3lf (Cloakroom + Lost&Found) Team''' + +new_issue_notification = '''New issue "{{ ticket_name | limit_length }}" [{{ ticket_uuid }}] created +{{ ticket_url }}''' + +reply_issue_notification = '''Reply to issue "{{ ticket_name }}" [{{ ticket_uuid }}] (was {{ previous_state_pretty }}) +{{ ticket_url }}''' diff --git a/core/notifications/dispatch.py b/core/notifications/dispatch.py new file mode 100644 index 0000000..752c342 --- /dev/null +++ b/core/notifications/dispatch.py @@ -0,0 +1,85 @@ +import asyncio + +from aiohttp.client import ClientSession +from channels.layers import get_channel_layer +from channels.db import database_sync_to_async +from urllib.parse import quote as urlencode + +from core.settings import TELEGRAM_BOT_TOKEN, TELEGRAM_GROUP_CHAT_ID +from mail.protocol import send_smtp, make_notification +from notifications.models import UserNotificationChannel +from notifications.templates import render_notification_new_ticket_async, render_notification_reply_ticket_async +from tickets.models import IssueThread + + +async def http_get(url): + async with ClientSession() as session: + async with session.get(url) as response: + return await response.text() + + +async def telegram_notify(message, chat_id): + encoded_message = urlencode(message) + url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage?chat_id={chat_id}&text={encoded_message}" + return await http_get(url) + + +async def email_notify(message, title, email): + mail = make_notification(message, email, title) + await send_smtp(mail) + + +class NotificationDispatcher: + channel_layer = None + room_group_name = "general" + + def __init__(self): + self.channel_layer = get_channel_layer('default') + if not self.channel_layer: + raise Exception("Could not get channel layer") + + @database_sync_to_async + def get_notification_targets(self): + channels = UserNotificationChannel.objects.filter(active=True) + return list(channels) + + @database_sync_to_async + def get_ticket(self, ticket_id): + return IssueThread.objects.filter(id=ticket_id).select_related('event').first() + + async def run_forever(self): + # Infinite loop to continuously listen for messages + print("Listening for messages...") + channel_name = await self.channel_layer.new_channel() + await self.channel_layer.group_add(self.room_group_name, channel_name) + print("Channel name:", channel_name) + while True: + # Blocking receive to get the message from the channel layer + message = await self.channel_layer.receive(channel_name) + + if (message and 'type' in message and message['type'] == 'generic.event' and 'name' in message and + message['name'] == 'user_notification'): + if 'ticket_id' in message and 'event_id' in message and 'new' in message: + ticket = await self.get_ticket(message['ticket_id']) + await self.dispatch(ticket, message['event_id'], message['new']) + else: + print("Error: Invalid message format") + + async def dispatch(self, ticket, event_id, new): + message = await render_notification_new_ticket_async( + ticket) if new else await render_notification_reply_ticket_async(ticket) + title = f"[#{ticket.short_uuid()}] {ticket.name}" + print("Dispatching message:", message, "with event_id:", event_id) + targets = await self.get_notification_targets() + jobs = [] + jobs.append(telegram_notify(message, TELEGRAM_GROUP_CHAT_ID)) + for target in targets: + if target.channel_type == 'telegram': + print("Sending telegram notification to:", target.channel_target) + jobs.append(telegram_notify(message, target.channel_target)) + elif target.channel_type == 'email': + print("Sending email notification to:", target.channel_target) + jobs.append(email_notify(message, title, target.channel_target)) + else: + print("Unknown channel type:", target.channel_type) + await asyncio.gather(*jobs) diff --git a/core/notifications/migrations/0001_initial.py b/core/notifications/migrations/0001_initial.py new file mode 100644 index 0000000..4d276eb --- /dev/null +++ b/core/notifications/migrations/0001_initial.py @@ -0,0 +1,51 @@ +# Generated by Django 4.2.7 on 2024-05-03 21:02 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + +from notifications.defaults import auto_reply_body, new_issue_notification, reply_issue_notification +from notifications.models import MessageTemplate + + +class Migration(migrations.Migration): + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + def create_required_templates(apps, schema_editor): + MessageTemplate.objects.create(name='auto_reply', message=auto_reply_body, marked_required=True) + MessageTemplate.objects.create(name='new_issue_notification', message=new_issue_notification, + marked_required=True) + MessageTemplate.objects.create(name='reply_issue_notification', message=reply_issue_notification, + marked_required=True) + + operations = [ + migrations.CreateModel( + name='MessageTemplate', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('message', models.TextField()), + ('created', models.DateTimeField(auto_now_add=True)), + ('marked_confidential', models.BooleanField(default=False)), + ('marked_required', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='UserNotificationChannel', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('channel_type', + models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)), + ('channel_target', models.CharField(max_length=255)), + ('event_filter', models.CharField(max_length=255)), + ('active', models.BooleanField(default=True)), + ('created', models.DateTimeField(auto_now_add=True)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.RunPython(create_required_templates), + ] diff --git a/core/notifications/migrations/__init__.py b/core/notifications/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notifications/models.py b/core/notifications/models.py new file mode 100644 index 0000000..9cbfbe5 --- /dev/null +++ b/core/notifications/models.py @@ -0,0 +1,29 @@ +from django.db import models + +from authentication.models import ExtendedUser + + +class MessageTemplate(models.Model): + name = models.CharField(max_length=255) + message = models.TextField() + created = models.DateTimeField(auto_now_add=True) + marked_confidential = models.BooleanField(default=False) + marked_required = models.BooleanField(default=False) # may not be deleted + + def __str__(self): + return self.name + + +class UserNotificationChannel(models.Model): + user = models.ForeignKey(ExtendedUser, models.CASCADE) + channel_type = models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255) + channel_target = models.CharField(max_length=255) + event_filter = models.CharField(max_length=255) + active = models.BooleanField(default=True) + created = models.DateTimeField(auto_now_add=True) + + def validate_constraints(self, exclude=None): # TODO: email -> emailaddress, telegram -> chatid + return True + + def __str__(self): + return self.user.username + '(' + self.channel_type + ')' diff --git a/core/notifications/templates.py b/core/notifications/templates.py new file mode 100644 index 0000000..af77193 --- /dev/null +++ b/core/notifications/templates.py @@ -0,0 +1,69 @@ +import jinja2 +from channels.db import database_sync_to_async +from core.settings import PRIMARY_HOST + +from notifications.models import MessageTemplate + +TEMPLATE_VARS = ['ticket_name', 'ticket_uuid', 'ticket_id', 'ticket_url', + 'current_state', 'previous_state', 'current_state_pretty', 'previous_state_pretty', + 'event_slug', 'event_name', + 'username', 'user_nick', + 'web_host'] # TODO customer_name, tracking_code + + +def limit_length(s, length=50): + if len(s) > length: + return s[:(length - 3)] + "..." + return s + + +def ticket_url(ticket): + eventslug = ticket.event.slug if ticket.event else "37C3" # TODO 37C3 should not be hardcoded + return f"https://{PRIMARY_HOST}/{eventslug}/ticket/{ticket.id}/" + + +def render_template(template, **kwargs): + try: + environment = jinja2.Environment() + environment.filters['limit_length'] = limit_length + tmpl = MessageTemplate.objects.get(name=template) + template = environment.from_string(tmpl.message) + return template.render(**kwargs, web_host=PRIMARY_HOST) + except MessageTemplate.DoesNotExist: + return None + + +def get_ticket_vars(ticket): + states = list(ticket.state_changes.order_by('-timestamp')) + return { + 'ticket_name': ticket.name, + 'ticket_uuid': ticket.short_uuid(), + 'ticket_id': ticket.id, + 'ticket_url': ticket_url(ticket), + 'current_state': states[0].state if states else 'none', + 'previous_state': states[1].state if len(states) > 1 else 'none', + 'current_state_pretty': states[0].get_state_display() if states else 'none', + 'previous_state_pretty': states[1].get_state_display() if len(states) > 1 else 'none', + 'event_slug': ticket.event.slug if ticket.event else "37C3", # TODO 37C3 should not be hardcoded + 'event_name': ticket.event.name if ticket.event else "37C3", + } + + +def render_auto_reply(ticket): + return render_template('auto_reply', **get_ticket_vars(ticket)) + + +def render_notification_new_ticket(ticket): + return render_template('new_issue_notification', **get_ticket_vars(ticket)) + + +def render_notification_reply_ticket(ticket): + return render_template('reply_issue_notification', **get_ticket_vars(ticket)) + + +async def render_notification_new_ticket_async(ticket): + return await database_sync_to_async(render_notification_new_ticket)(ticket) + + +async def render_notification_reply_ticket_async(ticket): + return await database_sync_to_async(render_notification_reply_ticket)(ticket) diff --git a/core/notifications/tests/__init__.py b/core/notifications/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/notify_sessions/decorators.py b/core/notify_sessions/decorators.py new file mode 100644 index 0000000..c349c42 --- /dev/null +++ b/core/notify_sessions/decorators.py @@ -0,0 +1,21 @@ +from asgiref.sync import async_to_sync +from channels.layers import get_channel_layer + + +def notify_sessions(event, data): + def wrapper(func): + def wrapped(*args, **kwargs): + ret = func(*args, **kwargs) + channel_layer = get_channel_layer() + async_to_sync(channel_layer.group_send)( + event, + { + 'type': 'notify', + 'data': data, + } + ) + return ret + + return wrapped + + return wrapper diff --git a/core/server.py b/core/server.py old mode 100644 new mode 100755 index d08b595..a09e315 --- a/core/server.py +++ b/core/server.py @@ -12,6 +12,7 @@ django.setup() from helper import init_loop from mail.protocol import LMTPHandler from mail.socket import UnixSocketLMTPController +from notifications.dispatch import NotificationDispatcher class UvicornServer(uvicorn.Server): @@ -54,6 +55,11 @@ async def lmtp(loop): log.info("LMTP done") +async def notifications(loop): + dispatcher = NotificationDispatcher() + await dispatcher.run_forever() + + def main(): import sdnotify import setproctitle @@ -67,6 +73,7 @@ def main(): loop.create_task(web(loop)) # loop.create_task(tcp(loop)) loop.create_task(lmtp(loop)) + loop.create_task(notifications(loop)) n = sdnotify.SystemdNotifier() n.notify("READY=1") log.info("Server ready") diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py index b7d8b28..2c9e9da 100644 --- a/core/tickets/serializers.py +++ b/core/tickets/serializers.py @@ -52,6 +52,8 @@ class IssueSerializer(BasicIssueSerializer): ret = super().to_internal_value(data) if 'state' in data: ret['state'] = data['state'] + # if 'assigned_to' in data: + # ret['assigned_to'] = data['assigned_to'] return ret def validate(self, attrs): diff --git a/core/tickets/tests/v2/test_tickets.py b/core/tickets/tests/v2/test_tickets.py index 9720625..161cbfe 100644 --- a/core/tickets/tests/v2/test_tickets.py +++ b/core/tickets/tests/v2/test_tickets.py @@ -313,6 +313,16 @@ class IssueApiTest(TestCase): content_type='application/json') self.assertEqual(response.status_code, 400) + #def test_post_comment(self): + # issue = IssueThread.objects.create( + # name="test issue", + # ) + # response = self.client.post('/api/2/comments/', {'comment': 'test', 'issue_thread': issue.id}) + # self.assertEqual(response.status_code, 201) + # self.assertEqual(response.json()['comment'], 'test') + # self.assertEqual(response.json()['issue_thread'], issue.id) + # self.assertEqual(response.json()['timestamp'], response.json()['timestamp']) + def test_post_comment_altenative(self): issue = IssueThread.objects.create( name="test issue", diff --git a/deploy/ansible/playbooks/templates/django.env.j2 b/deploy/ansible/playbooks/templates/django.env.j2 index c9b1c83..748ecf4 100644 --- a/deploy/ansible/playbooks/templates/django.env.j2 +++ b/deploy/ansible/playbooks/templates/django.env.j2 @@ -13,3 +13,5 @@ STATIC_ROOT=/var/www/c3lf-sys3/staticfiles ACTIVE_SPAM_TRAINING=True DEBUG_MODE_ACTIVE={{ debug_mode_active }} DJANGO_SECRET_KEY={{ django_secret_key }} +TELEGRAM_GROUP_CHAT_ID={{ telegram_group_chat_id }} +TELEGRAM_BOT_TOKEN={{ telegram_bot_token }} \ No newline at end of file diff --git a/web/package.json b/web/package.json index 87f6d71..09596d6 100644 --- a/web/package.json +++ b/web/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@chenfengyuan/vue-qrcode": "^2.0.0", "@fortawesome/fontawesome-svg-core": "^6.5.1", "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/vue-fontawesome": "^3.0.6", diff --git a/web/src/components/CollapsableCards.vue b/web/src/components/CollapsableCards.vue index d1edab7..554a960 100644 --- a/web/src/components/CollapsableCards.vue +++ b/web/src/components/CollapsableCards.vue @@ -1,6 +1,31 @@ - + Dashboard +
  • + Settings +
  • Events
    • +
  • + Notifications +
  • Shipping
    • diff --git a/web/src/views/admin/Debug.vue b/web/src/views/admin/Debug.vue new file mode 100644 index 0000000..0c83e76 --- /dev/null +++ b/web/src/views/admin/Debug.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue new file mode 100644 index 0000000..cc2b615 --- /dev/null +++ b/web/src/views/admin/Notifications.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/web/src/views/admin/Settings.vue b/web/src/views/admin/Settings.vue new file mode 100644 index 0000000..2f15a83 --- /dev/null +++ b/web/src/views/admin/Settings.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file From 6ac49458f464ce7529aeedc3ca9bd5437f5568e8 Mon Sep 17 00:00:00 2001 From: jedi Date: Wed, 26 Jun 2024 21:22:34 +0200 Subject: [PATCH 21/35] stash --- web/src/components/Timeline.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue index 88bfa94..f3ac1d8 100644 --- a/web/src/components/Timeline.vue +++ b/web/src/components/Timeline.vue @@ -73,7 +73,7 @@ import TimelineMail from "@/components/TimelineMail.vue"; import TimelineComment from "@/components/TimelineComment.vue"; import TimelineStateChange from "@/components/TimelineStateChange.vue"; -import {mapActions, mapGetters} from "vuex"; +import {mapGetters} from "vuex"; import TimelineAssignment from "@/components/TimelineAssignment.vue"; import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue"; import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue"; From c5e59a3b2b2a216d609d2c6b455d80e45d70b4fd Mon Sep 17 00:00:00 2001 From: jedi Date: Fri, 28 Jun 2024 00:49:09 +0200 Subject: [PATCH 22/35] stash --- core/notifications/api_v2.py | 15 ++++++++++++-- web/src/store.js | 10 ++++++++- web/src/views/admin/Notifications.vue | 30 +++++++++------------------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py index f50a453..e459d01 100644 --- a/core/notifications/api_v2.py +++ b/core/notifications/api_v2.py @@ -5,7 +5,7 @@ from rest_framework.decorators import api_view, permission_classes from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response -from notifications.models import MessageTemplate +from notifications.models import MessageTemplate, UserNotificationChannel from rest_framework import serializers from notifications.templates import TEMPLATE_VARS @@ -17,11 +17,22 @@ class MessageTemplateSerializer(serializers.ModelSerializer): fields = '__all__' +class UserNotificationChannelSerializer(serializers.ModelSerializer): + class Meta: + model = UserNotificationChannel + fields = '__all__' + + class MessageTemplateViewSet(viewsets.ModelViewSet): serializer_class = MessageTemplateSerializer queryset = MessageTemplate.objects.all() +class UserNotificationChannelViewSet(viewsets.ModelViewSet): + serializer_class = UserNotificationChannelSerializer + queryset = UserNotificationChannel.objects.all() + + @api_view(['GET']) @permission_classes([IsAuthenticated]) @permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission @@ -31,7 +42,7 @@ def get_template_vars(self): router = routers.SimpleRouter() router.register(r'message_templates', MessageTemplateViewSet) - +router.register(r'user_notification_channels', UserNotificationChannelViewSet) urlpatterns = ([ re_path('message_template_variables', get_template_vars), ] + router.urls) diff --git a/web/src/store.js b/web/src/store.js index 1365151..cb08834 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -20,6 +20,7 @@ const store = createStore({ messageTemplates: [], messageTemplateVariables: [], shippingVouchers: [], + userNotificationChannels: [], loadedItems: {}, loadedTickets: {}, @@ -547,7 +548,14 @@ const store = createStore({ state.fetchedData.tickets = 0; await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]); } - } + }, + async fetchUserNotificationChannels({commit, state}) { + if (!state.user.token) return; + const {data, success} = await http.get('/2/user_notification_channels/', state.user.token); + if (data && success) { + state.userNotificationChannels = data; + } + }, }, plugins: [ persistentStatePlugin({ // TODO change remember to some kind of enable field diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index cc2b615..5a451fc 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,22 +1,9 @@ From 3e038328671bee0a48be389bc42dfb6de0776b45 Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 29 Jun 2024 16:48:08 +0200 Subject: [PATCH 23/35] stash --- core/notifications/api_v2.py | 3 +++ web/src/views/admin/Notifications.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/notifications/api_v2.py b/core/notifications/api_v2.py index e459d01..a9492f5 100644 --- a/core/notifications/api_v2.py +++ b/core/notifications/api_v2.py @@ -9,6 +9,7 @@ from notifications.models import MessageTemplate, UserNotificationChannel from rest_framework import serializers from notifications.templates import TEMPLATE_VARS +from authentication.serializers import UserSerializer class MessageTemplateSerializer(serializers.ModelSerializer): @@ -18,6 +19,8 @@ class MessageTemplateSerializer(serializers.ModelSerializer): class UserNotificationChannelSerializer(serializers.ModelSerializer): + user = UserSerializer() + class Meta: model = UserNotificationChannel fields = '__all__' diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index 5a451fc..312a902 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,7 +1,7 @@ From e311f87d5d5fb9f2ea93ff0bcd9b6870119cccc2 Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 13 Jul 2024 17:28:38 +0200 Subject: [PATCH 24/35] stash --- web/src/components/Timeline.vue | 2 +- web/src/store.js | 8 +++++- web/src/views/admin/Notifications.vue | 37 +++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue index f3ac1d8..88bfa94 100644 --- a/web/src/components/Timeline.vue +++ b/web/src/components/Timeline.vue @@ -73,7 +73,7 @@ import TimelineMail from "@/components/TimelineMail.vue"; import TimelineComment from "@/components/TimelineComment.vue"; import TimelineStateChange from "@/components/TimelineStateChange.vue"; -import {mapGetters} from "vuex"; +import {mapActions, mapGetters} from "vuex"; import TimelineAssignment from "@/components/TimelineAssignment.vue"; import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue"; import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue"; diff --git a/web/src/store.js b/web/src/store.js index cb08834..87b13a5 100644 --- a/web/src/store.js +++ b/web/src/store.js @@ -48,6 +48,7 @@ const store = createStore({ states: 0, messageTemplates: 0, shippingVouchers: 0, + userNotificationChannels: 0, }, persistent_loaded: false, shared_loaded: false, @@ -262,6 +263,10 @@ const store = createStore({ state.shippingVouchers = codes; state.fetchedData = {...state.fetchedData, shippingVouchers: Date.now()}; }, + setUserNotificationChannels(state, channels) { + state.userNotificationChannels = channels; + state.fetchedData = {...state.fetchedData, userNotificationChannels: Date.now()}; + }, }, actions: { async login({commit}, {username, password, remember}) { @@ -551,9 +556,10 @@ const store = createStore({ }, async fetchUserNotificationChannels({commit, state}) { if (!state.user.token) return; + if (state.fetchedData.userNotificationChannels > Date.now() - 1000 * 60 * 60 * 24) return; const {data, success} = await http.get('/2/user_notification_channels/', state.user.token); if (data && success) { - state.userNotificationChannels = data; + commit('setUserNotificationChannels', data); } }, }, diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue index 312a902..71cb630 100644 --- a/web/src/views/admin/Notifications.vue +++ b/web/src/views/admin/Notifications.vue @@ -1,9 +1,36 @@ + + \ No newline at end of file diff --git a/web/src/components/inputs/InputCombo.vue b/web/src/components/inputs/InputCombo.vue index 50b5459..9a2c5fc 100644 --- a/web/src/components/inputs/InputCombo.vue +++ b/web/src/components/inputs/InputCombo.vue @@ -1,6 +1,4 @@ + + diff --git a/web/src/views/Items.vue b/web/src/views/Items.vue index 2f9e5ed..e3ba0a0 100644 --- a/web/src/views/Items.vue +++ b/web/src/views/Items.vue @@ -20,7 +20,7 @@ :columns="['uid', 'description', 'box']" :items="getEventItems" :keyName="'uid'" - @itemActivated="openLightboxModalWith($event)" + @itemActivated="showItemDetail" >