smartpush 2.0.8__py3-none-any.whl → 2.1.0__py3-none-any.whl

smartpush/base/request_base.py

@@ -31,7 +31,7 @@ class RequestBase:
         self.session.mount("https://", HTTPAdapter(max_retries=retry_strategy))
 
     @retry(stop=stop_after_attempt(3), wait=wait_fixed(2), after=log_attempt)
-    def request(self, method, path, **kwargs):
+    def request(self, method, path,**kwargs):
         url = f"{self.host}{path}"
         print(f"{method} 请求：", url)
         # 统一处理请求参数
@@ -50,6 +50,7 @@ class RequestBase:
             response = self.session.request(method, url, **default_kwargs)
             response.raise_for_status()
             response_json = response.json()
+            assert response_json.get('code') == 1 if not kwargs.get('pass_assert_code') else True
             print("响应内容为：\n", json.dumps(response_json, ensure_ascii=False))
             return response_json
         except requests.exceptions.RequestException as e:

smartpush/base/url_enum.py

@@ -38,6 +38,12 @@ class URL:
         crowdPackageDetail = '/crowdPackage/detail', POST
         crowdPackageList = '/crowdPackage/list', POST
 
+    class Contacts(BaseEnum):
+        """
+        :type 联系人
+        """
+        getContactPersonList = '/contact/getContactPersonList', POST
+
     class Form(BaseEnum):
         """
         :type 表单操作

smartpush/contacts/contacts.py

@@ -0,0 +1,40 @@
+import json
+import time
+
+from tenacity import retry, stop_after_attempt, wait_exponential
+
+from smartpush.base.request_base import RequestBase
+from smartpush.base.url_enum import URL
+
+
+class Contacts(RequestBase):
+
+    def callGetContactPersonList(self, value):
+        """
+        查询联系人信息
+        :param value:
+        :return:
+        """
+        requestParam = {"rules": {"query": value}, "sessionId": "", "page": 1, "pageSize": 20}
+        result = self.request(method=URL.Contacts.getContactPersonList.method,
+                              path=URL.Contacts.getContactPersonList.url, data=requestParam)
+        return result['resultData']
+
+
+class AssertContacts(Contacts,):
+    tries=3
+    @retry(stop=stop_after_attempt(tries), wait=wait_exponential(multiplier=1, min=1, max=2))
+    def AssertEmailOrNameInContactPersonList(self, value, subscribeEmailStatus=False, subscribeSmsStatus=False):
+        result = self.callGetContactPersonList(value)
+        contactPersonDetailList = result['resultData']['contactPersonDetailList']
+        for contactPersonDetail in contactPersonDetailList:
+            contactPersonDetailEmail = contactPersonDetail['email']
+            contactPersonDetailName = contactPersonDetail['userName']
+            contactPersonDetailSubscribeEmailStatus = contactPersonDetail['subscribeEmailStatus']
+            contactPersonDetailSubscribeSmsStatus = contactPersonDetail['subscribeSmsStatus']
+            # 断言内容
+            assert contactPersonDetailEmail == value or contactPersonDetailName == value
+            assert contactPersonDetailSubscribeEmailStatus == subscribeEmailStatus
+            assert contactPersonDetailSubscribeSmsStatus == subscribeSmsStatus
+
+

smartpush/crowd/crowd.py

@@ -1,9 +1,12 @@
 import json
 import time
 
+from tenacity import retry, stop_after_attempt, wait_fixed
+
 from smartpush.base.request_base import CrowdRequestBase, RequestBase
 from smartpush.base.url_enum import URL
 from smartpush.export.basic.ExcelExportChecker import compare_dicts
+from smartpush.export.basic.GetOssUrl import log_attempt
 from smartpush.utils import ListDictUtils
 
 
@@ -93,6 +96,20 @@ class CrowdList(RequestBase):
         resultData = result['resultData']
         return resultData
 
+class AssertCrowd(Crowd):
+    def __init__(self, crowd_id, host, headers, **kwargs):
+        super(AssertCrowd, self).__init__(crowd_id=crowd_id, host=host, headers=headers, **kwargs)
+        self.crowd_id = crowd_id
+
+    @retry(stop=stop_after_attempt(3), wait=wait_fixed(3), after=log_attempt)
+    def assert_filter_value_in_person_package(self, page=1, pageSize=20, filter_type=None, operator='eq', filter_value=None):
+        try:
+            crowd_persons = super.callCrowdPersonListInPackage(page=page, pageSize=pageSize, filter_type=filter_type, operator=operator, filter_value=filter_value)
+            assert crowd_persons['num'] >=1
+            assert crowd_persons['responseResult'][0][filter_type] == filter_value
+        except:
+            raise
+
 
 if __name__ == '__main__':
     host = "https://test.smartpushedm.com/bff/api-em-ec2"

{smartpush-2.0.8.dist-info → smartpush-2.1.0.dist-info}/METADATA

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

{smartpush-2.0.8.dist-info → smartpush-2.1.0.dist-info}/RECORD

@@ -1,14 +1,15 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=s3hPwC6KePS5BtqNS9o15eCh7Nx2gn16bn6tfYK0iQI,18112
-smartpush/test.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/account/operate_account.py,sha256=nzJLLAEwNElavZeWVqnA_MSGTBzQrSrknmezYBwtvWs,1525
 smartpush/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/base/faker_data.py,sha256=-OcFFQnDGpjZR3guo_tHfxV7zQEHo9ciidWGqKv_jNs,25437
-smartpush/base/request_base.py,sha256=hP5uhCwOMlCgwKjyh1PhJ5fCmWY-8LowZdW97r5cm_0,2938
-smartpush/base/url_enum.py,sha256=OuEd3EqlLvKiYesU2gISPLh9wH2nNYZ-5nzBu_6Zxnw,2748
+smartpush/base/request_base.py,sha256=uVb1Na-D8K8qBP69sQhiAYvFG3uKMuXQ5PJwnr9-u5k,3035
+smartpush/base/url_enum.py,sha256=47XCczKEvTcO6Ap4VbEfV7K_S0t2xu3O434sHqwycE4,2896
+smartpush/contacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+smartpush/contacts/contacts.py,sha256=JssmzyHmFF6TeIKpFH6VvGC5abBXOzkSwZrAWA8v8a8,1718
 smartpush/crowd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/crowd/crowd.py,sha256=KNwvX-BnBnMVVuHM79a-VeBMp_guB-Kqw3tFaAPiAp8,9768
+smartpush/crowd/crowd.py,sha256=jxX8svt6bRytGLSYiZbCn5RnE7OiRZH0QGgPawlMhMU,10646
 smartpush/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/email/activity.py,sha256=rQ62GIfg0Yh0fFkwiaRIVATBn5vY1wZzbLEJLwHmx1E,10016
 smartpush/email/schema.py,sha256=mysik-N6cry4HuSxzMMhQFsnnu5_UJ_oqVPTGY1RUkQ,31471
@@ -36,7 +37,7 @@ smartpush/utils/StringUtils.py,sha256=n8mo9k0JQN63MReImgv-66JxmmymOGknR8pH2fkQrA
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 smartpush/utils/date_utils.py,sha256=Xgx2DbmWYri71xXBiaKYTZDeh2a8MFhYns_xB0U2JOA,13159
 smartpush/utils/form_utils.py,sha256=ld-g_Dm_ZlnagQt7imYfUc87bcBRVlTctywuLtzmjXQ,849
-smartpush-2.0.8.dist-info/METADATA,sha256=D3-WYT04C9a5G0DZbJES26R09PJg78oWBzI4clh5OPY,131
-smartpush-2.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-2.0.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-2.0.8.dist-info/RECORD,,
+smartpush-2.1.0.dist-info/METADATA,sha256=sjwzBM86P_76kduitL3FyIspyM5FmzXi31jp4i3AEY4,131
+smartpush-2.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.1.0.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.1.0.dist-info/RECORD,,