Speed up sql

.forgejo/workflows/test.yml

@@ -1,5 +1,6 @@
 on:
   pull_request:
+  push:
 
 jobs:
   test:

core/authentication/api_v2.py

@@ -12,25 +12,7 @@ from knox.models import AuthToken
 from knox.views import LoginView as KnoxLoginView
 
 from authentication.models import ExtendedUser
-
-
-class UserSerializer(serializers.ModelSerializer):
-    permissions = serializers.SerializerMethodField()
-    groups = serializers.SlugRelatedField(many=True, read_only=True, slug_field='name')
-
-    class Meta:
-        model = ExtendedUser
-        fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups')
-        read_only_fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups')
-
-    def get_permissions(self, obj):
-        return list(set(obj.get_permissions()))
-
-
-@receiver(post_save, sender=ExtendedUser)
-def create_auth_token(sender, instance=None, created=False, **kwargs):
-    if created:
-        AuthToken.objects.create(user=instance)
+from authentication.serializers import UserSerializer, GroupSerializer
 
 
 class UserViewSet(viewsets.ModelViewSet):
@@ -38,26 +20,17 @@ class UserViewSet(viewsets.ModelViewSet):
     serializer_class = UserSerializer
 
 
-class GroupSerializer(serializers.ModelSerializer):
-    permissions = serializers.SerializerMethodField()
-    members = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Group
-        fields = ('id', 'name', 'permissions', 'members')
-
-    def get_permissions(self, obj):
-        return ["*:" + p.codename for p in obj.permissions.all()]
-
-    def get_members(self, obj):
-        return [u.username for u in obj.user_set.all()]
-
-
 class GroupViewSet(viewsets.ModelViewSet):
     queryset = Group.objects.all()
     serializer_class = GroupSerializer
 
 
+@receiver(post_save, sender=ExtendedUser)
+def create_auth_token(sender, instance=None, created=False, **kwargs):
+    if created:
+        AuthToken.objects.create(user=instance)
+
+
 @api_view(['GET'])
 @permission_classes([IsAuthenticated])
 def selfUser(request):

core/authentication/serializers.py

@@ -0,0 +1,32 @@
+from rest_framework import serializers
+from django.contrib.auth.models import Group
+
+from authentication.models import ExtendedUser
+
+
+class UserSerializer(serializers.ModelSerializer):
+    permissions = serializers.SerializerMethodField()
+    groups = serializers.SlugRelatedField(many=True, read_only=True, slug_field='name')
+
+    class Meta:
+        model = ExtendedUser
+        fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups')
+        read_only_fields = ('id', 'username', 'email', 'first_name', 'last_name', 'permissions', 'groups')
+
+    def get_permissions(self, obj):
+        return list(set(obj.get_permissions()))
+
+
+class GroupSerializer(serializers.ModelSerializer):
+    permissions = serializers.SerializerMethodField()
+    members = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Group
+        fields = ('id', 'name', 'permissions', 'members')
+
+    def get_permissions(self, obj):
+        return ["*:" + p.codename for p in obj.permissions.all()]
+
+    def get_members(self, obj):
+        return [u.username for u in obj.user_set.all()]

core/core/settings.py

@@ -15,9 +15,11 @@ import sys
 import dotenv
 from pathlib import Path
 
+
 def truthy_str(s):
     return s.lower() in ['true', '1', 't', 'y', 'yes', 'yeah', 'yup', 'certainly', 'sure', 'positive', 'uh-huh', '👍']
 
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -32,7 +34,9 @@ SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'django-insecure-tm*$w_14iqbiy-!7(8#
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = truthy_str(os.getenv('DEBUG_MODE_ACTIVE', 'False'))
 
-ALLOWED_HOSTS = [os.getenv('HTTP_HOST', 'localhost')]
+PRIMARY_HOST = os.getenv('HTTP_HOST', 'localhost')
+
+ALLOWED_HOSTS = [PRIMARY_HOST]
 
 MAIL_DOMAIN = os.getenv('MAIL_DOMAIN', 'localhost')
 
@@ -142,7 +146,8 @@ else:
             'USER': os.getenv('DB_USER', 'system3'),
             'PASSWORD': os.getenv('DB_PASSWORD', 'system3'),
             'OPTIONS': {
-                'charset': 'utf8mb4'
+                'charset': 'utf8mb4',
+                'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
             }
         }
     }

core/core/urls.py

@@ -21,9 +21,6 @@ from .version import get_info
 
 urlpatterns = [
     path('djangoadmin/', admin.site.urls),
-    path('api/1/', include('inventory.api_v1')),
-    path('api/1/', include('files.api_v1')),
-    path('api/1/', include('files.media_v1')),
     path('api/2/', include('inventory.api_v2')),
     path('api/2/', include('files.api_v2')),
     path('media/2/', include('files.media_v2')),

core/files/api_v1.py

@@ -1,27 +0,0 @@
-from rest_framework import serializers, viewsets, routers
-
-from files.models import File
-
-
-class FileSerializer(serializers.ModelSerializer):
-    data = serializers.CharField(max_length=1000000, write_only=True)
-
-    class Meta:
-        model = File
-        fields = ['hash', 'data']
-        read_only_fields = ['hash']
-
-
-class FileViewSet(viewsets.ModelViewSet):
-    serializer_class = FileSerializer
-    queryset = File.objects.all()
-    lookup_field = 'hash'
-    permission_classes = []
-    authentication_classes = []
-
-
-router = routers.SimpleRouter(trailing_slash=False)
-router.register(r'files', FileViewSet, basename='files')
-router.register(r'file', FileViewSet, basename='files')
-
-urlpatterns = router.urls

core/files/media_v1.py

@@ -1,65 +0,0 @@
-import os
-from django.http import HttpResponse
-from django.urls import path
-from drf_yasg.utils import swagger_auto_schema
-from rest_framework import status
-from rest_framework.decorators import api_view, permission_classes, authentication_classes
-from rest_framework.response import Response
-
-from core.settings import MEDIA_ROOT
-from files.models import File
-
-
-@swagger_auto_schema(method='GET', auto_schema=None)
-@api_view(['GET'])
-@permission_classes([])
-@authentication_classes([])
-def media_urls(request, hash):
-    try:
-        file = File.objects.get(hash=hash)
-        hash_path = file.file
-        return HttpResponse(status=status.HTTP_200_OK,
-                            content_type=file.mime_type,
-                            headers={
-                                'X-Accel-Redirect': f'/redirect_media/{hash_path}',
-                                'Access-Control-Allow-Origin': '*',
-                            })  # TODO Expires and Cache-Control
-
-    except File.DoesNotExist:
-        return Response(status=status.HTTP_404_NOT_FOUND)
-
-
-@swagger_auto_schema(method='GET', auto_schema=None)
-@api_view(['GET'])
-@permission_classes([])
-@authentication_classes([])
-def thumbnail_urls(request, hash):
-    size = 200
-    try:
-        file = File.objects.get(hash=hash)
-        hash_path = file.file
-        if not os.path.exists(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}'):
-            from PIL import Image
-            image = Image.open(file.file)
-            image.thumbnail((size, size))
-            rgb_image = image.convert('RGB')
-            thumb_dir = os.path.dirname(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}')
-            if not os.path.exists(thumb_dir):
-                os.makedirs(thumb_dir)
-            rgb_image.save(MEDIA_ROOT + f'/thumbnails/{size}/{hash_path}', 'jpeg', quality=90)
-
-        return HttpResponse(status=status.HTTP_200_OK,
-                            content_type="image/jpeg",
-                            headers={
-                                'X-Accel-Redirect': f'/redirect_thumbnail/{size}/{hash_path}',
-                                'Access-Control-Allow-Origin': '*',
-                            })  # TODO Expires and Cache-Control
-
-    except File.DoesNotExist:
-        return Response(status=status.HTTP_404_NOT_FOUND)
-
-
-urlpatterns = [
-    path('thumbs/<path:hash>', thumbnail_urls),
-    path('images/<path:hash>', media_urls),
-]

core/files/tests/v1/test_files.py

@@ -1,68 +0,0 @@
-from django.test import TestCase, Client
-from django.core.files.base import ContentFile
-
-from files.models import File
-from inventory.models import Event, Container, Item
-
-client = Client()
-
-
-class FileTestCase(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.event = Event.objects.create(slug='EVENT', name='Event')
-        self.box = Container.objects.create(name='BOX')
-
-    def test_create_file_raw(self):
-        from hashlib import sha256
-        content = b"foo"
-        chash = sha256(content).hexdigest()
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        file = File.objects.create(file=ContentFile(b"foo"), mime_type='text/plain', hash=chash, item=item)
-        file.save()
-        self.assertEqual(1, len(File.objects.all()))
-        self.assertEqual(content, File.objects.all()[0].file.read())
-        self.assertEqual(chash, File.objects.all()[0].hash)
-
-    def test_list_files(self):
-        import base64
-
-        item = File.objects.create(data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8'))
-        response = client.get('/api/1/files')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()[0]['hash'], item.hash)
-        self.assertEqual(len(response.json()[0]['hash']), 64)
-        self.assertEqual(len(File.objects.all()), 1)
-        self.assertEqual(File.objects.all()[0].file.read(), b"foo")
-
-    def test_one_file(self):
-        import base64
-        item = File.objects.create(data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8'))
-        response = client.get(f'/api/1/file/{item.hash}')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['hash'], item.hash)
-        self.assertEqual(len(response.json()['hash']), 64)
-        self.assertEqual(len(File.objects.all()), 1)
-        self.assertEqual(File.objects.all()[0].file.read(), b"foo")
-
-    def test_create_file(self):
-        import base64
-        Item.objects.create(container=self.box, event=self.event, description='1')
-        item = Item.objects.create(container=self.box, event=self.event, description='2')
-        response = client.post('/api/1/file',
-                               {'data': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')},
-                               content_type='application/json')
-        self.assertEqual(response.status_code, 201)
-        self.assertEqual(len(response.json()['hash']), 64)
-        self.assertEqual(len(File.objects.all()), 1)
-        self.assertEqual(File.objects.all()[0].file.read(), b"foo")
-
-    def test_delete_file(self):
-        import base64
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8'))
-        file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"bar").decode('utf-8'))
-        self.assertEqual(len(File.objects.all()), 2)
-        response = client.delete(f'/api/1/file/{file.hash}')
-        self.assertEqual(response.status_code, 204)

core/inventory/api_v1.py

@@ -1,150 +0,0 @@
-from django.utils import timezone
-from django.urls import re_path
-from rest_framework import routers, viewsets, serializers
-from rest_framework.decorators import api_view, permission_classes, authentication_classes
-from rest_framework.response import Response
-
-from files.models import File
-from inventory.models import Event, Container, Item
-from inventory.serializers import EventSerializer, ContainerSerializer
-
-
-class EventViewSet(viewsets.ModelViewSet):
-    serializer_class = EventSerializer
-    queryset = Event.objects.all()
-    permission_classes = []
-    authentication_classes = []
-
-
-class ContainerViewSet(viewsets.ModelViewSet):
-    serializer_class = ContainerSerializer
-    queryset = Container.objects.all()
-    permission_classes = []
-    authentication_classes = []
-
-
-class ItemSerializer(serializers.ModelSerializer):
-    dataImage = serializers.CharField(write_only=True, required=False)
-    cid = serializers.SerializerMethodField()
-    box = serializers.SerializerMethodField()
-    file = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Item
-        fields = ['cid', 'box', 'uid', 'description', 'file', 'dataImage']
-        read_only_fields = ['uid']
-
-    def get_cid(self, instance):
-        return instance.container.cid
-
-    def get_box(self, instance):
-        return instance.container.name
-
-    def get_file(self, instance):
-        if len(instance.files.all()) > 0:
-            return instance.files.all().order_by('-created_at')[0].hash
-        return None
-
-    def to_internal_value(self, data):
-        if 'cid' in data:
-            container = Container.objects.get(cid=data['cid'])
-            internal = super().to_internal_value(data)
-            internal['container'] = container
-            return internal
-        return super().to_internal_value(data)
-
-    def validate(self, attrs):
-        return super().validate(attrs)
-
-    def create(self, validated_data):
-        if 'dataImage' in validated_data:
-            file = File.objects.create(data=validated_data['dataImage'])
-            validated_data.pop('dataImage')
-            item = Item.objects.create(**validated_data)
-            item.files.set([file])
-            return item
-        return Item.objects.create(**validated_data)
-
-    def update(self, instance, validated_data):
-        if 'returned' in validated_data:
-            if validated_data['returned']:
-                validated_data['returned_at'] = timezone.now()
-            validated_data.pop('returned')
-        if 'dataImage' in validated_data:
-            file = File.objects.create(data=validated_data['dataImage'])
-            validated_data.pop('dataImage')
-            instance.files.add(file)
-        return super().update(instance, validated_data)
-
-
-@api_view(['GET'])
-@permission_classes([])
-@authentication_classes([])
-def search_items(request, event_slug, query):
-    try:
-        event = Event.objects.get(slug=event_slug)
-        query_tokens = query.split(' ')
-        q = Item.objects.filter(event=event)
-        for token in query_tokens:
-            if token:
-                q = q.filter(description__icontains=token)
-        return Response(ItemSerializer(q, many=True).data)
-    except Event.DoesNotExist:
-        return Response(status=404)
-
-
-@api_view(['GET', 'POST'])
-@permission_classes([])
-@authentication_classes([])
-def item(request, event_slug):
-    try:
-        event = Event.objects.get(slug=event_slug)
-        if request.method == 'GET':
-            return Response(ItemSerializer(Item.objects.filter(event=event), many=True).data)
-        elif request.method == 'POST':
-            validated_data = ItemSerializer(data=request.data)
-            if validated_data.is_valid():
-                validated_data.save(event=event)
-                return Response(validated_data.data, status=201)
-    except Event.DoesNotExist:
-        return Response(status=404)
-
-
-@api_view(['GET', 'PUT', 'DELETE'])
-@permission_classes([])
-@authentication_classes([])
-def item_by_id(request, event_slug, id):
-    try:
-        event = Event.objects.get(slug=event_slug)
-        item = Item.objects.get(event=event, uid=id)
-        if request.method == 'GET':
-            return Response(ItemSerializer(item).data)
-        elif request.method == 'PUT':
-            validated_data = ItemSerializer(item, data=request.data)
-            if validated_data.is_valid():
-                validated_data.save()
-                return Response(validated_data.data)
-        elif request.method == 'DELETE':
-            item.delete()
-            return Response(status=204)
-    except Item.DoesNotExist:
-        return Response(status=404)
-    except Event.DoesNotExist:
-        return Response(status=404)
-
-
-urlpatterns = [
-    re_path('events/?$', EventViewSet.as_view({'get': 'list', 'post': 'create'})),
-    re_path('events/(?P<pk>[0-9]+)/?$',
-            EventViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})),
-    re_path('boxes/?$', ContainerViewSet.as_view({'get': 'list', 'post': 'create'})),
-    re_path('boxes/(?P<pk>[0-9]+)/?$',
-            ContainerViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})),
-    re_path('box/?$', ContainerViewSet.as_view({'get': 'list', 'post': 'create'})),
-    re_path('box/(?P<pk>[0-9]+)/?$',
-            ContainerViewSet.as_view({'get': 'retrieve', 'put': 'update', 'delete': 'destroy'})),
-    re_path('(?P<event_slug>[a-zA-Z0-9]+)/items/?$', item),
-    re_path('(?P<event_slug>[a-zA-Z0-9]+)/items/(?P<query>[^/]+)/?$', search_items),
-    re_path('(?P<event_slug>[a-zA-Z0-9]+)/item/?$', item),
-    re_path('(?P<event_slug>[a-zA-Z0-9]+)/item/(?P<id>[0-9]+)/?$', item_by_id),
-]

core/inventory/api_v2.py

@@ -1,4 +1,4 @@
-from django.urls import path
+from django.urls import re_path
 from django.contrib.auth.decorators import permission_required
 from rest_framework import routers, viewsets
 from rest_framework.decorators import api_view, permission_classes
@@ -6,7 +6,9 @@ from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
 
 from inventory.models import Event, Container, Item
-from inventory.serializers import EventSerializer, ContainerSerializer, ItemSerializer
+from inventory.serializers import EventSerializer, ContainerSerializer, ItemSerializer, SearchResultSerializer
+
+from base64 import b64decode
 
 
 class EventViewSet(viewsets.ModelViewSet):
@@ -20,18 +22,26 @@ class ContainerViewSet(viewsets.ModelViewSet):
     queryset = Container.objects.all()
 
 
+def filter_items(items, query):
+    query_tokens = query.split(' ')
+    for item in items:
+        value = 0
+        for token in query_tokens:
+            if token in item.description:
+                value += 1
+        if value > 0:
+            yield {'search_score': value, 'item': item}
+
+
 @api_view(['GET'])
 @permission_classes([IsAuthenticated])
-@permission_required('view_item', raise_exception=True)
 def search_items(request, event_slug, query):
     try:
         event = Event.objects.get(slug=event_slug)
-        query_tokens = query.split(' ')
-        q = Item.objects.filter(event=event)
-        for token in query_tokens:
-            if token:
-                q = q.filter(description__icontains=token)
-        return Response(ItemSerializer(q, many=True).data)
+        if not request.user.has_event_perm(event, 'view_item'):
+            return Response(status=403)
+        items = filter_items(Item.objects.filter(event=event), b64decode(query).decode('utf-8'))
+        return Response(SearchResultSerializer(items, many=True).data)
     except Event.DoesNotExist:
         return Response(status=404)
 
@@ -40,7 +50,9 @@ def search_items(request, event_slug, query):
 @permission_classes([IsAuthenticated])
 def item(request, event_slug):
     try:
-        event = Event.objects.get(slug=event_slug)
+        event = None
+        if event_slug != 'none':
+            event = Event.objects.get(slug=event_slug)
         if request.method == 'GET':
             if not request.user.has_event_perm(event, 'view_item'):
                 return Response(status=403)
@@ -52,6 +64,7 @@ def item(request, event_slug):
             if validated_data.is_valid():
                 validated_data.save(event=event)
                 return Response(validated_data.data, status=201)
+            return Response(status=400)
     except Event.DoesNotExist:
         return Response(status=404)
 
@@ -61,7 +74,7 @@ def item(request, event_slug):
 def item_by_id(request, event_slug, id):
     try:
         event = Event.objects.get(slug=event_slug)
-        item = Item.objects.get(event=event, uid=id)
+        item = Item.objects.get(event=event, id=id)
         if request.method == 'GET':
             if not request.user.has_event_perm(event, 'view_item'):
                 return Response(status=403)
@@ -99,8 +112,8 @@ router.register(r'boxes', ContainerViewSet, basename='boxes')
 router.register(r'box', ContainerViewSet, basename='boxes')
 
 urlpatterns = router.urls + [
-    path('<event_slug>/items/', item),
-    path('<event_slug>/items/<query>/', search_items),
-    path('<event_slug>/item/', item),
-    path('<event_slug>/item/<id>/', item_by_id),
+    re_path(r'^(?P<event_slug>[\w-]+)/items/$', item, name='item'),
+    re_path(r'^(?P<event_slug>[\w-]+)/items/(?P<query>[-A-Za-z0-9+/]*={0,3})/$', search_items, name='search_items'),
+    re_path(r'^(?P<event_slug>[\w-]+)/item/$', item, name='item'),
+    re_path(r'^(?P<event_slug>[\w-]+)/item/(?P<id>\d+)/$', item_by_id, name='item_by_id'),
 ]

core/inventory/migrations/0005_rename_cid_container_id_rename_eid_event_id_and_more.py

@@ -0,0 +1,52 @@
+# Generated by Django 4.2.7 on 2024-11-19 22:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0004_alter_event_created_at_alter_item_created_at'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='container',
+            old_name='cid',
+            new_name='id',
+        ),
+        migrations.RenameField(
+            model_name='event',
+            old_name='eid',
+            new_name='id',
+        ),
+        migrations.RenameField(
+            model_name='item',
+            old_name='iid',
+            new_name='id',
+        ),
+        migrations.RenameField(
+            model_name='item',
+            old_name='uid',
+            new_name='uid_deprecated',
+        ),
+        migrations.AlterUniqueTogether(
+            name='item',
+            unique_together=set(),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='container',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inventory.container'),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='event',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inventory.event'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='item',
+            unique_together={('uid_deprecated', 'event')},
+        ),
+    ]

core/inventory/migrations/0006_alter_event_table.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-11-20 01:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0005_rename_cid_container_id_rename_eid_event_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name='event',
+            table='common_event',
+        ),
+    ]

core/inventory/models.py

@@ -1,15 +1,16 @@
-from django.core.files.base import ContentFile
-from django.db import models, IntegrityError
+from itertools import groupby
+
+from django.db import models
 from django_softdelete.models import SoftDeleteModel, SoftDeleteManager
 
 
 class ItemManager(SoftDeleteManager):
 
     def create(self, **kwargs):
-        if 'uid' in kwargs:
-            raise ValueError('uid must not be set manually')
-        uid = Item.all_objects.filter(event=kwargs['event']).count() + 1
-        kwargs['uid'] = uid
+        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)
 
     def get_queryset(self):
@@ -17,40 +18,47 @@ class ItemManager(SoftDeleteManager):
 
 
 class Item(SoftDeleteModel):
-    iid = models.AutoField(primary_key=True)
-    uid = models.IntegerField()
+    id = models.AutoField(primary_key=True)
+    uid_deprecated = models.IntegerField()
     description = models.TextField()
-    event = models.ForeignKey('Event', models.CASCADE, db_column='eid')
-    container = models.ForeignKey('Container', models.CASCADE, db_column='cid')
+    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 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()
 
     class Meta:
-        unique_together = (('uid', 'event'),)
+        unique_together = (('uid_deprecated', 'event'),)
         permissions = [
             ('match_item', 'Can match item')
         ]
 
     def __str__(self):
-        return '[' + str(self.uid) + ']' + self.description
+        return '[' + str(self.id) + ']' + self.description
 
 
 class Container(SoftDeleteModel):
-    cid = models.AutoField(primary_key=True)
+    id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255)
     created_at = models.DateTimeField(blank=True, null=True)
     updated_at = models.DateTimeField(blank=True, null=True)
 
     def __str__(self):
-        return '[' + str(self.cid) + ']' + self.name
+        return '[' + str(self.id) + ']' + self.name
 
 
 class Event(models.Model):
-    eid = models.AutoField(primary_key=True)
+    id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255)
     slug = models.CharField(max_length=255, unique=True)
     start = models.DateTimeField(blank=True, null=True)
@@ -62,3 +70,6 @@ class Event(models.Model):
 
     def __str__(self):
         return '[' + str(self.slug) + ']' + self.name
+
+    class Meta:
+        db_table = 'common_event'

core/inventory/serializers.py

@@ -1,9 +1,12 @@
 from django.utils import timezone
 from rest_framework import serializers
+from rest_framework.relations import SlugRelatedField
 
 from files.models import File
 from inventory.models import Event, Container, Item
+from inventory.shared_serializers import BasicItemSerializer
 from mail.models import EventAddress
+from tickets.shared_serializers import BasicIssueSerializer
 
 
 class EventAdressSerializer(serializers.ModelSerializer):
@@ -17,8 +20,8 @@ class EventSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Event
-        fields = ['eid', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses']
-        read_only_fields = ['eid']
+        fields = ['id', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses']
+        read_only_fields = ['id']
 
 
 class ContainerSerializer(serializers.ModelSerializer):
@@ -26,44 +29,27 @@ class ContainerSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Container
-        fields = ['cid', 'name', 'itemCount']
-        read_only_fields = ['cid', 'itemCount']
+        fields = ['id', 'name', 'itemCount']
+        read_only_fields = ['id', 'itemCount']
 
     def get_itemCount(self, instance):
-        return Item.objects.filter(container=instance.cid).count()
+        return Item.objects.filter(container=instance.id).count()
 
 
-class ItemSerializer(serializers.ModelSerializer):
+class ItemSerializer(BasicItemSerializer):
     dataImage = serializers.CharField(write_only=True, required=False)
-    cid = serializers.SerializerMethodField()
-    box = serializers.SerializerMethodField()
-    file = serializers.SerializerMethodField()
-    returned = serializers.SerializerMethodField(required=False)
+    related_issues = BasicIssueSerializer(many=True, read_only=True)
 
     class Meta:
         model = Item
-        fields = ['cid', 'box', 'uid', 'description', 'file', 'dataImage', 'returned']
-        read_only_fields = ['uid']
-
-    def get_cid(self, instance):
-        return instance.container.cid
-
-    def get_box(self, instance):
-        return instance.container.name
-
-    def get_file(self, instance):
-        if len(instance.files.all()) > 0:
-            return instance.files.all().order_by('-created_at')[0].hash
-        return None
-
-    def get_returned(self, instance):
-        return instance.returned_at is not None
+        fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues']
+        read_only_fields = ['id']
 
     def to_internal_value(self, data):
         container = None
         returned = False
         if 'cid' in data:
-            container = Container.objects.get(cid=data['cid'])
+            container = Container.objects.get(id=data['cid'])
         if 'returned' in data:
             returned = data['returned']
         internal = super().to_internal_value(data)
@@ -74,6 +60,8 @@ class ItemSerializer(serializers.ModelSerializer):
         return internal
 
     def validate(self, attrs):
+        if not 'container' in attrs and not self.partial:
+            raise serializers.ValidationError("This field cannot be empty.")
         return super().validate(attrs)
 
     def create(self, validated_data):
@@ -95,3 +83,14 @@ class ItemSerializer(serializers.ModelSerializer):
             validated_data.pop('dataImage')
             instance.files.add(file)
         return super().update(instance, validated_data)
+
+
+class SearchResultSerializer(serializers.Serializer):
+    search_score = serializers.IntegerField()
+    item = ItemSerializer()
+
+    def to_representation(self, instance):
+        return {**ItemSerializer(instance['item']).data, 'search_score': instance['search_score']}
+
+    class Meta:
+        model = Item

core/inventory/shared_serializers.py

@@ -0,0 +1,31 @@
+from rest_framework import serializers
+
+from inventory.models import Event, Item
+
+
+class BasicItemSerializer(serializers.ModelSerializer):
+    cid = serializers.SerializerMethodField()
+    box = serializers.SerializerMethodField()
+    file = serializers.SerializerMethodField()
+    returned = serializers.SerializerMethodField(required=False)
+    event = serializers.SlugRelatedField(slug_field='slug', queryset=Event.objects.all(),
+                                         allow_null=True, required=False)
+
+    class Meta:
+        model = Item
+        fields = ['cid', 'box', 'id', 'description', 'file', 'returned', 'event']
+        read_only_fields = ['id']
+
+    def get_cid(self, instance):
+        return instance.container.id if instance.container else None
+
+    def get_box(self, instance):
+        return instance.container.name if instance.container else None
+
+    def get_file(self, instance):
+        if len(instance.files.all()) > 0:
+            return sorted(instance.files.all(), key=lambda x: x.created_at, reverse=True)[0].hash
+        return None
+
+    def get_returned(self, instance):
+        return instance.returned_at is not None

core/inventory/tests/v1/test_api.py

@@ -1,34 +0,0 @@
-from django.test import TestCase, Client
-
-client = Client()
-
-
-class ApiTest(TestCase):
-
-    def test_root(self):
-        from core.settings import SYSTEM3_VERSION
-        response = client.get('/api/')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()["framework_version"], SYSTEM3_VERSION)
-
-    def test_events(self):
-        response = client.get('/api/1/events')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])
-
-    def test_containers(self):
-        response = client.get('/api/1/boxes')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])
-
-    def test_files(self):
-        response = client.get('/api/1/files')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])
-
-    def test_items(self):
-        from inventory.models import Event
-        Event.objects.create(slug='TEST1', name='Event')
-        response = client.get('/api/1/TEST1/items')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])

core/inventory/tests/v1/test_containers.py

@@ -1,59 +0,0 @@
-from django.test import TestCase, Client
-from inventory.models import Container
-
-client = Client()
-
-
-class ContainerTestCase(TestCase):
-
-    def test_empty(self):
-        response = client.get('/api/1/boxes')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])
-
-    def test_members(self):
-        Container.objects.create(name='BOX')
-        response = client.get('/api/1/boxes')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 1)
-        self.assertEqual(response.json()[0]['cid'], 1)
-        self.assertEqual(response.json()[0]['name'], 'BOX')
-        self.assertEqual(response.json()[0]['itemCount'], 0)
-
-    def test_multi_members(self):
-        Container.objects.create(name='BOX 1')
-        Container.objects.create(name='BOX 2')
-        Container.objects.create(name='BOX 3')
-        response = client.get('/api/1/boxes')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 3)
-
-    def test_create_container(self):
-        response = client.post('/api/1/box', {'name': 'BOX'})
-        self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json()['cid'], 1)
-        self.assertEqual(response.json()['name'], 'BOX')
-        self.assertEqual(response.json()['itemCount'], 0)
-        self.assertEqual(len(Container.objects.all()), 1)
-        self.assertEqual(Container.objects.all()[0].cid, 1)
-        self.assertEqual(Container.objects.all()[0].name, 'BOX')
-
-    def test_update_container(self):
-        from rest_framework.test import APIClient
-        box = Container.objects.create(name='BOX 1')
-        response = APIClient().put(f'/api/1/box/{box.cid}', {'name': 'BOX 2'})
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['cid'], 1)
-        self.assertEqual(response.json()['name'], 'BOX 2')
-        self.assertEqual(response.json()['itemCount'], 0)
-        self.assertEqual(len(Container.objects.all()), 1)
-        self.assertEqual(Container.objects.all()[0].cid, 1)
-        self.assertEqual(Container.objects.all()[0].name, 'BOX 2')
-
-    def test_delete_container(self):
-        box = Container.objects.create(name='BOX 1')
-        Container.objects.create(name='BOX 2')
-        self.assertEqual(len(Container.objects.all()), 2)
-        response = client.delete(f'/api/1/box/{box.cid}')
-        self.assertEqual(response.status_code, 204)
-        self.assertEqual(len(Container.objects.all()), 1)

core/inventory/tests/v1/test_events.py

@@ -1,56 +0,0 @@
-from django.test import TestCase, Client
-from inventory.models import Event
-
-client = Client()
-
-
-class EventTestCase(TestCase):
-
-    def test_empty(self):
-        response = client.get('/api/1/events')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), [])
-
-    def test_members(self):
-        Event.objects.create(slug='EVENT', name='Event')
-        response = client.get('/api/1/events')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 1)
-        self.assertEqual(response.json()[0]['slug'], 'EVENT')
-        self.assertEqual(response.json()[0]['name'], 'Event')
-
-    def test_multi_members(self):
-        Event.objects.create(slug='EVENT1', name='Event 1')
-        Event.objects.create(slug='EVENT2', name='Event 2')
-        Event.objects.create(slug='EVENT3', name='Event 3')
-        response = client.get('/api/1/events')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 3)
-
-    def test_create_event(self):
-        response = client.post('/api/1/events', {'slug': 'EVENT', 'name': 'Event'})
-        self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json()['slug'], 'EVENT')
-        self.assertEqual(response.json()['name'], 'Event')
-        self.assertEqual(len(Event.objects.all()), 1)
-        self.assertEqual(Event.objects.all()[0].slug, 'EVENT')
-        self.assertEqual(Event.objects.all()[0].name, 'Event')
-
-    def test_update_event(self):
-        from rest_framework.test import APIClient
-        event = Event.objects.create(slug='EVENT1', name='Event 1')
-        response = APIClient().put(f'/api/1/events/{event.eid}', {'slug': 'EVENT2', 'name': 'Event 2 new'})
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['slug'], 'EVENT2')
-        self.assertEqual(response.json()['name'], 'Event 2 new')
-        self.assertEqual(len(Event.objects.all()), 1)
-        self.assertEqual(Event.objects.all()[0].slug, 'EVENT2')
-        self.assertEqual(Event.objects.all()[0].name, 'Event 2 new')
-
-    def test_remove_event(self):
-        event = Event.objects.create(slug='EVENT1', name='Event 1')
-        Event.objects.create(slug='EVENT2', name='Event 2')
-        self.assertEqual(len(Event.objects.all()), 2)
-        response = client.delete(f'/api/1/events/{event.eid}')
-        self.assertEqual(response.status_code, 204)
-        self.assertEqual(len(Event.objects.all()), 1)

core/inventory/tests/v1/test_items.py

@@ -1,133 +0,0 @@
-from django.test import TestCase, Client
-
-from files.models import File
-from inventory.models import Event, Container, Item
-
-client = Client()
-
-
-class ItemTestCase(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.event = Event.objects.create(slug='EVENT', name='Event')
-        self.box = Container.objects.create(name='BOX')
-
-    def test_empty(self):
-        response = client.get(f'/api/1/{self.event.slug}/item')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.content, b'[]')
-
-    def test_members(self):
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        response = client.get(f'/api/1/{self.event.slug}/item')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None}])
-
-    def test_members_with_file(self):
-        import base64
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8'))
-        response = client.get(f'/api/1/{self.event.slug}/item')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': file.hash}])
-
-    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')
-        Item.objects.create(container=self.box, event=self.event, description='3')
-        response = client.get(f'/api/1/{self.event.slug}/item')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 3)
-
-    def test_create_item(self):
-        response = client.post(f'/api/1/{self.event.slug}/item', {'cid': self.box.cid, 'description': '1'})
-        self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json(),
-                         {'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None})
-        self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
-        self.assertEqual(Item.objects.all()[0].description, '1')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
-
-    def test_create_item_with_file(self):
-        import base64
-        response = client.post(f'/api/1/{self.event.slug}/item',
-                               {'cid': self.box.cid, 'description': '1',
-                                'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode(
-                                    'utf-8')}, content_type='application/json')
-        self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json()['uid'], 1)
-        self.assertEqual(response.json()['description'], '1')
-        self.assertEqual(response.json()['box'], 'BOX')
-        self.assertEqual(response.json()['cid'], self.box.cid)
-        self.assertEqual(len(response.json()['file']), 64)
-        self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
-        self.assertEqual(Item.objects.all()[0].description, '1')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
-        self.assertEqual(len(File.objects.all()), 1)
-
-    def test_update_item(self):
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        response = client.put(f'/api/1/{self.event.slug}/item/{item.uid}', {'description': '2'},
-                              content_type='application/json')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         {'uid': 1, 'description': '2', 'box': 'BOX', 'cid': self.box.cid, 'file': None})
-        self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
-        self.assertEqual(Item.objects.all()[0].description, '2')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
-
-    def test_update_item_with_file(self):
-        import base64
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        response = client.put(f'/api/1/{self.event.slug}/item/{item.uid}',
-                              {'description': '2',
-                               'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')},
-                              content_type='application/json')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['uid'], 1)
-        self.assertEqual(response.json()['description'], '2')
-        self.assertEqual(response.json()['box'], 'BOX')
-        self.assertEqual(response.json()['cid'], self.box.cid)
-        self.assertEqual(len(response.json()['file']), 64)
-        self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
-        self.assertEqual(Item.objects.all()[0].description, '2')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
-        self.assertEqual(len(File.objects.all()), 1)
-
-    def test_delete_item(self):
-        item = Item.objects.create(container=self.box, event=self.event, description='1')
-        Item.objects.create(container=self.box, event=self.event, description='2')
-        self.assertEqual(len(Item.objects.all()), 2)
-        response = client.delete(f'/api/1/{self.event.slug}/item/{item.uid}')
-        self.assertEqual(response.status_code, 204)
-        self.assertEqual(len(Item.objects.all()), 1)
-
-    def test_delete_item2(self):
-        Item.objects.create(container=self.box, event=self.event, description='1')
-        item2 = Item.objects.create(container=self.box, event=self.event, description='2')
-        self.assertEqual(len(Item.objects.all()), 2)
-        response = client.delete(f'/api/1/{self.event.slug}/item/{item2.uid}')
-        self.assertEqual(response.status_code, 204)
-        self.assertEqual(len(Item.objects.all()), 1)
-        item3 = Item.objects.create(container=self.box, event=self.event, description='3')
-        self.assertEqual(item3.uid, 3)
-        self.assertEqual(len(Item.objects.all()), 2)
-
-    def test_item_count(self):
-        Item.objects.create(container=self.box, event=self.event, description='1')
-        Item.objects.create(container=self.box, event=self.event, description='2')
-        response = client.get('/api/1/boxes')
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 1)
-        self.assertEqual(response.json()[0]['itemCount'], 2)
-
-    def test_item_nonexistent(self):
-        response = client.get(f'/api/1/NOEVENT/item')
-        self.assertEqual(response.status_code, 404)

core/inventory/tests/v2/test_containers.py

@@ -24,7 +24,7 @@ class ContainerTestCase(TestCase):
         response = self.client.get('/api/2/boxes/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.json()), 1)
-        self.assertEqual(response.json()[0]['cid'], 1)
+        self.assertEqual(response.json()[0]['id'], 1)
         self.assertEqual(response.json()[0]['name'], 'BOX')
         self.assertEqual(response.json()[0]['itemCount'], 0)
 
@@ -39,28 +39,28 @@ class ContainerTestCase(TestCase):
     def test_create_container(self):
         response = self.client.post('/api/2/box/', {'name': 'BOX'})
         self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json()['cid'], 1)
+        self.assertEqual(response.json()['id'], 1)
         self.assertEqual(response.json()['name'], 'BOX')
         self.assertEqual(response.json()['itemCount'], 0)
         self.assertEqual(len(Container.objects.all()), 1)
-        self.assertEqual(Container.objects.all()[0].cid, 1)
+        self.assertEqual(Container.objects.all()[0].id, 1)
         self.assertEqual(Container.objects.all()[0].name, 'BOX')
 
     def test_update_container(self):
         box = Container.objects.create(name='BOX 1')
-        response = self.client.put(f'/api/2/box/{box.cid}/', {'name': 'BOX 2'}, content_type='application/json')
+        response = self.client.put(f'/api/2/box/{box.id}/', {'name': 'BOX 2'}, content_type='application/json')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['cid'], 1)
+        self.assertEqual(response.json()['id'], 1)
         self.assertEqual(response.json()['name'], 'BOX 2')
         self.assertEqual(response.json()['itemCount'], 0)
         self.assertEqual(len(Container.objects.all()), 1)
-        self.assertEqual(Container.objects.all()[0].cid, 1)
+        self.assertEqual(Container.objects.all()[0].id, 1)
         self.assertEqual(Container.objects.all()[0].name, 'BOX 2')
 
     def test_delete_container(self):
         box = Container.objects.create(name='BOX 1')
         Container.objects.create(name='BOX 2')
         self.assertEqual(len(Container.objects.all()), 2)
-        response = self.client.delete(f'/api/2/box/{box.cid}/')
+        response = self.client.delete(f'/api/2/box/{box.id}/')
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(Container.objects.all()), 1)

core/inventory/tests/v2/test_events.py

@@ -39,7 +39,7 @@ 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().put(f'/api/2/events/{event.eid}/', {'slug': 'EVENT2', 'name': 'Event 2 new'})
+        response = APIClient().put(f'/api/2/events/{event.id}/', {'slug': 'EVENT2', 'name': 'Event 2 new'})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()['slug'], 'EVENT2')
         self.assertEqual(response.json()['name'], 'Event 2 new')
@@ -51,7 +51,7 @@ class EventTestCase(TestCase):
         event = Event.objects.create(slug='EVENT1', name='Event 1')
         Event.objects.create(slug='EVENT2', name='Event 2')
         self.assertEqual(len(Event.objects.all()), 2)
-        response = client.delete(f'/api/2/events/{event.eid}/')
+        response = client.delete(f'/api/2/events/{event.id}/')
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(Event.objects.all()), 1)
 

core/inventory/tests/v2/test_items.py

@@ -7,6 +7,8 @@ from authentication.models import ExtendedUser
 from files.models import File
 from inventory.models import Event, Container, Item
 
+from base64 import b64encode
+
 
 class ItemTestCase(TestCase):
 
@@ -28,9 +30,15 @@ class ItemTestCase(TestCase):
         item = Item.objects.create(container=self.box, event=self.event, description='1')
         response = self.client.get(f'/api/2/{self.event.slug}/item/')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None,
-                           'returned': False}])
+        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'], 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)
 
     def test_members_with_file(self):
         import base64
@@ -38,9 +46,15 @@ class ItemTestCase(TestCase):
         file = File.objects.create(item=item, data="data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8'))
         response = self.client.get(f'/api/2/{self.event.slug}/item/')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         [{'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': file.hash,
-                           'returned': False}])
+        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'], file.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')
@@ -51,71 +65,89 @@ class ItemTestCase(TestCase):
         self.assertEqual(len(response.json()), 3)
 
     def test_create_item(self):
-        response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.cid, 'description': '1'})
+        response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id, 'description': '1'})
         self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json(),
-                         {'uid': 1, 'description': '1', 'box': 'BOX', 'cid': self.box.cid, 'file': None,
-                          'returned': False})
+        self.assertEqual(response.json()['id'], 1)
+        self.assertEqual(response.json()['description'], '1')
+        self.assertEqual(response.json()['box'], 'BOX')
+        self.assertEqual(response.json()['cid'], self.box.id)
+        self.assertEqual(response.json()['file'], None)
+        self.assertEqual(response.json()['returned'], False)
+        self.assertEqual(response.json()['event'], self.event.slug)
+        self.assertEqual(len(response.json()['related_issues']), 0)
         self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
+        self.assertEqual(Item.objects.all()[0].id, 1)
         self.assertEqual(Item.objects.all()[0].description, '1')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
+        self.assertEqual(Item.objects.all()[0].container.id, self.box.id)
+
+    def test_create_item_without_container(self):
+        response = self.client.post(f'/api/2/{self.event.slug}/item/', {'description': '1'})
+        self.assertEqual(response.status_code, 400)
+
+    def test_create_item_without_description(self):
+        response = self.client.post(f'/api/2/{self.event.slug}/item/', {'cid': self.box.id})
+        self.assertEqual(response.status_code, 400)
 
     def test_create_item_with_file(self):
         import base64
         response = self.client.post(f'/api/2/{self.event.slug}/item/',
-                                    {'cid': self.box.cid, 'description': '1',
+                                    {'cid': self.box.id, 'description': '1',
                                      'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode(
                                          'utf-8')}, content_type='application/json')
         self.assertEqual(response.status_code, 201)
-        self.assertEqual(response.json()['uid'], 1)
+        self.assertEqual(response.json()['id'], 1)
         self.assertEqual(response.json()['description'], '1')
         self.assertEqual(response.json()['box'], 'BOX')
-        self.assertEqual(response.json()['cid'], self.box.cid)
+        self.assertEqual(response.json()['id'], self.box.id)
         self.assertEqual(len(response.json()['file']), 64)
         self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
+        self.assertEqual(Item.objects.all()[0].id, 1)
         self.assertEqual(Item.objects.all()[0].description, '1')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
+        self.assertEqual(Item.objects.all()[0].container.id, self.box.id)
         self.assertEqual(len(File.objects.all()), 1)
 
     def test_update_item(self):
         item = Item.objects.create(container=self.box, event=self.event, description='1')
-        response = self.client.put(f'/api/2/{self.event.slug}/item/{item.uid}/', {'description': '2'},
+        response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'description': '2'},
                                    content_type='application/json')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(),
-                         {'uid': 1, 'description': '2', 'box': 'BOX', 'cid': self.box.cid, 'file': None,
-                          'returned': False})
+        self.assertEqual(response.json()['id'], item.id)
+        self.assertEqual(response.json()['description'], '2')
+        self.assertEqual(response.json()['box'], 'BOX')
+        self.assertEqual(response.json()['cid'], self.box.id)
+        self.assertEqual(response.json()['file'], None)
+        self.assertEqual(response.json()['returned'], False)
+        self.assertEqual(response.json()['event'], self.event.slug)
+        self.assertEqual(len(response.json()['related_issues']), 0)
         self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
+        self.assertEqual(Item.objects.all()[0].id, 1)
         self.assertEqual(Item.objects.all()[0].description, '2')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
+        self.assertEqual(Item.objects.all()[0].container.id, self.box.id)
 
     def test_update_item_with_file(self):
         import base64
         item = Item.objects.create(container=self.box, event=self.event, description='1')
-        response = self.client.put(f'/api/2/{self.event.slug}/item/{item.uid}/',
+        response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/',
                                    {'description': '2',
                                     'dataImage': "data:text/plain;base64," + base64.b64encode(b"foo").decode('utf-8')},
                                    content_type='application/json')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json()['uid'], 1)
+        self.assertEqual(response.json()['id'], 1)
         self.assertEqual(response.json()['description'], '2')
         self.assertEqual(response.json()['box'], 'BOX')
-        self.assertEqual(response.json()['cid'], self.box.cid)
+        self.assertEqual(response.json()['id'], self.box.id)
         self.assertEqual(len(response.json()['file']), 64)
         self.assertEqual(len(Item.objects.all()), 1)
-        self.assertEqual(Item.objects.all()[0].uid, 1)
+        self.assertEqual(Item.objects.all()[0].id, 1)
         self.assertEqual(Item.objects.all()[0].description, '2')
-        self.assertEqual(Item.objects.all()[0].container.cid, self.box.cid)
+        self.assertEqual(Item.objects.all()[0].container.id, self.box.id)
         self.assertEqual(len(File.objects.all()), 1)
 
     def test_delete_item(self):
         item = Item.objects.create(container=self.box, event=self.event, description='1')
         Item.objects.create(container=self.box, event=self.event, description='2')
         self.assertEqual(len(Item.objects.all()), 2)
-        response = self.client.delete(f'/api/2/{self.event.slug}/item/{item.uid}/')
+        response = self.client.delete(f'/api/2/{self.event.slug}/item/{item.id}/')
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(Item.objects.all()), 1)
 
@@ -123,11 +155,11 @@ class ItemTestCase(TestCase):
         Item.objects.create(container=self.box, event=self.event, description='1')
         item2 = Item.objects.create(container=self.box, event=self.event, description='2')
         self.assertEqual(len(Item.objects.all()), 2)
-        response = self.client.delete(f'/api/2/{self.event.slug}/item/{item2.uid}/')
+        response = self.client.delete(f'/api/2/{self.event.slug}/item/{item2.id}/')
         self.assertEqual(response.status_code, 204)
         self.assertEqual(len(Item.objects.all()), 1)
         item3 = Item.objects.create(container=self.box, event=self.event, description='3')
-        self.assertEqual(item3.uid, 3)
+        self.assertEqual(item3.id, 3)
         self.assertEqual(len(Item.objects.all()), 2)
 
     def test_item_count(self):
@@ -148,7 +180,7 @@ class ItemTestCase(TestCase):
         response = self.client.get(f'/api/2/{self.event.slug}/item/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.json()), 1)
-        response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.uid}/', {'returned': True},
+        response = self.client.patch(f'/api/2/{self.event.slug}/item/{item.id}/', {'returned': True},
                                      content_type='application/json')
         self.assertEqual(response.status_code, 200)
         item.refresh_from_db()
@@ -168,4 +200,75 @@ class ItemTestCase(TestCase):
         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]['uid'], item1.uid)
+        self.assertEqual(response.json()[0]['id'], item1.id)
+
+
+class ItemSearchTestCase(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.event = Event.objects.create(slug='EVENT', name='Event')
+        self.box = Container.objects.create(name='BOX')
+        self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
+        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.item1 = Item.objects.create(container=self.box, event=self.event, description='abc def')
+        self.item2 = Item.objects.create(container=self.box, event=self.event, description='def ghi')
+        self.item3 = Item.objects.create(container=self.box, event=self.event, description='jkl mno pqr')
+        self.item4 = Item.objects.create(container=self.box, event=self.event, description='stu vwx')
+
+    def test_search(self):
+        search_query = b64encode(b'abc').decode('utf-8')
+        response = self.client.get(f'/api/2/{self.event.slug}/items/{search_query}/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(1, len(response.json()))
+        self.assertEqual(self.item1.id, response.json()[0]['id'])
+        self.assertEqual('abc def', response.json()[0]['description'])
+        self.assertEqual('BOX', response.json()[0]['box'])
+        self.assertEqual(self.box.id, response.json()[0]['cid'])
+        self.assertEqual(1, response.json()[0]['search_score'])
+
+    def test_search2(self):
+        search_query = b64encode(b'def').decode('utf-8')
+        response = self.client.get(f'/api/2/{self.event.slug}/items/{search_query}/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(2, len(response.json()))
+        self.assertEqual(self.item1.id, response.json()[0]['id'])
+        self.assertEqual('abc def', response.json()[0]['description'])
+        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('def ghi', response.json()[1]['description'])
+        self.assertEqual('BOX', response.json()[1]['box'])
+        self.assertEqual(self.box.id, response.json()[1]['cid'])
+        self.assertEqual(1, response.json()[0]['search_score'])
+
+    def test_search3(self):
+        search_query = b64encode(b'jkl').decode('utf-8')
+        response = self.client.get(f'/api/2/{self.event.slug}/items/{search_query}/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(1, len(response.json()))
+        self.assertEqual(self.item3.id, response.json()[0]['id'])
+        self.assertEqual('jkl mno pqr', response.json()[0]['description'])
+        self.assertEqual('BOX', response.json()[0]['box'])
+        self.assertEqual(self.box.id, response.json()[0]['cid'])
+        self.assertEqual(1, response.json()[0]['search_score'])
+
+    def test_search4(self):
+        search_query = b64encode(b'abc def').decode('utf-8')
+        response = self.client.get(f'/api/2/{self.event.slug}/items/{search_query}/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(2, len(response.json()))
+        self.assertEqual(self.item1.id, response.json()[0]['id'])
+        self.assertEqual('abc def', response.json()[0]['description'])
+        self.assertEqual('BOX', response.json()[0]['box'])
+        self.assertEqual(self.box.id, response.json()[0]['cid'])
+        self.assertEqual(2, response.json()[0]['search_score'])
+        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'])
+        self.assertEqual(1, response.json()[1]['search_score'])
+

core/tickets/api_v2.py

@@ -1,4 +1,4 @@
-import logging
+from base64 import b64decode
 
 from django.urls import re_path
 from django.contrib.auth.decorators import permission_required
@@ -14,13 +14,24 @@ from inventory.models import Event
 from mail.models import Email
 from mail.protocol import send_smtp, make_reply, collect_references
 from notify_sessions.models import SystemEvent
-from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
-from tickets.serializers import IssueSerializer, CommentSerializer, ShippingVoucherSerializer
+from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher, ItemRelation
+from tickets.serializers import IssueSerializer, CommentSerializer, ShippingVoucherSerializer, SearchResultSerializer
+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):
+    serializer_class = RelationSerializer
+    queryset = ItemRelation.objects.all()
+
+
+class CommentViewSet(viewsets.ModelViewSet):
+    serializer_class = CommentSerializer
+    queryset = Comment.objects.all()
 
 
 class ShippingVoucherViewSet(viewsets.ModelViewSet):
@@ -56,7 +67,7 @@ def reply(request, pk):
 @api_view(['POST'])
 @permission_classes([IsAuthenticated])
 @permission_required('tickets.add_issuethread_manual', raise_exception=True)
-def manual_ticket(request):
+def manual_ticket(request, event_slug):
     if 'name' not in request.data:
         return Response({'status': 'error', 'message': 'missing name'}, status=status.HTTP_400_BAD_REQUEST)
     if 'sender' not in request.data:
@@ -66,8 +77,16 @@ def manual_ticket(request):
     if 'body' not in request.data:
         return Response({'status': 'error', 'message': 'missing body'}, status=status.HTTP_400_BAD_REQUEST)
 
+    event = None
+    if event_slug != 'none':
+        try:
+            event = Event.objects.get(slug=event_slug)
+        except:
+            return Response({'status': 'error', 'message': 'invalid event'}, status=status.HTTP_400_BAD_REQUEST)
+
     issue = IssueThread.objects.create(
         name=request.data['name'],
+        event=event,
         manually_created=True,
     )
     email = Email.objects.create(
@@ -117,13 +136,40 @@ def add_comment(request, pk):
     return Response(CommentSerializer(comment).data, status=status.HTTP_201_CREATED)
 
 
+def filter_issues(issues, query):
+    query_tokens = query.split(' ')
+    for issue in issues:
+        value = 0
+        for token in query_tokens:
+            if token in issue.description:
+                value += 1
+        if value > 0:
+            yield {'search_score': value, 'issue': issue}
+
+
+@api_view(['GET'])
+@permission_classes([])
+# @permission_classes([IsAuthenticated])
+# @permission_required('view_item', raise_exception=True)
+def search_issues(request, event_slug, query):
+    try:
+        event = Event.objects.get(slug=event_slug)
+        items = filter_issues(IssueThread.objects.filter(event=event), b64decode(query).decode('utf-8'))
+        return Response(SearchResultSerializer(items, many=True).data)
+    except Event.DoesNotExist:
+        return Response(status=404)
+
+
 router = routers.SimpleRouter()
 router.register(r'tickets', IssueViewSet, basename='issues')
+router.register(r'matches', RelationViewSet, basename='matches')
 router.register(r'shipping_vouchers', ShippingVoucherViewSet, basename='shipping_vouchers')
 
 urlpatterns = ([
+                   re_path(r'tickets/states/$', get_available_states, name='get_available_states'),
                    re_path(r'^tickets/(?P<pk>\d+)/reply/$', reply, name='reply'),
                    re_path(r'^tickets/(?P<pk>\d+)/comment/$', add_comment, name='add_comment'),
-                   re_path(r'^tickets/manual/$', manual_ticket, name='manual_ticket'),
-                   re_path(r'^tickets/states/$', get_available_states, name='get_available_states'),
+                   re_path(r'^(?P<event_slug>[\w-]+)/tickets/manual/$', manual_ticket, name='manual_ticket'),
+                   re_path(r'^(?P<event_slug>[\w-]+)/tickets/(?P<query>[-A-Za-z0-9+/]*={0,3})/$', search_issues,
+                            name='search_issues'),
                ] + router.urls)

core/tickets/migrations/0012_remove_issuethread_related_items_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.7 on 2024-11-20 23:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0006_alter_event_table'),
+        ('tickets', '0011_train_old_spam'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='issuethread',
+            name='related_items',
+        ),
+        migrations.AlterField(
+            model_name='itemrelation',
+            name='issue_thread',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='item_relation_changes', to='tickets.issuethread'),
+        ),
+        migrations.AlterField(
+            model_name='itemrelation',
+            name='item',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_relation_changes', to='inventory.item'),
+        ),
+    ]

core/tickets/models.py

@@ -1,5 +1,7 @@
-from django.db import models
+from itertools import groupby
+
 from django.utils import timezone
+from django.db import models
 from django_softdelete.models import SoftDeleteModel
 
 from authentication.models import ExtendedUser
@@ -43,7 +45,6 @@ class IssueThread(SoftDeleteModel):
     name = models.CharField(max_length=255)
     event = models.ForeignKey(Event, null=True, on_delete=models.SET_NULL, related_name='issue_threads')
     manually_created = models.BooleanField(default=False)
-    related_items = models.ManyToManyField(Item, through='ItemRelation')
 
     def short_uuid(self):
         return self.uuid[:8]
@@ -51,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'
 
@@ -66,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
 
@@ -76,6 +85,11 @@ class IssueThread(SoftDeleteModel):
             return
         self.assignments.create(assigned_to=value)
 
+    @property
+    def related_items(self):
+        groups = groupby(self.item_relation_changes.all(), lambda rel: rel.item.id)
+        return [sorted(v, key=lambda r: r.timestamp)[0].item for k, v in groups]
+
     def __str__(self):
         return '[' + str(self.id) + '][' + self.short_uuid() + '] ' + self.name
 
@@ -132,8 +146,8 @@ class Assignment(models.Model):
 
 class ItemRelation(models.Model):
     id = models.AutoField(primary_key=True)
-    issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='item_relations')
-    item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name='issues')
+    issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='item_relation_changes')
+    item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name='issue_relation_changes')
     timestamp = models.DateTimeField(auto_now_add=True)
     status = models.CharField(max_length=255, choices=RELATION_STATUS_CHOICES, default='possible')
 

core/tickets/serializers.py

@@ -1,9 +1,11 @@
 from rest_framework import serializers
 
 from authentication.models import ExtendedUser
+from inventory.models import Event
+from inventory.shared_serializers import BasicItemSerializer
 from mail.api_v2 import AttachmentSerializer
 from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
-from inventory.serializers import ItemSerializer
+from tickets.shared_serializers import BasicIssueSerializer
 
 
 class CommentSerializer(serializers.ModelSerializer):
@@ -36,24 +38,20 @@ class ShippingVoucherSerializer(serializers.ModelSerializer):
         read_only_fields = ('id', 'timestamp', 'used_at')
 
 
-class IssueSerializer(serializers.ModelSerializer):
+class IssueSerializer(BasicIssueSerializer):
     timeline = serializers.SerializerMethodField()
     last_activity = serializers.SerializerMethodField()
-    assigned_to = serializers.SlugRelatedField(slug_field='username', queryset=ExtendedUser.objects.all(),
-                                               allow_null=True, required=False)
-    related_items = ItemSerializer(many=True, read_only=True)
+    related_items = BasicItemSerializer(many=True, read_only=True)
 
     class Meta:
         model = IssueThread
-        fields = ('id', 'timeline', 'name', 'state', 'assigned_to', 'last_activity', 'uuid', 'related_items')
+        fields = ('id', 'timeline', 'name', 'state', 'assigned_to', 'last_activity', 'uuid', 'related_items', 'event')
         read_only_fields = ('id', 'timeline', 'last_activity', 'uuid', 'related_items')
 
     def to_internal_value(self, data):
         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):
@@ -65,14 +63,12 @@ class IssueSerializer(serializers.ModelSerializer):
     @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_relations.order_by('-timestamp').first().timestamp if \
-                self.item_relations.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)
@@ -114,13 +110,13 @@ class IssueSerializer(serializers.ModelSerializer):
                 'timestamp': assignment.timestamp,
                 'assigned_to': assignment.assigned_to.username,
             })
-        for relation in obj.item_relations.all():
+        for relation in (obj.item_relation_changes.all()):
             timeline.append({
                 'type': 'item_relation',
                 'id': relation.id,
                 'status': relation.status,
                 'timestamp': relation.timestamp,
-                'item': ItemSerializer(relation.item).data,
+                'item': BasicItemSerializer(relation.item).data,
             })
         for shipping_voucher in obj.shipping_vouchers.all():
             timeline.append({
@@ -132,5 +128,14 @@ class IssueSerializer(serializers.ModelSerializer):
             })
         return sorted(timeline, key=lambda x: x['timestamp'])
 
-    def get_queryset(self):
-        return IssueThread.objects.all().order_by('-last_activity')
+
+
+class SearchResultSerializer(serializers.Serializer):
+    search_score = serializers.IntegerField()
+    item = IssueSerializer()
+
+    def to_representation(self, instance):
+        return {**IssueSerializer(instance['item']).data, 'search_score': instance['search_score']}
+
+    class Meta:
+        model = IssueThread

core/tickets/shared_serializers.py

@@ -0,0 +1,23 @@
+from rest_framework import serializers
+
+from authentication.models import ExtendedUser
+from inventory.models import Event
+from tickets.models import IssueThread, ItemRelation
+
+
+class RelationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ItemRelation
+        fields = ('id', 'status', 'timestamp', 'item', 'issue_thread')
+
+
+class BasicIssueSerializer(serializers.ModelSerializer):
+    assigned_to = serializers.SlugRelatedField(slug_field='username', queryset=ExtendedUser.objects.all(),
+                                               allow_null=True, required=False)
+    event = serializers.SlugRelatedField(slug_field='slug', queryset=Event.objects.all(),
+                                         allow_null=True, required=False)
+
+    class Meta:
+        model = IssueThread
+        fields = ('id', 'name', 'state', 'assigned_to', 'uuid', 'event')
+        read_only_fields = ('id', 'timeline', 'last_activity', 'uuid', 'related_items')

core/tickets/tests/v2/test_matches.py

@@ -0,0 +1,149 @@
+from datetime import datetime, timedelta
+
+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 django.contrib.auth.models import Permission
+from knox.models import AuthToken
+
+from base64 import b64encode
+
+
+class IssueItemMatchApiTest(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.event = Event.objects.create(slug='evt')
+        self.box = Container.objects.create(name='box1')
+        self.item = Item.objects.create(container=self.box, description="foo", event=self.event)
+        self.token = AuthToken.objects.create(user=self.user)
+        self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
+        now = datetime.now()
+        self.issue = IssueThread.objects.create(
+            name="test issue",
+            event=self.event,
+        )
+        self.mail1 = Email.objects.create(
+            subject='test',
+            body='test',
+            sender='test',
+            recipient='test',
+            issue_thread=self.issue,
+            timestamp=now,
+        )
+        self.comment = Comment.objects.create(
+            issue_thread=self.issue,
+            comment="test",
+            timestamp=now + timedelta(seconds=3),
+        )
+        self.match = ItemRelation.objects.create(
+            issue_thread=self.issue,
+            item=self.item,
+            timestamp=now + timedelta(seconds=5),
+        )
+
+    def test_issues(self):
+        response = self.client.get('/api/2/tickets/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 1)
+        self.assertEqual(response.json()[0]['id'], self.issue.id)
+        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]['uuid'], self.issue.uuid)
+        self.assertEqual(response.json()[0]['last_activity'], self.match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'))
+        self.assertEqual(len(response.json()[0]['timeline']), 4)
+        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'], 'comment')
+        self.assertEqual(response.json()[0]['timeline'][1]['id'], self.mail1.id)
+        self.assertEqual(response.json()[0]['timeline'][2]['id'], self.comment.id)
+        self.assertEqual(response.json()[0]['timeline'][0]['state'], 'pending_new')
+        self.assertEqual(response.json()[0]['timeline'][1]['sender'], 'test')
+        self.assertEqual(response.json()[0]['timeline'][1]['recipient'], 'test')
+        self.assertEqual(response.json()[0]['timeline'][1]['subject'], 'test')
+        self.assertEqual(response.json()[0]['timeline'][1]['body'], 'test')
+        self.assertEqual(response.json()[0]['timeline'][1]['timestamp'],
+                         self.mail1.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'))
+        self.assertEqual(response.json()[0]['timeline'][2]['comment'], 'test')
+        self.assertEqual(response.json()[0]['timeline'][2]['timestamp'],
+                         self.comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'))
+        self.assertEqual(response.json()[0]['timeline'][3]['status'], 'possible')
+        self.assertEqual(response.json()[0]['timeline'][3]['timestamp'],
+                         self.match.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'))
+        self.assertEqual(response.json()[0]['timeline'][3]['item']['description'], "foo")
+        self.assertEqual(response.json()[0]['timeline'][3]['item']['event'], "evt")
+        self.assertEqual(response.json()[0]['timeline'][3]['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")
+
+    def test_members(self):
+        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'], self.item.id)
+        self.assertEqual(response.json()[0]['description'], 'foo')
+        self.assertEqual(response.json()[0]['box'], 'box1')
+        self.assertEqual(response.json()[0]['cid'], self.box.id)
+        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']), 1)
+        self.assertEqual(response.json()[0]['related_issues'][0]['id'], self.issue.id)
+        self.assertEqual(response.json()[0]['related_issues'][0]['name'], "test issue")
+
+    def test_add_match(self):
+        response = self.client.get('/api/2/matches/')
+        self.assertEqual(1, len(response.json()))
+        item = Item.objects.create(container=self.box, event=self.event, description='1')
+        issue = IssueThread.objects.create(name="test issue", event=self.event)
+
+        response = self.client.post(f'/api/2/matches/',
+                                    {'item': item.id, 'issue_thread': issue.id},
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+
+        response = self.client.get('/api/2/matches/')
+        self.assertEqual(2, len(response.json()))
+
+        response = self.client.get('/api/2/tickets/')
+        self.assertEqual(4, len(response.json()[0]['timeline']))
+        self.assertEqual('item_relation', response.json()[0]['timeline'][3]['type'])
+        self.assertEqual('possible', response.json()[0]['timeline'][3]['status'])
+        self.assertEqual(1, len(response.json()[0]['related_items']))
+
+    def test_change_match_state(self):
+        response = self.client.get('/api/2/matches/')
+        self.assertEqual(1, len(response.json()))
+
+        response = self.client.get('/api/2/tickets/')
+        self.assertEqual(4, len(response.json()[0]['timeline']))
+        self.assertEqual('item_relation', response.json()[0]['timeline'][3]['type'])
+        self.assertEqual('possible', response.json()[0]['timeline'][3]['status'])
+        self.assertEqual(1, len(response.json()[0]['related_items']))
+
+        response = self.client.post(f'/api/2/matches/',
+                                    {'item': self.item.id, 'issue_thread': self.issue.id, 'status': 'confirmed'},
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json()['status'], 'confirmed')
+        self.assertEqual(response.json()['id'], 2)
+
+        response = self.client.get('/api/2/matches/')
+        self.assertEqual(2, len(response.json()))
+
+        response = self.client.get('/api/2/tickets/')
+        self.assertEqual(5, len(response.json()[0]['timeline']))
+        self.assertEqual('item_relation', response.json()[0]['timeline'][3]['type'])
+        self.assertEqual('possible', response.json()[0]['timeline'][3]['status'])
+        self.assertEqual('item_relation', response.json()[0]['timeline'][4]['type'])
+        self.assertEqual('confirmed', response.json()[0]['timeline'][4]['status'])
+        self.assertEqual(1, len(response.json()[0]['related_items']))

core/tickets/tests/v2/test_tickets.py

@@ -3,11 +3,14 @@ from datetime import datetime, timedelta
 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
+from tickets.models import IssueThread, StateChange, Comment, ItemRelation
 from django.contrib.auth.models import Permission
 from knox.models import AuthToken
 
+from base64 import b64encode
+
 
 class IssueApiTest(TestCase):
 
@@ -16,6 +19,9 @@ class IssueApiTest(TestCase):
         self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
         self.user.user_permissions.add(*Permission.objects.all())
         self.user.save()
+        self.event = Event.objects.create(slug='evt')
+        self.box = Container.objects.create(name='box1')
+        self.item = Item.objects.create(container=self.box, description="foo", event=self.event)
         self.token = AuthToken.objects.create(user=self.user)
         self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
 
@@ -28,6 +34,7 @@ class IssueApiTest(TestCase):
         now = datetime.now()
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         mail1 = Email.objects.create(
             subject='test',
@@ -51,6 +58,11 @@ class IssueApiTest(TestCase):
             comment="test",
             timestamp=now + timedelta(seconds=3),
         )
+        match = ItemRelation.objects.create(
+            issue_thread=issue,
+            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)
@@ -61,10 +73,11 @@ class IssueApiTest(TestCase):
         self.assertEqual(response.json()[0]['id'], issue.id)
         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]['uuid'], issue.uuid)
-        self.assertEqual(response.json()[0]['last_activity'], comment.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'))
-        self.assertEqual(len(response.json()[0]['timeline']), 4)
+        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(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')
@@ -88,17 +101,29 @@ class IssueApiTest(TestCase):
         self.assertEqual(response.json()[0]['timeline'][3]['comment'], 'test')
         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')
+        self.assertEqual(response.json()[0]['timeline'][4]['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]['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")
 
     def test_issues_incomplete_timeline(self):
         now = datetime.now()
         issue1 = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         issue2 = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         issue3 = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         mail1 = Email.objects.create(
             subject='test',
@@ -118,8 +143,11 @@ class IssueApiTest(TestCase):
         self.assertEqual(200, response.status_code)
         self.assertEqual(3, len(response.json()))
         self.assertEqual(issue1.id, response.json()[0]['id'])
+        self.assertEqual("evt", response.json()[0]['event'])
         self.assertEqual(issue2.id, response.json()[1]['id'])
+        self.assertEqual("evt", response.json()[1]['event'])
         self.assertEqual(issue3.id, response.json()[2]['id'])
+        self.assertEqual("evt", response.json()[2]['event'])
         self.assertEqual(issue1.state_changes.first().timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
                          response.json()[0]['last_activity'])
         self.assertEqual(mail1.timestamp.strftime('%Y-%m-%dT%H:%M:%S.%fZ'),
@@ -153,6 +181,7 @@ class IssueApiTest(TestCase):
         now = datetime.now()
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         mail1 = Email.objects.create(
             subject='test',
@@ -189,6 +218,7 @@ class IssueApiTest(TestCase):
         self.assertEqual(200, response.status_code)
         self.assertEqual(1, len(response.json()))
         self.assertEqual(issue.id, response.json()[0]['id'])
+        self.assertEqual("evt", response.json()[0]['event'])
         self.assertEqual('pending_new', response.json()[0]['state'])
         self.assertEqual('test issue', response.json()[0]['name'])
         self.assertEqual(None, response.json()[0]['assigned_to'])
@@ -230,13 +260,14 @@ class IssueApiTest(TestCase):
         self.assertEqual(file2.hash, response.json()[0]['timeline'][1]['attachments'][1]['hash'])
 
     def test_manual_creation(self):
-        response = self.client.post('/api/2/tickets/manual/',
+        response = self.client.post('/api/2/evt/tickets/manual/',
                                     {'name': 'test issue', 'sender': 'test', 'recipient': 'test', 'body': 'test'},
                                     content_type='application/json')
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.json()['state'], 'pending_new')
         self.assertEqual(response.json()['name'], 'test issue')
         self.assertEqual(response.json()['assigned_to'], None)
+        self.assertEqual("evt", response.json()['event'])
         timeline = response.json()['timeline']
         self.assertEqual(len(timeline), 2)
         self.assertEqual(timeline[0]['type'], 'state')
@@ -247,9 +278,35 @@ class IssueApiTest(TestCase):
         self.assertEqual(timeline[1]['subject'], 'test issue')
         self.assertEqual(timeline[1]['body'], 'test')
 
+    def test_manual_creation_none(self):
+        response = self.client.post('/api/2/none/tickets/manual/',
+                                    {'name': 'test issue', 'sender': 'test', 'recipient': 'test', 'body': 'test'},
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json()['state'], 'pending_new')
+        self.assertEqual(response.json()['name'], 'test issue')
+        self.assertEqual(response.json()['assigned_to'], None)
+        self.assertEqual(None, response.json()['event'])
+        timeline = response.json()['timeline']
+        self.assertEqual(len(timeline), 2)
+        self.assertEqual(timeline[0]['type'], 'state')
+        self.assertEqual(timeline[0]['state'], 'pending_new')
+        self.assertEqual(timeline[1]['type'], 'mail')
+        self.assertEqual(timeline[1]['sender'], 'test')
+        self.assertEqual(timeline[1]['recipient'], 'test')
+        self.assertEqual(timeline[1]['subject'], 'test issue')
+        self.assertEqual(timeline[1]['body'], 'test')
+
+    def test_manual_creation_invalid(self):
+        response = self.client.post('/api/2/foobar/tickets/manual/',
+                                    {'name': 'test issue', 'sender': 'test', 'recipient': 'test', 'body': 'test'},
+                                    content_type='application/json')
+        self.assertEqual(response.status_code, 400)
+
     def test_post_comment_altenative(self):
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         response = self.client.post(f'/api/2/tickets/{issue.id}/comment/', {'comment': 'test'})
         self.assertEqual(response.status_code, 201)
@@ -260,6 +317,7 @@ class IssueApiTest(TestCase):
     def test_post_alt_comment_empty(self):
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         response = self.client.post(f'/api/2/tickets/{issue.id}/comment/', {'comment': ''})
         self.assertEqual(response.status_code, 400)
@@ -267,6 +325,7 @@ class IssueApiTest(TestCase):
     def test_state_change(self):
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         response = self.client.patch(f'/api/2/tickets/{issue.id}/', {'state': 'pending_open'},
                                      content_type='application/json')
@@ -284,6 +343,7 @@ class IssueApiTest(TestCase):
     def test_state_change_invalid_state(self):
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         response = self.client.patch(f'/api/2/tickets/{issue.id}/', {'state': 'invalid'},
                                      content_type='application/json')
@@ -292,12 +352,14 @@ class IssueApiTest(TestCase):
     def test_assign_user(self):
         issue = IssueThread.objects.create(
             name="test issue",
+            event=self.event,
         )
         response = self.client.patch(f'/api/2/tickets/{issue.id}/', {'assigned_to': self.user.username},
                                      content_type='application/json')
         self.assertEqual(200, response.status_code)
         self.assertEqual('pending_new', response.json()['state'])
         self.assertEqual('test issue', response.json()['name'])
+        self.assertEqual("evt", response.json()['event'])
         self.assertEqual(self.user.username, response.json()['assigned_to'])
         timeline = response.json()['timeline']
         self.assertEqual(2, len(timeline))
@@ -305,3 +367,21 @@ class IssueApiTest(TestCase):
         self.assertEqual('pending_new', timeline[0]['state'])
         self.assertEqual('assignment', timeline[1]['type'])
         self.assertEqual(self.user.username, timeline[1]['assigned_to'])
+
+
+class IssueSearchTest(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.event = Event.objects.create(slug='EVENT', name='Event')
+        self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
+        self.user.user_permissions.add(*Permission.objects.all())
+        self.user.save()
+        self.token = AuthToken.objects.create(user=self.user)
+        self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
+
+    def test_search(self):
+        search_query = b64encode(b'abc').decode('utf-8')
+        response = self.client.get(f'/api/2/{self.event.slug}/tickets/{search_query}/')
+        self.assertEqual(200, response.status_code)
+        self.assertEqual([], response.json())

web/src/components/Navbar.vue

@@ -6,7 +6,8 @@
                 {{ getEventSlug }}
             </button>
             <div class="dropdown-menu bg-dark" aria-labelledby="dropdownMenuButton">
-                <a class="dropdown-item text-light" href="#" v-for="(event, index) in events" v-bind:key="index"
+                <a class="dropdown-item text-light" href="#" v-for="(event, index) in selectableEvents"
+                   v-bind:key="index"
                    :class="{ active: event.slug === getEventSlug }" @click="changeEvent(event)">{{ event.slug }}</a>
             </div>
         </div>
@@ -48,12 +49,12 @@
                 </button>
             </div>
             <button type="button" class="btn text-nowrap btn-success mr-1" @click="$emit('addItemClicked')"
-                    v-if="isItemView()">
+                    v-if="isItemView()  && getEventSlug !== 'all'">
                 <font-awesome-icon icon="plus"/>
                 <span class="d-none d-md-inline">&nbsp;Add Item</span>
             </button>
             <button type="button" class="btn text-nowrap btn-success mr-1" @click="$emit('addTicketClicked')"
-                    v-if="isTicketView()">
+                    v-if="isTicketView() && getEventSlug !== 'all'">
                 <font-awesome-icon icon="plus"/>
                 <span class="d-none d-md-inline">&nbsp;Add Ticket</span>
             </button>
@@ -64,19 +65,6 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav ml-auto">
-                <!--li class="nav-item dropdown">
-                    <button class="btn nav-link dropdown-toggle" type="button" id="dropdownMenuButton2"
-                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        {{ getActiveView }}
-                    </button>
-                    <ul class="dropdown-menu bg-dark" aria-labelledby="dropdownMenuButton2">
-                        <li class="" v-for="(link, index) in views" v-bind:key="index"
-                            :class="{ active: link.path === getActiveView }">
-                            <a class="nav-link text-nowrap" href="#" @click="changeView(link)">{{ link.title }}</a>
-                        </li>
-                    </ul>
-                </li-->
-
                 <li class="nav-item" v-for="(link, index) in links" v-bind:key="index">
                     <a class="nav-link text-nowrap" :href="link.path" @click.prevent="navigateTo(link.path)">
                         {{ link.title }}
@@ -115,6 +103,9 @@ export default {
     computed: {
         ...mapState(['events']),
         ...mapGetters(['getEventSlug', 'getActiveView', "checkPermission", "hasPermissions", "layout", "route"]),
+        selectableEvents() {
+            return [{slug: 'all'}, ...this.events, {slug: 'none'}];
+        }
     },
     methods: {
         ...mapActions(['changeEvent', 'changeView']),

web/src/store.js

@@ -3,7 +3,7 @@ import router from './router';
 
 import * as base64 from 'base-64';
 import * as utf8 from 'utf8';
-import {ticketStateColorLookup, ticketStateIconLookup, http} from "@/utils";
+import {ticketStateColorLookup, ticketStateIconLookup, http, http_session} from "@/utils";
 import sharedStatePlugin from "@/shared-state-plugin";
 import persistentStatePlugin from "@/persistent-state-plugin";
 
@@ -11,17 +11,18 @@ const store = createStore({
     state: {
         keyIncrement: 0,
         events: [],
-        loadedItems: [],
-        itemCache: {},
+        items: [],
         loadedBoxes: [],
         toasts: [],
-        tickets: [],
         users: [],
         groups: [],
         state_options: [],
         shippingVouchers: [],
 
-        lastEvent: '37C3',
+        loadedItems: {},
+        loadedTickets: {},
+
+        lastEvent: 'all',
         lastUsed: {},
         searchQuery: '',
         remember: false,
@@ -62,7 +63,14 @@ const store = createStore({
     },
     getters: {
         route: state => router.currentRoute.value,
+        session: state => http_session(state.user.token),
         getEventSlug: state => router.currentRoute.value.params.event ? router.currentRoute.value.params.event : state.lastEvent,
+        getAllItems: state => Object.values(state.loadedItems).flat(),
+        getAllTickets: state => Object.values(state.loadedTickets).flat(),
+        getEventItems: (state, getters) => getters.getEventSlug === 'all' ? getters.getAllItems : getters.getAllItems.filter(t => t.event === getters.getEventSlug || (t.event == null && getters.getEventSlug === 'none')),
+        getEventTickets: (state, getters) => getters.getEventSlug === 'all' ? getters.getAllTickets : getters.getAllTickets.filter(t => t.event === getters.getEventSlug || (t.event == null && getters.getEventSlug === 'none')),
+        isItemsLoaded: (state, getters) => (getters.getEventSlug === 'all' || getters.getEventSlug === 'none') ? !!state.loadedItems : Object.keys(state.loadedItems).includes(getters.getEventSlug),
+        isTicketsLoaded: (state, getters) => (getters.getEventSlug === 'all' || getters.getEventSlug === 'none') ? !!state.loadedTickets : Object.keys(state.loadedTickets).includes(getters.getEventSlug),
         getActiveView: state => router.currentRoute.value.name || 'items',
         getFilters: state => router.currentRoute.value.query,
         getBoxes: state => state.loadedBoxes,
@@ -130,35 +138,48 @@ const store = createStore({
         changeView(state, {view, slug}) {
             router.push({path: `/${slug}/${view}`});
         },
-        replaceLoadedItems(state, newItems) {
-            state.loadedItems = newItems;
-            state.fetchedData = {...state.fetchedData, items: Date.now()}; // TODO: manage caching items for different events and search results correctly
-        },
-        setItemCache(state, {slug, items}) {
-            state.itemCache[slug] = items;
-        },
         replaceBoxes(state, loadedBoxes) {
             state.loadedBoxes = loadedBoxes;
             state.fetchedData = {...state.fetchedData, boxes: Date.now()};
         },
+        setItems(state, {slug, items}) {
+            state.loadedItems[slug] = items;
+            state.loadedItems = {...state.loadedItems};
+            console.log(state.loadedItems)
+        },
+        replaceItems(state, items) {
+            const groups = Object.groupBy(items, i => i.event ? i.event : 'none')
+            for (const [key, value] of Object.entries(groups)) state.loadedItems[key] = value;
+            state.loadedItems = {...state.loadedItems};
+            console.log(state.loadedItems)
+        },
         updateItem(state, updatedItem) {
-            const item = state.loadedItems.filter(({uid}) => uid === updatedItem.uid)[0];
+            const item = state.loadedItems[updatedItem.event?updatedItem.event:'none'].filter(
+                ({uid}) => uid === updatedItem.uid)[0];
             Object.assign(item, updatedItem);
         },
         removeItem(state, item) {
-            state.loadedItems = state.loadedItems.filter(it => it !== item);
+            state.loadedItems[item.event?item.event:'none'] = state.loadedItems[item.event].filter(it => it !== item);
         },
         appendItem(state, item) {
-            state.loadedItems.push(item);
+            state.loadedItems[item.event?item.event:'none'].push(item);
+        },
+        setTickets(state, {slug, tickets}) {
+            state.loadedTickets[slug] = tickets;
+            state.loadedTickets = {...state.loadedTickets};
+            console.log(state.loadedTickets)
         },
         replaceTickets(state, tickets) {
-            state.tickets = tickets;
-            state.fetchedData = {...state.fetchedData, tickets: Date.now()};
+            const groups = Object.groupBy(tickets, t => t.event ? t.event : 'none')
+            for (const [key, value] of Object.entries(groups)) state.loadedTickets[key] = value;
+            state.loadedTickets = {...state.loadedTickets};
+            console.log(state.loadedTickets)
         },
         updateTicket(state, updatedTicket) {
-            const ticket = state.tickets.filter(({id}) => id === updatedTicket.id)[0];
+            const ticket = state.loadedTickets[updatedTicket.event?updatedTicket.event:'none'].filter(
+                ({id}) => id === updatedTicket.id)[0];
             Object.assign(ticket, updatedTicket);
-            state.tickets = [...state.tickets];
+            state.loadedTickets = {...state.loadedTickets};
         },
         replaceUsers(state, users) {
             state.users = users;
@@ -249,7 +270,7 @@ const store = createStore({
                 return false;
             }
         },
-        async reloadToken({commit, state, getters}) {
+        async reloadToken({commit, state}) {
             try {
                 if (state.user.username && state.user.password) {
                     const data = await fetch('/api/2/login/', {
@@ -297,59 +318,51 @@ const store = createStore({
         async fetchImage({state}, url) {
             return await fetch(url, {headers: {'Authorization': `Token ${state.user.token}`}});
         },
-        async loadUserInfo({commit, state}) {
-            const {data, success} = await http.get('/2/self/', state.user.token);
+        async loadUserInfo({commit, getters}) {
+            const {data, success} = await getters.session.get('/2/self/');
             commit('setPermissions', data.permissions);
         },
-        async loadEvents({commit, state}) {
+        async loadEvents({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.events > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/events/', state.user.token);
-            if (data && success)
-                commit('replaceEvents', data);
+            const {data, success} = await getters.session.get('/2/events/');
+            if (data && success) commit('replaceEvents', data);
         },
-        async createEvent({commit, dispatch, state}, event) {
-            const {data, success} = await http.post('/2/events/', event, state.user.token);
-            if (data && success)
-                commit('replaceEvents', [...state.events, data]);
+        async createEvent({commit, dispatch, state, getters}, event) {
+            const {data, success} = await getters.session.post('/2/events/', event);
+            if (data && success) commit('replaceEvents', [...state.events, data]);
         },
-        async deleteEvent({commit, dispatch, state}, event_id) {
-            const {data, success} = await http.delete(`/2/events/${event_id}/`, state.user.token);
+        async deleteEvent({commit, dispatch, state, getters}, event_id) {
+            const {data, success} = await getters.session.delete(`/2/events/${event_id}/`);
             if (success) {
                 await dispatch('loadEvents')
                 commit('replaceEvents', [...state.events.filter(e => e.eid !== event_id)])
             }
         },
-        async fetchTicketStates({commit, state}) {
+        async fetchTicketStates({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.states > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/tickets/states/', state.user.token);
-            if (data && success)
-                commit('replaceTicketStates', data);
+            const {data, success} = await getters.session.get('/2/tickets/states/');
+            if (data && success) commit('replaceTicketStates', data);
         },
-        changeEvent({dispatch, getters, commit}, eventName) {
-            router.push({path: `/${eventName.slug}/${getters.getActiveView}/`});
-            dispatch('loadEventItems');
+        async changeEvent({dispatch, getters, commit}, eventName) {
+            await router.push({path: `/${eventName.slug}/${getters.getActiveView}/`});
+            //dispatch('loadEventItems');
         },
-        changeView({getters}, link) {
-            router.push({path: `/${getters.getEventSlug}/${link.path}/`});
+        async changeView({getters}, link) {
+            await router.push({path: `/${getters.getEventSlug}/${link.path}/`});
         },
-        showBoxContent({getters}, box) {
-            router.push({path: `/${getters.getEventSlug}/items/`, query: {box}});
+        async showBoxContent({getters}, box) {
+            await router.push({path: `/${getters.getEventSlug}/items/`, query: {box}});
         },
         async loadEventItems({commit, getters, state}) {
             if (!state.user.token) return;
             if (state.fetchedData.items > Date.now() - 1000 * 60 * 60 * 24) return;
             try {
-                commit('replaceLoadedItems', []);
                 const slug = getters.getEventSlug;
-                if (slug in state.itemCache) {
-                    commit('replaceLoadedItems', state.itemCache[slug]);
-                }
-                const {data, success} = await http.get(`/2/${slug}/items/`, state.user.token);
+                const {data, success} = await getters.session.get(`/2/${slug}/items/`);
                 if (data && success) {
-                    commit('replaceLoadedItems', data);
-                    commit('setItemCache', {slug, items: data});
+                    commit('setItems', {slug, items: data});
                 }
             } catch (e) {
                 console.error("Error loading items");
@@ -357,129 +370,124 @@ const store = createStore({
         },
         async searchEventItems({commit, getters, state}, query) {
             const encoded_query = base64.encode(utf8.encode(query));
-
-            const {data, success} = await http.get(`/2/${getters.getEventSlug}/items/${encoded_query}/`, state.user.token);
-            if (data && success)
-                commit('replaceLoadedItems', data);
+            const slug = getters.getEventSlug;
+            const {
+                data, success
+            } = await getters.session.get(`/2/${slug}/items/${encoded_query}/`);
+            if (data && success) {
+                commit('setItems', {slug, items: data});
+            }
         },
-        async loadBoxes({commit, state}) {
+        async loadBoxes({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.boxes > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/boxes/', state.user.token);
-            if (data && success)
-                commit('replaceBoxes', data);
+            const {data, success} = await getters.session.get('/2/boxes/');
+            if (data && success) commit('replaceBoxes', data);
         },
-        async createBox({commit, dispatch, state}, box) {
-            const {data, success} = await http.post('/2/boxes/', box, state.user.token);
+        async createBox({commit, dispatch, state, getters}, box) {
+            const {data, success} = await getters.session.post('/2/boxes/', box);
             commit('replaceBoxes', data);
             dispatch('loadBoxes').then(() => {
                 commit('closeAddBoxModal');
             });
         },
-        async deleteBox({commit, dispatch, state}, box_id) {
-            await http.delete(`/2/boxes/${box_id}/`, state.user.token);
+        async deleteBox({commit, dispatch, state, getters}, box_id) {
+            await getters.session.delete(`/2/boxes/${box_id}/`);
             dispatch('loadBoxes');
         },
         async updateItem({commit, getters, state}, item) {
             const {
-                data,
-                success
-            } = await http.put(`/2/${getters.getEventSlug}/item/${item.uid}/`, item, state.user.token);
+                data, success
+            } = await getters.session.put(`/2/${getters.getEventSlug}/item/${item.uid}/`, item);
             commit('updateItem', data);
         },
         async markItemReturned({commit, getters, state}, item) {
-            await http.patch(`/2/${getters.getEventSlug}/item/${item.uid}/`, {returned: true}, state.user.token);
+            await getters.session.patch(`/2/${getters.getEventSlug}/item/${item.uid}/`, {returned: true},
+                state.user.token);
             commit('removeItem', item);
         },
         async deleteItem({commit, getters, state}, item) {
-            await http.delete(`/2/${getters.getEventSlug}/item/${item.uid}/`, item, state.user.token);
+            await getters.session.delete(`/2/${getters.getEventSlug}/item/${item.uid}/`, item);
             commit('removeItem', item);
         },
         async postItem({commit, getters, state}, item) {
             commit('updateLastUsed', {box: item.box, cid: item.cid});
-            const {data, success} = await http.post(`/2/${getters.getEventSlug}/item/`, item, state.user.token);
+            const {data, success} = await getters.session.post(`/2/${getters.getEventSlug}/item/`, item);
             commit('appendItem', data);
         },
-        async loadTickets({commit, state}) {
+        async loadTickets({commit, state, getters}) {
             if (!state.user.token) return;
-            if (state.fetchedData.tickets > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/tickets/', state.user.token);
-            if (data && success)
-                commit('replaceTickets', data);
+            //if (state.fetchedData.tickets > Date.now() - 1000 * 60 * 60 * 24) return;
+            const {data, success} = await getters.session.get('/2/tickets/');
+            if (data && success) commit('replaceTickets', data);
         },
         async searchEventTickets({commit, getters, state}, query) {
             const encoded_query = base64.encode(utf8.encode(query));
 
-            const {data, success} = await http.get(`/2/${getters.getEventSlug}/tickets/${encoded_query}/`, state.user.token);
-            if (data && success)
-                commit('replaceTickets', data);
+            const {
+                data, success
+            } = await getters.session.get(`/2/${getters.getEventSlug}/tickets/${encoded_query}/`);
+            if (data && success) commit('replaceTickets', data);
         },
-        async sendMail({commit, dispatch, state}, {id, message}) {
-            const {data, success} = await http.post(`/2/tickets/${id}/reply/`, {message}, state.user.token);
+        async sendMail({commit, dispatch, state, getters}, {id, message}) {
+            const {data, success} = await getters.session.post(`/2/tickets/${id}/reply/`, {message},
+                state.user.token);
             if (data && success) {
                 state.fetchedData.tickets = 0;
                 await dispatch('loadTickets');
             }
         },
-        async postManualTicket({commit, dispatch, state}, {sender, message, title,}) {
-            const {data, success} = await http.post(`/2/tickets/manual/`, {
-                name: title,
-                sender,
-                body: message,
-                recipient: 'mail@c3lf.de'
-            }, state.user.token);
+        async postManualTicket({commit, dispatch, state, getters}, {sender, message, title,}) {
+            const {data, success} = await getters.session.post(`/2/tickets/manual/`, {
+                name: title, sender, body: message, recipient: 'mail@c3lf.de'
+            });
             await dispatch('loadTickets');
         },
-        async postComment({commit, dispatch, state}, {id, message}) {
-            const {data, success} = await http.post(`/2/tickets/${id}/comment/`, {comment: message}, state.user.token);
+        async postComment({commit, dispatch, state, getters}, {id, message}) {
+            const {data, success} = await getters.session.post(`/2/tickets/${id}/comment/`, {comment: message});
             if (data && success) {
                 state.fetchedData.tickets = 0;
                 await dispatch('loadTickets');
             }
         },
-        async loadUsers({commit, state}) {
+        async loadUsers({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.users > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/users/', state.user.token);
-            if (data && success)
-                commit('replaceUsers', data);
+            const {data, success} = await getters.session.get('/2/users/');
+            if (data && success) commit('replaceUsers', data);
         },
-        async loadGroups({commit, state}) {
+        async loadGroups({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.groups > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/groups/', state.user.token);
-            if (data && success)
-                commit('replaceGroups', data);
+            const {data, success} = await getters.session.get('/2/groups/');
+            if (data && success) commit('replaceGroups', data);
         },
-        async updateTicket({commit, state}, ticket) {
-            const {data, success} = await http.put(`/2/tickets/${ticket.id}/`, ticket, state.user.token);
+        async updateTicket({commit, state, getters}, ticket) {
+            const {data, success} = await getters.session.put(`/2/tickets/${ticket.id}/`, ticket);
             commit('updateTicket', data);
         },
-        async updateTicketPartial({commit, state}, {id, ...ticket}) {
-            const {data, success} = await http.patch(`/2/tickets/${id}/`, ticket, state.user.token);
+        async updateTicketPartial({commit, state, getters}, {id, ...ticket}) {
+            const {data, success} = await getters.session.patch(`/2/tickets/${id}/`, ticket);
             commit('updateTicket', data);
         },
-        async fetchShippingVouchers({commit, state}) {
+        async fetchShippingVouchers({commit, state, getters}) {
             if (!state.user.token) return;
             if (state.fetchedData.shippingVouchers > Date.now() - 1000 * 60 * 60 * 24) return;
-            const {data, success} = await http.get('/2/shipping_vouchers/', state.user.token);
+            const {data, success} = await getters.session.get('/2/shipping_vouchers/');
             if (data && success) {
                 commit('setShippingVouchers', data);
             }
         },
-        async createShippingVoucher({dispatch, state}, code) {
-            const {data, success} = await http.post('/2/shipping_vouchers/', code, state.user.token);
+        async createShippingVoucher({dispatch, state, getters}, code) {
+            const {data, success} = await getters.session.post('/2/shipping_vouchers/', code);
             if (data && success) {
                 state.fetchedData.shippingVouchers = 0;
                 dispatch('fetchShippingVouchers');
             }
         },
-        async claimShippingVoucher({dispatch, state}, {ticket, shipping_voucher_type}) {
+        async claimShippingVoucher({dispatch, state, getters}, {ticket, shipping_voucher_type}) {
             const id = state.shippingVouchers.filter(voucher => voucher.type === shipping_voucher_type && voucher.issue_thread === null)[0].id;
-            const {
-                data,
-                success
-            } = await http.patch(`/2/shipping_vouchers/${id}/`, {issue_thread: ticket}, state.user.token);
+            const {data, success} = await getters.session.patch(`/2/shipping_vouchers/${id}/`, {issue_thread: ticket});
             if (data && success) {
                 state.fetchedData.shippingVouchers = 0;
                 state.fetchedData.tickets = 0;
@@ -487,58 +495,30 @@ const store = createStore({
             }
         }
     },
-    plugins: [
-        persistentStatePlugin({ // TODO change remember to some kind of enable field
-            prefix: "lf_",
-            debug: false,
-            isLoadedKey: "persistent_loaded",
-            state: [
-                "remember",
-                "user",
-                "events",
-                "lastUsed",
-            ]
-        }),
-        sharedStatePlugin({
-            debug: false,
-            isLoadedKey: "shared_loaded",
-            clearingMutation: "logout",
-            afterInit: "afterSharedInit",
-            state: [
-                "test",
-                "state_options",
-                "fetchedData",
-                "tickets",
-                "users",
-                "groups",
-                "loadedBoxes",
-                "loadedItems",
-                "shippingVouchers",
-            ],
-            watch: [
-                "test",
-                "state_options",
-                "fetchedData",
-                "tickets",
-                "users",
-                "groups",
-                "loadedBoxes",
-                "loadedItems",
-                "shippingVouchers",
-            ],
-            mutations: [
-                //"replaceTickets",
-            ],
-        }),
-    ],
+    plugins: [persistentStatePlugin({ // TODO change remember to some kind of enable field
+        prefix: "lf_",
+        debug: false,
+        isLoadedKey: "persistent_loaded",
+        state: ["remember", "user", "events", "lastUsed",]
+    }), sharedStatePlugin({
+        debug: false,
+        isLoadedKey: "shared_loaded",
+        clearingMutation: "logout",
+        afterInit: "afterSharedInit",
+        state: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes", "loadedTickets", "shippingVouchers",],
+        watch: ["test", "state_options", "fetchedData", "loadedItems", "users", "groups", "loadedBoxes", "loadedTickets", "shippingVouchers",],
+        mutations: [//"replaceTickets",
+        ],
+    }),],
 });
 
 store.watch((state) => state.user, (user) => {
     if (store.getters.isLoggedIn) {
-        if (router.currentRoute.value.name === 'login' && router.currentRoute.value.query.redirect)
+        if (router.currentRoute.value.name === 'login' && router.currentRoute.value.query.redirect) {
             router.push(router.currentRoute.value.query.redirect);
-        else if (router.currentRoute.value.name === 'login')
+        } else if (router.currentRoute.value.name === 'login') {
             router.push('/');
+        }
     } else {
         if (router.currentRoute.value.name !== 'login') {
             router.push({

web/src/utils.js

@@ -100,4 +100,12 @@ const http = {
     }
 }
 
-export {ticketStateColorLookup, ticketStateIconLookup, http};
+const http_session = token => ({
+    get: async (url) => await http.get(url, token),
+    post: async (url, data) => await http.post(url, data, token),
+    put: async (url, data) => await http.put(url, data, token),
+    patch: async (url, data) => await http.patch(url, data, token),
+    delete: async (url) => await http.delete(url, token),
+});
+
+export {ticketStateColorLookup, ticketStateIconLookup, http, http_session};

web/src/views/Items.vue

@@ -1,5 +1,5 @@
 <template>
-    <AsyncLoader :loaded="loadedItems.length > 0">
+    <AsyncLoader :loaded="isItemsLoaded">
         <div class="container-fluid px-xl-5 mt-3">
             <Modal title="Edit Item" v-if="editingItem" @close="closeEditingModal()">
                 <template #body>
@@ -18,7 +18,7 @@
                 <div class="col-xl-8 offset-xl-2">
                     <Table
                         :columns="['uid', 'description', 'box']"
-                        :items="loadedItems"
+                        :items="getEventItems"
                         :keyName="'uid'"
                         @itemActivated="openLightboxModalWith($event)"
                     >
@@ -44,7 +44,7 @@
             <Cards
                 v-if="layout === 'cards'"
                 :columns="['uid', 'description', 'box']"
-                :items="loadedItems"
+                :items="getEventItems"
                 :keyName="'uid'"
                 v-slot="{ item }"
                 @itemActivated="openLightboxModalWith($event)"
@@ -97,8 +97,8 @@ export default {
     }),
     components: {AsyncLoader, AuthenticatedImage, Lightbox, Table, Cards, Modal, EditItem},
     computed: {
-        ...mapState(['loadedItems']),
-        ...mapGetters(['layout']),
+        ...mapState([]),
+        ...mapGetters(['getEventItems', 'isItemsLoaded', 'layout']),
     },
     methods: {
         ...mapActions(['deleteItem', 'markItemReturned', 'loadEventItems', 'updateItem', 'scheduleAfterInit']),

web/src/views/Ticket.vue

@@ -80,11 +80,11 @@ export default {
         }
     },
     computed: {
-        ...mapState(['tickets', 'state_options', 'users']),
-        ...mapGetters(['availableShippingVoucherTypes']),
+        ...mapState(['state_options', 'users']),
+        ...mapGetters(['availableShippingVoucherTypes', 'getAllTickets', 'route']),
         ticket() {
-            const id = parseInt(this.$route.params.id)
-            const ret = this.tickets.find(ticket => ticket.id === id);
+            const id = parseInt(this.route.params.id)
+            const ret = this.getAllTickets.find(ticket => ticket.id === id);
             return ret ? ret : {};
         },
         shippingEmail() {
@@ -124,14 +124,15 @@ export default {
         },
     },
     mounted() {
-		this.scheduleAfterInit(() => [Promise.all([this.fetchTicketStates(), this.loadTickets(), this.loadUsers(), this.fetchShippingVouchers()]).then(()=>{
-			if (this.ticket.state == "pending_new"){
-				this.selected_state = "pending_open";
-				this.changeTicketStatus(this.ticket)
-			};
-			this.selected_state = this.ticket.state;
-			this.selected_assignee = this.ticket.assigned_to
-		})]);
+        this.scheduleAfterInit(() => [Promise.all([this.fetchTicketStates(), this.loadTickets(), this.loadUsers(), this.fetchShippingVouchers()]).then(() => {
+            if (this.ticket.state == "pending_new") {
+                this.selected_state = "pending_open";
+                this.changeTicketStatus(this.ticket)
+            }
+            ;
+            this.selected_state = this.ticket.state;
+            this.selected_assignee = this.ticket.assigned_to
+        })]);
     }
 };
 </script>

web/src/views/Tickets.vue

@@ -1,11 +1,12 @@
 <template>
-    <AsyncLoader :loaded="tickets.length > 0">
+    <AsyncLoader :loaded="isTicketsLoaded">
         <div class="container-fluid px-xl-5 mt-3">
             <div class="row">
                 <div class="col-xl-8 offset-xl-2">
                     <Table
-                        :columns="['id', 'name', 'state', 'last_activity', 'assigned_to', 'actions', 'actions2']"
-                        :items="tickets.map(formatTicket)"
+                        :columns="['id', 'name', 'state', 'last_activity', 'assigned_to',
+                                    ...(getEventSlug==='all'?['event']:[])]"
+                        :items="getEventTickets.map(formatTicket)"
                         :keyName="'id'"
                         v-if="layout === 'table'"
                     >
@@ -21,8 +22,9 @@
                     </Table>
                 </div>
             </div>
-            <CollapsableCards v-if="layout === 'tasks'" :items="tickets"
-                              :columns="['id', 'name', 'last_activity', 'assigned_to']"
+            <CollapsableCards v-if="layout === 'tasks'" :items="getEventTickets"
+                              :columns="['id', 'name', 'last_activity', 'assigned_to',
+                                        ...(getEventSlug==='all'?['event']:[])]"
                               :keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
                           'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
                 <template #section_header="{index, section, count}">
@@ -34,6 +36,7 @@
                         <td>{{ item.name }}</td>
                         <td>{{ item.last_activity }}</td>
                         <td>{{ item.assigned_to }}</td>
+                        <td v-if="getEventSlug==='all'">{{ item.event }}</td>
                         <td>
                             <div class="btn-group">
                                 <a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
@@ -64,8 +67,7 @@ export default {
     name: 'Tickets',
     components: {AsyncLoader, Lightbox, Table, Cards, Modal, EditItem, CollapsableCards},
     computed: {
-        ...mapState(['tickets']),
-        ...mapGetters(['stateInfo', 'getEventSlug', 'layout']),
+        ...mapGetters(['getEventTickets', 'isTicketsLoaded', 'stateInfo', 'getEventSlug', 'layout']),
     },
     methods: {
         ...mapActions(['loadTickets', 'fetchTicketStates', 'scheduleAfterInit']),
@@ -79,7 +81,8 @@ export default {
                 state: this.stateInfo(ticket.state).text,
                 stateColor: this.stateInfo(ticket.state).color,
                 last_activity: ticket.last_activity,
-                assigned_to: ticket.assigned_to
+                assigned_to: ticket.assigned_to,
+                event: ticket.event
             };
         }
     },