From a831429bfea44303ae5f3dd7735ed719eeccfb73 Mon Sep 17 00:00:00 2001
From: Stamate Valentin <stamatevalentin125@gmail.com>
Date: Thu, 19 May 2022 13:57:11 +0300
Subject: [PATCH] small changes

---
 src/app/database/models.ts       |  4 +++-
 src/app/service/admin.service.ts | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/database/models.ts b/src/app/database/models.ts
index 8ab6e32..ace81a8 100644
--- a/src/app/database/models.ts
+++ b/src/app/database/models.ts
@@ -9,7 +9,9 @@ export interface SuccessfulEmail {
 }
 
 export interface EmailPreview {
-    destination: string;
+    from: string;
+    to: string;
+    subject: string;
     html: string;
 }
 
diff --git a/src/app/service/admin.service.ts b/src/app/service/admin.service.ts
index 698e20a..3c47808 100644
--- a/src/app/service/admin.service.ts
+++ b/src/app/service/admin.service.ts
@@ -1,4 +1,4 @@
-import {Coordinator, EmailEndpointResponse, SuccessfulEmail} from "../database/models";
+import {Coordinator, EmailEndpointResponse} from "../database/models";
 import {
     AcademyMemberModel,
     AllowedStudentsModel,
@@ -114,7 +114,9 @@ export class AdminService {
             const emailContent = emailTemplate.replace(new RegExp(/{{activity}}/g), emailActivityContent);
 
             emailEndpointResponse.emailPreview.push({
-                destination: data.emailTo,
+                from: from,
+                to: data.emailTo,
+                subject: subject,
                 html: emailContent,
             });
 
@@ -270,7 +272,9 @@ export class AdminService {
             emailContent = emailContent.replace(new RegExp(/{{studentName}}/g), data.studentName);
 
             emailEndpointResponse.emailPreview.push({
-                destination: data.studentEmail,
+                from: from,
+                to: data.studentEmail,
+                subject: subject,
                 html: emailContent,
             });
 
@@ -331,7 +335,9 @@ export class AdminService {
             emailContent = emailContent.replace(new RegExp(/{{commission}}/g), commission);
 
             emailEndpointResponse.emailPreview.push({
-                destination: data.studentEmail,
+                from: from,
+                to: data.studentEmail,
+                subject: subject,
                 html: emailContent,
             });