From 29b6c4a6774047bb79c5fa47ff53568a54e31d2f Mon Sep 17 00:00:00 2001
From: Jake Hobbs <jakehobbs@gmail.com>
Date: Fri, 19 Jan 2024 00:29:04 -0800
Subject: [PATCH] clean up

---
 src/components/petition.tsx | 47 +++++++++++++++----------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/components/petition.tsx b/src/components/petition.tsx
index 8348bb4..0595937 100644
--- a/src/components/petition.tsx
+++ b/src/components/petition.tsx
@@ -59,35 +59,29 @@ export const Petition = () => {
   const onSubmit = useMemo(
     () =>
       handleSubmit(async (data) => {
-        console.log(data); // TODO: remove
-        const params = {
-          id: "helptheducks",
-          name: data.name,
-          email: data.email,
-          ...(data.phone && { phone: data.phone }),
-          ...(data.zip && { zip: data.zip }),
-          ...(data.city && { city: data.city }),
-          ...(!data.outsideUS && { country: "United States" }),
-          fullHref: window.location.href,
-        };
-        console.log(params);
-        const resp = await ky.post(PETITION_API_URL, {
-          body: new URLSearchParams(params),
+        // We purposefully do these one at a time. If the first one fails,
+        // we don't want to submit the second one. This allows the user to
+        // resubmit the form without causing duplicate emails to be sent.
+        const petitionResp = await ky.post(PETITION_API_URL, {
+          body: new URLSearchParams({
+            id: "helptheducks",
+            name: data.name,
+            email: data.email,
+            ...(data.phone && { phone: data.phone }),
+            ...(data.zip && { zip: data.zip }),
+            ...(data.city && { city: data.city }),
+            ...(!data.outsideUS && { country: "United States" }),
+            fullHref: window.location.href,
+          }),
           headers: {
             "Content-Type": "application/x-www-form-urlencoded",
           },
           throwHttpErrors: false,
         });
-        console.log(resp.status);
-        if (resp.status !== 200) {
-          // TODO: handle error
-          alert(
-            "There was an error submitting your petition. Please try again.",
-          );
-          return;
+        if (petitionResp.status !== 200) {
+          throw new Error("Error submitting petition");
         }
-        // TODO: submit to new duck service too. (json)
-        const resp2 = await ky.post(CAMPAIGN_MAILER_API_URL, {
+        const campaignMailerResp = await ky.post(CAMPAIGN_MAILER_API_URL, {
           json: {
             name: data.name,
             email: data.email,
@@ -102,11 +96,8 @@ export const Petition = () => {
           },
           throwHttpErrors: false,
         });
-        console.log(resp2.status);
-        if (resp2.status !== 200) {
-          alert(
-            "There was an error submitting to duck service. Please try again.",
-          );
+        if (campaignMailerResp.status !== 200) {
+          throw new Error("Error submitting message");
         }
       }),
     [handleSubmit],