refactor(email): template model (#1221)

* refactor(chat)!: admin/router missing endpoints/query params/participants actions (#1135) * refactor(chat): sendInvitation props as object * fix(chat): missing populate query param from router * fix(chat): missing search message regex matching * chore(chat): cleanups * fix(chat): router invitation token count * refactor(chat): admin route createRoom participants logs, set creator * refactor(chat): participants actions * fix(chat): router query params id types * feat(chat): router remove member from room route * fix(chat): admin route getRooms missing params * fix(chat): admin route deleteRooms missing audit-mode config check * feat(chat): admin route removeUsers/addUsers/roomInvitations/roomById * feat(chat): participants join log on invitation accept * refactor(email): add editor-design JSON email template field
ConduitPlatform · Nov 4, 2024 · 66c9d3d · 66c9d3d
1 parent 39ce2ae
commit 66c9d3d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/modules/email/src/Email.ts b/modules/email/src/Email.ts
@@ -125,6 +125,7 @@ export default class Email extends ManagedModule<Config> {
       body: call.request.body,
       variables: call.request.variables,
       sender: call.request.sender,
+      jsonTemplate: call.request.jsonTemplate,
     };
     let errorMessage: string | null = null;
     const template = await this.emailService

diff --git a/modules/email/src/admin/index.ts b/modules/email/src/admin/index.ts
@@ -79,7 +79,8 @@ export class AdminHandlers {
   }
 
   async createTemplate(call: ParsedRouterRequest): Promise<UnparsedRouterResponse> {
-    const { _id, sender, externalManaged, name, subject, body } = call.request.params;
+    const { _id, sender, externalManaged, name, subject, body, jsonTemplate } =
+      call.request.params;
 
     let externalId = undefined;
     const body_vars = getHandleBarsValues(body);
@@ -115,6 +116,7 @@ export class AdminHandlers {
         externalManaged,
         sender,
         externalId,
+        jsonTemplate,
       })
       .catch((e: Error) => {
         throw new GrpcError(status.INTERNAL, e.message);
@@ -148,7 +150,10 @@ export class AdminHandlers {
     }
 
     const updatedTemplate = await EmailTemplate.getInstance()
-      .findByIdAndUpdate(call.request.params.id, templateDocument)
+      .findByIdAndUpdate(call.request.params.id, {
+        ...templateDocument,
+        jsonTemplate: call.request.bodyParams.jsonTemplate,
+      })
       .catch((e: Error) => {
         throw new GrpcError(status.INTERNAL, e.message);
       });
@@ -466,6 +471,7 @@ export class AdminHandlers {
           body: ConduitString.Required,
           sender: ConduitString.Optional,
           externalManaged: ConduitBoolean.Optional,
+          jsonTemplate: ConduitString.Optional,
         },
       },
       new ConduitRouteReturnDefinition('CreateTemplate', {
@@ -485,6 +491,7 @@ export class AdminHandlers {
           name: ConduitString.Optional,
           subject: ConduitString.Optional,
           body: ConduitString.Optional,
+          jsonTemplate: ConduitString.Optional,
         },
       },
       new ConduitRouteReturnDefinition('PatchTemplate', {

diff --git a/modules/email/src/email.proto b/modules/email/src/email.proto
@@ -7,6 +7,7 @@ message RegisterTemplateRequest {
   string body = 3;
   repeated string variables = 4;
   optional string sender = 5;
+  optional string jsonTemplate = 6;
 }
 
 message RegisterTemplateResponse {

diff --git a/modules/email/src/interfaces/RegisterTemplateParams.ts b/modules/email/src/interfaces/RegisterTemplateParams.ts
@@ -4,4 +4,5 @@ export interface IRegisterTemplateParams {
   body: string;
   sender?: string;
   variables: string[];
+  jsonTemplate?: string;
 }
diff --git a/modules/email/src/models/EmailTemplate.schema.ts b/modules/email/src/models/EmailTemplate.schema.ts
@@ -29,6 +29,10 @@ const schema: ConduitModel = {
   sender: {
     type: TYPE.String,
   },
+  jsonTemplate: {
+    type: TYPE.String,
+    sqlType: SQLDataType.TEXT,
+  },
   externalManaged: {
     type: TYPE.Boolean,
     default: false,
@@ -61,6 +65,7 @@ export class EmailTemplate extends ConduitActiveSchema<EmailTemplate> {
   variables?: string[];
   sender?: string;
   externalManaged: boolean;
+  jsonTemplate?: string;
   externalId?: string;
   createdAt: Date;
   updatedAt: Date;

diff --git a/modules/email/src/services/email.service.ts b/modules/email/src/services/email.service.ts
@@ -47,7 +47,7 @@ export class EmailService {
   }
 
   async registerTemplate(params: IRegisterTemplateParams) {
-    const { name, body, subject, variables, sender } = params;
+    const { name, body, subject, variables, sender, jsonTemplate } = params;
 
     const existing = await EmailTemplate.getInstance().findOne({ name });
     if (!isNil(existing)) return existing;
@@ -58,6 +58,7 @@ export class EmailService {
       body,
       sender,
       variables,
+      jsonTemplate,
     });
   }