Connected year and semester ai results with backend

Author: abhitrueprogrammer

src/app/api/ai-upload/route.ts

@@ -11,9 +11,10 @@ import {
 import { connectToDatabase } from "@/lib/mongoose";
 import cloudinary from "cloudinary";
 import type {
-   ICourses,
-   CloudinaryUploadResult,
+  ICourses,
+  CloudinaryUploadResult,
   ExamDetail,
+  Semester,
 } from "@/interface";
 import { PaperAdmin } from "@/db/papers";
 import axios from "axios";
@@ -50,16 +51,14 @@ export async function POST(req: Request) {
     }
     const tags = await processAndAnalyze({ imageURL });
     const finalTags = await setTagsFromCurrentLists(tags);
-    console.log(finalTags)
+    console.log("Final tags:", finalTags);
     const subject = finalTags["course-name"];
     const slot = finalTags.slot;
     const exam = finalTags["exam-type"];
-    const year = formData.get("year") as string;
-    const campus = formData.get("campus") as string;
-    const semester =formData.get("semester") as string;
+    const year = finalTags.year;
+    const campus = formData.get("campus") as string
+    const semester = finalTags.semester;
 
- 
-    console.log(subject , slot, exam)
     if (
       !(
         courses.includes(subject) &&
@@ -70,7 +69,10 @@ export async function POST(req: Request) {
         semesters.includes(semester)
       )
     ) {
-      return NextResponse.json({ message: "Bad request/AI couldn't set tags" }, { status: 400 });
+      return NextResponse.json(
+        { message: "AI couldn't set tags" },
+        { status: 400 },
+      );
     }
     await connectToDatabase();
     let finalUrl: string | undefined = "";
@@ -209,14 +211,17 @@ async function setTagsFromCurrentLists(
     `${process.env.SERVER_URL}/api/course-list`,
   );
   const courses = data.map((course: { name: string }) => course.name);
-  if (!courses[0] || !slots[0] || !exams[0]) {
-    throw "Cannot fetch default value for courses/slot/exam!";
+  if (!courses[0] || !slots[0] || !exams[0] || !semesters[0] || !years[0]) {
+    throw "Cannot fetch default value for courses/slot/exam/sem/year!";
   }
+
   const newTags: ExamDetail = {
     "course-name": courses[0],
     slot: slots[0],
     "course-code": "notInUse",
     "exam-type": exams[0],
+    semester: semesters[0] as Semester,
+    year: years[0],
   };
   const coursesFuzy = new Fuse(courses);
   if (!tags) {
@@ -229,16 +234,27 @@ async function setTagsFromCurrentLists(
     if (subjectSearch) {
       newTags["course-name"] = subjectSearch.item;
     }
-    const slotPattern = new RegExp(`[${tags.slot}]`, "i");
-    const slotSearchResult = slots.find((s) => slotPattern.test(s));
-    if(slotSearchResult)
-    {
-      newTags.slot = slotSearchResult 
+    const slotSearchResult = findMatch(slots, tags.slot);
+    if (slotSearchResult) {
+      newTags.slot = slotSearchResult;
     }
     if ("exam-type" in tags && tags["exam-type"] in examMap) {
       const examType = tags["exam-type"] as keyof typeof examMap;
       newTags["exam-type"] = examMap[examType];
     }
+    const semesterSearchResult = findMatch(semesters, tags.semester);
+    if (semesterSearchResult) {
+      newTags.semester = semesterSearchResult as Semester;
+    }
+    const yearSearchResult = findMatch(years, tags.year);
+    if (yearSearchResult) {
+      newTags.year = yearSearchResult;
+    }
   }
   return newTags;
 }
+function findMatch<T>(arr: T[], value: string | undefined): T | undefined {
+  if (!value) return undefined; // Handle undefined case
+  const pattern = new RegExp(`[${value}]`, "i");
+  return arr.find((item) => pattern.test(String(item)));
+}

src/app/upload/page.tsx

@@ -7,17 +7,8 @@ import { Button } from "@/components/ui/button";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
 import { type PostPDFToCloudinary } from "@/interface";
-import {  years, campuses, semesters } from "@/components/select_options";
 import Dropzone from "react-dropzone";
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectLabel,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
+
 import { createCanvas } from "canvas";
 import { getDocument, GlobalWorkerOptions } from "pdfjs-dist";
 import { PDFDocument } from "pdf-lib";
@@ -49,9 +40,7 @@ import { PDFDocument } from "pdf-lib";
 }
 
 const Page = () => {
-  const [year, setYear] = useState("");
   const [campus, setCampus] = useState("");
-  const [semester, setSemester] = useState("");
 
   const [files, setFiles] = useState<File[]>([]);
   const [isUploading, setIsUploading] = useState(false);
@@ -78,19 +67,19 @@ const Page = () => {
     //   toast.error("Exam is required");
     //   return;
     // }
-    if (!year) {
-      toast.error("Year is required");
-      return;
-    }
+    // if (!year) {
+    //   toast.error("Year is required");
+    //   return;
+    // }
     if (!campus) {
       setCampus("Vellore")
       // toast.error("Campus is required");
       // return;
     }
-    if (!semester) {
-      toast.error("Semester is required");
-      return;
-    }
+    // if (!semester) {
+    //   toast.error("Semester is required");
+    //   return;
+    // }
     if (!files || files.length === 0) {
       toast.error("No files selected");
       return;
@@ -132,9 +121,7 @@ const Page = () => {
     {
       formData.append("image", await pdfToImage(files[0]))
     }
-    formData.append("year", year);
     // formData.append("exam", exam);
-    formData.append("semester", semester);
     formData.append("campus", campus);
 
     formData.append("isPdf", String(isPdf));
@@ -154,7 +141,7 @@ const Page = () => {
       // setSlot("");
       // setSubject("");
       // setExam("");
-      setYear("");
+      // setYear("");
       setFiles([]);
       setResetSearch(true);
       setTimeout(() => setResetSearch(false), 100);
@@ -172,65 +159,9 @@ const Page = () => {
       </div>
       <div className="2xl:my-15 flex flex-col items-center">
         <fieldset className="mb-4 w-[350px] rounded-lg border-2 border-gray-300 p-4 pr-8">
-          <legend className="text-lg font-bold">Select paper parameters</legend>
+          {/* <legend className="text-lg font-bold">Upload papers</legend> */}
 
           <div className="flex w-full flex-col 2xl:gap-y-4">
-            {/* Year Selection */}
-            <div>
-              <label>Year:</label>
-              <Select value={year} onValueChange={setYear}>
-                <SelectTrigger className="m-2 rounded-md border p-2">
-                  <SelectValue placeholder="Select year" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectGroup>
-                    <SelectLabel>Year:</SelectLabel>
-                    {years.map((year) => (
-                      <SelectItem key={year} value={String(year)}>
-                        {year}
-                      </SelectItem>
-                    ))}
-                  </SelectGroup>
-                </SelectContent>
-              </Select>
-            </div>
-
-            <div>
-              {/* <label>Campus:</label>
-              <Select value={campus} onValueChange={setCampus}>
-                <SelectTrigger className="m-2 rounded-md border p-2">
-                  <SelectValue placeholder="Select campus" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectGroup>
-                    <SelectLabel>Years</SelectLabel>
-                    {campuses.map((campus) => (
-                      <SelectItem key={campus} value={String(campus)}>
-                        {campus}
-                      </SelectItem>
-                    ))}
-                  </SelectGroup>
-                </SelectContent>
-              </Select> */}
-            </div>
-            <div>
-              <label>Semester:</label>
-              <Select value={semester} onValueChange={setSemester}>
-                <SelectTrigger className="m-2 rounded-md border p-2">
-                  <SelectValue placeholder="Select semester" />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectGroup>
-                    <SelectLabel>Semester</SelectLabel>
-                    {semesters.map((semester) => (
-                      <SelectItem key={semester} value={String(semester)}>
-                        {semester}
-                      </SelectItem>
-                    ))}
-                  </SelectGroup>
-                </SelectContent>
-              </Select>
-            </div>
 
             {/* File Dropzone */}
             <div>

src/interface.ts

@@ -126,6 +126,7 @@ export interface DecryptedLoginResponse {
     id: string;
   };
 }
+export type Semester = "Fall" | "Winter" | "Summer" | "Weekend";
 
 export interface IPaper {
   _id: string;