fix(backend): include fields in email subscriber mapping for schema version 1

Author: tyler-dane

packages/backend/src/__tests__/drivers/email.driver.ts

@@ -40,11 +40,13 @@ export class EmailDriver {
     },
     tagId: string,
   ): Promise<Response_TagSubscriber> {
+    const fields = subscriber.fields ?? undefined;
     return Promise.resolve({
       subscriber: {
         tagId,
         ...subscriber,
         tagged_at: new Date().toISOString(),
+        fields,
         first_name: subscriber.first_name!,
       },
     });
@@ -53,9 +55,11 @@ export class EmailDriver {
   private static async upsertSubscriber(
     subscriber: Subscriber & { id: number; created_at: string },
   ): Promise<Response_UpsertSubscriber> {
+    const fields = subscriber.fields ?? undefined;
     return Promise.resolve({
       subscriber: {
         ...subscriber,
+        fields,
         first_name: subscriber.first_name!,
       },
     });

packages/core/src/mappers/subscriber/map.subscriber.ts

@@ -29,15 +29,23 @@ export const mapCompassUserToEmailSubscriber = (
 export const mapWaitlistUserToEmailSubscriber = (
   user: Schema_Waitlist,
 ): Subscriber => {
-  const subscriber: Subscriber = {
+  if (user.schemaVersion === "1") {
+    return {
+      email_address: user.email,
+      first_name: user.firstName,
+      state: "active",
+      fields: {
+        "Last name": user.lastName,
+        Birthday: "1970-01-01",
+        Source: user.source,
+      },
+    };
+  }
+
+  return {
     email_address: user.email,
-    first_name: user.firstName,
+    first_name: null,
     state: "active",
-    fields: {
-      "Last name": user.lastName,
-      Birthday: "1970-01-01",
-      Source: user.source,
-    },
+    fields: null,
   };
-  return subscriber;
 };