1.4.2

Reviewed-on: #91

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ff-admin-server",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ff-admin-server",
-      "version": "1.4.0",
+      "version": "1.4.2",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "cors": "^2.8.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ff-admin-server",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
   "main": "dist/index.js",
   "scripts": {

src/factory/admin/configuration/queryStore.ts

@@ -12,6 +12,7 @@ export default abstract class QueryStoreFactory {
       id: record.id,
       title: record.title,
       query: record.query.startsWith("{") ? JSON.parse(record.query) : record.query,
+      updatedAt: record.updatedAt,
     };
   }
 

src/helpers/backupHelper.ts

@@ -349,7 +349,12 @@ export default abstract class BackupHelper {
         "member.birthdate",
         "member.internalId",
       ])
-      .addSelect([...(collectIds ? ["query.id"] : []), "recipientsByQuery.title", "recipientsByQuery.query"])
+      .addSelect([
+        ...(collectIds ? ["recipientsByQuery.id"] : []),
+        "recipientsByQuery.title",
+        "recipientsByQuery.query",
+        "recipientsByQuery.updatedAt",
+      ])
       .getMany()
       .then((res: any) =>
         res.map((n: any) => ({
@@ -750,11 +755,11 @@ export default abstract class BackupHelper {
       .filter((d) => availableTemplates.includes(d.scope))
       .map((d) => ({
         ...d,
-        headerHeightId: templates.find((template) => template.template == d.headerHeight.template)?.id ?? null,
+        headerHeightId: templates.find((template) => template.template == d.headerHeight)?.id ?? null,
-        footerHeightId: templates.find((template) => template.template == d.footerHeight.template)?.id ?? null,
+        footerHeightId: templates.find((template) => template.template == d.footerHeight)?.id ?? null,
-        headerId: templates.find((template) => template.template == d.header.template)?.id ?? null,
+        headerId: templates.find((template) => template.template == d.header?.template)?.id ?? null,
-        bodyId: templates.find((template) => template.template == d.body.template)?.id ?? null,
+        bodyId: templates.find((template) => template.template == d.body?.template)?.id ?? null,
-        footerId: templates.find((template) => template.template == d.footer.template)?.id ?? null,
+        footerId: templates.find((template) => template.template == d.footer?.template)?.id ?? null,
       }));
     availableTemplates.forEach((at) => {
       if (!dataWithMappedId.some((d) => d.scope == at)) {

src/viewmodel/admin/configuration/queryStore.models.ts

@@ -4,4 +4,5 @@ export interface QueryStoreViewModel {
   id: string;
   title: string;
   query: string | DynamicQueryStructure;
+  updatedAt: Date;
 }