update

src/app/api/cv-profile/route.ts

@@ -24,6 +24,18 @@ async function getMatchingArrayValues(
     .filter((v) => v.toLowerCase().includes(search.toLowerCase()));
 }
 
+// Resolve all profile_ids that belong to a given user_id
+// cv_profile.file_id → cv_file.file_id → cv_file.user_id
+async function getProfileIdsByUserId(user_id: string): Promise<string[]> {
+  const rows = await prisma.$queryRaw<{ profile_id: string }[]>`
+    SELECT p.profile_id
+    FROM cv_profile p
+    INNER JOIN cv_file f ON f.file_id = p.file_id
+    WHERE f.user_id = ${user_id}::uuid
+  `;
+  return rows.map((r) => r.profile_id);
+}
+
 export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
 
@@ -37,11 +49,16 @@ export async function GET(request: NextRequest) {
 
   // --- CRITERIA ---
   const criteria_id = searchParams.get("criteria_id");
-
   if (criteria_id && !UUID_REGEX.test(criteria_id)) {
     return NextResponse.json({ error: "Invalid criteria_id format" }, { status: 400 });
   }
 
+  // --- USER FILTER ---
+  const user_id = searchParams.get("user_id");
+  if (user_id && !UUID_REGEX.test(user_id)) {
+    return NextResponse.json({ error: "Invalid user_id format" }, { status: 400 });
+  }
+
   // --- FILTERS ---
   const domicile = searchParams.get("domicile");
   const yoe = searchParams.get("yoe");
@@ -49,7 +66,6 @@ export async function GET(request: NextRequest) {
   const hardskills = searchParams.getAll("hardskills");
   const certifications = searchParams.getAll("certifications");
   const business_domain = searchParams.getAll("business_domain");
-
   const univ_edu_1 = searchParams.get("univ_edu_1");
   const univ_edu_2 = searchParams.get("univ_edu_2");
   const univ_edu_3 = searchParams.get("univ_edu_3");
@@ -71,69 +87,77 @@ export async function GET(request: NextRequest) {
   ];
 
   const isScoreSort = sortBy === "score" && !!criteria_id;
-
   const orderBy = !isScoreSort && allowedSortFields.includes(sortBy)
     ? { [sortBy]: sortOrder }
     : { created_at: "desc" as const };
 
-  // --- PARALLEL ARRAY SEARCH (only when search is provided) ---
-  const [matchingHardskills, matchingSoftskills, matchingCertifications, matchingBusinessDomain] =
-    search
-      ? await Promise.all([
-          getMatchingArrayValues("hardskills", search, prisma),
-          getMatchingArrayValues("softskills", search, prisma),
-          getMatchingArrayValues("certifications", search, prisma),
-          getMatchingArrayValues("business_domain", search, prisma),
-        ])
-      : [[], [], [], []];
-
-  // --- BUILD WHERE ---
-  const where: any = {
-    ...(search ? {
-      OR: [
-        { fullname: { contains: search, mode: "insensitive" } },
-        { domicile: { contains: search, mode: "insensitive" } },
-        { univ_edu_1: { contains: search, mode: "insensitive" } },
-        { univ_edu_2: { contains: search, mode: "insensitive" } },
-        { univ_edu_3: { contains: search, mode: "insensitive" } },
-        { major_edu_1: { contains: search, mode: "insensitive" } },
-        { major_edu_2: { contains: search, mode: "insensitive" } },
-        { major_edu_3: { contains: search, mode: "insensitive" } },
-        { filename: { contains: search, mode: "insensitive" } },
-        // ✅ Guard against empty arrays which cause Prisma errors
-        ...(matchingHardskills.length > 0 ? [{ hardskills: { hasSome: matchingHardskills } }] : []),
-        ...(matchingSoftskills.length > 0 ? [{ softskills: { hasSome: matchingSoftskills } }] : []),
-        ...(matchingCertifications.length > 0 ? [{ certifications: { hasSome: matchingCertifications } }] : []),
-        ...(matchingBusinessDomain.length > 0 ? [{ business_domain: { hasSome: matchingBusinessDomain } }] : []),
-        ...(Number.isNaN(Number.parseFloat(search)) ? [] : [
-          { gpa_edu_1: { equals: Number.parseFloat(search) } },
-          { gpa_edu_2: { equals: Number.parseFloat(search) } },
-          { gpa_edu_3: { equals: Number.parseFloat(search) } },
-        ]),
-        ...(Number.isNaN(Number.parseInt(search)) ? [] : [
-          { yoe: { equals: Number.parseInt(search) } },
-        ]),
-      ],
-    } : {}),
-
-    ...(domicile && { domicile }),
-    ...(yoe && { yoe: { gte: Number.parseInt(yoe) } }),
-    ...(softskills.length > 0 && { softskills: { hasSome: softskills } }),
-    ...(hardskills.length > 0 && { hardskills: { hasSome: hardskills } }),
-    ...(certifications.length > 0 && { certifications: { hasSome: certifications } }),
-    ...(business_domain.length > 0 && { business_domain: { hasSome: business_domain } }),
-    ...(univ_edu_1 && { univ_edu_1 }),
-    ...(major_edu_1 && { major_edu_1 }),
-    ...(gpa_1 && { gpa_edu_1: { gte: Number.parseFloat(gpa_1) } }),
-    ...(univ_edu_2 && { univ_edu_2 }),
-    ...(major_edu_2 && { major_edu_2 }),
-    ...(gpa_2 && { gpa_edu_2: { gte: Number.parseFloat(gpa_2) } }),
-    ...(univ_edu_3 && { univ_edu_3 }),
-    ...(major_edu_3 && { major_edu_3 }),
-    ...(gpa_3 && { gpa_edu_3: { gte: Number.parseFloat(gpa_3) } }),
-  };
-
   try {
+    // --- RESOLVE user_id → profile_ids FILTER ---
+    // Run in parallel with array search since both are independent
+    const [
+      matchingHardskills,
+      matchingSoftskills,
+      matchingCertifications,
+      matchingBusinessDomain,
+      userProfileIds,
+    ] = await Promise.all([
+      search ? getMatchingArrayValues("hardskills", search, prisma) : Promise.resolve([]),
+      search ? getMatchingArrayValues("softskills", search, prisma) : Promise.resolve([]),
+      search ? getMatchingArrayValues("certifications", search, prisma) : Promise.resolve([]),
+      search ? getMatchingArrayValues("business_domain", search, prisma) : Promise.resolve([]),
+      user_id ? getProfileIdsByUserId(user_id) : Promise.resolve(null), // null = no filter
+    ]);
+
+    // --- BUILD WHERE ---
+    const where: any = {
+      // Filter by user's profiles if user_id is provided
+      ...(userProfileIds !== null && {
+        profile_id: { in: userProfileIds },
+      }),
+
+      ...(search ? {
+        OR: [
+          { fullname: { contains: search, mode: "insensitive" } },
+          { domicile: { contains: search, mode: "insensitive" } },
+          { univ_edu_1: { contains: search, mode: "insensitive" } },
+          { univ_edu_2: { contains: search, mode: "insensitive" } },
+          { univ_edu_3: { contains: search, mode: "insensitive" } },
+          { major_edu_1: { contains: search, mode: "insensitive" } },
+          { major_edu_2: { contains: search, mode: "insensitive" } },
+          { major_edu_3: { contains: search, mode: "insensitive" } },
+          { filename: { contains: search, mode: "insensitive" } },
+          ...(matchingHardskills.length > 0 ? [{ hardskills: { hasSome: matchingHardskills } }] : []),
+          ...(matchingSoftskills.length > 0 ? [{ softskills: { hasSome: matchingSoftskills } }] : []),
+          ...(matchingCertifications.length > 0 ? [{ certifications: { hasSome: matchingCertifications } }] : []),
+          ...(matchingBusinessDomain.length > 0 ? [{ business_domain: { hasSome: matchingBusinessDomain } }] : []),
+          ...(Number.isNaN(Number.parseFloat(search)) ? [] : [
+            { gpa_edu_1: { equals: Number.parseFloat(search) } },
+            { gpa_edu_2: { equals: Number.parseFloat(search) } },
+            { gpa_edu_3: { equals: Number.parseFloat(search) } },
+          ]),
+          ...(Number.isNaN(Number.parseInt(search)) ? [] : [
+            { yoe: { equals: Number.parseInt(search) } },
+          ]),
+        ],
+      } : {}),
+
+      ...(domicile && { domicile }),
+      ...(yoe && { yoe: { gte: Number.parseInt(yoe) } }),
+      ...(softskills.length > 0 && { softskills: { hasSome: softskills } }),
+      ...(hardskills.length > 0 && { hardskills: { hasSome: hardskills } }),
+      ...(certifications.length > 0 && { certifications: { hasSome: certifications } }),
+      ...(business_domain.length > 0 && { business_domain: { hasSome: business_domain } }),
+      ...(univ_edu_1 && { univ_edu_1 }),
+      ...(major_edu_1 && { major_edu_1 }),
+      ...(gpa_1 && { gpa_edu_1: { gte: Number.parseFloat(gpa_1) } }),
+      ...(univ_edu_2 && { univ_edu_2 }),
+      ...(major_edu_2 && { major_edu_2 }),
+      ...(gpa_2 && { gpa_edu_2: { gte: Number.parseFloat(gpa_2) } }),
+      ...(univ_edu_3 && { univ_edu_3 }),
+      ...(major_edu_3 && { major_edu_3 }),
+      ...(gpa_3 && { gpa_edu_3: { gte: Number.parseFloat(gpa_3) } }),
+    };
+
     // --- RESOLVE SCORE MAP ---
     const scoreMap = new Map<string, number | null>();
 
@@ -142,17 +166,15 @@ export async function GET(request: NextRequest) {
         where: { criteria_id },
         select: { weight_id: true },
       });
+
       if (weight) {
         const matchings = await prisma.cv_matching.findMany({
           where: { weight_id: weight.weight_id },
           select: { matching_id: true, profile_id: true },
         });
 
-        console.log(matchings)
-
         if (matchings.length > 0) {
           const matchingIds = matchings.map((m) => m.matching_id);
-
           const scores = await prisma.cv_score.findMany({
             where: { matching_id: { in: matchingIds } },
             select: { matching_id: true, profile_id: true, score: true },
@@ -164,9 +186,7 @@ export async function GET(request: NextRequest) {
 
           for (const s of scores) {
             const profileId = s.profile_id ?? matchingToProfile.get(s.matching_id ?? "");
-            if (profileId) {
-              scoreMap.set(profileId, s.score ?? null);
-            }
+            if (profileId) scoreMap.set(profileId, s.score ?? null);
           }
         }
       }
@@ -182,7 +202,7 @@ export async function GET(request: NextRequest) {
       prisma.cv_profile.count({ where }),
     ]);
 
-    // --- EARLY RETURN IF NO criteria_id (no score enrichment needed) ---
+    // --- EARLY RETURN IF NO criteria_id ---
     if (!criteria_id) {
       return NextResponse.json({
         data: profiles,
@@ -240,4 +260,4 @@ export async function GET(request: NextRequest) {
     console.error(error);
     return NextResponse.json({ error: "Failed to fetch profiles" }, { status: 500 });
   }
-}
+}

src/components/dashboard/candidates-table.tsx

@@ -6,6 +6,7 @@ import { Checkbox } from "@/components/ui/checkbox"
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
 import { Form, FormControl, FormField, FormItem, FormLabel } from "@/components/ui/form"
 import { Input } from "@/components/ui/input"
+import { useUser } from "@/composables/useUser"
 import { authFetch } from "@/lib/api"
 import { exportCandidatesToCSV } from "@/lib/export-service"
 import { createAndCalculateScore } from "@/lib/scoring-service"
@@ -29,8 +30,10 @@ const fetchCandidates = async (
   search: string,
   sortConfig: { key: string | null; direction: "asc" | "desc" },
   filters: FilterFormValues,
-  criteriaId: string | null
+  criteriaId: string | null,
+  userId: string
 ) => {
+  if (!userId) return []
   const params = new URLSearchParams()
   params.set("page", String(page))
   params.set("limit", "10")
@@ -54,6 +57,7 @@ const fetchCandidates = async (
   if (filters.certifications) params.append("certifications", filters.certifications)
   if (filters.businessDomain) params.append("business_domain", filters.businessDomain)
   if (criteriaId) params.append("criteria_id", criteriaId)
+  params.append("user_id", userId)
 
   const res = await authFetch(`/api/cv-profile?${params}`)
   if (!res.ok) throw new Error("Failed to fetch candidates")
@@ -140,13 +144,13 @@ const TableRow = memo(({
     {visibleColumns.fullname && <td className="p-3 text-sm">{row.fullname}</td>}
     {visibleColumns.univ_edu_1 && <td className="p-3 text-sm">{row.univ_edu_1 ?? "-"}</td>}
     {visibleColumns.major_edu_1 && <td className="p-3 text-sm">{row.major_edu_1 ?? "-"}</td>}
-    {visibleColumns.gpa_edu_1 && <td className="p-3 text-sm">{row.gpa_edu_1 ?? "-"}</td>}
+    {visibleColumns.gpa_edu_1 && <td className="p-3 text-sm">{row.gpa_edu_1?.toFixed(2) ?? "-"}</td>}
     {visibleColumns.univ_edu_2 && <td className="p-3 text-sm">{row.univ_edu_2 ?? "-"}</td>}
     {visibleColumns.major_edu_2 && <td className="p-3 text-sm">{row.major_edu_2 ?? "-"}</td>}
-    {visibleColumns.gpa_edu_2 && <td className="p-3 text-sm">{row.gpa_edu_2 ?? "-"}</td>}
+    {visibleColumns.gpa_edu_2 && <td className="p-3 text-sm">{row.gpa_edu_2?.toFixed(2) ?? "-"}</td>}
     {visibleColumns.univ_edu_3 && <td className="p-3 text-sm">{row.univ_edu_3 ?? "-"}</td>}
     {visibleColumns.major_edu_3 && <td className="p-3 text-sm">{row.major_edu_3 ?? "-"}</td>}
-    {visibleColumns.gpa_edu_3 && <td className="p-3 text-sm">{row.gpa_edu_3 ?? "-"}</td>}
+    {visibleColumns.gpa_edu_3 && <td className="p-3 text-sm">{row.gpa_edu_3?.toFixed(2) ?? "-"}</td>}
     {visibleColumns.domicile && <td className="p-3 text-sm">{row.domicile ?? "-"}</td>}
     {visibleColumns.yoe && <td className="p-3 text-sm">{row.yoe ?? "-"}</td>}
     {visibleColumns.hardskills && <td className="p-3 text-sm">{row.hardskills?.join(", ") ?? "-"}</td>}
@@ -890,6 +894,7 @@ export default function CandidateTable() {
   const [debouncedSearch, setDebouncedSearch] = useState("")
   const [currentPage, setCurrentPage] = useState(1)
   const [sortConfig, setSortConfig] = useState<{ key: string | null; direction: "asc" | "desc" }>({ key: null, direction: "asc" })
+  const { user } = useUser()
 
   const defaultColumns = allColumns.reduce(
     (acc, col) => ({ ...acc, [col.id]: col.visible }),
@@ -935,8 +940,8 @@ export default function CandidateTable() {
 
   // ✅ Candidates — always fresh, refetches on any param change
   const { data: candidatesData, isLoading, refetch } = useQuery({
-    queryKey: ["cv-profiles", currentPage, debouncedSearch, sortConfig, appliedFilters],
-    queryFn: () => fetchCandidates(currentPage, debouncedSearch, sortConfig, appliedFilters, criteriaId),
+    queryKey: ["cv-profiles", currentPage, debouncedSearch, sortConfig, appliedFilters, user],
+    queryFn: () => fetchCandidates(currentPage, debouncedSearch, sortConfig, appliedFilters, criteriaId, user?.user_id ?? ""),
     staleTime: 0, // always fresh
     placeholderData: (prev) => prev, // keep previous data while loading (no flicker)
     refetchOnWindowFocus: false,

src/components/dashboard/header.tsx

@@ -1,19 +1,7 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
-import { authFetch } from "@/lib/api";
-import { useQuery } from "@tanstack/react-query";
-
-interface MeResponse {
-  user_id: string
-  username: string
-  email: string
-  full_name: string
-  role: string
-  is_active: boolean
-  tenant_id: string
-  created_at: string
-}
+import { useUser } from "@/composables/useUser";
 
 function getInitials(name: string) {
   return name
@@ -25,15 +13,7 @@ function getInitials(name: string) {
 }
 
 export function Header() {
-  const { data: user } = useQuery<MeResponse>({
-    queryKey: ["me"],
-    queryFn: async () => {
-      const res = await authFetch("/api/me")
-      if (!res.ok) throw new Error("Failed to fetch user")
-      return res.json()
-    },
-    staleTime: 1000 * 60 * 5, // cache 5 minutes
-  })
+ const { user } = useUser()
 
   const initials = user ? getInitials(user.full_name) : "?"
   const displayName = user?.full_name ?? "Loading..."

src/components/dashboard/metrics-row.tsx

@@ -4,50 +4,54 @@ import { MetricsCard } from "@/components/ui/metrics-card";
 import { authFetch } from "@/lib/api";
 import { useQuery } from "@tanstack/react-query";
 
-const BASE_URL = "https://byteriot-candidateexplorer.hf.space/CandidateExplorer/agentic"
+const BASE_URL = "https://byteriot-candidateexplorer.hf.space/CandidateExplorer"
 
 type ScoreData = {
-  total_file: number
-  total_extracted: number
-  percent_extracted: number
+  data: {
+    total_file: number
+    total_extracted: number
+    percent_extracted: number
+  }
 }
 
 const fallbackScore: ScoreData = {
-  total_file: 0,
-  total_extracted: 0,
-  percent_extracted: 0,
+  data: {
+    total_file: 0,
+    total_extracted: 0,
+    percent_extracted: 0,
+  }
 }
 
 export function MetricsRow() {
 
   const fetchScore = async (): Promise<ScoreData> => {
-    const res = await authFetch(`${BASE_URL}/file/score`)
+    const res = await authFetch(`${BASE_URL}/file/score_card`)
     if (!res.ok) throw new Error("Failed to fetch score")
     return res.json()
   }
 
   const { data, isLoading: loadingScore, isError } = useQuery({
-      queryKey: ["score-data"],
-      queryFn: () => fetchScore(),
-      staleTime: 0, // always fresh
-      placeholderData: (prev) => prev, // keep previous data while loading (no flicker)
-      refetchOnWindowFocus: false,
-refetchOnMount: false,
-    })
+    queryKey: ["score-data"],
+    queryFn: () => fetchScore(),
+    staleTime: 0, // always fresh
+    placeholderData: (prev) => prev, // keep previous data while loading (no flicker)
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+  })
 
-    const scoreData = isError ? fallbackScore : data ?? fallbackScore
+  const scoreData = isError ? fallbackScore : data ?? fallbackScore
 
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-      <MetricsCard loading={loadingScore} label="Extracted Profile" value={`${scoreData?.total_extracted}`} />
-      <MetricsCard loading={loadingScore} label="Processed" value={`${scoreData?.percent_extracted}%`}>
+      <MetricsCard loading={loadingScore} label="Extracted Profile" value={`${scoreData?.data.total_extracted}`} />
+      <MetricsCard loading={loadingScore} label="Processed" value={`${scoreData?.data.percent_extracted}%`}>
         <div className="grid grid-cols-2 gap-5">
           <div className="text-gray-500">Processed</div>
-          <div className="font-bold text-gray-900">{scoreData?.total_extracted}</div>
+          <div className="font-bold text-gray-900">{scoreData?.data.total_extracted}</div>
         </div>
-         <div className="grid grid-cols-2 gap-5">
+        <div className="grid grid-cols-2 gap-5">
           <div className="text-gray-500">Total Profile</div>
-          <div className="font-bold text-gray-900">{scoreData?.total_file}</div>
+          <div className="font-bold text-gray-900">{scoreData?.data.total_file}</div>
         </div>
       </MetricsCard>
     </div>

src/composables/useUser.ts

@@ -0,0 +1,30 @@
+import { authFetch } from "@/lib/api";
+import { useQuery } from "@tanstack/react-query";
+
+interface MeResponse {
+  user_id: string;
+  username: string;
+  email: string;
+  full_name: string;
+  role: string;
+  is_active: boolean;
+  tenant_id: string;
+  created_at: string;
+}
+
+export const useUser = () => {
+  const { data: user } = useQuery<MeResponse>({
+    queryKey: ["me"],
+    queryFn: async () => {
+      const res = await authFetch("/api/me");
+      if (!res.ok) throw new Error("Failed to fetch user");
+      const json = await res.json();
+      return json;
+    },
+    staleTime: 1000 * 60 * 5, // cache 5 minutes
+  });
+
+  return {
+    user,
+  };
+};