system queries + custom template selection

src/helpers/dynamicQueryBuilder.ts

@@ -314,6 +314,13 @@ export default abstract class DynamicQueryBuilder {
         count: number;
       }
   > {
+    if (query == "member") {
+      query = memberQuery;
+    }
+    if (query == "memberByRunningMembership") {
+      query = memberByRunningMembershipQuery;
+    }
+
     if (typeof query == "string") {
       const upperQuery = query.trim().toUpperCase();
       if (!upperQuery.startsWith("SELECT") || /INSERT|UPDATE|DELETE|ALTER|DROP|CREATE|TRUNCATE/.test(upperQuery)) {
@@ -330,7 +337,7 @@ export default abstract class DynamicQueryBuilder {
 
         return await dataSource
           .transaction(async (manager) => {
-            data = await manager.query(query);
+            data = await manager.query(query.toString());
 
             throw new Error("AllwaysRollbackQuery");
           })
@@ -382,3 +389,29 @@ export default abstract class DynamicQueryBuilder {
     }
   }
 }
+
+const memberQuery: DynamicQueryStructure = {
+  select: "*",
+  table: "member",
+  orderBy: [
+    { column: "lastname", order: "ASC" },
+    { column: "firstname", order: "ASC" },
+  ],
+};
+
+const memberByRunningMembershipQuery: DynamicQueryStructure = {
+  select: "*",
+  table: "member",
+  join: [
+    {
+      select: "*",
+      table: "membership",
+      where: [{ structureType: "condition", concat: "_", operation: "null", column: "end", value: "" }],
+      foreignColumn: "memberships",
+    },
+  ],
+  orderBy: [
+    { column: "lastname", order: "ASC" },
+    { column: "firstname", order: "ASC" },
+  ],
+};

src/helpers/pdfExport.ts

@@ -41,6 +41,7 @@ export abstract class PdfExport {
       }));
     } else {
       ({ header, footer, body, headerMargin, footerMargin } = await TemplateHelper.renderFileForCustom({
+        module: template,
         customTemplate,
         headerData: data,
         bodyData: data,

src/helpers/templateHelper.ts

@@ -81,12 +81,14 @@ export abstract class TemplateHelper {
   }
 
   static async renderFileForCustom({
+    module,
     title = "pdf-export FF Admin",
     headerData = {},
     bodyData = {},
     footerData = {},
     customTemplate,
   }: {
+    module: `${PermissionModule}` | `${PermissionModule}.${string}`;
     title?: string;
     headerData?: any;
     bodyData?: any;
@@ -118,7 +120,7 @@ export abstract class TemplateHelper {
     if (customTemplate.bodyId && typeof customTemplate.bodyId == "number") {
       body = await this.getTemplateFromStore(customTemplate.bodyId);
     } else {
-      body = this.getTemplateFromFile(module + ".body");
+      body = this.getTemplateFromFile((customTemplate.bodyId || module) + ".body");
     }
     body = this.applyDataToTemplate(body, { title, ...bodyData });