Skip to content

Availability endpoint gives RequestId and Edit boolean #4120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christiangryt wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Availability endpoint gives RequestId and Edit boolean #4120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b31bc
allows fronend to forward object lending calender to lending request …
christiangryt Apr 16, 2026
560fac0
formatting and update to test to account for longer api response (4 t…
christiangryt Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lego/apps/lending/tests/test_lendableobject_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def test_single_lending_request(self):
self.assertEqual(len(response.json()), 1)

unavailable_range = response.json()[0]
self.assertEqual(len(unavailable_range), 4)
self.assertEqual(len(unavailable_range), 6)
self.assertEqual(unavailable_range[0], start_date.isoformat())
self.assertEqual(unavailable_range[1], end_date.isoformat())

Expand Down
19 changes: 16 additions & 3 deletions lego/apps/lending/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def availability(self, request, *args, **kwargs):
for a specified month and year.
"""
lendable_object = self.get_object()
user = request.user

try:
month = int(request.query_params.get("month", ""))
Expand Down Expand Up @@ -82,12 +83,17 @@ def availability(self, request, *args, **kwargs):
for request in overlapping_requests:
range_start = max(request.start_date, start_of_month)
range_end = min(request.end_date, end_of_month)
canEditRequest = request._meta.permission_handler.has_perm(
user, EDIT, request
)

unavailable_ranges.append([range_start, range_end, request.created_by])
unavailable_ranges.append(
[range_start, range_end, request.created_by, request.id, canEditRequest]
)

formatted_ranges = []
for i in range(len(unavailable_ranges)):
start, end, created_by = unavailable_ranges[i]
start, end, created_by, id, canEdit = unavailable_ranges[i]
start_date = start.isoformat()
end_date = end.isoformat()
created_by_username = created_by
Expand All @@ -106,7 +112,14 @@ def availability(self, request, *args, **kwargs):
created_by_fullname = None
created_by_username = None if (created_by is None) else created_by.username
formatted_ranges.append(
[start_date, end_date, created_by_fullname, created_by_username]
[
start_date,
end_date,
id,
canEdit,
created_by_fullname,
created_by_username,
]
)

return Response(formatted_ranges)
Expand Down
Loading