Minor adjustments

Ante-Koceic · Ante-Koceic · commit 3419fba52b03 · 2025-09-30T15:33:02.000+02:00
diff --git a/apps/contact/app/api/contact/route.tsx b/apps/contact/app/api/contact/route.tsx
@@ -80,15 +80,11 @@ export async function POST(request: NextRequest) {
     const origin = request.headers.get("origin");
     let source = "Unknown";
 
-    if (referer && origin && referer.startsWith(origin)) {
+    if (referer && origin) {
       source = referer.slice(origin.length);
     }
 
-    const {
-      id: notionPageId,
-      url,
-      error: errorMessage,
-    } = await createContact(
+    const response = await createContact(
       `Message from ${name} (${nanoid()})`,
       email,
       name,
@@ -97,17 +93,19 @@ export async function POST(request: NextRequest) {
       source,
     );
 
-    if (notionPageId && url) {
-      await notifyContactCreated(name, email, url);
-    } else if (errorMessage) {
+    if ("error" in response) {
       await notifyContactError(name, email, message);
-      throw {
-        body: {
-          message: errorMessage,
+
+      return new Response(JSON.stringify({ message: response.error }), {
+        status: 500,
+        headers: {
+          ...corsHeaders,
         },
-      };
+      });
     }
 
+    await notifyContactCreated(name, email, response.url || "");
+
     /* await sendEmail({
         template: <ContactTemplate />,
         options: { to: email, subject: "Thank you for contacting us!" },
@@ -127,9 +125,8 @@ export async function POST(request: NextRequest) {
   } catch (error) {
     console.error("Error - api/contacts", error);
 
-    const statusCode = (error as any).statusCode || 501;
-    const message =
-      (error as any)?.body?.message || "Issue while processing request";
+    const statusCode = 500;
+    const message = "Issue while processing request";
 
     return new Response(JSON.stringify({ message }), {
       status: statusCode,
diff --git a/apps/contact/helpers/email.test.tsx b/apps/contact/helpers/email.test.tsx
@@ -1,7 +1,6 @@
 import { expect, describe, it, mock, beforeEach, afterEach } from "bun:test";
 
 const mockSendMail = mock(() => {
-  console.log("SENDING");
   return Promise.resolve({});
 });
 
diff --git a/apps/contact/helpers/notion.test.ts b/apps/contact/helpers/notion.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from "bun:test";
-import { createContactObject, createContact, notion } from "./notion";
+import { createContact, notion } from "./notion";
 
 const mock = vi.spyOn(notion.pages, "create").mockResolvedValue({
   object: "page",
@@ -31,38 +31,6 @@ describe("Notion Helper", () => {
     databaseID: "mock-database-id",
     source: "website",
   };
-  describe("createContactObject", () => {
-    it("should create correct Notion payload structure", () => {
-      const payload = createContactObject(
-        validContactData.id,
-        validContactData.email,
-        validContactData.name,
-        validContactData.content,
-        validContactData.databaseID,
-        validContactData.source,
-      );
-
-      expect(payload).toHaveProperty("parent");
-      expect(payload).toHaveProperty("properties");
-      expect(payload).toHaveProperty("children");
-
-      expect(payload.parent.database_id).toBe("mock-database-id");
-
-      expect(payload.properties.id.title[0].text.content).toBe("test-id-123");
-      expect(payload.properties.email.email).toBe("john@example.com");
-      expect(payload.properties.name.rich_text[0].text.content).toBe(
-        "John Doe",
-      );
-      expect(payload.properties.source.rich_text[0].text.content).toBe(
-        "website",
-      );
-
-      expect(payload.children[0].paragraph.rich_text[0].text?.content).toBe(
-        "Test message",
-      );
-    });
-  });
-
   describe("createContact", () => {
     it("should validate required fields", () => {
       const requiredFields = ["id", "email", "name", "databaseID"];
@@ -72,7 +40,7 @@ describe("Notion Helper", () => {
       });
     });
 
-    it("should create Notion page and return id and url", async () => {
+    it("should create Notion page and return valid url", async () => {
       const response = await createContact(
         validContactData.id,
         validContactData.email,
@@ -82,19 +50,83 @@ describe("Notion Helper", () => {
         validContactData.source,
       );
 
-      expect(response.id).toBe("fake-page-id");
-      expect(response.url).toContain("www.notion.so");
-      expect(response.error).toBe(undefined);
       expect(mock).toHaveBeenCalledTimes(1);
+      expect(mock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          parent: {
+            database_id: "mock-database-id",
+          },
+        }),
+      );
+      expect(mock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          properties: expect.objectContaining({
+            email: {
+              email: "john@example.com",
+            },
+          }),
+        }),
+      );
+      expect(mock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          properties: expect.objectContaining({
+            name: {
+              rich_text: [
+                {
+                  text: {
+                    content: "John Doe",
+                  },
+                },
+              ],
+            },
+          }),
+        }),
+      );
+      expect(mock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          properties: expect.objectContaining({
+            source: {
+              rich_text: [
+                {
+                  text: {
+                    content: "website",
+                  },
+                },
+              ],
+            },
+          }),
+        }),
+      );
+      expect(mock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          children: expect.arrayContaining([
+            expect.objectContaining({
+              paragraph: {
+                rich_text: [
+                  {
+                    text: {
+                      content: "Test message",
+                    },
+                  },
+                ],
+              },
+            }),
+          ]),
+        }),
+      );
+      expect(response).toHaveProperty(
+        "url",
+        "https://www.notion.so/fakepageid",
+      );
+      expect(response).not.toHaveProperty("error");
     });
 
     it("should return error message if data is missing", async () => {
       const response = await createContact("", "", "", "", "", "");
 
-      expect(response.id).toBe(undefined);
-      expect(response.url).toBe(undefined);
-      expect(response.error?.length).toBeGreaterThan(0);
       expect(mock).toHaveBeenCalledTimes(0);
+      expect(response).not.toHaveProperty("url");
+      expect(response).toHaveProperty("error");
     });
 
     it("should return error message if page was not created", async () => {
@@ -112,10 +144,9 @@ describe("Notion Helper", () => {
         validContactData.source,
       );
 
-      expect(response.id).toBe(undefined);
-      expect(response.url).toBe(undefined);
-      expect(response.error?.length).toBeGreaterThan(0);
       expect(mock).toHaveBeenCalledTimes(1);
+      expect(response).not.toHaveProperty("url");
+      expect(response).toHaveProperty("error");
     });
   });
 });
diff --git a/apps/contact/helpers/notion.ts b/apps/contact/helpers/notion.ts
@@ -39,7 +39,7 @@ const mentionPeople = () => {
   return getMentions().flatMap(mentionPerson);
 };
 
-export const createContactObject = (
+const createContactObject = (
   id: string,
   email: string,
   name: string,
@@ -114,7 +114,7 @@ export const createContact = async (
   content: string,
   databaseID: string,
   source: string,
-) => {
+): Promise<{ url: string } | { error: string }> => {
   if (!id || !email || !name || !databaseID) {
     return {
       error: "Missing data in process contact event",
@@ -129,24 +129,23 @@ export const createContact = async (
     // isFullPage checks if the response is type PageObjectResponse => contains url
     if (response.id && isFullPage(response)) {
       return {
-        id: response.id,
         url: response.url,
       };
-    } else if (response.id && !isFullPage(response)) {
+    }
+    if (response.id && !isFullPage(response)) {
       // Notion allows navigation to the created page using only the id without '-'
       // https://dev.to/adamcoster/change-a-url-without-breaking-existing-links-4m0d
       const cleanId = response.id.replace(/-/g, "");
       const pageUrl = `https://www.notion.so/${cleanId}`;
       return {
-        id: response.id,
         url: pageUrl,
       };
-    } else {
-      return {
-        error: "Failed to create notion page",
-      };
     }
-  } catch (e) {
+    return {
+      error: "Failed to create notion page",
+    };
+  } catch (error) {
+    console.error("Notion hepler", error);
     return {
       error: "Failed to create notion page",
     };
diff --git a/apps/contact/helpers/slack.test.ts b/apps/contact/helpers/slack.test.ts
@@ -1,13 +1,12 @@
 import { describe, it, expect, beforeEach, afterEach } from "bun:test";
-import {
-  createPayload,
-  notifyContactCreated,
-  notifyContactError,
-} from "./slack";
+import { notifyContactCreated, notifyContactError } from "./slack";
 
 const originalEnv = { ...process.env };
 const originalFetch = globalThis.fetch;
-let fetchCalls: string[] = [];
+let fetchCalls: {
+  url: string;
+  init: RequestInit;
+}[] = [];
 
 const mockSlackResponse = {
   ok: true,
@@ -27,8 +26,8 @@ beforeEach(() => {
 
   fetchCalls = [];
 
-  globalThis.fetch = (async (url: string) => {
-    fetchCalls.push(url);
+  globalThis.fetch = (async (url: string, init: RequestInit) => {
+    fetchCalls.push({ url, init });
     return { status: 200, json: async () => mockSlackResponse } as Response;
   }) as typeof fetch;
 });
@@ -44,36 +43,7 @@ describe("Slack Helper", () => {
     email: "john@example.com",
     url: "https://notion.so/test",
   };
-  describe("createPayload", () => {
-    it("should create correct Slack payload structure", () => {
-      const payload = createPayload(
-        validContactData.name,
-        validContactData.email,
-        validContactData.url,
-      );
-
-      expect(payload).toHaveProperty("channel");
-      expect(payload).toHaveProperty("blocks");
-      expect(payload.blocks).toHaveLength(4);
-
-      // Checks that it is type header and contains text
-      expect(payload.blocks[0]).toHaveProperty("type", "header");
-      expect(payload.blocks[0]).toHaveProperty("text");
-      expect(payload.blocks[0].text?.text.length).toBeGreaterThan(0);
-
-      // Checks that it is type section and the text conatins name and email
-      expect(payload.blocks[1]).toHaveProperty("type", "section");
-      expect(payload.blocks[1]).toHaveProperty("text");
-      expect(payload.blocks[1].text?.text).toContain("John Doe");
-      expect(payload.blocks[1].text?.text).toContain("john@example.com");
-
-      // Checks that it is type section and the accessory conatins the url
-      expect(payload.blocks[3]).toHaveProperty("type", "section");
-      expect(payload.blocks[3]).toHaveProperty("accessory");
-      expect(payload.blocks[3].accessory?.url).toBe("https://notion.so/test");
-    });
-  });
-
+  const errorMessage = "Error message";
   describe("notifyContactCreated", async () => {
     it("should send message on slack", async () => {
       await notifyContactCreated(
@@ -83,7 +53,11 @@ describe("Slack Helper", () => {
       );
 
       expect(fetchCalls.length).toBe(1);
-      expect(fetchCalls[0]).toBe("https://slack.com/api/chat.postMessage");
+      expect(fetchCalls[0].url).toBe("https://slack.com/api/chat.postMessage");
+      expect(fetchCalls[0].init.body).toContain(validContactData.name);
+      expect(fetchCalls[0].init.body).toContain(validContactData.email);
+      expect(fetchCalls[0].init.body).toContain(validContactData.url);
+      expect(fetchCalls[0].init.body).not.toContain(errorMessage);
     });
   });
 
@@ -92,11 +66,15 @@ describe("Slack Helper", () => {
       await notifyContactError(
         validContactData.name,
         validContactData.email,
-        "Message",
+        errorMessage,
       );
 
       expect(fetchCalls.length).toBe(1);
-      expect(fetchCalls[0]).toBe("https://slack.com/api/chat.postMessage");
+      expect(fetchCalls[0].url).toBe("https://slack.com/api/chat.postMessage");
+      expect(fetchCalls[0].init.body).toContain(validContactData.name);
+      expect(fetchCalls[0].init.body).toContain(validContactData.email);
+      expect(fetchCalls[0].init.body).not.toContain(validContactData.url);
+      expect(fetchCalls[0].init.body).toContain(errorMessage);
     });
   });
 });
diff --git a/apps/contact/helpers/slack.ts b/apps/contact/helpers/slack.ts
@@ -1,6 +1,6 @@
 const { SLACK_CHANNEL, SLACK_BOT_TOKEN } = process.env;
 
-export const createPayload = (name: string, email: string, url: string) => ({
+const createPayload = (name: string, email: string, url: string) => ({
   channel: SLACK_CHANNEL,
   blocks: [
     {
@@ -42,11 +42,7 @@ export const createPayload = (name: string, email: string, url: string) => ({
   ],
 });
 
-export const createErrorPayload = (
-  name: string,
-  email: string,
-  content: string,
-) => ({
+const createErrorPayload = (name: string, email: string, content: string) => ({
   channel: SLACK_CHANNEL,
   blocks: [
     {
diff --git a/apps/contact/tests/api-route.test.tsx b/apps/contact/tests/api-route.test.tsx
