smartpush 1.4.7__py3-none-any.whl → 1.4.8__py3-none-any.whl

smartpush/base/url_enum.py

@@ -0,0 +1,30 @@
+from enum import Enum, unique
+
+
+@unique
+class URL(Enum):
+    """
+    :type:表单报告
+    """
+    pageFormReportDetail = '/formReport/detail/pageFormReportDetail', 'POST'  # 获取表单收集数据
+    getFormReportDetail = '/formReport/getFormReportDetail', 'POST'  # 获取表单报告数据(曝光/点击)
+    getFormPerformanceTrend = 'formReport/getFormPerformanceTrend', 'POST'
+
+    """
+    :type 群组
+    """
+    editCrowdPackage = '/crowdPackage/editCrowdPackage', 'POST'
+    crowdPersonList = '/crowdPackage/crowdPersonList', 'POST'
+
+    @property
+    def method(self):
+        return self.value[1]
+
+    @property
+    def url(self):
+        return self.value[0]
+
+
+if __name__ == '__main__':
+    print(URL.pageFormReportDetail.method)
+    print(URL.getFormReportDetail.url)

smartpush/export/basic/ExcelExportChecker.py

@@ -285,6 +285,68 @@ def check_excel_header(actual, expected, **kwargs):
         return False, f"表头校验异常 {e}"
 
 
+def check_excel_header_by_list(actual, expected, **kwargs):
+    """
+    比较导出表头是否一致是否一致
+    @param actual: 可以传oss链接
+    @param expected:期望的表头list
+    @return:
+    @return:
+    """
+
+    global diff
+    try:
+        if not isinstance(actual, io.BytesIO):
+            actual = read_excel_from_oss(actual)
+        actual1, expected1 = read_excel_header(actual, **kwargs)[0], get_header_map_data(
+            expected)
+        actual1.sort()
+        try:
+            diff = compare_lists(actual1, expected1)
+            assert not diff  # 为空则错误
+            return True, "表头校验值与顺序一致"
+        except AssertionError as e:
+            print("actual:", actual1)
+            print("expected:", expected1)
+            return False, f"表头校验值与顺序失败 {diff}"
+    except Exception as e:
+        return False, e
+
+
+def get_header_map_data(name_list):
+    """
+        获取头映射关系--中文
+        :param name_list:
+        :return:
+        """
+    header_dict_zh_cn = {
+        "sendTypeName": "活动类型",
+        "activityName": "活动名称",
+        "sendTotal": "发送数",
+        "deliveryTotal": "送达数",
+        "deliveryRate": "送达率",
+        "openRate": ["打开率（打开数/送达数）", "打开数"],
+        "noRepeatOpenRate": ["不重复打开率", "不重复打开"],
+        "clickRate": ["点击率（点击数/送达数）", "点击数"],
+        "noRepeatClickRate": ["不重复点击率", "不重复点击"],
+        "salesPriceTotal": "销售额",
+        "orderTotal": "订单数",
+        "averageOrderValue": "平均订单价值",
+        "conversionRate": "转化率",
+        "unsubTotal": "退订数",
+        "unsubRate": "退订率",
+        "complainRate": "弹回率",
+        "bounceRate": "投诉率",
+        "sendStartTime": "发送时间"
+    }
+    header_list = []
+    for key, value in header_dict_zh_cn.items():
+        if key in name_list:
+            header_list.append(value) if not isinstance(value, list) else header_list.extend(value)
+    header_list.sort()
+    return header_list
+
+
 def del_temp_file(file_name=""):
     """删除temp下临时文件"""
     file_path = os.path.join(os.path.dirname(os.getcwd()) + "/temp_file/" + file_name)
@@ -378,12 +440,14 @@ def check_field_format(actual_oss, **kwargs):
                     if kwargs["fileds"][key][filed_key] == "email":
                         fool = DataTypeUtils.DataTypeUtils().check_email_format(email=row[filed_key])
                         if not fool:
-                            errors.append(f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
+                            errors.append(
+                                f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
                     elif kwargs["fileds"][key][filed_key] == "time":
-                        fool = DataTypeUtils.DataTypeUtils().check_time_format(time_str=row[filed_key], precision=kwargs.get('precision', 's'))
+                        fool = DataTypeUtils.DataTypeUtils().check_time_format(time_str=row[filed_key],
+                                                                               precision=kwargs.get('precision', 's'))
                         if not fool:
                             errors.append(
                                 f"{actual_dict_key[key]} 表, 第{num}行{filed_key}列{kwargs['fileds'][key][filed_key]}格式不符合规范, 值为:{row[filed_key]}")
                     num += 1
     print(errors if len(errors) > 0 else "都校验成功")
-    return False if len(errors) > 0 else True
+    return False if len(errors) > 0 else True

smartpush/form/form_after.py

@@ -0,0 +1,143 @@
+import json
+from tenacity import retry, stop_after_attempt, wait_fixed
+from smartpush.base.request_base import RequestBase
+from smartpush.base.url_enum import URL
+from smartpush.export.basic.GetOssUrl import log_attempt
+
+
+class FormAfter(RequestBase):
+    def __init__(self, form_id, headers, host):
+        super().__init__(headers, host)
+        self.form_id = form_id
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def callPageFormReportDetail(self, reportDetailType, start_time=None, end_time=None):
+        """
+        获取PageFormReportDetail数据
+        :param end_time:
+        :param start_time:
+        :param reportDetailType:
+        :return:
+        """
+        requestParam = {"page": 1, "pageSize": 20, "reportDetailType": reportDetailType, "formId": self.form_id}
+        if start_time is not None and end_time is not None:
+            requestParam["startTime"] = start_time
+            requestParam["endTime"] = end_time
+        result = self.post(url=self.host + URL.pageFormReportDetail.url, data=json.dumps(requestParam)).json()
+        result.raise_for_status()
+        persons_list = result["resultData"]["reportDetailData"]["datas"]
+        return persons_list
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def callGetFormReportDetail(self):
+        requestParam = {"formId": self.form_id}
+        result = self.post(url=self.host + URL.getFormReportDetail.url, data=json.dumps(requestParam)).json()
+        result.raise_for_status()
+        resultData = result["resultData"]
+        return resultData
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def callGetFormPerformanceTrend(self):
+        requestParam = {"formId": self.form_id}
+        result = self.post(url=self.host + URL.getFormPerformanceTrend.url, data=json.dumps(requestParam)).json()
+        result.raise_for_status()
+        resultData = result["resultData"]
+        return resultData
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def callEditCrowdPackage(self, _id=None, groupRules=None, groupRelation="$AND"):
+        """
+        更新群组条件id
+        :param _id:
+        :param groupRules:
+        :param groupRelation:
+        :return:
+        """
+        requestParam = {"id": _id, "crowdName": "表单查询群组-自动化", "groupRelation": groupRelation,
+                        "groupRules": groupRules, "triggerStock": False}
+        result = self.post(url=self.host + URL.editCrowdPackage.url, data=json.dumps(requestParam)).json()
+        result.raise_for_status()
+        assert result.get("code") == 1
+        resultData = result["resultData"]
+        assert resultData.get("status") == 2
+        return resultData["id"]
+
+    def callCrowdPersonList(self, _id, page, pageSize, filter_type, filter_value):
+        requestParam = {"id": _id, "page": page, "pageSize": pageSize}
+        if filter_value is not None:
+            requestParam["filter"] = {filter_type: {"in": filter_value}}
+        result = self.post(url=self.host + URL.crowdPersonList.url, data=json.dumps(requestParam)).json()
+        result.raise_for_status()
+        return result['resultData']
+
+    # --------        处理数据  --------------
+    def collectFormDetails(self, key, start_time=None, end_time=None):
+        """
+        从表单收集明细中获取信息，判断是否收集成功
+        :param self:
+        :param key: 关键词
+        :param start_time: 开始时间
+        :param end_time: 结束时间
+        """
+        persons_list = self.callPageFormReportDetail("FORM_COLLECT", start_time, end_time)
+        if persons_list:
+            for person in persons_list:
+                if person['email'] == key:
+                    return True, person
+                elif person['phone'] == key:
+                    return True, person
+                else:
+                    return False, None
+
+    def FormReportNumQuery(self, num_type="viewNum", assertNum=None):
+        """
+        表单数据数据统计
+        :param assertNum:
+        :param num_type:viewNum/clickNum/collectNum/orderNum
+        """
+        data = self.callGetFormReportDetail()
+        if data is not None:
+            if assertNum is None:
+                var = data.get(num_type)
+                return var
+            else:
+                return data.get(num_type) == assertNum
+
+    def getFormAttributionSales(self, key, start_time=None, end_time=None):
+        """
+        判断折扣码是否能正确归因
+        :param key:
+        :param start_time:
+        :param end_time:
+        :return:
+        """
+        order_list = self.callPageFormReportDetail("FORM_SALES", start_time, end_time)
+        if order_list:
+            for order in order_list:
+                if order['email'] == key:
+                    return True, order
+                elif order['phone'] == key:
+                    return True, order
+                elif order['orderId'] == key:
+                    return True, order
+                else:
+                    return False, None
+
+    def getFormLineChart(self, date=None, num_type="viewNum", assertNum=None):
+        """
+        获取表单折线图
+        :param assertNum:
+        :param date:
+        :param num_type:viewNum/clickNum/collectNum
+        """
+        datas = dict(self.callGetFormPerformanceTrend())
+        if datas is not None:
+            for data in datas:
+                if data.get(date):
+                    if assertNum is not None:
+                        assert data.get(num_type) == assertNum
+                    else:
+                        return data.get(num_type)
+
+    def getCrowdPersonList(self, _id, page=1, pageSize=20, filter_type="email", filter_value=""):
+        self.callCrowdPersonList(self,_id,page,pageSize,filter_type,filter_value)

smartpush/form/form_assert.py

@@ -0,0 +1,17 @@
+"""
+获取在线有效表单列表，并判断是否触发对应的表单
+"""
+from smartpush.base.request_base import FormRequestBase
+
+
+class FormAssert(FormRequestBase):
+
+    def getValidForms(self):
+        self.post()
+
+
+
+"""
+C端与B端数据比较
+"""
+

smartpush/form/form_before.py

@@ -0,0 +1,9 @@
+from smartpush.base.request_base import FormRequestBase
+
+
+class FormBefore(FormRequestBase):
+    pass
+    """
+    创建各种类型的表单，确保是上架状态
+    """
+

smartpush/form/form_client_operation.py

@@ -0,0 +1,19 @@
+from smartpush.base.request_base import FormRequestBase
+
+
+class FormClientOperation(FormRequestBase):
+    """
+    表单曝光事件埋点上报
+    """
+
+    """
+    表单点击事件埋点上报
+    """
+
+    """
+    填写提交表单
+    """
+
+    """
+    C端使用表单折扣码进行下单
+    """

smartpush/utils/form_utils.py

@@ -0,0 +1,34 @@
+import base64
+from Crypto.Cipher import AES
+from Crypto.Util.Padding import pad, unpad
+
+
+def aes_encrypt(data, key, iv):
+    """
+    参数加密
+    :param data:
+    :param key:
+    :param iv:
+    :return:
+    """
+    key = key.encode('utf-8')
+    iv = iv.encode('utf-8')
+    cipher = AES.new(key, AES.MODE_CBC, iv)
+    ciphertext = cipher.encrypt(pad(data.encode('utf-8'), AES.block_size))
+    return base64.b64encode(ciphertext).decode('utf-8')
+
+
+def aes_decrypt(ciphertext, key, iv):
+    """
+    参数解密
+    :param ciphertext:
+    :param key:
+    :param iv:
+    :return:
+    """
+    key = key.encode('utf-8')
+    iv = iv.encode('utf-8')
+    ciphertext = base64.b64decode(ciphertext)
+    cipher = AES.new(key, AES.MODE_CBC, iv)
+    decrypted_data = unpad(cipher.decrypt(ciphertext), AES.block_size)
+    return decrypted_data.decode('utf-8')

{smartpush-1.4.7.dist-info → smartpush-1.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.4.7
+Version: 1.4.8
 Summary: 用于smartpush自动化测试工具包
 Author: lulu、felix、long
 

smartpush-1.4.8.dist-info/RECORD

@@ -0,0 +1,28 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/get_jira_info.py,sha256=OYaDV6VPAmkGKYLlRnsi1ZyKHU8xEiVnjsYrc41ZR0U,17910
+smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/base/faker_data.py,sha256=TOd5EKVImxZpsKEW_dtKa2iqiUGqU7OBkOM8pvqKVUc,24643
+smartpush/base/request_base.py,sha256=Fn1uPWgaZQZdu8yyi2n13nuiKPVeR95iwx99sG6XGVU,574
+smartpush/base/url_enum.py,sha256=REHYP_aa0xumLg8El-yrNRpablLnPEQpss8ZNPdkNtg,787
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=CFTytcowwf1xfoRE5DZayY8kKJqppYQ0smVIokfxitM,19833
+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=MI8WIMZyKlxrV5QVs8rXX6iD07Ldl37_L5Yb5FWqHzU,8595
+smartpush/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/form/form_after.py,sha256=a7d5G8Es3gRIzXiFDkI2McW_zq3FACfMxjRVBwSmK24,5866
+smartpush/form/form_assert.py,sha256=wPIRfQHhr7lN1fFd-mp0z_qKMtF4jfrNxRWvp2xfqCg,257
+smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs,175
+smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
+smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
+smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
+smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1alcE,1640
+smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrAo,4139
+smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
+smartpush-1.4.8.dist-info/METADATA,sha256=_Fh1DOsWYzvBYYvSbFzc98qbWwEGBrsGgC3RjmStBno,131
+smartpush-1.4.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.4.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.4.8.dist-info/RECORD,,

{smartpush-1.4.7.dist-info → smartpush-1.4.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any