fix: big bugs

Author: PattiyaY

models/requesttype.js

@@ -1,13 +1,11 @@
 import mongoose, { Schema } from "mongoose";
 
 const requesttypeSchema = new Schema({
-  projectid: { 
-    type: String,
-    ref: "Project"
-  },
-  status: { type: String },
+  projectid: { type: String, required: true },
+  status: { type: String, required: true },
 });
 
 const Requesttype =
-  mongoose.models.Requesttype || mongoose.model("Requesttype", requesttypeSchema);
+  mongoose.models.Requesttype ||
+  mongoose.model("Requesttype", requesttypeSchema);
 export default Requesttype;

src/app/api/request/route.js

@@ -1,5 +1,5 @@
 import { connectMongoDB } from "../../../../lib/mongodb";
-import Request from "../../../../models/requesttype";
+import Request from "../../../../models/request";
 import { NextResponse } from "next/server";
 
 export async function GET(req) {

src/app/api/requesttype/route.js

@@ -17,21 +17,33 @@ export async function GET(req) {
 }
 
 export async function POST(req) {
-  // Connect to MongoDB
-  await connectMongoDB();
+  try {
+    await connectMongoDB();
 
-  const url = new URL(req.url);
-  const projectid = url.searchParams.get("projectid");
-  
-  const requesttype = await Requesttype({
-    projectid,
-    status: "created",
-  }).save();
+    // Parse the JSON body from the request
+    const body = await req.json();
 
-  return NextResponse.json(
-    { message: "Successfully added requests", requests: requesttype },
-    { status: 201 }
-  );
+    // Validate required fields
+    if (!body.projectid) throw new Error("Missing projectid");
+
+    // Set default status if not provided
+    const requestData = {
+      projectid: body.projectid,
+      status: body.status,
+    };
+
+    // Save to database
+    const requesttype = new Requesttype(requestData);
+    const saveRequestType = await requesttype.save();
+
+    return NextResponse.json({ saveRequestType }, { status: 200 });
+  } catch (error) {
+    console.error("Error creating request:", error);
+    return NextResponse.json(
+      { message: "Error creating request", error: error.message },
+      { status: 500 }
+    );
+  }
 }
 
 export async function PUT(req) {
@@ -43,25 +55,26 @@ export async function PUT(req) {
 
     // Update requesttype or create if it doesn't exist
     const updatedRequestType = await Requesttype.findOneAndUpdate(
-        { projectid },
-        { status },
-        { new: true, upsert: true }
-      );
-  
-      return NextResponse.json(
-        { message: "Successfully updated request type", requesttype: updatedRequestType },
-        { status: 200 }
-      );
-    } catch (error) {
-      console.error("Error updating request type:", error);
-      return NextResponse.json(
-        { message: "Internal Server Error", error: error.message },
-        { status: 500 }
-      );
-    }
-  }
+      { projectid },
+      { status },
+      { new: true, upsert: true }
+    );
 
-  
+    return NextResponse.json(
+      {
+        message: "Successfully updated request type",
+        requesttype: updatedRequestType,
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    console.error("Error updating request type:", error);
+    return NextResponse.json(
+      { message: "Internal Server Error", error: error.message },
+      { status: 500 }
+    );
+  }
+}
 
 export async function DELETE(req) {
   await connectMongoDB();
@@ -81,4 +94,4 @@ export async function DELETE(req) {
     { message: "Request type deleted successfully" },
     { status: 200 }
   );
-}
+}

src/app/page.js

@@ -27,7 +27,7 @@ export default function HomePage() {
 
       const data = await res.json();
       setNotificationList(data);
-      // console.log("Notifications:", data);
+      console.log("Notifications:", data);
       return data;
     } catch (error) {
       console.error("Error fetching notifications:", error);
@@ -128,7 +128,12 @@ export default function HomePage() {
 
                     {/* Footer Section */}
                     <div className="flex justify-between items-center mt-2 text-xs text-gray-500">
-                      <p>Date: {new Date().toLocaleDateString()}</p>
+                      <p>
+                        Date:{" "}
+                        {new Date(notification.date).toLocaleDateString(
+                          "en-US"
+                        )}
+                      </p>
                       <div className="flex items-center gap-2">
                         <Image
                           src={bell}

src/app/requestresource/page.js

@@ -29,12 +29,12 @@ export default function RequestResource() {
         throw new Error(`Project fetch failed: ${projectRes.statusText}`);
 
       const projectData = await projectRes.json();
-      console.log("Fetched project:", projectData);
+      // console.log("Fetched project:", projectData);
 
-      console.log("project length", projectData.length);
+      // console.log("project length", projectData.length);
       if (projectData.length > 0) {
         const projectRequest = projectData[0]._id;
-        console.log("Project ID:", projectRequest);
+        // console.log("Project ID:", projectRequest);
 
         const resourceRes = await fetch(
           `/api/resource?projectRequest=${projectRequest}`
@@ -43,7 +43,7 @@ export default function RequestResource() {
           throw new Error(`Resource fetch failed: ${resourceRes.statusText}`);
 
         const resourceData = await resourceRes.json();
-        console.log("Fetched resources:", resourceData);
+        // console.log("Fetched resources:", resourceData);
 
         setTableRowsCR(
           resourceData.map((element) => ({
@@ -72,6 +72,13 @@ export default function RequestResource() {
     toast.success("Request sent successfully");
 
     try {
+      console.log("TABLE_ROWS_CR before request:", TABLE_ROWS_CR);
+
+      if (!TABLE_ROWS_CR || TABLE_ROWS_CR.length === 0) {
+        throw new Error("TABLE_ROWS_CR is empty or undefined.");
+      }
+
+      // Send request to /api/request
       const resRequest = await fetch("/api/request", {
         method: "POST",
         headers: {
@@ -80,27 +87,45 @@ export default function RequestResource() {
         body: JSON.stringify(TABLE_ROWS_CR),
       });
 
-      const resRequesttype = await fetch(`/api/requesttype?projectid=${projectid}&status=created`, {
+      if (!resRequest.ok) {
+        const errorMessage = await resRequest.text();
+        throw new Error(
+          `Request API failed: ${resRequest.status} - ${errorMessage}`
+        );
+      }
+    } catch (error) {
+      console.error("Error while saving request:", error.message);
+    }
+
+    try {
+      // Prepare JSON data for /api/requesttype
+      const requestTypeData = {
+        projectid: TABLE_ROWS_CR[0].projectid,
+        status: "created",
+      };
+
+      // Send request to /api/requesttype with JSON body
+      const resRequesttype = await fetch("/api/requesttype", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
-        
+        body: JSON.stringify(requestTypeData),
       });
-      
-
-      if (!resRequest.ok) {
-        throw new Error(`Error: ${resRequest.status} - ${resRequest.statusText}`);
-      } else {
-        await fetchResources(); // Refetch resources after request
 
-        router.push("/projectlist");
+      if (!resRequesttype.ok) {
+        const errorMessage = await resRequesttype.text();
+        throw new Error(
+          `RequestType API failed: ${resRequesttype.status} - ${errorMessage}`
+        );
       }
+
+      await fetchResources(); // Refetch resources after request
+      router.push("/projectlist");
     } catch (error) {
-      console.log("Error while saving request:", error.message);
+      console.error("Error while saving request:", error.message);
     }
   };
-
   return (
     <div>
       <h1 className="text-5xl font-bold mx-16 my-5">{projectName}</h1>