feat: add the "block_type" attribute to the BlockPresenter

This will provide more information on what each block is when being
returned.

Had to update all the testing... which is tedious. I'll have to find
something better for the JSON/attribute comparisons.

Author: kevinjalbert

shared/notionscripts/block_presenter.py

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

shared/notionscripts/tests/test_block_presenter.py

@@ -2,7 +2,7 @@
 
 from .notion_api_page_helper import get_test_page, create_collection_view
 
-from notion.block import TextBlock
+from notion.block import TextBlock, DividerBlock
 
 import json
 
@@ -13,21 +13,43 @@ def clean_id(id):
     return id.replace("-", "")
 
 
-def test_block_presentation(notion_token):
+def test_text_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": clean_id(block.id), "block_type": "text", "title": "textblock"}
+    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "block_type": "text", "title": "textblock"}' % clean_id(block.id)
+
 
+def test_divider_block_presentation(notion_token):
+    test_page = get_test_page()
+
+    block = test_page.children.add_new(DividerBlock)
     assert BlockPresenter(block).block == block
-    assert BlockPresenter(block) == {"id": clean_id(block.id), "title": "textblock"}
-    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "title": "textblock"}' % clean_id(block.id)
+    assert BlockPresenter(block) == {"id": clean_id(block.id), "block_type": "divider"}
+    assert json.dumps(BlockPresenter(block)) == '{"id": "%s", "block_type": "divider"}' % 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": clean_id(block.id), "enabled": True, "tags": [], "category": None, "value": 10, "name": "test row"}
+    assert BlockPresenter(block) == {"id": clean_id(block.id), "block_type": "page", "enabled": True,
+                                     "tags": [], "category": None, "value": 10, "name": "test row"}
+    assert json.dumps(BlockPresenter(
+        block)) == '{"id": "%s", "block_type": "page", "enabled": true, "tags": [], "category": null, "value": 10, "name": "test row"}' % clean_id(block.id)
+
+
+def test_collection_view_presentation(notion_token):
+    collection_view = create_collection_view()
+    collection_view.name = "Test view"
+
+    assert BlockPresenter(collection_view).block == collection_view
+    assert BlockPresenter(collection_view) == {"collection_id": clean_id(collection_view.parent.id),
+                                               "collection_title": "Test collection", "view_id": clean_id(collection_view.id), "view_title": "Test view"}
+
+    json_string_template = '{"collection_id": "%s", "view_id": "%s", "collection_title": "Test collection", "view_title": "Test view"}'
     assert json.dumps(BlockPresenter(
-        block)) == '{"id": "%s", "enabled": true, "tags": [], "category": null, "value": 10, "name": "test row"}' % clean_id(block.id)
+        collection_view)) == json_string_template % (clean_id(collection_view.parent.id), clean_id(collection_view.id))

shared/notionscripts/tests/test_notion_api.py

@@ -19,7 +19,7 @@ def test_block_content(notion_token):
     block = test_page.children.add_new(TextBlock, title="test get block content")
     content = notion_api.block_content(block.id)
 
-    assert content == {"id": clean_id(block.id), "title": "test get block content"}
+    assert content == {"id": clean_id(block.id), "block_type": "text", "title": "test get block content"}
 
 
 def test_block_children(notion_token):
@@ -32,9 +32,9 @@ def test_block_children(notion_token):
 
     content = notion_api.block_children(block.id)
 
-    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"}
+    assert content["parent"] == {"id": clean_id(block.id), "block_type": "text", "title": "a parent block"}
+    assert content["children"][0] == {"id": clean_id(child_block_1.id), "block_type": "text", "title": "child block 1"}
+    assert content["children"][1] == {"id": clean_id(child_block_2.id), "block_type": "text", "title": "child block 2"}
 
 
 def test_block_append(notion_token):
@@ -44,7 +44,7 @@ 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": clean_id(new_block.block.id), "title": "appending text"}
+    assert new_block == {"id": clean_id(new_block.block.id), "block_type": "text", "title": "appending text"}
     assert clean_id(new_block.block.parent.id) == clean_id(block.id)
 
 
@@ -55,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": clean_id(block.id), "title": "test block has been updated"}
+    assert updated_block == {"id": clean_id(block.id), "block_type": "text", "title": "test block has been updated"}
 
 
 def test_block_update_with_collection_block(notion_token):
@@ -66,7 +66,8 @@ 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": clean_id(block.id), "name": "test block has been updated", "value": 5, "category": None, "enabled": True, "tags": []}
+    assert updated_block == {"id": clean_id(block.id), "block_type": "page", "name": "test block has been updated",
+                             "value": 5, "category": None, "enabled": True, "tags": []}
 
 
 def test_block_delete_with_text_block(notion_token):