Fix Labels extraction

Author: malkovro

changelog/__init__.py

@@ -182,12 +182,14 @@ def get_pr_details(github_config, owner, repo, pr_number):
             )
         )
 
-    return PullRequestDetails(body=pr_json["body"], labels=pr_json["labels"])
+    labels = [label["name"] for label in pr_json["labels"]]
+
+    return PullRequestDetails(body=pr_json["body"], labels=labels)
 
 
 def extract_changelog(pr_body):
     """Extracts the Changelog from the PR Body"""
-    if pr_body == None:
+    if pr_body is None:
         return None
     try:
         changelog_match = CHANGELOG_RE.search(pr_body)
@@ -279,12 +281,17 @@ def format_changes(github_config, owner, repo, prs, markdown=False):
             number = "[{number}]({link})".format(number=number, link=link)
 
         pr_changelog_description = extract_changelog(extended_pr.details.body)
+
+        if len(extended_pr.details.labels or []) == 0:
+            change_level = min(change_level, 2)
+
         for label in extended_pr.details.labels or []:
-            change_level = min(change_level, LABEL_LEVELS[label])
+            change_level = min(change_level, LABEL_LEVELS.get(label) or 2)
+
         lines.append(
             "- {description} {number}".format(
                 description=pr_changelog_description
-                if pr_changelog_description != None
+                if pr_changelog_description is not None
                 else pr.title,
                 number=number,
             )

changelog/tests/test_changelog.py

@@ -186,7 +186,7 @@ def test_get_pr_details(self, mock_requests_get):
         response.status_code = 200
         response.json.return_value = {
             "body": "Here comes the details of the PR",
-            "labels": ["test", "BREAKING"],
+            "labels": [{"name": "test"}, {"name": "BREAKING"}],
         }
         mock_requests_get.return_value = response
         result = get_pr_details(fake_github_config, "someone", "one-repo", "1")
@@ -284,7 +284,7 @@ def test_format_changes_uses_correct_base_url(self):
             github_config, "owner", "a-repo", prs, markdown=True
         )
         expected = [
-            "PATCH RELEASE",
+            "MINOR RELEASE",
             "- first [#1](https://github.company.com/owner/a-repo/pull/1)",
             "- second [#2](https://github.company.com/owner/a-repo/pull/2)",
         ]
@@ -412,7 +412,7 @@ def test_generate_changelog(self, mock_requests_get):
         get_pr_details_response = mock.MagicMock()
         get_pr_details_response.status_code = 200
         get_pr_details_response.json.return_value = {
-            "body": "My Title #10\n\nCHANGELOG: Specific ChangeLog description",
+            "body": "My Title #10\n\nCHANGELOG: Specific Changelog",
             "labels": [],
         }
         responses.append(get_pr_details_response)
@@ -452,10 +452,10 @@ def test_generate_changelog(self, mock_requests_get):
         self.assertEqual(
             result,
             (
-                "PATCH RELEASE\n"
+                "MINOR RELEASE\n"
                 "- My Title #5\n"
                 "- Some title addresses bug #6\n"
                 "- My Title #9\n"
-                "- Specific ChangeLog description #10"
+                "- Specific Changelog #10"
             ),
         )