fix error sending notification when field is not defined

ohmyform · Mar 13, 2022 · 30c2bc9 · 30c2bc9
1 parent 99fe3d2
commit 30c2bc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ Template for next version
 
 ### Fixed
 
+- error sending notification when field is not defined (https://github.com/ohmyform/ohmyform/issues/161)
+
 ### Security
 
 ## [1.0.1] - 2022-03-01

diff --git a/src/service/submission/submission.notification.service.ts b/src/service/submission/submission.notification.service.ts
@@ -25,12 +25,12 @@ export class SubmissionNotificationService {
       try {
         const to = this.getEmail(
           submission,
-          notification.toField.id,
+          notification.toField?.id,
           notification.toEmail
         )
         const from = this.getEmail(
           submission,
-          notification.fromField.id,
+          notification.fromField?.id,
           notification.fromEmail
         )
 
@@ -73,6 +73,10 @@ export class SubmissionNotificationService {
   }
 
   private getEmail(submission: SubmissionEntity, fieldId: number, fallback: string): string {
+    if (!fieldId) {
+      return fallback
+    }
+
     const data = submission.fields.find(field => field.fieldId === fieldId)?.content
 
     if (!data) {