260316:1117 20260316:1100 Refactor UUID

frontend/app/(dashboard)/circulation/[uuid]/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useParams, useRouter } from "next/navigation";
+import { useParams } from "next/navigation";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { circulationService } from "@/lib/services/circulation.service";
 import { Circulation, UpdateCirculationRoutingDto } from "@/types/circulation";
@@ -42,14 +42,13 @@ function getStatusVariant(status: string): "default" | "secondary" | "destructiv
 
 export default function CirculationDetailPage() {
   const params = useParams();
-  const router = useRouter();
   const queryClient = useQueryClient();
-  const id = params.id as string;
+  const uuid = params.uuid as string;
 
   const { data: circulation, isLoading, error } = useQuery<Circulation>({
-    queryKey: ["circulation", id],
-    queryFn: () => circulationService.getById(id),
-    enabled: !!id,
+    queryKey: ["circulation", uuid],
+    queryFn: () => circulationService.getByUuid(uuid),
+    enabled: !!uuid,
   });
 
   const completeMutation = useMutation({
@@ -57,7 +56,7 @@ export default function CirculationDetailPage() {
       circulationService.updateRouting(routingId, data),
     onSuccess: () => {
       toast.success("Task completed successfully");
-      queryClient.invalidateQueries({ queryKey: ["circulation", id] });
+      queryClient.invalidateQueries({ queryKey: ["circulation", uuid] });
     },
     onError: () => {
       toast.error("Failed to update task status");
@@ -146,7 +145,7 @@ export default function CirculationDetailPage() {
             <div>
               <p className="text-sm text-muted-foreground">Linked Document</p>
               <Link
-                href={`/correspondences/${circulation.correspondenceId}`}
+                href={`/correspondences/${circulation.correspondence.uuid}`}
                 className="font-medium text-primary hover:underline"
               >
                 {circulation.correspondence.correspondence_number}

frontend/app/(dashboard)/circulation/new/page.tsx

@@ -83,7 +83,7 @@ export default function CreateCirculationPage() {
     mutationFn: (data: CreateCirculationDto) => circulationService.create(data),
     onSuccess: (result) => {
       toast.success("Circulation created successfully");
-      router.push(`/circulation/${result.id}`);
+      router.push(`/circulation/${result.uuid}`);
     },
     onError: () => {
       toast.error("Failed to create circulation");
@@ -232,7 +232,7 @@ export default function CreateCirculationPage() {
                               <div className="flex flex-wrap gap-1">
                                 {selectedAssignees.map((userId) => {
                                   const user = users.find(
-                                    (u: { userId: number }) => u.userId === userId
+                                    (u) => u.userId === userId
                                   );
                                   return user ? (
                                     <Badge
@@ -267,16 +267,16 @@ export default function CreateCirculationPage() {
                           <CommandList>
                             <CommandEmpty>No user found.</CommandEmpty>
                             <CommandGroup>
-                              {users.map((user: { userId: number; username: string; firstName?: string; lastName?: string }) => (
+                              {users.map((user) => (
                                 <CommandItem
-                                  key={user.userId}
+                                  key={user.userId ?? user.uuid}
                                   value={user.username}
-                                  onSelect={() => toggleAssignee(user.userId)}
+                                  onSelect={() => user.userId && toggleAssignee(user.userId)}
                                 >
                                   <Check
                                     className={cn(
                                       "mr-2 h-4 w-4",
-                                      selectedAssignees.includes(user.userId)
+                                      user.userId != null && selectedAssignees.includes(user.userId)
                                         ? "opacity-100"
                                         : "opacity-0"
                                     )}