Add issue number for commit created by drop_platform_support.py script

Author: Undin

helpers/drop_platform_support.py

@@ -7,7 +7,8 @@
 from pathlib import Path
 from typing import Dict, TypeVar, Tuple, Optional
 
-from external_services import commit_changes_to_educational_plugin, create_review_in_educational_plugin, get_reviewer, has_branch
+from external_services import commit_changes_to_educational_plugin, create_review_in_educational_plugin, get_reviewer, has_branch, \
+    get_youtrack_issue, YoutrackIssue
 
 K = TypeVar('K')
 V = TypeVar('V')
@@ -89,7 +90,7 @@ def process_gradle_properties(platform_version: int) -> Changes:
     }
 
 
-def commit_changes(space_token: str, platform_version: int, changes: Changes):
+def commit_changes(space_token: str, platform_version: int, issue: Optional[YoutrackIssue], changes: Changes):
     files = []
     for path, (modification, content) in changes.items():
         if modification == FileModification.Delete:
@@ -104,10 +105,15 @@ def commit_changes(space_token: str, platform_version: int, changes: Changes):
                 "content": {"className": "GitFileContent.Base64", "value": base64_content_value}
             })
 
+    if issue:
+        commit_message = f"EDU-{issue.issue_number}: Drop {platform_version} support"
+    else:
+        commit_message = f"Drop {platform_version} support"
+
     commit_changes_to_educational_plugin(
         space_token=space_token,
         branch_name=f"refs/heads/{branch(platform_version)}",
-        commit_massage=f"Drop {platform_version} support",
+        commit_massage=commit_message,
         changes=files
     )
 
@@ -116,8 +122,8 @@ def branch(platform_version: int) -> str:
     return f"drop-{platform_version}"
 
 
-def create_review(space_token: str, youtrack_token: str, platform_version: int):
-    reviewer = get_reviewer(youtrack_token, "edu: drop platform", platform_version)
+def create_review(space_token: str, platform_version: int, issue: Optional[YoutrackIssue]):
+    reviewer = get_reviewer(issue)
     create_review_in_educational_plugin(space_token, branch(platform_version), f"Drop support for {platform_version} platform", reviewer)
 
 
@@ -139,9 +145,10 @@ def main():
         print(f"{branch_name} already exists")
         return
 
+    issue = get_youtrack_issue(args.youtrack_token, "edu: drop platform", platform_version)
     changes = collect_changes(platform_version)
-    commit_changes(args.space_token, platform_version, changes)
-    create_review(args.space_token, args.youtrack_token, platform_version)
+    commit_changes(args.space_token, platform_version, issue, changes)
+    create_review(args.space_token, platform_version, issue)
 
 
 if __name__ == '__main__':

helpers/external_services.py

@@ -42,7 +42,7 @@ def has_branch(space_token: str, branch_name: str) -> bool:
 
 def get_youtrack_issues(youtrack_token: str, tag: str, text_query: str) -> List[Dict]:
     query_params = urlencode({
-        "fields": "summary,customFields(name,value(name))",
+        "fields": "summary,numberInProject,customFields(name,value(name))",
         "customFields": "Assignee",
         "query": f"tag: {{{tag}}} project: EDU {text_query}"
     }, quote_via=quote)
@@ -58,22 +58,36 @@ def full_platform_version(platform_version: int) -> str:
     return f"20{platform_version // 10}.{platform_version % 10}"
 
 
+class YoutrackIssue:
+    def __init__(self, issue_number: int, assignee_name: str):
+        self.issue_number = issue_number
+        self.assignee_name = assignee_name
+
+
 DEFAULT_REVIEWER = "Arseniy.Pendryak"
 
 
-def get_reviewer(youtrack_token: str, tag: str, platform_version: int) -> str:
+def get_reviewer(issue: Optional[YoutrackIssue]) -> str:
+    if not issue:
+        return DEFAULT_REVIEWER
+    # More heuristic solution than 100% reliable way
+    # but it seems it works for all possible cases for now.
+    return issue.assignee_name.replace(" ", ".")
+
+def get_youtrack_issue(youtrack_token: str, tag: str, platform_version: int) -> Optional[YoutrackIssue]:
     issues = get_youtrack_issues(youtrack_token, tag, str(platform_version))
     if not issues:
         issues = get_youtrack_issues(youtrack_token, tag, full_platform_version(platform_version))
 
     if not issues:
-        return DEFAULT_REVIEWER
+        return None
 
     # Expected json format:
     # ```
     # [
     #   {
     #     "summary" : "%summary_text%",
+    #     "numberInProject" : "%issue_number%",
     #     "customFields" : [
     #       {
     #         "value" : {
@@ -88,10 +102,9 @@ def get_reviewer(youtrack_token: str, tag: str, platform_version: int) -> str:
     #   }
     # ]
     # ```
+    issue_number: int = issues[0]["numberInProject"]
     assignee_name: str = issues[0]["customFields"][0]["value"]["name"]
-    # More heuristic solution than 100% reliable way
-    # but it seems it works for all possible cases for now.
-    return assignee_name.replace(" ", ".")
+    return YoutrackIssue(issue_number, assignee_name)
 
 
 def make_request(url: str, token: str, method: str, data: Optional[Dict] = None) -> Union[Dict, List]:

helpers/update_platform_dependencies.py

@@ -4,7 +4,8 @@
 import subprocess
 import sys
 
-from external_services import commit_changes_to_educational_plugin, create_review_in_educational_plugin, has_branch, get_reviewer
+from external_services import commit_changes_to_educational_plugin, create_review_in_educational_plugin, has_branch, get_reviewer, \
+    get_youtrack_issue
 
 
 def gradle_property_path(platform_version: int) -> str:
@@ -17,7 +18,8 @@ def read_gradle_property_text(platform_version: int) -> str:
 
 
 def create_review(space_token: str, youtrack_token: str, platform_version: int):
-    reviewer = get_reviewer(youtrack_token, "edu: support platform", platform_version)
+    issue = get_youtrack_issue(youtrack_token, "edu: support platform", platform_version)
+    reviewer = get_reviewer(issue)
     create_review_in_educational_plugin(
         space_token=space_token,
         source_branch=f"update-{platform_version}",