@stamhoofd/backend 2.43.0 → 2.43.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.43.0",
+    "version": "2.43.2",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.43.0",
-        "@stamhoofd/backend-middleware": "2.43.0",
-        "@stamhoofd/email": "2.43.0",
-        "@stamhoofd/models": "2.43.0",
-        "@stamhoofd/queues": "2.43.0",
-        "@stamhoofd/sql": "2.43.0",
-        "@stamhoofd/structures": "2.43.0",
-        "@stamhoofd/utility": "2.43.0",
+        "@stamhoofd/backend-i18n": "2.43.2",
+        "@stamhoofd/backend-middleware": "2.43.2",
+        "@stamhoofd/email": "2.43.2",
+        "@stamhoofd/models": "2.43.2",
+        "@stamhoofd/queues": "2.43.2",
+        "@stamhoofd/sql": "2.43.2",
+        "@stamhoofd/structures": "2.43.2",
+        "@stamhoofd/utility": "2.43.2",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "d5d4b4bedec089c5c6f945577695a410f0bd8a3d"
+    "gitHead": "06abe49aaa20e7baa4ee44b48f4fae33ae30ae3e"
 }

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -1,11 +1,11 @@
-import { AutoEncoder, Data, Decoder, EnumDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import { AutoEncoder, Decoder, EnumDecoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { EmailTemplate } from '@stamhoofd/models';
 import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
 
-import { Context } from '../../../../helpers/Context';
-import { StringNullableDecoder } from '../../../../decoders/StringNullableDecoder';
 import { StringArrayDecoder } from '../../../../decoders/StringArrayDecoder';
+import { StringNullableDecoder } from '../../../../decoders/StringNullableDecoder';
+import { Context } from '../../../../helpers/Context';
 
 type Params = Record<string, never>;
 type Body = undefined;
@@ -71,7 +71,16 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                         ? await EmailTemplate.where({ webshopId: request.query.webshopId ?? null, groupId: request.query.groupIds ? { sign: 'IN', value: request.query.groupIds } : null, type: { sign: 'IN', value: types } })
                         : []
                 );
-        const defaultTemplates = await EmailTemplate.where({ organizationId: null, type: { sign: 'IN', value: types } });
-        return new Response([...templates, ...defaultTemplates].map(template => EmailTemplateStruct.create(template)));
+
+        const defaultTemplateTypes = organization ? types.filter(type => type !== EmailTemplateType.SavedMembersEmail) : types;
+        const defaultTemplates = await EmailTemplate.where({
+            organizationId: null,
+            type: {
+                sign: 'IN',
+                value: defaultTemplateTypes,
+            },
+        });
+
+        return new Response(templates.concat(defaultTemplates).map(template => EmailTemplateStruct.create(template)));
     }
 }