fix: borrow and return changes

Author: agmmtoo

components/borrows/BtnReturnBorrow.tsx

@@ -26,10 +26,10 @@ export const BtnReturnBook: React.FC<
     if (confirm) clearTimeout(confirm)
   }
 
-  if (borrow.returned_at)
+  if (borrow.returning)
     return (
       <Button {...props} variant="secondary" disabled>
-        {formatDate(borrow.returned_at)}
+        {formatDate(borrow.returning.returned_at)}
       </Button>
     )
 

components/borrows/CardBorrow.tsx

@@ -27,7 +27,7 @@ const checkIsDue = (borrow: Borrow) => {
 }
 
 const getBorrowStatus = (borrow: Borrow) => {
-  if (borrow.returned_at) return 'returned'
+  if (borrow.returning?.returned_at) return 'returned'
 
   return checkIsDue(borrow) ? 'overdue' : 'active'
 }
@@ -39,7 +39,7 @@ export const CardBorrow: React.FC<{ borrow: Borrow }> = ({ borrow }) => {
     <Card
       key={borrow.id}
       className={clsx('relative', {
-        'bg-destructive/5': isDue && !borrow.returned_at,
+        'bg-destructive/5': isDue && !borrow.returning?.returned_at,
       })}
     >
       <CardHeader>

lib/api/borrow.ts

@@ -61,10 +61,12 @@ export const createBorrow = async (
 }
 
 export const returnBorrow = async (
-  data: Pick<Borrow, 'id' | 'returned_at'>,
+  data: Pick<Borrow, 'id'> & {
+    returned_at: string
+  },
   init?: RequestInit
 ): GetBorrowResponse => {
-  const response = await fetch(`${BORROW_URL}/${data.id}`, {
+  const response = await fetch(`${BORROW_URL}/${data.id}/return`, {
     ...init,
     method: 'PUT',
     body: JSON.stringify(data),

lib/types/borrow.ts

@@ -9,7 +9,7 @@ export type Borrow = WithCommon<{
   staff_id: string
   borrowed_at: string
   due_at: string
-  returned_at?: string
+  returning?: Return
   book: Pick<Book, 'id' | 'title' | 'code'>
   subscription: Pick<
     Subscription,
@@ -23,3 +23,9 @@ export type BorrowDetail = Omit<Borrow, 'book' | 'subscription' | 'staff'> & {
   subscription: SubscriptionDetail
   staff: Staff
 }
+
+type Return = WithCommon<{
+  borrowing_id: string
+  returned_at: string
+  staff: Pick<Staff, 'id' | 'name'>
+}>