smartpush 1.3.4__tar.gz → 1.3.7__tar.gz

{smartpush-1.3.4 → smartpush-1.3.7}/PKG-INFO

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

{smartpush-1.3.4 → smartpush-1.3.7}/setup.py

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

smartpush-1.3.7/smartpush/flow/MockFlow.py

@@ -0,0 +1,100 @@
+import json
+import random
+import time
+import requests
+from smartpush.utils import ListDictUtils
+
+
+def get_current_flow(host_domain, cookies, flow_id, oppor="forward"):
+    # 提取flow所有节点数据
+    _url = host_domain + "/flow/getFlowDetail"
+    headers = {
+        "cookie": cookies
+    }
+    params = {
+        "flowId": flow_id,
+        "active": True,
+        "includeActivityDetail": True
+    }
+    result = json.loads(requests.request(method="get", url=_url, headers=headers, params=params).text)
+
+    # 按节点id存储
+    node_counts = []
+    for node in result["resultData"]["nodes"]:
+        node_counts.append({node["id"]: {"completedCount": node["data"]["completedCount"],
+                                         "skippedCount": node["data"]["skippedCount"],
+                                         "openUserCount": node["data"]["openUserCount"],
+                                         "clickUserCount": node["data"]["clickUserCount"],
+                                         "waitingCount": node["data"]["waitingCount"]}
+                            }
+                           )
+    return {oppor: node_counts}, result["resultData"]["version"]
+
+
+def start_flow(host_domain, cookies, flow_id, version):
+    # 开启flow
+    _url = host_domain + "/flow/publishFlow"
+    headers = {
+        "cookie": cookies,
+        "Content-Type": "application/json"
+    }
+    params = {
+        "flowId": flow_id,
+        "version": str(version)
+    }
+    result = requests.request(method="post", url=_url, headers=headers, json=params).text
+
+
+def mock_pulsar(mock_domain, pulsar, limit=1):
+    # post请求
+    # times：为触发次数，默认1次即可
+    # 第三步提取的content直接替换mq的值即可
+    # 需参数化字段：
+    # abandonedOrderId、checkoutId、controlObjectId取第一步control_object_id做参数化
+    # platform为平台字段，枚举: 1:SF 2:ec1 4:ec2 8:domain
+    # messageId：需更改，保证不是之前使用过的
+    # userId：需参数化，兼容不同平台和环境
+    # handle、storeId：兼容不同店铺
+    #
+    # 备注：
+    # 可通过弃单id、userId字段测异常场景：如无联系人时，能触发但不发送，记录跳过数等；
+    _url = mock_domain + "/flow/testEventMulti"
+    headers = {
+        "Content-Type": "application/json"
+    }
+    # 生成随机message_id
+    prefix = 179
+    pulsar["messageId"] = f"{prefix}{random.randint(10 ** 15, 10 ** 16 - 1)}"
+    params = {
+        "times": limit,
+        "mq": pulsar
+    }
+    result = requests.request(method="post", url=_url, headers=headers, json=params).text
+    return json.loads(result)
+
+
+def check_flow(mock_domain, host_domain, cookies, **kwargs):
+    """
+    params
+    mock_domain:必填，触发接口域名
+    host_domain:必填，spflow接口域名
+    cookies:必填，sp登录态
+    flow_id:必填
+    pulsar:必填，模拟的触发数据
+    limit:非必填，默认为1 - mock_pulsar函数用于控制模拟触发的次数
+    num:非必填，默认为1 - compare_lists函数用于断言方法做差值计算
+    """
+    # 触发前提取flow数据，后续做对比
+    old_flow_counts, old_versions = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                                     flow_id=kwargs["flow_id"])
+    # 启动flow
+    start_flow(host_domain=host_domain, cookies=cookies, flow_id=kwargs["flow_id"], version=old_versions)
+    # 触发flow
+    mock_pulsar(mock_domain=mock_domain, pulsar=kwargs["pulsar"], limit=kwargs.get("limit", 1))
+    # 触发后提取flow数据，做断言
+    time.sleep(30)
+    new_flow_counts, new_versions = get_current_flow(host_domain=host_domain, cookies=cookies,
+                                                     flow_id=kwargs["flow_id"])
+    # 断言
+    result = ListDictUtils.compare_lists(temp1=old_flow_counts, temp2=new_flow_counts, num=kwargs.get("num", 1))
+    return [True, "断言成功"] if len(result) == 0 else [False, result]

{smartpush-1.3.4 → smartpush-1.3.7}/smartpush/get_jira_info.py

@@ -2,7 +2,6 @@ import datetime
 import json
 import requests
 from jira import JIRA
-from datetime import datetime
 from smartpush.utils.StringUtils import StringUtils
 
 test_user = {
@@ -201,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):
@@ -250,12 +250,12 @@ class JiraInfo:
         :return:
         """
         content = ""
-        today = datetime.today().strftime('%Y-%m-%d')
+        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.strptime(test_end_time, "%Y-%m-%d").strftime('%Y-%m-%d') if test_end_time is not None else None
+            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("后端工作量")
@@ -266,6 +266,7 @@ class JiraInfo:
             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):
@@ -310,8 +311,8 @@ class JiraInfo:
             automation_saves_labor_time = value.get("自动化节省工时")
             fixVersions = value.get("fixVersions")
             content += f"> [{key + '-' + summary}]({url}) \n状态：{status}\n实际上线时间：{actually_online_time}\n自动化测试工作量：{automated_testing_workload}\n自动节省工时：{automation_saves_labor_time}\n" \
-                       f"测试:{tester_user_id} \n\n "
-        content = f"### <font color=\"warning\"> 版本{fixVersions}需求已上线，请更新jira数据，进行版本收尾</font> \n" + content
+                       f"测试:{tester_user_id}\n版本号：{fixVersions} \n\n "
+        content = f"### <font color=\"warning\"> 本周版本需求已上线，请检查并更新jira数据，进行版本收尾</font> \n" + content
         self.send_wecom_robot_message(webhook, content)
 
     def get_tester_wecom_userid(self, tester, user_data):

smartpush-1.3.7/smartpush/test.py

@@ -0,0 +1,90 @@
+# -*- codeing = utf-8 -*-
+# @Time :2025/2/20 00:27
+# @Author :luzebin
+import pandas as pd
+
+from smartpush.export.basic import ExcelExportChecker
+from smartpush.export.basic.ReadExcel import read_excel_from_oss
+from smartpush.export.basic.ReadExcel import read_excel_and_write_to_dict
+from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
+from smartpush.utils.DataTypeUtils import DataTypeUtils
+from smartpush.flow import MockFlow
+
+if __name__ == '__main__':
+    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/31c1a577af244c65ab9f9a984c64f3d9/ab%E5%BC%B9%E7%AA%97%E6%B5%8B%E8%AF%952.10%E5%88%9B%E5%BB%BA-%E6%9C%89%E5%85%A8%E9%83%A8%E6%95%B0%E6%8D%AE%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"
+    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/31c1a577af244c65ab9f9a984c64f3d9/ab%E5%BC%B9%E7%AA%97%E6%B5%8B%E8%AF%952.10%E5%88%9B%E5%BB%BA-%E6%9C%89%E5%85%A8%E9%83%A8%E6%95%B0%E6%8D%AE%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"
+    # # print(check_excel_all(oss1, oss1))
+    oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-03-07/dca03e35cb074ac2a46935c85de9f510/导出全部客户.csv"
+    oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-03-07/c5fa0cc24d05416e93579266910fbd3e/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    expected_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    # actual_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    url = "https://cdn.smartpushedm.com/material_ec2_prod/2025-03-06/fe6f042f50884466979155c5ef825736/copy%20of%202025-01-16%20%E5%88%9B%E5%BB%BA%E7%9A%84%20A%2FB%20%E6%B5%8B%E8%AF%95%20copy%20of%202025-01-16%20app-%E6%99%AE%E9%80%9A%E6%A8%A1%E6%9D%BF%201%E6%95%B0%E6%8D%AE%E6%80%BB%E8%A7%88.xlsx"
+
+    # e_person_oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/b48f34b3e88045d189631ec1f0f23d51/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    # a_person_oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/c50519d803c04e3b9b52d9f625fed413/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+
+    # # #actual_oss= get_oss_address_with_retry("23161","https://cdn.smartpushedm.com/material_ec2_prod/2025-02-20/dae941ec20964ca5b106407858676f89/%E7%BE%A4%E7%BB%84%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx","",'{"page":1,"pageSize":10,"type":null,"status":null,"startTime":null,"endTime":null}')
+    # # res=read_excel_and_write_to_dict(read_excel_from_oss(actual_oss))
+    # # print(res)
+    # # print(read_excel_and_write_to_dict(read_excel_from_oss(oss1), type=".xlsx"))
+    # print(check_excel(check_type="all", actual_oss=actual_oss, expected_oss=expected_oss))
+    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,skiprows =1))
+    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,ignore_sort=True))
+    # print(check_excel_all(actual_oss=a_person_oss2, expected_oss=e_person_oss1, check_type="including"))
+    print(ExcelExportChecker.check_excel_all(actual_oss=oss3, expected_oss=oss4, check_type="including"))
+    # read_excel_csv_data(type=)
+    # print(DataTypeUtils().check_email_format())
+    # errors = ExcelExportChecker.check_field_format(actual_oss=oss1, fileds={0: {5: "time"}}, skiprows=1)
+    # ExcelExportChecker.check_excel_name(actual_oss=oss1, expected_oss=url)
+
+    _url = "http://sp-go-flow-test.inshopline.com"
+    params = {
+        "abandonedOrderId": "c2c4a695a36373f56899b370d0f1b6f2",
+        "areaCode": "",
+        "context": {
+            "order": {
+                "buyerSubscribeEmail": True,
+                "checkoutId": "c2c4a695a36373f56899b370d0f1b6f2",
+                "discountCodes": [],
+                "orderAmountSet": {
+                    "amount": 3,
+                    "currency": "JPY"
+                },
+                "orderDetails": [
+                    {
+                        "productId": "16060724900402692190790343",
+                        "title": "测试2.0-商品同步AutoSync-2023-08-17 20:52:00",
+                        "titleTranslations": []
+                    }
+                ],
+                "receiverCountryCode": "HK"
+            },
+            "user": {
+                "addresses": [],
+                "areaCode": "",
+                "email": "testsmart200+10@gmail.com",
+                "firstName": "testsmart200+10",
+                "gender": "others",
+                "id": "1911625831177650177",
+                "lastName": "",
+                "phone": "",
+                "tags": [],
+                "uid": "4603296300",
+                "userName": "testsmart200+10"
+            }
+        },
+        "controlObjectId": "c2c4a695a36373f56899b370d0f1b6f2",
+        "controlObjectType": 4,
+        "email": "testsmart200+10@gmail.com",
+        "handle": "smartpush4",
+        "language": "en",
+        "messageId": "1911625832100397058",
+        "phone": "",
+        "platform": 4,
+        "storeId": "1644395920444",
+        "timezone": "Asia/Macao",
+        "triggerId": "c1001",
+        "uid": "4603296300",
+        "userId": "1911625831177650177"
+    }
+    mock_pulsar = MockFlow.mock_pulsar(_url, params)

smartpush-1.3.7/smartpush/utils/ListDictUtils.py

@@ -0,0 +1,30 @@
+def compare_lists(temp1, temp2, num=1):
+    """对比两个list中字典，a中字典对应的键值+num等于b字典中键值
+    ab值示例：
+    a = [{"123": {"a": 1, "b": 2}}, {"456": {"a": 5, "b": 6}}]
+    b = [{"123": {"a": 2, "b": 2}}, {"456": {"a": 6, "b": 6}}]
+    """
+    error = []
+    # 同时遍历两个列表中的字典
+    for temp1_a, temp2_b in zip(temp1, temp2):
+        # 遍历每个字典的键
+        for outer_key in temp1_a:
+            # 确保 temp2 对应的字典中也有相同的外层键
+            if outer_key in temp2_b:
+                # 获取内层字典
+                inner_dict_a = temp1_a[outer_key]
+                inner_dict_b = temp2_b[outer_key]
+                # 遍历内层字典的键
+                for inner_key in inner_dict_a:
+                    # 确保 temp2 对应的内层字典中也有相同的键
+                    if inner_key in inner_dict_b:
+                        # 检查是否满足条件
+                        if inner_dict_a[inner_key] + num != inner_dict_b[inner_key]:
+                            error.append({
+                                outer_key: {
+
+                                    f"{inner_key}_in_a": inner_dict_a[inner_key],
+                                    f"{inner_key}_in_b": inner_dict_b[inner_key]
+                                }
+                            })
+    return error

{smartpush-1.3.4 → smartpush-1.3.7}/smartpush.egg-info/PKG-INFO

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

{smartpush-1.3.4 → smartpush-1.3.7}/smartpush.egg-info/SOURCES.txt

@@ -12,6 +12,9 @@ smartpush/export/basic/ExcelExportChecker.py
 smartpush/export/basic/GetOssUrl.py
 smartpush/export/basic/ReadExcel.py
 smartpush/export/basic/__init__.py
+smartpush/flow/MockFlow.py
+smartpush/flow/__init__.py
 smartpush/utils/DataTypeUtils.py
+smartpush/utils/ListDictUtils.py
 smartpush/utils/StringUtils.py
 smartpush/utils/__init__.py