Output URNs for hrefs in findaway manfiests

api/web_publication_manifest.py

@@ -111,18 +111,21 @@ def __init__(
         # Add the SpineItems as reading order items. None of them will
         # have working 'href' fields -- it's just to give the client a
         # picture of the structure of the timeline.
+        # For the href we return a URN that includes the part and sequence
+        # numbers, these URNs are not expected to be resolved, but the client
+        # can use them to identify the reading order items for bookmarks etc.
         part_key = "findaway:part"
         sequence_key = "findaway:sequence"
         total_duration = 0
         spine_items.sort(key=SpineItem.sort_key)
         for item in spine_items:
             kwargs = {part_key: item.part, sequence_key: item.sequence}
             self.add_reading_order(
-                href=None,
+                href=f"urn:org.thepalaceproject:findaway:{fulfillmentId}:{item.part}:{item.sequence}",
                 title=item.title,
                 duration=item.duration,
                 type=item.media_type,
-                **kwargs
+                **kwargs,
             )
             total_duration += item.duration
 

tests/api/test_bibliotheca.py

@@ -668,7 +668,8 @@ def test_findaway_license_to_webpub_manifest(
         assert "abcdef01234789abcdef0123" == encrypted["findaway:checkoutId"]
         assert "1234567890987654321ababa" == encrypted["findaway:licenseId"]
         assert "3M" == encrypted["findaway:accountId"]
-        assert "123456" == encrypted["findaway:fulfillmentId"]
+        fullfillment_id = encrypted["findaway:fulfillmentId"]
+        assert "123456" == fullfillment_id
         assert (
             "aaaaaaaa-4444-cccc-dddd-666666666666" == encrypted["findaway:sessionKey"]
         )
@@ -684,18 +685,23 @@ def test_findaway_license_to_webpub_manifest(
         assert 16.201 == first["duration"]
         assert "Track 1" == first["title"]
 
-        # There is no 'href' value for the readingOrder items because the
+        # The 'href' value for the readingOrder is a URN because the
         # files must be obtained through the Findaway SDK rather than
         # through regular HTTP requests.
         #
         # Since this is a relatively small book, it only has one part,
         # part #0. Within that part, the items have been sorted by
         # their sequence.
         for i, item in enumerate(reading_order):
-            assert None == item.get("href", None)
             assert Representation.MP3_MEDIA_TYPE == item["type"]
-            assert 0 == item["findaway:part"]
-            assert i + 1 == item["findaway:sequence"]
+            part = item["findaway:part"]
+            assert 0 == part
+            sequence = item["findaway:sequence"]
+            assert i + 1 == sequence
+            assert (
+                f"urn:org.thepalaceproject:findaway:{fullfillment_id}:{part}:{sequence}"
+                == item["href"]
+            )
 
         # The total duration, in seconds, has been added to metadata.
         assert 28371 == int(metadata["duration"])