Merge pull request #78 from Kisagi07:patch/users-api-changes

Add 'withoutUser' parameter to attendance API and improve user retrieval logic

Author: Kisagi07

app/api/attendances/route.ts

@@ -20,6 +20,7 @@ export async function GET(req: NextRequest) {
   const searchParams = req.nextUrl.searchParams;
   // get all allowed search params
   let limit = Number(searchParams.get("limit")) || undefined;
+  const withoutUser = searchParams.has("withoutUser");
   const groupedNamedDate = searchParams.has("grouped-name-date");
   const of = searchParams.get("of")?.split(",").map(Number);
   const month = searchParams.get("month") ?? undefined;
@@ -32,10 +33,7 @@ export async function GET(req: NextRequest) {
   if (type && !Object.values(logs_type).includes(type)) {
     return NextResponse.json({ message: `Allowed type: ${Object.values(logs_type).join(", ")}` });
   }
-  
-  if (!year) {
-    year = new Date().getFullYear().toString();
-  }
+
 
   if (year && isNaN(Number(year))) {
     return NextResponse.json({ message: "Invalid year" });
@@ -53,19 +51,28 @@ export async function GET(req: NextRequest) {
     endDate =  new Date(`${(Number(year) + 1)}-01-01`);    
   }
 
+  if (month && !year) {
+     year = new Date().getFullYear().toString();
+    startDate = new Date(`${year}-01-01`);
+    endDate =  new Date(`${(Number(year) + 1)}-01-01`);    
+  }
+
   if (year && month) {
     startDate = new Date(`${year}-${month}-01`);
     endDate = new Date(`${year}-${(Number(month) + 1)}-01`);
   }          
+  
 
   let logs = (await prisma.logs.findMany({
     take: limit,
     include: {
-      user: {
-        include: {
-          job_position: true,
-        },
-      },
+      user: withoutUser
+        ? undefined
+        : {
+            include: {
+              job_position: true,
+            },
+          },
     },
     orderBy: {
       created_at: "desc",
@@ -76,9 +83,9 @@ export async function GET(req: NextRequest) {
       },
       date: {
         lte: endDate,
-        gte: startDate
+        gte: startDate,
       },
-      type
+      type,
     },
   })) as LogWithUserWithJob[];
 

app/api/users/[work_id]/route.ts

@@ -17,15 +17,22 @@ const changeExRole = async (
   return updatedUser;
 };
 
-export async function GET(req: NextRequest, props: { params: Promise<{ work_id: string }> }) {
+export async function GET(
+  req: NextRequest,
+  props: { params: Promise<{ work_id: string }> }
+) {
   const params = await props.params;
   const searchParams = req.nextUrl.searchParams;
   const monthlyStatus = searchParams.has("monthly-status");
 
   const user = await prisma.users.findFirst({
-    where: {
-      work_id: params.work_id,
-    },
+    where: params.work_id.includes("ID")
+      ? {
+          work_id: params.work_id,
+        }
+      : {
+          id: Number(params.work_id),
+        },
     select: {
       name: true,
       work_id: true,
@@ -45,12 +52,15 @@ export async function GET(req: NextRequest, props: { params: Promise<{ work_id:
   if (!user) return NextResponse.json(null);
 
   user.profile_picture = user.profile_picture
-    ? `${process.env.APP_URL}/api/public${user.profile_picture}`
+    ? `${process.env.APP_URL}/api/images/${user.profile_picture}`
     : null;
   return NextResponse.json(user);
 }
 
-export async function DELETE(req: NextRequest, props: { params: Promise<{ work_id: string }> }) {
+export async function DELETE(
+  req: NextRequest,
+  props: { params: Promise<{ work_id: string }> }
+) {
   const params = await props.params;
   const user = await prisma.users.findFirst({
     where: {
@@ -83,9 +93,13 @@ export async function DELETE(req: NextRequest, props: { params: Promise<{ work_i
   return NextResponse.json({ message: "Deleted", data: { deleted } });
 }
 
-export async function PUT(req: NextRequest, props: { params: Promise<{ work_id: string }> }) {
+export async function PUT(
+  req: NextRequest,
+  props: { params: Promise<{ work_id: string }> }
+) {
   const params = await props.params;
-  const { name, job_position_id, gender, role, password, toEx, unEx } = await req.json();
+  const { name, job_position_id, gender, role, password, toEx, unEx } =
+    await req.json();
 
   let user = await prisma.users.findFirst({
     where: {
@@ -124,7 +138,11 @@ export async function PUT(req: NextRequest, props: { params: Promise<{ work_id:
       }
     }
     // if its not unique return error
-    if (!unique) return NextResponse.json({ error: "PIN already in use" }, { status: 409 });
+    if (!unique)
+      return NextResponse.json(
+        { error: "PIN already in use" },
+        { status: 409 }
+      );
     await prisma.users.update({
       where: {
         id: user.id,