minor fix and code refactoring

src/app/actions/get-papers-by-id.ts

@@ -1,20 +1,22 @@
-import { type PaperResponse } from "@/interface";
+import type { PaperResponse, ApiResponse } from "@/interface";
 import axios, { type AxiosResponse } from "axios";
 
 export const fetchPaperID = async (id: string): Promise<PaperResponse> => {
   const serverUrl = process.env.SERVER_URL ?? "https://papers.codechefvit.com";
 
   try {
-    const response: AxiosResponse<PaperResponse> = await axios.get(
+    const response: AxiosResponse<ApiResponse<PaperResponse>> = await axios.get(
       `${serverUrl}/api/paper-by-id/${id}`,
     );
-    return response.data;
+
+    if (!response.data.data) {
+      throw new Error("Paper not found");
+    }
+    return response.data.data;
   } catch (err: unknown) {
-    if (axios.isAxiosError(err)) {
-      console.error("Axios error:", err.response?.data ?? err.message);
-      const errorMessage =
-        (err.response?.data as { message?: string })?.message ??
-        "Failed to fetch paper";
+    if (axios.isAxiosError<ApiResponse<unknown>>(err)) {
+      const errorMessage = err.response?.data?.message ?? err.message;
+      console.error("Axios error:", errorMessage);
       throw new Error(errorMessage);
     } else {
       console.error("Unexpected error:", err);

src/app/api/course-list/route.ts

@@ -1,17 +1,14 @@
-import { NextResponse } from "next/server";
 import { getCourseList } from "@/lib/services/subject";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
     const courses = await getCourseList();
-    return NextResponse.json(courses, { status: 200 });
+    return success(courses);
   } catch (error) {
     console.error(error);
-    return NextResponse.json(
-      { message: "Failed to fetch courses", error },
-      { status: 500 },
-    );
+    return failure("Failed to fetch courses", 500);
   }
 }

src/app/api/paper-by-id/[id]/route.ts

@@ -1,23 +1,21 @@
-import { NextResponse } from "next/server";
 import { Types } from "mongoose";
 import { getPaperById } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response"
+
+export const dynamic = "force-dynamic";
 
 export async function GET(req: Request, { params }: { params: { id: string } }) {
   try {
     const { id } = params;
 
     if (!Types.ObjectId.isValid(id)) {
-      return NextResponse.json({ message: "Invalid paper ID" }, { status: 400 });
+      return failure("Invalid paper ID");
     }
-
     const paper = await getPaperById(id);
-
-    return NextResponse.json(paper, { status: 200 });
+    
+    return success(paper);
   } catch (error) {
     console.error(error);
-    return NextResponse.json(
-      { message: "Failed to fetch paper", error },
-      { status: 500 },
-    );
+    return failure("Failed to fetch paper", 500);
   }
 }

src/app/api/papers/count/route.ts

@@ -1,17 +1,15 @@
-import { NextResponse } from "next/server";
 import { getCourseCounts } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
-export async function GET(req: Request) {
+export async function GET() {
   try {
     const courseCount = await getCourseCounts();
 
-    return NextResponse.json(courseCount, { status: 200 });
+    return success(courseCount);
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch course counts", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch course counts", 500);
   }
 }

src/app/api/papers/route.ts

@@ -1,5 +1,6 @@
-import { NextResponse, type NextRequest } from "next/server";
+import { type NextRequest } from "next/server";
 import { getPapersBySubject } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
@@ -8,18 +9,13 @@ export async function GET(req: NextRequest) {
     const url = req.nextUrl.searchParams;
     const sub = url.get("subject");
     if (!sub) {
-      return NextResponse.json(
-        { message: "Subject query parameter is required" },
-        { status: 400 },
-      );
+      return failure("Subject query parameter is required");
     }
     const paper = await getPapersBySubject(sub);
 
-    return NextResponse.json(paper, { status: 200 });
+    return success(paper);
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch papers", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch papers", 500);
   }
 }

src/app/api/related-subject/route.ts

@@ -1,5 +1,6 @@
 import { getRelatedSubjects } from "@/lib/services/subject";
-import { NextResponse, type NextRequest } from "next/server";
+import { type NextRequest } from "next/server";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
@@ -9,21 +10,13 @@ export async function GET(req: NextRequest) {
     const subject = url.get("subject");
 
     if (!subject) {
-      return NextResponse.json(
-        { message: "Subject query parameter is required" },
-        { status: 400 },
-      );
+      return failure("Subject query parameter is required", 400);
     }
     const relatedSubjects = await getRelatedSubjects(subject);
 
-    return NextResponse.json(
-      {related_subjects: relatedSubjects},
-      { status: 200 },
-    );
+    return success({ related_subjects: relatedSubjects });
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch related subject", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch related subject", 500);
   }
 }

src/app/api/report-tag/route.ts

@@ -1,6 +1,6 @@
-import { NextResponse } from "next/server";
-import { reportTag, ReportTagBody } from "@/lib/services/report";
+import { reportTag, type ReportTagBody } from "@/lib/services/report";
 import { rateLimitCheck } from "@/lib/utils/rate-limiter";
+import { success, failure } from "@/lib/utils/response";
 import { customErrorHandler } from "@/lib/utils/error";
 
 export async function POST(req: Request & { ip?: string }) {
@@ -9,18 +9,12 @@ export async function POST(req: Request & { ip?: string }) {
     const paperId = typeof body.paperId === "string" ? body.paperId : undefined;
 
     if (!paperId) {
-      return NextResponse.json(
-        { error: "paperId is required" },
-        { status: 400 }
-      );
+      return failure("paperId is required", 400);
     }
     await rateLimitCheck(req, paperId);
     const newReport = await reportTag(paperId, body);
 
-    return NextResponse.json(
-      { message: "Report submitted.", report: newReport },
-      { status: 201 }
-    );
+    return success({ message: "Report submitted.", report: newReport }, "Created", 201);
   } catch (err) {
     console.error(err);
     return customErrorHandler(err, "Failed to submit tag report.");

src/app/api/request/route.ts

@@ -1,36 +1,19 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import PaperRequest from "@/db/paperRequest";
+import { success, failure } from "@/lib/utils/response";
+import { createPaperRequest } from "@/lib/services/paper"
+import type { CreatePaperInputType } from "@/lib/services/paper"
 
 export async function POST(req: Request) {
   try {
-    await connectToDatabase();
-    const body = (await req.json()) as {
-      subject: string;
-      exam: string;
-      slot: string;
-      year: string;
-    };
-
-    const { subject, exam, slot, year } = body;
+    const {subject, exam, slot, year} = (await req.json()) as CreatePaperInputType
 
     if (!subject || !exam || !slot || !year) {
-      return NextResponse.json(
-        { error: "All fields are required." },
-        { status: 400 },
-      );
+      return failure("All fields are required.", 400);
     }
 
-    const newRequest = await PaperRequest.create({ subject, exam, slot, year });
-    return NextResponse.json(
-      { message: "Paper request submitted successfully!", request: newRequest },
-      { status: 201 },
-    );
+    const newRequest = await createPaperRequest({subject, exam, slot, year});
+    return success({ message: "Paper request submitted successfully!", request: newRequest }, "Created", 201);
   } catch (error) {
     console.error("Error creating paper request:", error);
-    return NextResponse.json(
-      { error: "Failed to submit request." },
-      { status: 500 },
-    );
+    return failure("Failed to submit request.", 500);
   }
 }

src/app/api/selected-papers/route.ts

@@ -1,33 +1,18 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import Paper from "@/db/papers";
+import { success, failure } from "@/lib/utils/response";
+import { getSelectedPapers } from "@/lib/services/paper";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
-    await connectToDatabase();
-
-    const selectedPapers = await Paper.find({ isSelected: true }).limit(8);
+    const selectedPapers = await getSelectedPapers();
 
     if (selectedPapers.length === 0) {
-      return NextResponse.json(
-        {
-          message: "No selected papers found.",
-        },
-        { status: 404 },
-      );
+      return failure("No selected papers found.", 404);
     }
-    return NextResponse.json(selectedPapers, {
-      status: 200,
-    });
+    return success(selectedPapers);
   } catch (error) {
     console.error("Error fetching papers:", error);
-    return NextResponse.json(
-      {
-        error: "Failed to fetch papers.",
-      },
-      { status: 500 },
-    );
+    return failure("Failed to fetch papers.", 500);
   }
-}
+}

src/app/api/subscribe/route.ts

@@ -1,19 +1,19 @@
-import { NextResponse } from "next/server";
-import { customErrorHandler } from "@/lib/utils/error";
 import { subscribeEmail } from "@/lib/services/subscribe";
+import { success, failure } from "@/lib/utils/response";
+import { customErrorHandler } from "@/lib/utils/error";
 
 export async function POST(req: Request) {
   try {
     const { email } = (await req.json()) as { email: string };
 
     if (!email) {
-      return NextResponse.json({ error: "Email is required" }, { status: 400 });
+      return failure("Email is required", 400);
     }
     await subscribeEmail(email);
 
-    return NextResponse.json({ message: "Email added successfully" });
+    return success({ message: "Email added successfully" });
   } catch (error) {
     console.error("Error adding email:", error);
     return customErrorHandler(error, "Failed to add email");
   }
-} 
+}

src/app/api/upcoming-papers/route.ts

@@ -1,36 +1,19 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import UpcomingSubject from "@/db/upcoming-paper";
+import { success, failure } from "@/lib/utils/response";
+import { getUpcomingSubjects } from "@/lib/services/subject";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
-    await connectToDatabase();
-    const selectedSubjects = await UpcomingSubject.find()
-      .sort({ _id: 1 })
-      .limit(16)
-      .lean();
-
+    const selectedSubjects = await getUpcomingSubjects();
+
     if (selectedSubjects.length === 0) {
-      return NextResponse.json(
-        {
-          message: "No selected papers found.",
-        },
-        { status: 404 },
-      );
+      return failure("No selected papers found.", 404);
     }
 
-    return NextResponse.json(selectedSubjects, {
-      status: 200,
-    });
+    return success(selectedSubjects);
   } catch (error) {
     console.error("Error fetching papers:", error);
-    return NextResponse.json(
-      {
-        error: "Failed to fetch papers.",
-      },
-      { status: 500 },
-    );
+    return failure("Failed to fetch papers.", 500);
   }
-}
+}