Merge pull request #21 from PenginYY/main

feat: new model request type

Author: PenginYY

dags/create_resources.py

@@ -122,7 +122,7 @@ def callback(ch, method, properties, body):
             connection.close()
         print("Listener stopped.")
 
-        return received_message if received_message is not None else "67be6c7a49bb7121f5dab8fe"
+        return received_message if received_message is not None else "67cf664cd062ae3b148d5f13"
 
 def fetch_from_mongo(received_message):
     """

dags/idp.py

@@ -109,7 +109,7 @@ def callback(ch, method, properties, body):
             connection.close()
         print("Listener stopped.")
 
-        return received_message if received_message is not None else ""
+        return received_message if received_message is not None else "67cf664cd062ae3b148d5f13"
 
 def fetch_from_mongo(received_message):
     print(f"Received message from XCom: {received_message}")

models/requesttype.js

@@ -0,0 +1,13 @@
+import mongoose, { Schema } from "mongoose";
+
+const requesttypeSchema = new Schema({
+  projectid: { 
+    type: String,
+    ref: "Project"
+  },
+  status: { type: String },
+});
+
+const Requesttype =
+  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/request";
+import Request from "../../../../models/requesttype";
 import { NextResponse } from "next/server";
 
 export async function GET(req) {

src/app/api/requesttype/route.js

@@ -0,0 +1,84 @@
+import { connectMongoDB } from "../../../../lib/mongodb";
+import Requesttype from "../../../../models/requesttype";
+import { NextResponse } from "next/server";
+
+export async function GET(req) {
+  // Connect to MongoDB
+  await connectMongoDB();
+
+  const url = new URL(req.url);
+  const projectid = url.searchParams.get("projectId");
+
+  const query = projectid ? { projectid } : {};
+
+  const requesttype = await Requesttype.find(query);
+
+  return NextResponse.json(requesttype, { status: 200 }); // return NextResponse.json({ requests }, { status: 200 });
+}
+
+export async function POST(req) {
+  // Connect to MongoDB
+  await connectMongoDB();
+
+  const url = new URL(req.url);
+  const projectid = url.searchParams.get("projectid");
+  
+  const requesttype = await Requesttype({
+    projectid,
+    status: "created",
+  }).save();
+
+  return NextResponse.json(
+    { message: "Successfully added requests", requests: requesttype },
+    { status: 201 }
+  );
+}
+
+export async function PUT(req) {
+  try {
+    const { projectid, status } = await req.json();
+
+    // Connect to MongoDB
+    await connectMongoDB();
+
+    // 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 }
+      );
+    }
+  }
+
+  
+
+export async function DELETE(req) {
+  await connectMongoDB();
+
+  const url = new URL(req.url);
+  const projectid = url.searchParams.get("projectId");
+
+  if (!projectid) {
+    return NextResponse.json(
+      { message: "Missing required fields" },
+      { status: 400 }
+    );
+  }
+
+  await Requesttype.deleteOne({ projectid });
+  return NextResponse.json(
+    { message: "Request type deleted successfully" },
+    { status: 200 }
+  );
+}

src/app/requestresource/page.js

@@ -72,18 +72,28 @@ export default function RequestResource() {
     toast.success("Request sent successfully");
 
     try {
-      const res = await fetch("/api/request", {
+      const resRequest = await fetch("/api/request", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
         body: JSON.stringify(TABLE_ROWS_CR),
       });
 
-      if (!res.ok) {
-        throw new Error(`Error: ${res.status} - ${res.statusText}`);
+      const resRequesttype = await fetch(`/api/requesttype?projectid=${projectid}&status=created`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        
+      });
+      
+
+      if (!resRequest.ok) {
+        throw new Error(`Error: ${resRequest.status} - ${resRequest.statusText}`);
       } else {
         await fetchResources(); // Refetch resources after request
+
         router.push("/projectlist");
       }
     } catch (error) {