smartpush 1.3.2__tar.gz → 1.3.5__tar.gz

{smartpush-1.3.2 → smartpush-1.3.5}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.3.2
+Version: 1.3.5
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙

{smartpush-1.3.2 → smartpush-1.3.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='smartpush',
-    version='1.3.2',
+    version='1.3.5',
     description='用于smartpush自动化测试工具包',
     author='卢泽彬、邵宇飞、周彦龙',
     packages=find_packages(),

{smartpush-1.3.2 → smartpush-1.3.5}/smartpush/get_jira_info.py

@@ -2,14 +2,23 @@ import datetime
 import json
 import requests
 from jira import JIRA
-
 from smartpush.utils.StringUtils import StringUtils
 
 test_user = {
     "邵宇飞": "dw_shaoyufei",
     "卢泽彬-Lulu-QA": "dw_luzebin",
     "xiangchen zhong": "dw_zhongxiangchen",
-    "周彦龙": "zhouyanlong"
+    "周彦龙": "dw_zhouyanlong",
+    "梁铭津-bryant": "dw_liangmingjin",
+    "高忠明 - gaozhongming": "dw_gaozhongming",
+    "jiayong zhang": "dw_zhangjiayong",
+    "毕杰芳-Dawn Bi": "dw_bijiefang",
+    "李志": "dw_lizhi7",
+    "张玉吉-小橙C": "dw_zhangyuji",
+    "周艳辉-zhouyanhui-QA": "dw_zhouyanhui",
+    "zhaoyi wang": "dw_wangzhaoyi",
+    "测试-陈美伶-Zoe": "dw_chenmeiling",
+    "黄伟灵": "dw_huangweiling"
 }
 
 
@@ -61,27 +70,27 @@ def get_update_issues_jql():
 
 
 class JiraInfo:
-    def __init__(self, _jira_user, _api_key, _project_key):
+    def __init__(self, _jira_user, _api_key):
         self.project_name = None
         self.jira_url = "https://shopline.atlassian.net/"
-        self.project_key = _project_key
+        # self.project_key = _project_key
         self.issue = None
         self.jira_user = _jira_user
         self.jira_api_key = _api_key
         self.jira = JIRA(server=self.jira_url, basic_auth=(self.jira_user, self.jira_api_key))
-        self.get_jira_prodcut()
+        # self.get_jira_prodcut()
         self.custom_fields = self.get_custom_fields()
 
-    def get_jira_prodcut(self):
-        """"""
-        project = self.jira.project(str(self.project_key))
-        self.project_name = project.name
-        print(f"Project: {project.key} - {project.name}")
+    # def get_jira_prodcut(self):
+    #     """"""
+    #     project = self.jira.project(str(self.project_key))
+    #     self.project_name = project.name
+    #     print(f"Project: {project.key} - {project.name}")
         # return project
 
     def get_custom_fields(self) -> dict:
         """
-        查询指定项目jira中的自定义字段，smartpush项目是 10559
+        查询指定项目jira中的自定义字段，smartpush项目是 10559 商品是 10092
         @param project_id: 项目id
         @param jira_obj: 对象
         @return: 返回的是自定义的值对应的id
@@ -92,10 +101,7 @@ class JiraInfo:
         for field in all_fields:
             try:
                 if field.get('custom'):
-                    # if field['scope']['project']['id'] == self.project_key:
                     custom_fields[field['id']] = field['name']
-                    # else:
-                    #     pass
             except:
                 continue
         # print(custom_fields)
@@ -112,7 +118,7 @@ class JiraInfo:
             filter_obj = self.jira.filter(filter_id)
             jql = filter_obj.jql
         elif jql is None:
-            default_jql_str = f'project = {self.project_key}'
+            default_jql_str = f'project = SSP'
         try:
             all_issues = {}
             start_at = 0
@@ -194,6 +200,7 @@ class JiraInfo:
             else:
                 print(f"{new_jql} 更新失败！")
         except Exception as e:
+            # raise e
             print(f"更新过滤器 JQL 时出错: {e}")
 
     def product_and_ui_acceptance_notice(self, webhook, datas):
@@ -233,7 +240,33 @@ class JiraInfo:
                 tester_user_id = self.get_tester_wecom_userid(value.get("测试人员"), test_user)
                 test_end_time = value.get("测试完成时间（测试环境）")
                 content += f"> [{key + '-' + summary}]({url}) \n测试:{tester_user_id} \n测试完成时间：{test_end_time}\n\n "
-        content = f"### <font color=\"warning\"> 本周涉及后端需求如下，请分析并登记覆盖率，周会前填写</font> \n" + content
+        content = f"### <font color=\"warning\"> 本周涉及后端需求如下，请分析并登记覆盖率报告，周会前填写</font> \n" + content
+        self.send_wecom_robot_message(webhook, content)
+
+    def registration_coverage_notice_every_day(self, webhook, datas):
+        """
+        1、有后端开发工作量时才提示
+        2、并且把填写的链接附上
+        :return:
+        """
+        content = ""
+        today = datetime.date.today().strftime('%Y-%m-%d')
+        for key, value in datas.items():
+            adjusted_test_completion_time = value.get("调整后测试完成时间（测试环境）")
+            test_end_time = value.get("测试完成时间（测试环境）") if adjusted_test_completion_time is None else adjusted_test_completion_time
+            test_end_text = '测试完成时间（测试环境）' if adjusted_test_completion_time is None else '调整后测试完成时间（测试环境）'
+            test_end_time_new = datetime.datetime.strptime(test_end_time, "%Y-%m-%d").strftime('%Y-%m-%d') if test_end_time is not None else None
+            summary = value.get("summary")
+            url = value.get("url")
+            backend_workload = value.get("后端工作量")
+            if test_end_time is not None and backend_workload is not None and backend_workload > 0 and test_end_time_new == today:
+                tester_user_id = self.get_tester_wecom_userid(value.get("测试人员"), test_user)
+                content += f"> [{key + '-' + summary}]({url}) \n后端工作量:{backend_workload}\n测试人员:{tester_user_id} \n{test_end_text}:{test_end_time}\n\n "
+        if StringUtils.is_empty(content):
+            print(f"*** {today} 无涉及覆盖率登记需求，不发送通知 ***")
+            return
+        content = f"### <font color=\"warning\"> 涉及后端需求，测试完成后，请分析并登记覆盖率报告</font> \n" + content
+        # print(content)
         self.send_wecom_robot_message(webhook, content)
 
     def bug_not_closed_notice(self, webhook, datas):
@@ -252,6 +285,7 @@ class JiraInfo:
                 tester_user_id = self.get_tester_wecom_userid(value.get("测试人员"), test_user)
                 content += f"> [{key + '-' + summary}]({url}) \n暂未修复bug数量：{len(not_fixed_dict)}\n测试:{tester_user_id} \n\n "
         if StringUtils.is_empty(content):
+            print("无待修复bug..不发送通知")
             return
         content = f"### <font color=\"warning\"> 提醒本周上线需求暂未修复缺陷，请尽快确认</font> \n" + content
         self.send_wecom_robot_message(webhook, content)
@@ -290,6 +324,8 @@ class JiraInfo:
         :return:
         """
         mobile_string = ""
+        if tester is None:
+            return None
         for name in tester:
             user_id = user_data.get(name, None)
             mobile_string += f"<@{user_id}>"
@@ -370,17 +406,11 @@ class JiraInfo:
         try:
             response = requests.post(webhook_url, headers=headers, data=json.dumps(data))
             response.raise_for_status()
+            print("发送企微消息成功!")
             return response.json()
         except requests.RequestException as e:
             print(f"请求出错: {e}")
             return None
         except ValueError as e:
             print(f"解析响应出错: {e}")
-            return None
-
-
-# if __name__ == '__main__':
-#     # jirainfo.product_and_ui_acceptance_notice(webhook_url, result)  # 发验收
-#     # jirainfo.bug_not_closed_notice(webhook_url, result)  # bug未修复
-#     # jirainfo.registration_coverage_notice(webhook_url, result)  # 覆盖率
-#     # jirainfo.modify_the_online_status_of_jira_notice(webhook_url, result)  # 覆盖率
+            return None

{smartpush-1.3.2 → smartpush-1.3.5}/smartpush.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.3.2
+Version: 1.3.5
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙

{smartpush-1.3.2 → smartpush-1.3.5}/smartpush.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 setup.py
 smartpush/__init__.py
 smartpush/get_jira_info.py
+smartpush/test.py
 smartpush.egg-info/PKG-INFO
 smartpush.egg-info/SOURCES.txt
 smartpush.egg-info/dependency_links.txt