fix: normalize the ids for blocks to not have "-" in them

This makes it so the URL scheme opening to blocks in iOS works.

Author: kevinjalbert

shared/notionscripts/block_presenter.py

@@ -8,8 +8,9 @@ class BlockPresenter(dict):
     def __init__(self, block):
         self.block = block
         if isinstance(block, CollectionRowBlock):
-            dict.__init__(self, **{"id": block.id, **block.get_all_properties()})
+            dict.__init__(self, **{"id": block.id.replace("-", ""), **block.get_all_properties()})
         elif isinstance(block, CollectionView):
-            dict.__init__(self, **{"collection_id": block.parent.id, "view_id": block.id, "collection_title": block.parent.title, "view_title": block.name})
+            dict.__init__(self, **{"collection_id": block.parent.id.replace("-", ""), "view_id": block.id.replace("-", ""),
+                                   "collection_title": block.parent.title, "view_title": block.name})
         else:
-            dict.__init__(self, **{"id": block.id, "title": block.title})
+            dict.__init__(self, **{"id": block.id.replace("-", ""), "title": block.title})

shared/notionscripts/tests/test_block_presenter.py

@@ -9,20 +9,25 @@
 import pytest  # noqa, F401
 
 
+def clean_id(id):
+    return id.replace("-", "")
+
+
 def test_block_presentation(notion_token):
     test_page = get_test_page()
 
     block = test_page.children.add_new(TextBlock, title="textblock")
 
     assert BlockPresenter(block).block == block
-    assert BlockPresenter(block) == {"id": block.id, "title": "textblock"}
-    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "title": "textblock"}' % block.id
+    assert BlockPresenter(block) == {"id": clean_id(block.id), "title": "textblock"}
+    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "title": "textblock"}' % clean_id(block.id)
 
 
 def test_collection_row_block_presentation(notion_token):
     collection_view = create_collection_view()
     block = collection_view.collection.add_row(name="test row", value=10, enabled=True)
 
     assert BlockPresenter(block).block == block
-    assert BlockPresenter(block) == {"id": block.id, "enabled": True, "tags": [], "category": None, "value": 10, "name": "test row"}
-    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "enabled": true, "tags": [], "category": null, "value": 10, "name": "test row"}' % block.id
+    assert BlockPresenter(block) == {"id": clean_id(block.id), "enabled": True, "tags": [], "category": None, "value": 10, "name": "test row"}
+    assert json.dumps(BlockPresenter(
+        block)) == '{"id": "%s", "enabled": true, "tags": [], "category": null, "value": 10, "name": "test row"}' % clean_id(block.id)

shared/notionscripts/tests/test_notion_api.py

@@ -8,14 +8,18 @@
 import pytest  # noqa, F401
 
 
+def clean_id(id):
+    return id.replace("-", "")
+
+
 def test_block_content(notion_token):
     notion_api = NotionApi(token=notion_token)
     test_page = get_test_page()
 
     block = test_page.children.add_new(TextBlock, title="test get block content")
     content = notion_api.block_content(block.id)
 
-    assert content == {"id": block.id, "title": "test get block content"}
+    assert content == {"id": clean_id(block.id), "title": "test get block content"}
 
 
 def test_block_children(notion_token):
@@ -28,9 +32,9 @@ def test_block_children(notion_token):
 
     content = notion_api.block_children(block.id)
 
-    assert content["parent"] == {"id": block.id, "title": "a parent block"}
-    assert content["children"][0] == {"id": child_block_1.id, "title": "child block 1"}
-    assert content["children"][1] == {"id": child_block_2.id, "title": "child block 2"}
+    assert content["parent"] == {"id": clean_id(block.id), "title": "a parent block"}
+    assert content["children"][0] == {"id": clean_id(child_block_1.id), "title": "child block 1"}
+    assert content["children"][1] == {"id": clean_id(child_block_2.id), "title": "child block 2"}
 
 
 def test_block_append(notion_token):
@@ -40,8 +44,8 @@ def test_block_append(notion_token):
     block = test_page.children.add_new(TextBlock, title="test block append")
     new_block = notion_api.block_append(block.id, {"title": "appending text"})
 
-    assert new_block == {"id": new_block.block.id, "title": "appending text"}
-    assert new_block.block.parent.id == block.id
+    assert new_block == {"id": clean_id(new_block.block.id), "title": "appending text"}
+    assert clean_id(new_block.block.parent.id) == clean_id(block.id)
 
 
 def test_block_update_with_text_block(notion_token):
@@ -51,7 +55,7 @@ def test_block_update_with_text_block(notion_token):
     block = test_page.children.add_new(TextBlock, title="test block update")
     updated_block = notion_api.block_update(block.id, {"title": "test block has been updated"})
 
-    assert updated_block == {"id": block.id, "title": "test block has been updated"}
+    assert updated_block == {"id": clean_id(block.id), "title": "test block has been updated"}
 
 
 def test_block_update_with_collection_block(notion_token):
@@ -62,7 +66,7 @@ def test_block_update_with_collection_block(notion_token):
 
     updated_block = notion_api.block_update(block.id, {"name": "test block has been updated", "value": 5})
 
-    assert updated_block == {"id": block.id, "name": "test block has been updated", "value": 5, "category": None, "enabled": True, "tags": []}
+    assert updated_block == {"id": clean_id(block.id), "name": "test block has been updated", "value": 5, "category": None, "enabled": True, "tags": []}
 
 
 def test_block_delete_with_text_block(notion_token):
@@ -114,8 +118,8 @@ def test_collection_view_content(notion_token):
     collection_view_content = notion_api.collection_view_content(collection_id.replace("-", ""), view_id.replace("-", ""))
 
     assert collection_view_content["collection"] == {
-        "collection_id": collection_id,
-        "view_id": view_id,
+        "collection_id": clean_id(collection_id),
+        "view_id": clean_id(view_id),
         "collection_title": "Test collection",
         "view_title": "Test view"
     }