fix: auth permission and user detail payload

api/auth/permissions.py

@@ -18,7 +18,7 @@ class IsStaffUser(IsAuthenticated):
 
         return bool(
             header is not None
-            and verified_token.exists()
+            and verified_token is not None
             and verified_token.user.is_staff
         )
 

api/auth/views.py

@@ -93,6 +93,13 @@ class UserDetailView(views.APIView):
 
         user_id = verified_token[0].user.id
         user = User.objects.get(pk=user_id)
+
+        account_id = None
+        if user.is_staff:
+            account_id = user.librarian.id
+        else:
+            account_id = user.member.id
+
         data = {
             "id": user.pk,
             "username": user.username,
@@ -100,6 +107,7 @@ class UserDetailView(views.APIView):
             "first_name": user.first_name,
             "last_name": user.last_name,
             "is_staff": user.is_staff,
+            "account_id": account_id,
         }
 
         return Response(data, status=status.HTTP_200_OK)

api/loans/serializers.py

@@ -13,7 +13,7 @@ class BookLoanSerializer(serializers.ModelSerializer):
 
     def to_representation(self, instance):
         data = super().to_representation(instance)
-        remaining_loan_time = instance.due_date.day - timezone.now().day
+        remaining_loan_time = timezone.now().day - instance.due_date.day
         data["remaining_loan_time"] = str(remaining_loan_time) + " days left"
         return data
 
@@ -23,6 +23,7 @@ class BookLoanSerializer(serializers.ModelSerializer):
 
 
 class MemberLoanSerializer(BookLoanSerializer):
+    book_detail = BookSerializer(source="book", read_only=True)
     is_overdue = serializers.BooleanField(read_only=True)
 
     def to_representation(self, instance):
@@ -32,4 +33,11 @@ class MemberLoanSerializer(BookLoanSerializer):
 
     class Meta:
         model = BookLoan
-        fields = ["book", "loan_date", "due_date", "is_overdue"]
+        fields = [
+            "book",
+            "book_detail",
+            "member",
+            "loan_date",
+            "due_date",
+            "is_overdue",
+        ]

api/loans/views.py

@@ -57,4 +57,4 @@ class MemberLoanViewSet(BookLoanViewSet):
 
     def get_queryset(self):
         member_id = self.kwargs.get("member_id")
-        return BookLoan.objects.filter(member__id=member_id).order_by("loan_date")
+        return BookLoan.objects.filter(member=member_id).order_by("loan_date")