Skip to content

fix: versioned href for slides URL #8040

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

Merged
rjsparks merged 1 commit into from
Oct 14, 2024
Merged

fix: versioned href for slides URL #8040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,7 @@ def agenda_extract_slide(item):
"id": item.id,
"title": item.title,
"rev": item.rev,
"url": item.get_versionless_href(),
"url": item.get_href(),
"ext": item.file_extension(),
}

Expand Down
14 changes: 6 additions & 8 deletions ietf/utils/meetecho.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,12 +481,10 @@ def delete_conference(self, conf: Conference):
class SlidesManager(Manager):
"""Interface between Datatracker models and Meetecho API

Note: The URL we send comes from get_versionless_href(). This should match what we use as the
URL in api_get_session_materials(). Additionally, it _must_ give the right result for a Document
instance that has not yet been persisted to the database. This is because upload_session_slides()
(as of 2024-03-07) SessionPresentations before saving its updated Documents. This means, for
example, using get_absolute_url() will cause bugs. (We should refactor upload_session_slides() to
avoid this requirement.)
Note: the URL sent for a slide deck comes from DocumentInfo.get_href() and includes the revision
of the slides being sent. Be sure that 1) the URL matches what api_get_session_materials() returns
for the slides; and 2) the URL is valid if it is fetched immediately - possibly even before the call
to SlidesManager.add() or send_update() returns.
"""

def __init__(self, api_config):
Expand Down Expand Up @@ -521,7 +519,7 @@ def add(self, session: "Session", slides: "Document", order: int):
deck={
"id": slides.pk,
"title": slides.title,
"url": slides.get_versionless_href(), # see above note re: get_versionless_href()
"url": slides.get_href(),
"rev": slides.rev,
"order": order,
}
Expand Down Expand Up @@ -575,7 +573,7 @@ def send_update(self, session: "Session"):
{
"id": deck.document.pk,
"title": deck.document.title,
"url": deck.document.get_versionless_href(), # see note above re: get_versionless_href()
"url": deck.document.get_href(),
"rev": deck.document.rev,
"order": deck.order,
}
Expand Down
8 changes: 4 additions & 4 deletions ietf/utils/tests_meetecho.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ def test_add(self, mock_add, mock_wg_token):
deck={
"id": slides_doc.pk,
"title": slides_doc.title,
"url": slides_doc.get_versionless_href(),
"url": slides_doc.get_href(session.meeting),
"rev": slides_doc.rev,
"order": 13,
},
Expand Down Expand Up @@ -597,7 +597,7 @@ def test_delete(self, mock_delete, mock_update, mock_wg_token):
{
"id": slides_doc.pk,
"title": slides_doc.title,
"url": slides_doc.get_versionless_href(),
"url": slides_doc.get_href(session.meeting),
"rev": slides_doc.rev,
"order": 1,
},
Expand Down Expand Up @@ -635,7 +635,7 @@ def test_revise(self, mock_add, mock_delete, mock_wg_token):
deck={
"id": slides_doc.pk,
"title": slides_doc.title,
"url": slides_doc.get_versionless_href(),
"url": slides_doc.get_href(slides.session.meeting),
"rev": slides_doc.rev,
"order": 23,
},
Expand All @@ -660,7 +660,7 @@ def test_send_update(self, mock_send_update, mock_wg_token):
{
"id": slides.document_id,
"title": slides.document.title,
"url": slides.document.get_versionless_href(),
"url": slides.document.get_href(slides.session.meeting),
"rev": slides.document.rev,
"order": 0,
}
Expand Down