refactor: déplace méthode followup dans email-service

betagouv · Nov 16, 2023 · 5c0c9bd · 5c0c9bd
1 parent 99730aa
commit 5c0c9bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/backend/lib/messaging/email/email-service.ts b/backend/lib/messaging/email/email-service.ts
@@ -12,7 +12,13 @@ export async function sendEmail(category: EmailCategory, followup) {
       html: render.html,
       tags: [category],
     })
-    return response.messageId
+    followup.sentAt = Date.now()
+    followup.messageId = response.messageId
+    if (!followup.surveyOptin) {
+      followup.email = undefined
+    }
+    followup.error = undefined
+    return followup.save()
   } catch (err) {
     console.error("error", err)
     throw err

diff --git a/backend/models/followup.ts b/backend/models/followup.ts
@@ -16,16 +16,6 @@ FollowupSchema.static("findByEmail", function (email: string) {
   return this.find({ email })
 })
 
-FollowupSchema.method("postSimulationResultsEmail", function (messageId) {
-  this.sentAt = Date.now()
-  this.messageId = messageId
-  if (!this.surveyOptin) {
-    this.email = undefined
-  }
-  this.error = undefined
-  return this.save()
-})
-
 FollowupSchema.method("postSimulationResultsSms", function (messageId) {
   this.smsSentAt = Date.now()
   this.smsMessageId = messageId
@@ -42,8 +32,7 @@ FollowupSchema.method("renderSimulationResultsEmail", function () {
 
 FollowupSchema.method("sendSimulationResultsEmail", async function () {
   try {
-    const messageId = await sendEmail(EmailCategory.SimulationResults, this)
-    return this.postSimulationResultsEmail(messageId)
+    return await sendEmail(EmailCategory.SimulationResults, this)
   } catch (err) {
     console.log("error", err)
     this.error = JSON.stringify(err, null, 2)

diff --git a/lib/types/followup.d.ts b/lib/types/followup.d.ts
@@ -25,7 +25,6 @@ interface FollowupAttributes {
 }
 
 interface FollowupMethods {
-  postSimulationResultsEmail(messageId: string): void
   postSimulationResultsSms(messageId: string): void
   renderSimulationResultsEmail(): any
   renderSimulationResultsSms(): any