smartpush 1.3.7__py3-none-any.whl → 1.3.8__py3-none-any.whl

smartpush/flow/MockFlow.py

@@ -5,7 +5,7 @@ import requests
 from smartpush.utils import ListDictUtils
 
 
-def get_current_flow(host_domain, cookies, flow_id, oppor="forward"):
+def get_current_flow(host_domain, cookies, flow_id):
     # 提取flow所有节点数据
     _url = host_domain + "/flow/getFlowDetail"
     headers = {
@@ -17,18 +17,51 @@ def get_current_flow(host_domain, cookies, flow_id, oppor="forward"):
         "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"]:
+
+    def process_node(node):
         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"]}
+                                         "waitingCount": node["data"]["waitingCount"]
+                                         }
                             }
                            )
-    return {oppor: node_counts}, result["resultData"]["version"]
+        # 处理split节点
+        if "split" in node["data"].keys():
+            for branch_node in node['data']['split']['branches']["false"]:
+                process_node(branch_node)
+            for branch_node in node['data']['split']['branches']["true"]:
+                process_node(branch_node)
+        # 处理abTesting节点
+        elif "abTesting" in node["data"].keys():
+            for branch_node in node['data']['abTesting']['branches']["a"]:
+                process_node(branch_node)
+            for branch_node in node['data']['abTesting']['branches']["b"]:
+                process_node(branch_node)
+
+    # 处理所有顶层节点
+    for node in result['resultData']['nodes']:
+        process_node(node)
+    return node_counts, result["resultData"]["version"]
+
+
+def update_flow(host_domain, cookies, **kwargs):
+    """
+    # 更新flow
+    update_flow_params: 必填，saveFlow接口所有参数，dict格式
+    version: 非必填，flow版本号
+    """
+    _url = host_domain + "/flow/saveFlow"
+    headers = {
+        "cookie": cookies,
+        "Content-Type": "application/json"
+    }
+    kwargs["update_flow_params"]["version"] = kwargs.get("version", kwargs["update_flow_params"]["version"])
+    params = kwargs["update_flow_params"]
+    result = requests.request(method="post", url=_url, headers=headers, json=params).text
 
 
 def start_flow(host_domain, cookies, flow_id, version):
@@ -46,18 +79,10 @@ def start_flow(host_domain, cookies, flow_id, version):
 
 
 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"
@@ -83,10 +108,15 @@ def check_flow(mock_domain, host_domain, cookies, **kwargs):
     pulsar:必填，模拟的触发数据
     limit:非必填，默认为1 - mock_pulsar函数用于控制模拟触发的次数
     num:非必填，默认为1 - compare_lists函数用于断言方法做差值计算
+    update_flow_params: 非必填，dict格式，需更新flow时传参，参数结构为sp的saveFlow接口内容
     """
     # 触发前提取flow数据，后续做对比
     old_flow_counts, old_versions = get_current_flow(host_domain=host_domain, cookies=cookies,
                                                      flow_id=kwargs["flow_id"])
+    # 更新flow
+    if kwargs.get("update_flow_params", False):
+        update_flow(host_domain=host_domain, cookies=cookies, update_flow_params=kwargs.get("update_flow_params"),
+                    version=old_versions)
     # 启动flow
     start_flow(host_domain=host_domain, cookies=cookies, flow_id=kwargs["flow_id"], version=old_versions)
     # 触发flow
@@ -97,4 +127,4 @@ def check_flow(mock_domain, host_domain, cookies, **kwargs):
                                                      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]
+    return [True, "断言成功"] if len(result) == 0 else [False, result]

smartpush/test.py

@@ -31,13 +31,17 @@ if __name__ == '__main__':
     # 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"))
+    # 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"
+    host_domain = "https://test.smartpushedm.com/api-em-ec2"
+    cookies = "_ga=GA1.1.88071637.1717860341; _ga_NE61JB8ZM6=GS1.1.1718954972.32.1.1718954972.0.0.0; _ga_Z8N3C69PPP=GS1.1.1723104149.2.0.1723104149.0.0.0; _ga_D2KXR23WN3=GS1.1.1735096783.3.1.1735096812.0.0.0; osudb_lang=; a_lang=zh-hans-cn; osudb_uid=4213785218; osudb_oar=#01#SID0000126BGKWZjG4n42Q2CwFh4CS1WDoQZHTsZddVzHm5AvTJYrgIBGBQYLWO+XpYs47JMugUA6ZpHRvCdRTXw0OLXxpvdGnuT8GZ5qgcuWxiOIUHwdOCKPO9aEBTTB6NWeShMEFpZlU9lLxzcYL6HLlPBHe; osudb_appid=SMARTPUSH; osudb_subappid=1; ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDc1MzQzMjYsImp0aSI6IjVlMTMyOWU3LTAwMzItNDIyNS1hY2NmLWFlNDY4ZTUxZDgxMiIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjE4IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6InRlc3RzbWFydDA5NUBnbWFpbC5jb20iLCJ1c2VyUm9sZSI6Im93bmVyIiwicGxhdGZvcm1UeXBlIjo3LCJzdWJQbGF0Zm9ybSI6MSwicGhvbmUiOiIiLCJsYW5ndWFnZSI6InpoLWhhbnMtY24iLCJhdXRoVHlwZSI6IiIsImF0dHJpYnV0ZXMiOnsiY291bnRyeUNvZGUiOiJDTiIsImN1cnJlbmN5IjoiVVNEIiwiY3VycmVuY3lTeW1ib2wiOiJVUyQiLCJkb21haW4iOiJmZWxpeC10Yy5teXNob3BsaW5lc3RnLmNvbSIsImxhbmd1YWdlIjoiZW4iLCJtZXJjaGFudEVtYWlsIjoidGVzdHNtYXJ0MDk1QGdtYWlsLmNvbSIsIm1lcmNoYW50TmFtZSI6ImZlbGl4LXRjIiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOnRydWUsInN0YWZmTGFuZ3VhZ2UiOm51bGwsInN0YXR1cyI6MiwidGltZXpvbmUiOiJBc2lhL0hvbmdfS29uZyJ9LCJzdG9yZUlkIjoiMTY2NTY2MTA4NDM2MyIsImhhbmRsZSI6ImZlbGl4LXRjIiwiZW52IjoiQ04iLCJzdGUiOiIiLCJ2ZXJpZnkiOiIifSwibG9naW5UaW1lIjoxNzQ0OTQyMzI2NTM0LCJzY29wZSI6WyJlbWFpbC1tYXJrZXQiLCJjb29raWUiLCJzbC1lY29tLWVtYWlsLW1hcmtldC1uZXctdGVzdCIsImVtYWlsLW1hcmtldC1uZXctZGV2LWZzIiwiYXBpLXVjLWVjMiIsImFwaS1zdS1lYzIiLCJhcGktZW0tZWMyIiwiZmxvdy1wbHVnaW4iLCJhcGktc3AtbWFya2V0LWVjMiJdLCJjbGllbnRfaWQiOiJlbWFpbC1tYXJrZXQifQ.rBrzepA8U8ghqLcNGGF4N6s6PXA6v6tJaKVOe5jQdaw; JSESSIONID=0228F95DD250A037C91E0E2927EE2FC7"
+
+
     params = {
         "abandonedOrderId": "c2c4a695a36373f56899b370d0f1b6f2",
         "areaCode": "",
@@ -87,4 +91,8 @@ if __name__ == '__main__':
         "uid": "4603296300",
         "userId": "1911625831177650177"
     }
-    mock_pulsar = MockFlow.mock_pulsar(_url, params)
+    mock_pulsar = MockFlow.check_flow(mock_domain=_url, host_domain=host_domain, cookies=cookies,
+                                      flow_id="FLOW6749144046546626518", pulsar=params)
+    # node_counts, versions = MockFlow.get_current_flow(host_domain=host_domain, cookies=cookies,
+    #                                                   flow_id="FLOW6749144046546626518")
+    print(mock_pulsar)

smartpush/utils/ListDictUtils.py

@@ -22,7 +22,6 @@ def compare_lists(temp1, temp2, num=1):
                         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]
                                 }

{smartpush-1.3.7.dist-info → smartpush-1.3.8.dist-info}/METADATA

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

{smartpush-1.3.7.dist-info → smartpush-1.3.8.dist-info}/RECORD

@@ -1,18 +1,18 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=Ej2JRlO_Kct6Koju57b27ySy_B4q43f0I2bFcS_fmaw,17801
-smartpush/test.py,sha256=BIzo668m0cD8OTtMF6Gt4Ph0WcrFvBt287FzMU2hR-8,5502
+smartpush/test.py,sha256=gOZE1am6-6ZPcfKLfh2KblHXhL5YY-LncPZhji4THYI,7648
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
 smartpush/export/basic/ExcelExportChecker.py,sha256=R_1gFy69vE2V5pY20zFsnhqWgJ42Vtf35zBtOPfhUpU,17590
 smartpush/export/basic/GetOssUrl.py,sha256=LeF1y1_uJaYXth1KvO6mEDS29ezb9tliBv5SrbqYkXc,6136
 smartpush/export/basic/ReadExcel.py,sha256=ZnG2mtYqLY-xuYx9SyulbdYUP_0E5jIeKDewfakAsTw,7342
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush/flow/MockFlow.py,sha256=5uv09Wfc1i4mqjx5FuuH1-31775gr4UmXQv5rbAoN1Y,3991
+smartpush/flow/MockFlow.py,sha256=I9EKR9-rQ6H-fI4dzYZ_WRrHqxVdIcxaPKGKzG_3e3I,5083
 smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
-smartpush/utils/ListDictUtils.py,sha256=zhRCwPsvGCECHZWPUmm3fMRUCipg_fFVpBtX4PFNPzE,1386
+smartpush/utils/ListDictUtils.py,sha256=OsmNzMA3nCAUJaRw53uyUkZI0t95VBlfxYwD4FFtjz8,1385
 smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush-1.3.7.dist-info/METADATA,sha256=CnE9qGsxwJ_KlOxXUMOL408udG8bMWkCjTRWT0u-Vss,145
-smartpush-1.3.7.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.3.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.3.7.dist-info/RECORD,,
+smartpush-1.3.8.dist-info/METADATA,sha256=8_OjDrX1Go1UcCFJO-VlEzcBHOlnIpVVmvxRiiRKCCs,145
+smartpush-1.3.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.3.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.3.8.dist-info/RECORD,,