From 553d2be73b9070f11680fbd2433ce5b7f297c794 Mon Sep 17 00:00:00 2001
From: licihua <licihua@huawei.com>
Date: Mon, 26 Apr 2021 14:23:14 +0800
Subject: [PATCH] Refactoring code for issue_report

---
 advisors/issue_report.py | 21 +++++++--------------
 command/issue_report     |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/advisors/issue_report.py b/advisors/issue_report.py
index cf2af119..c5672ea7 100755
--- a/advisors/issue_report.py
+++ b/advisors/issue_report.py
@@ -26,15 +26,15 @@ FILE_NAME = sys.argv[0]
 CMD_INPUT_ARGS = sys.argv[1:]
 
 
-def _to_markdown(df: pd.DataFrame, index=False):
-    cols = list(df.columns)
+def _to_markdown(data_frame: pd.DataFrame, index=False):
+    cols = list(data_frame.columns)
     if index:
         cols.insert(0, "index")
     title = "|" + "|".join(str(col) for col in cols) + "|\n"
     under_title = "|" + "---|" * len(cols) + "\n"
 
     content = ""
-    for idx, row in df.iterrows():
+    for idx, row in data_frame.iterrows():
         curr_row = list(str(r) for r in row)
         if index:
             curr_row.insert(0, str(idx))
@@ -42,6 +42,7 @@ def _to_markdown(df: pd.DataFrame, index=False):
 
     return title + under_title + content
 
+
 def build_request_parameters(issue_params, cve_params):
     """
     构建请求参数
@@ -180,6 +181,7 @@ def generate_csv(issue_sources, cve_sources, output_path):
         closed_at.append(response.get("closed_at", "暂无相应信息"))
         progress.append(response.get("plan_start_at", "暂无相应信息"))
         version.append(response.get("milestone", "暂无相应信息"))
+
     for response in cve_sources:
         issue_id.append(response.get("issue_id", "暂无相应信息"))
         issue_type.append(response.get("type"))
@@ -262,15 +264,7 @@ def generate_md(issue_sources, cve_sources, output_path):
     dataframe_fixed_issue = pd.DataFrame(
         {"Issue": fixed_issue_id, "概述": fixed_issue_title, "所属版本": fixed_version}
     )
-
-    count = 0
-    for col in dataframe_fixed_issue:
-        if count < 5:
-            print(col)
-
-        count += 1
     dataframe_fixed_issue_str = _to_markdown(dataframe_fixed_issue)
-
     dataframe_todo_issue = pd.DataFrame(
         {
             "Issue": todo_issue_id,
@@ -280,7 +274,6 @@ def generate_md(issue_sources, cve_sources, output_path):
         }
     )
 
-
     dataframe_todo_issue_str = _to_markdown(dataframe_todo_issue)
 
     cve_id = []
@@ -330,8 +323,8 @@ def args_parser():
     Parse arguments
     """
     pars = argparse.ArgumentParser()
-    pars.add_argument("-m", "--milestone", nargs='+', type=str, help="Milestone")
-    pars.add_argument("-b", "--branch", nargs='+', type=str, help="Branch")
+    pars.add_argument("-m", "--milestone", nargs='+', type=str, required=True, help="Milestone")
+    pars.add_argument("-b", "--branch", nargs='+', type=str, required=True, help="Branch")
     pars.add_argument("-o", "--output_path", default=".", type=str, help="output path")
 
     config = pars.parse_args()
diff --git a/command/issue_report b/command/issue_report
index b5a15f62..1a072e26 100755
--- a/command/issue_report
+++ b/command/issue_report
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #******************************************************************************
-# Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+# Copyright (c) Huawei Technologies Co., Ltd. 2020-2021. All rights reserved.
 # licensed under the Mulan PSL v2.
 # You can use this software according to the terms and conditions of the Mulan PSL v2.
 # You may obtain a copy of Mulan PSL v2 at:
@@ -14,7 +14,7 @@
 """
 This is an automatic script for create issue report for openEuler
 """
-from advisors.issue_report import main
+from advisors.issue_report import issue_report
 
 
 if __name__ == '__main__':
-- 
Gitee