Merge pull request #457 from Gslmao-s-Org/Gslmao/seperate-logic

Gslmao/seperate logic

Author: YOGESH-08

src/app/api/subscribe/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
-import { appendEmailToSheet } from "@/lib/services/google-sheets";
-import { verifyEmail } from "@devmehq/email-validator-js";
+import { customErrorHandler } from "@/lib/utils/error";
+import { subscribeEmail } from "@/lib/services/subscribe";
 
 export async function POST(req: Request) {
   try {
@@ -9,26 +9,11 @@ export async function POST(req: Request) {
     if (!email) {
       return NextResponse.json({ error: "Email is required" }, { status: 400 });
     }
+    await subscribeEmail(email);
 
-    const result = await verifyEmail({
-      emailAddress: email,
-      verifyMx: true,
-      verifySmtp: false,
-      timeout: 4000
-    });
-
-    if (!result.validFormat) {
-      return NextResponse.json({ error: "Invalid email format" }, { status: 400 });
-    }
-
-    if (!result.validMx) {
-      return NextResponse.json({ error: "Email domain is invalid" }, { status: 400 });
-    }
-
-    await appendEmailToSheet(email);
     return NextResponse.json({ message: "Email added successfully" });
   } catch (error) {
     console.error("Error adding email:", error);
-    return NextResponse.json({ error: "Failed to add email" }, { status: 500 });
+    return customErrorHandler(error, "Failed to add email");
   }
 } 

src/components/Footer.tsx

@@ -18,7 +18,7 @@ import toast from "react-hot-toast";
 
 type SubscribeResponse = {
   success?: boolean;
-  error?: string;
+  message?: string;
 };
 
 export default function Footer() {
@@ -44,7 +44,7 @@ export default function Footer() {
       })     
       .then(async (res) => {
         const data = (await res.json()) as SubscribeResponse;
-        if (!res.ok) throw new Error(data.error ?? "Something went wrong.");
+        if (!res.ok) throw new Error(data.message ?? "Something went wrong.");
         return data;
       }),
       {

src/lib/services/subject.ts

@@ -1,13 +1,14 @@
 import { connectToDatabase } from "@/lib/database/mongoose";
-import { Course } from "@/db/course";
 import { IRelatedSubject } from "@/interface";
 import { escapeRegExp } from "@/lib/utils/regex";
+import { Course } from "@/db/course";
 import RelatedSubject from "@/db/relatedSubjects";
 
 export async function getCourseList(){
 	await connectToDatabase();
 	return await Course.find().lean();
 }
+
 export async function getRelatedSubjects(subject: string) {
 	await connectToDatabase();
 	const escapedSubject = escapeRegExp(subject);
@@ -16,4 +17,4 @@ export async function getRelatedSubjects(subject: string) {
 	});
 
 	return subjects[0]?.related_subjects ?? [];
-}
+}

src/lib/services/subscribe.ts

@@ -0,0 +1,22 @@
+import { verifyEmail } from "@devmehq/email-validator-js";
+import { appendEmailToSheet } from "@/lib/services/google-sheets";
+import { CustomError } from "@/lib/utils/error";
+
+export async function subscribeEmail(email: string) {
+  const result = await verifyEmail({
+      emailAddress: email,
+      verifyMx: true,
+      verifySmtp: false,
+      timeout: 4000
+    });
+
+  if (!result.validFormat) {
+    throw new CustomError("Invalid email format", 400);
+  }
+
+  if (!result.validMx) {
+    throw new CustomError("Email domain is invalid", 400);
+  }
+
+  await appendEmailToSheet(email);
+}