fix: remove dup primary_email from new table

mozilla · Aug 30, 2024 · 9469811 · 9469811
1 parent 77ab60c
commit 9469811
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/app/api/utils/email.tsx b/src/app/api/utils/email.tsx
@@ -70,12 +70,11 @@ export async function generateUnsubscribeLinkForSubscriber(
     const sub = await addEmailPreferenceForSubscriber(
       subscriber.id,
       {
-        primary_email: subscriber.primary_email,
         unsubscribe_token: unsubToken,
       },
-      ["primary_email", "unsubscribe_token"],
+      ["unsubscribe_token"],
     );
-    return `${process.env.SERVER_URL}/api/v1/user/unsubscribe-email?email=${sub.primary_email}&token=${sub.unsubscribe_token}`;
+    return `${process.env.SERVER_URL}/api/v1/user/unsubscribe-email?email=${subscriber.primary_email}&token=${sub.unsubscribe_token}`;
   } catch (e) {
     console.error("generate_unsubscribe_link", {
       exception: e as string,

diff --git a/src/db/tables/subscriber_email_preferences.ts b/src/db/tables/subscriber_email_preferences.ts
@@ -11,7 +11,6 @@ const knex = createDbConnection();
 // NOTE: The "subscriber_email_preferences" table only has attributes for free reports
 // TODO: modify the CRUD utils after MNTOR-3557
 interface SubscriberFreeEmailPreferencesInput {
-  primary_email?: string;
   unsubscribe_token?: string;
   monthly_monitor_report_free?: boolean;
   monthly_monitor_report_free_at?: Date;
@@ -49,7 +48,6 @@ async function addEmailPreferenceForSubscriber(
     res = await knex("subscriber_email_preferences")
       .insert({
         subscriber_id: subscriberId,
-        primary_email: preference.primary_email || "",
         unsubscribe_token: preference.unsubscribe_token || "",
         monthly_monitor_report_free:
           preference.monthly_monitor_report_free ?? true,
@@ -224,7 +222,6 @@ async function unsubscribeMonthlyMonitorReportForEmail(email: string) {
       );
     } else if (sub.id && sub.monthly_monitor_report_free) {
       await updateEmailPreferenceForSubscriber(sub.id, true, {
-        primary_email: sub.primary_email,
         monthly_monitor_report_free: false,
       });
     } else {