From d1c3ffffc5f29c1a2ba75171c7833640fd479359 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Sat, 9 Nov 2024 05:05:05 +0100
Subject: [PATCH 01/16] implement simple backend search for items and tickets

---
 .forgejo/workflows/deploy_staging.yml |  5 +-
 core/inventory/tests/v2/test_items.py | 74 +++++++++++++++++++++++++++
 core/tickets/serializers.py           | 11 ++++
 3 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy_staging.yml b/.forgejo/workflows/deploy_staging.yml
index 3b44d24..0dccd66 100644
--- a/.forgejo/workflows/deploy_staging.yml
+++ b/.forgejo/workflows/deploy_staging.yml
@@ -20,9 +20,12 @@ jobs:
       - name: Run django tests
         working-directory: core
         run: python3 manage.py test
+      - name: Run django coverage
+        working-directory: core
+        run: coverage manage.py test
 
   deploy:
-    needs: [test]
+    needs: [ test ]
     runs-on: docker
     steps:
       - uses: actions/checkout@v4
diff --git a/core/inventory/tests/v2/test_items.py b/core/inventory/tests/v2/test_items.py
index 0c85eb4..9b25384 100644
--- a/core/inventory/tests/v2/test_items.py
+++ b/core/inventory/tests/v2/test_items.py
@@ -13,6 +13,8 @@ from base64 import b64encode
 
 from tickets.models import IssueThread, ItemRelation
 
+from base64 import b64encode
+
 
 class ItemTestCase(TestCase):
 
@@ -343,3 +345,75 @@ class ItemSearchTestCase(TestCase):
         self.assertEqual('BOX1', response.json()[1]['box'])
         self.assertEqual(self.box1.id, response.json()[1]['cid'])
         self.assertEqual(1, response.json()[1]['search_score'])
+
+
+
+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.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()[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'])
+
diff --git a/core/tickets/serializers.py b/core/tickets/serializers.py
index 50cdb72..6ce73be 100644
--- a/core/tickets/serializers.py
+++ b/core/tickets/serializers.py
@@ -146,3 +146,14 @@ class SearchResultSerializer(serializers.Serializer):
 
     class Meta:
         model = IssueThread
+
+
+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

From 9141752fdfcb39094293c255062c63be42200751 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Tue, 17 Dec 2024 21:52:57 +0100
Subject: [PATCH 02/16] fix container selection in AddItemModal.vue

---
 web/src/components/AddItemModal.vue      | 55 ++++++++++++++++++------
 web/src/components/AddTicketModal.vue    |  3 +-
 web/src/components/EditItem.vue          | 50 ---------------------
 web/src/components/inputs/InputCombo.vue |  6 +--
 web/src/views/Item.vue                   |  2 -
 web/src/views/Items.vue                  |  5 +--
 6 files changed, 48 insertions(+), 73 deletions(-)
 delete mode 100644 web/src/components/EditItem.vue

diff --git a/web/src/components/AddItemModal.vue b/web/src/components/AddItemModal.vue
index a3c23fd..24bd449 100644
--- a/web/src/components/AddItemModal.vue
+++ b/web/src/components/AddItemModal.vue
@@ -2,7 +2,29 @@
     <div>
         <Modal v-if="isModal" title="Add Item" @close="$emit('close')">
             <template #body>
-                <EditItem :item="item"/>
+                <div>
+                    <InputPhoto
+                        :model="item"
+                        field="file"
+                        :on-capture="storeImage"
+                    />
+                    <InputString
+                        label="description"
+                        :model="item"
+                        field="description"
+                        :validation-fn="str => str && str.length > 0"
+                    />
+                    <div class="form-group">
+                        <label for="box">box</label>
+                        <InputCombo
+                            label="box"
+                            :model="item"
+                            nameKey="box"
+                            uniqueKey="cid"
+                            :options="boxes"
+                        />
+                    </div>
+                </div>
             </template>
             <template #buttons>
                 <button type="button" class="btn btn-secondary" @click="$emit('close')">Cancel</button>
@@ -13,33 +35,40 @@
 </template>
 
 <script>
+import {mapActions, mapGetters, mapState} from "vuex";
 import Modal from '@/components/Modal';
-import EditItem from '@/components/EditItem';
-import {mapActions, mapState} from "vuex";
+import InputCombo from "@/components/inputs/InputCombo.vue";
+import InputPhoto from "@/components/inputs/InputPhoto.vue";
+import InputString from "@/components/inputs/InputString.vue";
 
 export default {
     name: 'AddItemModal',
-    components: {Modal, EditItem},
+    components: {InputString, InputPhoto, InputCombo, Modal},
     props: ['isModal'],
     data: () => ({
         item: {}
     }),
     computed: {
-        ...mapState(['lastUsed'])
+        ...mapState(['lastUsed']),
+        ...mapGetters(['getBoxes']),
+        boxes({getBoxes}) {
+            return getBoxes.map(obj => ({cid: obj.id, box: obj.name}));
+        }
     },
     methods: {
         ...mapActions(['postItem', 'loadBoxes', 'scheduleAfterInit']),
-        saveNewItem() {
-            this.postItem(this.item).then(() => {
-                this.$emit('close');
-            });
+        async saveNewItem() {
+            await this.postItem(this.item);
+            this.$emit('close');
+        },
+        storeImage(image) {
+            this.item.dataImage = image;
         }
     },
-    created() {
-        this.item = {box: this.lastUsed.box || '', cid: this.lastUsed.cid || ''};
-    },
     mounted() {
-        this.scheduleAfterInit(() => [this.loadBoxes()]);
+        this.scheduleAfterInit(() => [this.loadBoxes().then(() => {
+            this.item = {box: this.lastUsed.box || '', cid: this.lastUsed.cid || ''};
+        })])
     }
 };
 </script>
diff --git a/web/src/components/AddTicketModal.vue b/web/src/components/AddTicketModal.vue
index 37d539c..b407670 100644
--- a/web/src/components/AddTicketModal.vue
+++ b/web/src/components/AddTicketModal.vue
@@ -19,11 +19,10 @@
 <script>
 import {mapActions} from 'vuex';
 import Modal from '@/components/Modal';
-import EditItem from '@/components/EditItem';
 
 export default {
     name: 'AddTicketModal',
-    components: {Modal, EditItem},
+    components: {Modal},
     props: ['isModal'],
     data: () => ({
         ticket: {
diff --git a/web/src/components/EditItem.vue b/web/src/components/EditItem.vue
deleted file mode 100644
index 833bfd5..0000000
--- a/web/src/components/EditItem.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-    <div>
-        <h6>Editing Item <span class="badge badge-secondary">#{{ item.uid }}</span></h6>
-        <InputPhoto
-            :model="item"
-            field="file"
-            :on-capture="storeImage"
-        />
-        <InputString
-            label="description"
-            :model="item"
-            field="description"
-            :validation-fn="str => str && str.length > 0"
-        />
-        <div class="form-group">
-            <label for="box">box</label>
-            <InputCombo
-                label="box"
-                :model="item"
-                nameKey="box"
-                uniqueKey="cid"
-                :options="boxes"
-            />
-        </div>
-    </div>
-</template>
-
-<script>
-import InputString from './inputs/InputString';
-import InputCombo from './inputs/InputCombo';
-import {mapGetters} from 'vuex';
-import InputPhoto from './inputs/InputPhoto';
-
-export default {
-    name: 'EditItem',
-    components: {InputPhoto, InputCombo, InputString},
-    props: ['item'],
-    computed: {
-        ...mapGetters(['getBoxes']),
-        boxes({getBoxes}) {
-            return getBoxes.map(obj => ({cid: obj.cid, box: obj.name}));
-        }
-    },
-    methods: {
-        storeImage(image) {
-            this.item.dataImage = image;
-        }
-    }
-};
-</script>
diff --git a/web/src/components/inputs/InputCombo.vue b/web/src/components/inputs/InputCombo.vue
index fc64d42..2a291e0 100644
--- a/web/src/components/inputs/InputCombo.vue
+++ b/web/src/components/inputs/InputCombo.vue
@@ -43,11 +43,11 @@ export default {
     props: ['label', 'model', 'nameKey', 'uniqueKey', 'options', 'onOptionAdd'],
     data: ({options, model, nameKey, uniqueKey}) => ({
         internalName: model[nameKey],
-        selectedOption: options.filter(e => e[uniqueKey] == model[uniqueKey])[0],
+        selectedOption: options.filter(e => e[uniqueKey] === model[uniqueKey])[0],
         addingOption: false
     }),
     computed: {
-        isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] == internalName),
+        isValid: ({options, nameKey, internalName}) => options.some(e => e[nameKey] === internalName),
         sortedOptions: ({
                             options,
                             nameKey
@@ -56,7 +56,7 @@ export default {
     watch: {
         internalName(newValue) {
             if (this.isValid) {
-                if (!this.selectedOption || newValue != this.selectedOption[this.nameKey]) {
+                if (!this.selectedOption || newValue !== this.selectedOption[this.nameKey]) {
                     this.selectedOption = this.options.filter(e => e[this.nameKey] === newValue)[0];
                 }
                 this.model[this.nameKey] = this.selectedOption[this.nameKey];
diff --git a/web/src/views/Item.vue b/web/src/views/Item.vue
index d00b8b1..7b9f484 100644
--- a/web/src/views/Item.vue
+++ b/web/src/views/Item.vue
@@ -112,14 +112,12 @@ import InputString from "@/components/inputs/InputString.vue";
 import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
 import InputPhoto from "@/components/inputs/InputPhoto.vue";
 import Modal from "@/components/Modal.vue";
-import EditItem from "@/components/EditItem.vue";
 import AsyncButton from "@/components/inputs/AsyncButton.vue";
 
 export default {
     name: 'Item',
     components: {
         AsyncButton,
-        EditItem,
         Modal, InputPhoto, AuthenticatedImage, InputString, InputCombo, AsyncLoader, ClipboardButton, Timeline
     },
     data() {
diff --git a/web/src/views/Items.vue b/web/src/views/Items.vue
index 21b11d1..30e553f 100644
--- a/web/src/views/Items.vue
+++ b/web/src/views/Items.vue
@@ -67,11 +67,10 @@
 </template>
 
 <script>
+import {mapActions, mapGetters, mapMutations} from 'vuex';
 import Table from '@/components/Table';
 import Cards from '@/components/Cards';
 import Modal from '@/components/Modal';
-import EditItem from '@/components/EditItem';
-import {mapActions, mapGetters, mapMutations} from 'vuex';
 import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
 import AsyncLoader from "@/components/AsyncLoader.vue";
 import router from "@/router";
@@ -82,7 +81,7 @@ export default {
         lightboxHash: null,
         editingItem: null,
     }),
-    components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal, EditItem},
+    components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal},
     computed: {
         ...mapGetters(['getEventItems', 'isItemsLoaded', 'layout']),
     },

From b31f3758e0234f7a655b4b85e31822858d6fe273 Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Thu, 19 Dec 2024 13:44:17 +0000
Subject: [PATCH 03/16] cicd: Fix failure when .ssh exists

---
 .forgejo/workflows/deploy_staging.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/deploy_staging.yml b/.forgejo/workflows/deploy_staging.yml
index 3b44d24..4c5fcd0 100644
--- a/.forgejo/workflows/deploy_staging.yml
+++ b/.forgejo/workflows/deploy_staging.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Populate relevant files
         run: |
-          mkdir ~/.ssh
+          mkdir -p ~/.ssh
           echo "${{ secrets.C3LF_SSH_TESTING }}" > ~/.ssh/id_ed25519
           chmod 0600 ~/.ssh/id_ed25519
           ls -lah ~/.ssh
@@ -43,7 +43,7 @@ jobs:
           eval $(ssh-agent -s)
           ssh-add ~/.ssh/id_ed25519
           echo "andromeda.lab.or.it ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDXPoO0PE+B9PYwbGaLo98zhbmjAkp6eBtVeZe43v/+T" >> ~/.ssh/known_hosts
-          mkdir /etc/ansible
+          mkdir -p /etc/ansible
           echo "${{ secrets.C3LF_INVENTORY_TESTING }}" > /etc/ansible/hosts
 
       - name: Check ansible version

From e4fa48eb75300bb99e1a6a31f00c318da28cadaf Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Sat, 21 Dec 2024 20:21:05 +0100
Subject: [PATCH 04/16] force loading of items after switching to another event

---
 web/src/views/Items.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/src/views/Items.vue b/web/src/views/Items.vue
index 30e553f..72b4079 100644
--- a/web/src/views/Items.vue
+++ b/web/src/views/Items.vue
@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import {mapActions, mapGetters, mapMutations} from 'vuex';
+import {mapActions, mapGetters, mapMutations, mapState} from 'vuex';
 import Table from '@/components/Table';
 import Cards from '@/components/Cards';
 import Modal from '@/components/Modal';
@@ -83,7 +83,7 @@ export default {
     }),
     components: {AsyncLoader, AuthenticatedImage, Table, Cards, Modal},
     computed: {
-        ...mapGetters(['getEventItems', 'isItemsLoaded', 'layout']),
+        ...mapGetters(['getEventItems', 'isItemsLoaded', 'layout', 'getEventSlug']),
     },
     methods: {
         ...mapActions(['deleteItem', 'markItemReturned', 'loadEventItems', 'updateItem', 'scheduleAfterInit']),
@@ -95,6 +95,11 @@ export default {
             return window.confirm(message);
         }
     },
+    watch: {
+        getEventSlug() {
+            this.scheduleAfterInit(() => [this.loadEventItems()]);
+        }
+    },
     mounted() {
         this.scheduleAfterInit(() => [this.loadEventItems()]);
     }

From c512da26602a80fe1b29afbe34143a27f94447cb Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Sun, 22 Dec 2024 18:18:54 +0100
Subject: [PATCH 05/16] use id instead of eid in Events.vue and use index
 independent of sorting

---
 web/src/views/admin/Events.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/src/views/admin/Events.vue b/web/src/views/admin/Events.vue
index e2ff952..e156d56 100644
--- a/web/src/views/admin/Events.vue
+++ b/web/src/views/admin/Events.vue
@@ -1,6 +1,7 @@
 <template>
     <AsyncLoader :loaded="events.length > 0">
-        <ExpandableTable v-if="!!events" :columns="['slug', 'name']" :items="events" :keyName="'slug'">
+        <ExpandableTable v-if="!!events" :columns="['slug', 'name']" :items="events.map((e,i)=>({idx: i, ...e}))"
+                         :keyName="'slug'">
             <template v-slot:header_actions>
                 <button class="btn btn-success" @click.prevent="openAddEventModal">
                     <font-awesome-icon icon="plus"/>
@@ -43,7 +44,7 @@
                 <div class="mt-3">
                     <label class="mr-3">Addresses: </label>
                     <div v-for="(address, a_id) in item.addresses" class="btn-group btn-group-sm mr-3"
-                         @click.stop="deleteAddress(id, a_id)">
+                         @click.stop="deleteAddress(item.idx, a_id)">
                         <button class="btn btn-secondary" disabled style="opacity: 1">
                             {{ address }}
                         </button>
@@ -52,8 +53,9 @@
                         </button>
                     </div>
                     <div class="btn-group btn-group-sm">
-                        <input type="text" v-model="new_address[id]">
-                        <button class="btn btn-secondary" @click.stop="addAddress(id)" style="white-space: nowrap;">
+                        <input type="text" v-model="new_address[item.idx]">
+                        <button class="btn btn-secondary" @click.stop="addAddress(item.idx)"
+                                style="white-space: nowrap;">
                             <font-awesome-icon icon="envelope"/>&nbsp;add
                         </button>
                     </div>
@@ -88,11 +90,11 @@ export default {
             if (!this.events[id].addresses.includes(a))
                 this.events[id].addresses.push(a)
             this.new_address[id] = ""
-            this.updateEvent({id: this.events[id].eid, partial_event: {addresses: this.events[id].addresses}});
+            this.updateEvent({id: this.events[id].id, partial_event: {addresses: this.events[id].addresses}});
         },
         deleteAddress(id, a_id) {
             this.events[id].addresses = this.events[id].addresses.filter((e, i) => i !== a_id);
-            this.updateEvent({id: this.events[id].eid, partial_event: {addresses: this.events[id].addresses}});
+            this.updateEvent({id: this.events[id].id, partial_event: {addresses: this.events[id].addresses}});
         }
     },
 };

From ed7186cbbdc47c618b03bdd2b9c5a5f94d357de1 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Sun, 22 Dec 2024 21:00:28 +0100
Subject: [PATCH 06/16] add testdata to docker setup. use sqlite in 'dev'
 scenario and mailpit in 'testing'

---
 core/core/settings.py              | 25 ++++++---
 deploy/dev/docker-compose.yml      | 26 +--------
 deploy/testdata.py                 | 88 ++++++++++++++++++++++++++++++
 deploy/testing/docker-compose.yml  | 21 ++++++-
 web/node_modules/.forgit_fordocker |  0
 5 files changed, 126 insertions(+), 34 deletions(-)
 create mode 100644 deploy/testdata.py
 create mode 100644 web/node_modules/.forgit_fordocker

diff --git a/core/core/settings.py b/core/core/settings.py
index 5a8f20f..805a27b 100644
--- a/core/core/settings.py
+++ b/core/core/settings.py
@@ -124,19 +124,12 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'core.wsgi.application'
+ASGI_APPLICATION = 'core.asgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
-if 'test' in sys.argv:
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': ':memory:',
-        }
-    }
-else:
+if os.getenv('DB_HOST') is not None:
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.mysql',
@@ -149,6 +142,20 @@ else:
                 'charset': 'utf8mb4',
                 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
             }
+        },
+    }
+elif os.getenv('DB_FILE') is not None:
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': os.getenv('DB_FILE', 'local.db'),
+        }
+    }
+else:
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': ':memory:',
         }
     }
 
diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml
index dff5ab3..e44c276 100644
--- a/deploy/dev/docker-compose.yml
+++ b/deploy/dev/docker-compose.yml
@@ -3,20 +3,15 @@ services:
     build:
       context: ../../core
       dockerfile: ../deploy/dev/Dockerfile.backend
-    command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000'
+    command: bash -c 'python manage.py migrate && python testdata.py && python manage.py runserver 0.0.0.0:8000'
     environment:
       - HTTP_HOST=core
-      - DB_HOST=db
-      - DB_PORT=3306
-      - DB_NAME=system3
-      - DB_USER=system3
-      - DB_PASSWORD=system3
+      - DB_FILE=dev.db
     volumes:
       - ../../core:/code
+      - ../testdata.py:/code/testdata.py
     ports:
       - "8000:8000"
-    depends_on:
-      - db
 
   frontend:
     build:
@@ -31,18 +26,3 @@ services:
       - "8080:8080"
     depends_on:
       - core
-
-  db:
-    image: mariadb
-    environment:
-      MARIADB_RANDOM_ROOT_PASSWORD: true
-      MARIADB_DATABASE: system3
-      MARIADB_USER: system3
-      MARIADB_PASSWORD: system3
-    volumes:
-      - mariadb_data:/var/lib/mysql
-    ports:
-      - "3306:3306"
-
-volumes:
-  mariadb_data:
\ No newline at end of file
diff --git a/deploy/testdata.py b/deploy/testdata.py
new file mode 100644
index 0000000..dca385f
--- /dev/null
+++ b/deploy/testdata.py
@@ -0,0 +1,88 @@
+import os
+
+
+def setup():
+    from authentication.models import ExtendedUser, EventPermission
+    from inventory.models import Event
+    from django.contrib.auth.models import Permission, Group
+    permissions = ['add_item', 'view_item', 'view_file', 'delete_item', 'change_item']
+    if not ExtendedUser.objects.filter(username='admin').exists():
+        admin = ExtendedUser.objects.create_superuser('admin', 'admin@example.com', 'admin')
+        admin.set_password('admin')
+        admin.user_permissions.add(*Permission.objects.all())
+        admin.save()
+
+    if not ExtendedUser.objects.filter(username='testuser').exists():
+        testuser = ExtendedUser.objects.create_user('testuser', 'testuser@example.com', 'testuser')
+        testuser.set_password('testuser')
+        testuser.user_permissions.add(*Permission.objects.all())
+        testuser.save()
+
+    team = Group.objects.get(name='Team')
+    team.permissions.add(
+        *Permission.objects.all()
+    )
+
+    if not ExtendedUser.objects.filter(username='testuser2').exists():
+        testuser2 = ExtendedUser.objects.create_user('testuser2', 'testuser2@example.com', 'testuser2')
+        testuser2.set_password('testuser2')
+        testuser2.groups.add(team)
+        testuser2.save()
+
+    event1 = Event.objects.get_or_create(id=1, name='first test event', slug='TEST1',
+                                         start='2023-12-18 00:00:00.000000', end='2023-12-27 00:00:00.000000',
+                                         pre_start='2023-12-31 00:00:00.000000', post_end='2024-01-04 00:00:00.000000')[
+        0]
+
+    event2 = Event.objects.get_or_create(id=2, name='second test event', slug='TEST2',
+                                         start='2024-12-18 00:00:00.000000', end='2024-12-27 00:00:00.000000',
+                                         pre_start='2024-12-31 00:00:00.000000', post_end='2025-01-04 00:00:00.000000')[
+        0]
+
+    #    for permission in permissions:
+    #        EventPermission.objects.create(event=event_37c3, user=foo,
+    #                                       permission=Permission.objects.get(codename=permission))
+
+    from tickets.models import IssueThread
+
+    from mail.models import Email
+
+    issue_thread = IssueThread.objects.get_or_create(
+        id=1,
+        name="test",
+        event=Event.objects.get(slug='TEST1')
+    )[0]
+    mail1 = Email.objects.get_or_create(
+        id=1,
+        subject='test subject',
+        body='test',
+        sender='test1@test',
+        recipient='test2@test',
+        issue_thread=issue_thread,
+    )[0]
+    mail1_reply = Email.objects.get_or_create(
+        id=2,
+        subject='Message received',
+        body='Thank you for your message.',
+        sender='test2@test',
+        recipient='test1@test',
+        in_reply_to=mail1.reference,
+        issue_thread=issue_thread,
+    )[0]
+
+
+def main():
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "core.settings")
+    import django
+
+    django.setup()
+
+    from django.core.management import call_command
+    call_command('migrate')
+
+    setup()
+    print('testdata initialised')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/deploy/testing/docker-compose.yml b/deploy/testing/docker-compose.yml
index e93e901..b41dd63 100644
--- a/deploy/testing/docker-compose.yml
+++ b/deploy/testing/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     build:
       context: ../../core
       dockerfile: ../deploy/testing/Dockerfile.backend
-    command: bash -c 'python manage.py migrate && python /code/server.py'
+    command: bash -c 'python manage.py migrate &&  python testdata.py && python /code/server.py'
     environment:
       - HTTP_HOST=core
       - REDIS_HOST=redis
@@ -29,13 +29,16 @@ services:
       - DB_NAME=system3
       - DB_USER=system3
       - DB_PASSWORD=system3
+      - MAIL_DOMAIN=mail:1025
     volumes:
       - ../../core:/code
+      - ../testdata.py:/code/testdata.py
     ports:
       - "8000:8000"
     depends_on:
       - db
       - redis
+      - mail
 
   frontend:
     build:
@@ -51,5 +54,19 @@ services:
     depends_on:
       - core
 
+  mail:
+    image: docker.io/axllent/mailpit
+    volumes:
+      - mailpit_data:/data
+    ports:
+      - 8025:8025
+      - 1025:1025
+    environment:
+      MP_MAX_MESSAGES: 5000
+      MP_DATABASE: /data/mailpit.db
+      MP_SMTP_AUTH_ACCEPT_ANY: 1
+      MP_SMTP_AUTH_ALLOW_INSECURE: 1
+
 volumes:
-  mariadb_data:
\ No newline at end of file
+  mariadb_data:
+  mailpit_data:
diff --git a/web/node_modules/.forgit_fordocker b/web/node_modules/.forgit_fordocker
new file mode 100644
index 0000000..e69de29

From 1e2315102197d801d3211c9d88b4b753e2c0b26f Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Sun, 22 Dec 2024 21:26:45 +0100
Subject: [PATCH 07/16] deploy: Fix dkim-key selection in rspamd

---
 .../playbooks/templates/rspamd-dkim.cf.j2     | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2

diff --git a/deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2 b/deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2
new file mode 100644
index 0000000..9e21aa5
--- /dev/null
+++ b/deploy/ansible/playbooks/templates/rspamd-dkim.cf.j2
@@ -0,0 +1,79 @@
+# local.d/dkim_signing.conf
+
+enabled = true;
+
+# If false, messages with empty envelope from are not signed
+allow_envfrom_empty = true;
+
+# If true, envelope/header domain mismatch is ignored
+allow_hdrfrom_mismatch = false;
+
+# If true, multiple from headers are allowed (but only first is used)
+allow_hdrfrom_multiple = false;
+
+# If true, username does not need to contain matching domain
+allow_username_mismatch = false;
+
+# Default path to key, can include '$domain' and '$selector' variables
+path = "/var/lib/rspamd/dkim/$domain.$selector.key";
+
+# Default selector to use
+selector = "dkim";
+
+# If false, messages from authenticated users are not selected for signing
+sign_authenticated = true;
+
+# If false, messages from local networks are not selected for signing
+sign_local = true;
+
+# Map file of IP addresses/subnets to consider for signing
+# sign_networks = "/some/file"; # or url
+
+# Symbol to add when message is signed
+symbol = "DKIM_SIGNED";
+
+# Whether to fallback to global config
+try_fallback = true;
+
+# Domain to use for DKIM signing: can be "header" (MIME From), "envelope" (SMTP From), "recipient" (SMTP To), "auth" (SMTP username) or directly specified domain name
+use_domain = "header";
+
+# Domain to use for DKIM signing when sender is in sign_networks ("header"/"envelope"/"auth")
+#use_domain_sign_networks = "header";
+
+# Domain to use for DKIM signing when sender is a local IP ("header"/"envelope"/"auth")
+#use_domain_sign_local = "header";
+
+# Whether to normalise domains to eSLD
+use_esld = true;
+
+# Whether to get keys from Redis
+use_redis = false;
+
+# Hash for DKIM keys in Redis
+key_prefix = "DKIM_KEYS";
+
+# map of domains -> names of selectors (since rspamd 1.5.3)
+#selector_map = "/etc/rspamd/dkim_selectors.map";
+
+# map of domains -> paths to keys (since rspamd 1.5.3)
+#path_map = "/etc/rspamd/dkim_paths.map";
+
+# If `true` get pubkey from DNS record and check if it matches private key
+check_pubkey = false;
+# Set to `false` if you want to skip signing if public and private keys mismatch
+allow_pubkey_mismatch = true;
+
+# Domain specific settings
+domain {
+  # Domain name is used as key
+  c3lf.de {
+
+    # Private key path
+    path = "/var/lib/rspamd/dkim/{{ mail_domain }}.key";
+
+    # Selector
+    selector = "{{ mail_domain }}";
+  }
+}
+

From 06c0d6cf44cb36dce1efc0d655a7c0f6d98e09db Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Sat, 21 Dec 2024 12:51:38 +0100
Subject: [PATCH 08/16] metrics: Add the first (simple) custom metrics

---
 core/core/management/__init__.py                 |  0
 core/core/management/commands/__init__.py        |  0
 core/core/management/commands/update_metrics.py  |  8 ++++++++
 core/core/metrics.py                             | 11 +++++++++++
 core/core/settings.py                            |  1 +
 core/core/urls.py                                |  2 ++
 deploy/ansible/playbooks/deploy-c3lf-sys3.yml    | 16 ++++++++++++++++
 .../templates/c3lf-sys3-cron.service.j2          | 13 +++++++++++++
 .../playbooks/templates/c3lf-sys3-cron.timer.j2  |  9 +++++++++
 9 files changed, 60 insertions(+)
 create mode 100644 core/core/management/__init__.py
 create mode 100644 core/core/management/commands/__init__.py
 create mode 100644 core/core/management/commands/update_metrics.py
 create mode 100644 core/core/metrics.py
 create mode 100644 deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
 create mode 100644 deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2

diff --git a/core/core/management/__init__.py b/core/core/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/core/management/commands/__init__.py b/core/core/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/core/core/management/commands/update_metrics.py b/core/core/management/commands/update_metrics.py
new file mode 100644
index 0000000..a51cfea
--- /dev/null
+++ b/core/core/management/commands/update_metrics.py
@@ -0,0 +1,8 @@
+from django.core.management.base import BaseCommand, CommandError
+from core.metrics import update_item_count
+
+class Command(BaseCommand):
+    help = "Refresh the metrics"
+    
+    def handle(self, *args, **options):
+        update_item_count()
\ No newline at end of file
diff --git a/core/core/metrics.py b/core/core/metrics.py
new file mode 100644
index 0000000..4f79754
--- /dev/null
+++ b/core/core/metrics.py
@@ -0,0 +1,11 @@
+from prometheus_client import Gauge
+from django_prometheus import exports
+from inventory.models import *
+
+g_items_total = Gauge('c3lf_items_total', 'Current Total items')
+
+def update_item_count():
+    # Get the count of MyModel objects
+    count = Item.objects.count()
+    # Set the gauge to the current count
+    g_items_total.set(count)
\ No newline at end of file
diff --git a/core/core/settings.py b/core/core/settings.py
index 805a27b..81f1366 100644
--- a/core/core/settings.py
+++ b/core/core/settings.py
@@ -70,6 +70,7 @@ INSTALLED_APPS = [
     'inventory',
     'mail',
     'notify_sessions',
+    'core'
 ]
 
 REST_FRAMEWORK = {
diff --git a/core/core/urls.py b/core/core/urls.py
index 1c5f158..2386891 100644
--- a/core/core/urls.py
+++ b/core/core/urls.py
@@ -19,6 +19,8 @@ from django.urls import path, include
 
 from .version import get_info
 
+from .metrics import *
+
 urlpatterns = [
     path('djangoadmin/', admin.site.urls),
     path('api/2/', include('inventory.api_v2')),
diff --git a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
index 544b4e4..679f85a 100644
--- a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
+++ b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
@@ -311,6 +311,16 @@
       notify:
         - restart c3lf-sys3
 
+    - name: add c3lf-sys3-cron service
+      template:
+        src: templates/c3lf-sys3-cron.service.j2
+        dest: /etc/systemd/system/c3lf-sys3-cron.service
+
+    - name: add c3lf-sys3-cron timer
+      template:
+        src: templates/c3lf-sys3-cron.timer.j2
+        dest: /etc/systemd/system/c3lf-sys3-cron.timer
+
     - name: reload systemd
       systemd:
         daemon_reload: yes
@@ -321,6 +331,12 @@
         state: started
         enabled: yes
 
+    - name: start c3lf-sys3 timer
+      service:
+        name: c3lf-sys3-cron.timer
+        state: started
+        enabled: yes
+
     - name: add postfix to www-data group
       user:
         name: postfix
diff --git a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2 b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
new file mode 100644
index 0000000..0df787e
--- /dev/null
+++ b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
@@ -0,0 +1,13 @@
+[Unit]
+Description=c3lf sys3 background service
+After=network.target
+
+[Service]
+User=www-data
+Group=www-data
+WorkingDirectory=/var/www/c3lf-sys3
+ExecStart=/var/www/c3lf-sys3/venv/bin/python3 /var/www/c3lf-sys3/repo/core/manage.py update_metrics
+Environment=DJANGO_SETTINGS_MODULE=core.settings
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2 b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2
new file mode 100644
index 0000000..6d888b4
--- /dev/null
+++ b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run Nextcloud cron.php every 5 minutes
+
+[Timer]
+OnCalendar=minutely
+Unit=c3lf-sys3-cron.service
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file

From 2886d887f5333aed3b48a14ae58a75ee1454dbbf Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Mon, 23 Dec 2024 11:42:27 +0100
Subject: [PATCH 09/16] metrics: Make metrics actually usable

With this commit, we should get stats for the item count per event per
returned-state.
---
 core/core/management/__init__.py              |  0
 core/core/management/commands/__init__.py     |  0
 .../management/commands/update_metrics.py     |  8 ----
 core/core/metrics.py                          | 42 +++++++++++++++----
 core/core/settings.py                         |  1 -
 deploy/ansible/playbooks/deploy-c3lf-sys3.yml | 16 -------
 .../templates/c3lf-sys3-cron.service.j2       | 13 ------
 .../templates/c3lf-sys3-cron.timer.j2         |  9 ----
 8 files changed, 33 insertions(+), 56 deletions(-)
 delete mode 100644 core/core/management/__init__.py
 delete mode 100644 core/core/management/commands/__init__.py
 delete mode 100644 core/core/management/commands/update_metrics.py
 delete mode 100644 deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
 delete mode 100644 deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2

diff --git a/core/core/management/__init__.py b/core/core/management/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/core/core/management/commands/__init__.py b/core/core/management/commands/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/core/core/management/commands/update_metrics.py b/core/core/management/commands/update_metrics.py
deleted file mode 100644
index a51cfea..0000000
--- a/core/core/management/commands/update_metrics.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-from core.metrics import update_item_count
-
-class Command(BaseCommand):
-    help = "Refresh the metrics"
-    
-    def handle(self, *args, **options):
-        update_item_count()
\ No newline at end of file
diff --git a/core/core/metrics.py b/core/core/metrics.py
index 4f79754..16a826d 100644
--- a/core/core/metrics.py
+++ b/core/core/metrics.py
@@ -1,11 +1,35 @@
-from prometheus_client import Gauge
-from django_prometheus import exports
-from inventory.models import *
+from django.apps import apps
+from prometheus_client.core import CounterMetricFamily, REGISTRY
+from django.db.models import Case, Value, When, BooleanField, Count
+from inventory.models import Item
 
-g_items_total = Gauge('c3lf_items_total', 'Current Total items')
+class ItemCountCollector(object):
 
-def update_item_count():
-    # Get the count of MyModel objects
-    count = Item.objects.count()
-    # Set the gauge to the current count
-    g_items_total.set(count)
\ No newline at end of file
+    def collect(self):
+        counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'state'])
+
+        yield counter
+
+        if not apps.models_ready or not apps.apps_ready:
+            return
+
+        queryset = (
+            Item.all_objects
+                .annotate(
+                    returned=Case(
+                        When(returned_at__isnull=False, then=Value(False)),
+                        default=Value(True),
+                        output_field=BooleanField()
+                    )
+                )
+                .values('event__slug', 'returned', 'event_id')
+                .annotate(amount=Count('id'))
+                .order_by('event__slug', 'returned')  # Optional: order by slug and returned
+        )
+
+        for e in queryset:
+            counter.add_metric([e["event__slug"].lower(), str(e["returned"])], e["amount"])
+
+        yield counter
+
+REGISTRY.register(ItemCountCollector())
\ No newline at end of file
diff --git a/core/core/settings.py b/core/core/settings.py
index 81f1366..805a27b 100644
--- a/core/core/settings.py
+++ b/core/core/settings.py
@@ -70,7 +70,6 @@ INSTALLED_APPS = [
     'inventory',
     'mail',
     'notify_sessions',
-    'core'
 ]
 
 REST_FRAMEWORK = {
diff --git a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
index 679f85a..544b4e4 100644
--- a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
+++ b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
@@ -311,16 +311,6 @@
       notify:
         - restart c3lf-sys3
 
-    - name: add c3lf-sys3-cron service
-      template:
-        src: templates/c3lf-sys3-cron.service.j2
-        dest: /etc/systemd/system/c3lf-sys3-cron.service
-
-    - name: add c3lf-sys3-cron timer
-      template:
-        src: templates/c3lf-sys3-cron.timer.j2
-        dest: /etc/systemd/system/c3lf-sys3-cron.timer
-
     - name: reload systemd
       systemd:
         daemon_reload: yes
@@ -331,12 +321,6 @@
         state: started
         enabled: yes
 
-    - name: start c3lf-sys3 timer
-      service:
-        name: c3lf-sys3-cron.timer
-        state: started
-        enabled: yes
-
     - name: add postfix to www-data group
       user:
         name: postfix
diff --git a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2 b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
deleted file mode 100644
index 0df787e..0000000
--- a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=c3lf sys3 background service
-After=network.target
-
-[Service]
-User=www-data
-Group=www-data
-WorkingDirectory=/var/www/c3lf-sys3
-ExecStart=/var/www/c3lf-sys3/venv/bin/python3 /var/www/c3lf-sys3/repo/core/manage.py update_metrics
-Environment=DJANGO_SETTINGS_MODULE=core.settings
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2 b/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2
deleted file mode 100644
index 6d888b4..0000000
--- a/deploy/ansible/playbooks/templates/c3lf-sys3-cron.timer.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run Nextcloud cron.php every 5 minutes
-
-[Timer]
-OnCalendar=minutely
-Unit=c3lf-sys3-cron.service
-
-[Install]
-WantedBy=timers.target
\ No newline at end of file

From 22ac14611006a0eb9c6248b7fec938d80ff2d97b Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Mon, 23 Dec 2024 14:36:08 +0100
Subject: [PATCH 10/16] metrics: Make labels more speakable

---
 core/core/metrics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core/metrics.py b/core/core/metrics.py
index 16a826d..083bda2 100644
--- a/core/core/metrics.py
+++ b/core/core/metrics.py
@@ -6,7 +6,7 @@ from inventory.models import Item
 class ItemCountCollector(object):
 
     def collect(self):
-        counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'state'])
+        counter = CounterMetricFamily("item_count", "Current number of items", labels=['event', 'returned_state'])
 
         yield counter
 

From 198a9ccaa0b8693d5813a57a4b2c2fa7db5c601c Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Sun, 22 Dec 2024 09:45:50 +0100
Subject: [PATCH 11/16] deploy: Remove mail relay host

---
 deploy/ansible/playbooks/templates/postfix.cf.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy/ansible/playbooks/templates/postfix.cf.j2 b/deploy/ansible/playbooks/templates/postfix.cf.j2
index f80d69b..ee073d6 100644
--- a/deploy/ansible/playbooks/templates/postfix.cf.j2
+++ b/deploy/ansible/playbooks/templates/postfix.cf.j2
@@ -37,7 +37,6 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = $myhostname, , localhost
-relayhost = firefly.lab.or.it
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mailbox_size_limit = 0
 recipient_delimiter = +

From 02d0c1498d29601000a8a2f853faf0961fffbda8 Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Sun, 22 Dec 2024 20:04:34 +0100
Subject: [PATCH 12/16] deploy: Add dkim signing with rspamd

---
 deploy/ansible/playbooks/deploy-c3lf-sys3.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
index 544b4e4..4005146 100644
--- a/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
+++ b/deploy/ansible/playbooks/deploy-c3lf-sys3.yml
@@ -345,6 +345,13 @@
       notify:
         - restart postfix
 
+    - name: configure rspamd dkim
+      template:
+        src: templates/rspamd-dkim.cf.j2
+        dest: /etc/rspamd/local.d/dkim_signing.conf
+      notify:
+        - restart rspamd
+
     - name: configure rspamd
       copy:
         content: |

From b393767871965f0fbdc0016a23be436c6021b61a Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Mon, 23 Dec 2024 15:02:41 +0100
Subject: [PATCH 13/16] deploy: Fix hostname in postfix config

---
 deploy/ansible/playbooks/templates/postfix.cf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/ansible/playbooks/templates/postfix.cf.j2 b/deploy/ansible/playbooks/templates/postfix.cf.j2
index ee073d6..f6e0b09 100644
--- a/deploy/ansible/playbooks/templates/postfix.cf.j2
+++ b/deploy/ansible/playbooks/templates/postfix.cf.j2
@@ -32,7 +32,7 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 
 
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = polaris.c3lf.de
+myhostname = polaris.lab.or.it
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname

From f266133d1451ca28f73ac55f0e2449c6160bca04 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Mon, 23 Dec 2024 17:12:03 +0100
Subject: [PATCH 14/16] bugfix: use correct url in manual ticket creation

---
 web/src/store.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/src/store.js b/web/src/store.js
index 9aa3dd3..aa4820d 100644
--- a/web/src/store.js
+++ b/web/src/store.js
@@ -339,7 +339,7 @@ const store = createStore({
                 commit('replaceEvents', [...state.events.filter(e => e.id !== event_id)])
             }
         },
-        async updateEvent({commit, dispatch, state}, {id, partial_event}){
+        async updateEvent({commit, dispatch, state}, {id, partial_event}) {
             const {data, success} = await http.patch(`/2/events/${id}/`, partial_event, state.user.token);
             if (success) {
                 commit('replaceEvents', [...state.events.filter(e => e.id !== id), data])
@@ -443,7 +443,8 @@ const store = createStore({
             }
         },
         async postManualTicket({commit, dispatch, state, getters}, {sender, message, title,}) {
-            const {data, success} = await getters.session.post(`/2/tickets/manual/`, {
+            const slug = getters.getEventSlug;
+            const {data, success} = await getters.session.post(`/2/${slug !== 'all' ? slug : 'none'}/tickets/manual/`, {
                 name: title, sender, body: message, recipient: 'mail@c3lf.de'
             });
             await dispatch('loadTickets');
@@ -456,7 +457,10 @@ const store = createStore({
             }
         },
         async postItemComment({commit, dispatch, state, getters}, {id, message}) {
-            const {data, success} = await getters.session.post(`/2/${getters.getEventSlug}/item/${id}/comment/`, {comment: message});
+            const {
+                data,
+                success
+            } = await getters.session.post(`/2/${getters.getEventSlug}/item/${id}/comment/`, {comment: message});
             if (data && success) {
                 state.fetchedData.items = 0;
                 await dispatch('loadEventItems');

From 66a03a9dca1973eee61c6e2a8accc638a83cd160 Mon Sep 17 00:00:00 2001
From: lagertonne <mail@lagertonne.de>
Date: Tue, 24 Dec 2024 07:05:47 +0100
Subject: [PATCH 15/16] metrics: Fix inverted return state in metrics

---
 core/core/metrics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core/metrics.py b/core/core/metrics.py
index 083bda2..149829c 100644
--- a/core/core/metrics.py
+++ b/core/core/metrics.py
@@ -17,7 +17,7 @@ class ItemCountCollector(object):
             Item.all_objects
                 .annotate(
                     returned=Case(
-                        When(returned_at__isnull=False, then=Value(False)),
+                        When(returned_at__isnull=True, then=Value(False)),
                         default=Value(True),
                         output_field=BooleanField()
                     )

From 598f758332429fe7765ad32a0e47fe57cab6a2c1 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Tue, 24 Dec 2024 15:55:07 +0100
Subject: [PATCH 16/16] reduce shadow logouts, by actually logging out when
 token fails or is expired

---
 web/src/persistent-state-plugin/index.js |  3 ++
 web/src/store.js                         |  9 ++++++
 web/src/utils.js                         | 37 ++++++++++++++++++++----
 web/src/views/Login.vue                  |  2 +-
 web/src/views/Register.vue               |  2 +-
 5 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/web/src/persistent-state-plugin/index.js b/web/src/persistent-state-plugin/index.js
index b7cff69..14f5577 100644
--- a/web/src/persistent-state-plugin/index.js
+++ b/web/src/persistent-state-plugin/index.js
@@ -20,6 +20,9 @@ export default (config) => (store) => {
             }
         });
         store.state[config.isLoadedKey] = true;
+        if ('validate' in config) {
+            config.validate(store.state);
+        }
     }
 
     const reload = initialize;
diff --git a/web/src/store.js b/web/src/store.js
index aa4820d..fa86f94 100644
--- a/web/src/store.js
+++ b/web/src/store.js
@@ -515,6 +515,15 @@ const store = createStore({
         prefix: "lf_",
         debug: false,
         isLoadedKey: "persistent_loaded",
+        validate: (state) => {
+            if (state.user && state.user.expiry && state.user.token) {
+                const as_date = new Date(state.user.expiry);
+                if (as_date < new Date()) {
+                    state.user.token = null;
+                    state.user.expiry = null;
+                }
+            }
+        },
         state: ["remember", "user", "events", "lastUsed",]
     }), sharedStatePlugin({
         debug: false,
diff --git a/web/src/utils.js b/web/src/utils.js
index ebc911a..d753623 100644
--- a/web/src/utils.js
+++ b/web/src/utils.js
@@ -1,3 +1,5 @@
+import store from '@/store'
+
 function ticketStateColorLookup(ticket) {
     if (ticket.startsWith('closed_')) {
         return 'secondary';
@@ -36,6 +38,8 @@ const http = {
                 "Authorization": `Token ${token}`,
             },
         });
+        if (response.status === 401)
+            throw {http_status: response.status};
         const success = response.status === 200 || response.status === 201;
         return {data: await response.json() || {}, success};
     },
@@ -51,6 +55,8 @@ const http = {
             },
             body: JSON.stringify(data),
         });
+        if (response.status === 401)
+            throw {http_status: response.status};
         const success = response.status === 200 || response.status === 201;
         return {data: await response.json() || {}, success};
     },
@@ -66,6 +72,8 @@ const http = {
             },
             body: JSON.stringify(data),
         });
+        if (response.status === 401)
+            throw {http_status: response.status};
         const success = response.status === 200 || response.status === 201;
         return {data: await response.json() || {}, success};
     },
@@ -81,6 +89,8 @@ const http = {
             },
             body: JSON.stringify(data),
         });
+        if (response.status === 401)
+            throw {http_status: response.status};
         const success = response.status === 200 || response.status === 201;
         return {data: await response.json() || {}, success};
     },
@@ -95,17 +105,34 @@ const http = {
                 "Authorization": `Token ${token}`,
             },
         });
+        if (response.status === 401)
+            throw {http_status: response.status};
         const success = response.status === 204;
         return {data: await response.text() || {}, success};
     }
 }
 
 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),
+    get: async (url) => await http.get(url, token).catch((e) => {
+        if (e.http_status === 401) store.commit('logout');
+        return {data: {}, success: false};
+    }),
+    post: async (url, data) => await http.post(url, data, token).catch((e) => {
+        if (e.http_status === 401) store.commit('logout');
+        return {data: {}, success: false};
+    }),
+    put: async (url, data) => await http.put(url, data, token).catch((e) => {
+        if (e.http_status === 401) store.commit('logout');
+        return {data: {}, success: false};
+    }),
+    patch: async (url, data) => await http.patch(url, data, token).catch((e) => {
+        if (e.http_status === 401) store.commit('logout');
+        return {data: {}, success: false};
+    }),
+    delete: async (url) => await http.delete(url, token).catch((e) => {
+        if (e.http_status === 401) store.commit('logout');
+        return {data: {}, success: false};
+    }),
 });
 
 export {ticketStateColorLookup, ticketStateIconLookup, http, http_session};
\ No newline at end of file
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index 8cff6c2..d002cc6 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -72,7 +72,7 @@ export default {
     name: 'Login',
     data() {
         return {
-            msg: 'Welcome to ' + window.location.hostname,
+            msg: 'Lost&Found Team Login',
             username: '',
             password: '',
             remember: false
diff --git a/web/src/views/Register.vue b/web/src/views/Register.vue
index 11ed693..15412f7 100644
--- a/web/src/views/Register.vue
+++ b/web/src/views/Register.vue
@@ -87,7 +87,7 @@ export default {
     name: 'Register',
     data() {
         return {
-            msg: 'Register',
+            msg: 'Register as team member',
             password2: '',
             form: {
                 username: '',