Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions mdfluence/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,9 @@ def create_attachment(self, confluence_page, fp, message=""):
)

def add_labels(self, page, labels):
# return self.api.content(page.id).post(
return self._post(
f"content/{page.id}/label",
data=[{"name": label, "type": "global"} for label in labels],
json=[{"name": label, "type": "global"} for label in labels],
)

def get_url(self, page):
Expand Down
12 changes: 9 additions & 3 deletions mdfluence/upsert.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,15 @@ def labels_need_updating(page, existing_page):
if page.labels is None:
return False

if sorted(
[label.name for label in existing_page.metadata.labels.results]
) != sorted(page.labels):
existing_labels = getattr(
getattr(getattr(existing_page, "metadata", None), "labels", None),
"results",
None,
)
if existing_labels is None:
return True

if sorted([label.name for label in existing_labels]) != sorted(page.labels):
return True


Expand Down
15 changes: 15 additions & 0 deletions test_package/unit/test_upsert.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,21 @@ def test_page_needs_updating_page_changed(mocker):
)


def test_labels_need_updating_when_no_metadata(mocker):
"""Page has no metadata.labels.results — should return True (needs update)"""
existing_page_mock = mocker.Mock(spec=[])

page = Page(
space=mocker.sentinel.space,
title=mocker.sentinel.title,
body="hello",
parent_id=mocker.sentinel.parent_id,
labels=["label1"],
)

assert mdfluence.upsert.labels_need_updating(page, existing_page_mock)


def test_page_needs_updating_content_replace_all_labels_and_labels_not_changed(mocker):
"""We want to replace all the labels, but they have not changed"""
labels = ["label1", "label2"]
Expand Down
Loading