smartpush 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

smartpush/base/url_enum.py

@@ -16,6 +16,11 @@ class URL(Enum):
     editCrowdPackage = '/crowdPackage/editCrowdPackage', 'POST'
     crowdPersonList = '/crowdPackage/crowdPersonList', 'POST'
 
+    """
+    :type 表单操作
+    """
+    deleteForm = '/form/deleteFormInfo', 'GET'
+
     @property
     def method(self):
         return self.value[1]

smartpush/export/basic/ExcelExportChecker.py

@@ -337,8 +337,8 @@ def get_header_map_data(name_list):
         "conversionRate": "转化率",
         "unsubTotal": "退订数",
         "unsubRate": "退订率",
-        "complainRate": "弹回率",
-        "bounceRate": "投诉率",
+        "complainRate": "投诉率",
+        "bounceRate": "弹回邮箱率",
         "sendStartTime": "发送时间"
     }
     header_list = []

smartpush/form/form_after.py

@@ -1,14 +1,13 @@
 import json
 from tenacity import retry, stop_after_attempt, wait_fixed
-from smartpush.base.request_base import RequestBase
+from smartpush.base.request_base import RequestBase, FormRequestBase
 from smartpush.base.url_enum import URL
 from smartpush.export.basic.GetOssUrl import log_attempt
 
 
-class FormAfter(RequestBase):
+class FormAfter(FormRequestBase):
     def __init__(self, form_id, headers, host):
-        super().__init__(headers, host)
-        self.form_id = form_id
+        super().__init__(form_id,headers, host)
 
     @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
     def callPageFormReportDetail(self, reportDetailType, start_time=None, end_time=None):
@@ -70,6 +69,13 @@ class FormAfter(RequestBase):
         result.raise_for_status()
         return result['resultData']
 
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
+    def callDeleteForm(self, merchant_id):
+        params = {"formId": self.form_id, "merchant_id": merchant_id}
+        result = self.get(url=self.host + URL.deleteForm.url, params=params)
+        result.raise_for_status()
+        print(f"删除id{self.form_id}表单成功")
+
     # --------        处理数据  --------------
     def collectFormDetails(self, key, start_time=None, end_time=None):
         """
@@ -140,4 +146,4 @@ class FormAfter(RequestBase):
                         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)
+        self.callCrowdPersonList(self, _id, page, pageSize, filter_type, filter_value)

{smartpush-1.5.0.dist-info → smartpush-1.5.2.dist-info}/METADATA

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

{smartpush-1.5.0.dist-info → smartpush-1.5.2.dist-info}/RECORD

@@ -3,16 +3,16 @@ smartpush/get_jira_info.py,sha256=OYaDV6VPAmkGKYLlRnsi1ZyKHU8xEiVnjsYrc41ZR0U,17
 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/base/url_enum.py,sha256=xj98cd22sZ39TzKfhVEERgSJ1WScn7R4HVU-z8KTbM8,874
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=p3NIjZuXlCprIYkKQlRqoCQpU8shwa2S8k6LJZxnnF4,19957
+smartpush/export/basic/ExcelExportChecker.py,sha256=3IAeu1kjFS4MpDxjVB1htAcRA1BtfpH3xEkZyP4htAA,19963
 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_after.py,sha256=vuxtOnADC0PJd53h_KM9yEfVpeQHIC8JTPrRE8bw7VA,6225
 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
@@ -22,7 +22,7 @@ smartpush/utils/ListDictUtils.py,sha256=Fm5_d7UyY6xB8gySMPdl5jIFSRhXZcYXdYW-_L1a
 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.5.0.dist-info/METADATA,sha256=_d7i8OmR9fUZB0kjfo-zFSP2lzBmFA4fO-befH3b0uA,131
-smartpush-1.5.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.5.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.5.0.dist-info/RECORD,,
+smartpush-1.5.2.dist-info/METADATA,sha256=MOQLSgRKyErD-iK5bpZI1r5F2poLsWA2d7vM2fWg8PI,131
+smartpush-1.5.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.5.2.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.5.2.dist-info/RECORD,,