From f7ec0220a8308db9a8517366c932e62fcff70b55 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 14 Dec 2023 17:48:02 +0800
Subject: [PATCH] allow setting folder when creating a new email

---
 .../api/src/resolvers/newsletters/index.ts     | 18 +++++++++++++-----
 packages/api/src/services/newsletters.ts       |  8 +++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/api/src/resolvers/newsletters/index.ts b/packages/api/src/resolvers/newsletters/index.ts
index 49f13b090..e871197f5 100644
--- a/packages/api/src/resolvers/newsletters/index.ts
+++ b/packages/api/src/resolvers/newsletters/index.ts
@@ -7,6 +7,7 @@ import {
   DeleteNewsletterEmailError,
   DeleteNewsletterEmailErrorCode,
   DeleteNewsletterEmailSuccess,
+  MutationCreateNewsletterEmailArgs,
   MutationDeleteNewsletterEmailArgs,
   NewsletterEmailsError,
   NewsletterEmailsErrorCode,
@@ -24,8 +25,9 @@ import { authorized } from '../../utils/helpers'
 
 export const createNewsletterEmailResolver = authorized<
   CreateNewsletterEmailSuccess,
-  CreateNewsletterEmailError
->(async (_parent, _args, { claims, log }) => {
+  CreateNewsletterEmailError,
+  MutationCreateNewsletterEmailArgs
+>(async (_parent, { input }, { claims, log }) => {
   log.info('createNewsletterEmailResolver')
   analytics.track({
     userId: claims.uid,
@@ -36,7 +38,13 @@ export const createNewsletterEmailResolver = authorized<
   })
 
   try {
-    const newsletterEmail = await createNewsletterEmail(claims.uid)
+    const newsletterEmail = await createNewsletterEmail(
+      claims.uid,
+      undefined,
+      input?.folder || undefined,
+      input?.name || undefined,
+      input?.description || undefined
+    )
 
     return {
       newsletterEmail: {
@@ -45,7 +53,7 @@ export const createNewsletterEmailResolver = authorized<
       },
     }
   } catch (e) {
-    log.info(e)
+    log.error('createNewsletterEmailResolver', e)
 
     return {
       errorCodes: [CreateNewsletterEmailErrorCode.BadRequest],
@@ -67,7 +75,7 @@ export const newsletterEmailsResolver = authorized<
       })),
     }
   } catch (e) {
-    log.info(e)
+    log.error('newsletterEmailsResolver', e)
 
     return {
       errorCodes: [NewsletterEmailsErrorCode.BadRequest],
diff --git a/packages/api/src/services/newsletters.ts b/packages/api/src/services/newsletters.ts
index f492cf4b5..e5e382624 100644
--- a/packages/api/src/services/newsletters.ts
+++ b/packages/api/src/services/newsletters.ts
@@ -19,7 +19,10 @@ const parsedAddress = (emailAddress: string) => {
 
 export const createNewsletterEmail = async (
   userId: string,
-  confirmationCode?: string
+  confirmationCode?: string,
+  folder?: string,
+  name?: string,
+  description?: string
 ): Promise<NewsletterEmail> => {
   const user = await userRepository.findById(userId)
   if (!user) {
@@ -34,6 +37,9 @@ export const createNewsletterEmail = async (
     address: emailAddress,
     user,
     confirmationCode,
+    name,
+    description,
+    folder,
   })
 }