smartpush 2.0.7__py3-none-any.whl → 2.0.9__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,22 @@ class CrowdList(RequestBase):
         resultData = result['resultData']
         return resultData
 
+class AssertCrowd(Crowd):
+    def __init__(self,try_number = 3):
+        super(AssertCrowd, self).__init__()
+        self.try_number = try_number
+    def getTryNumber(self):
+        return self.try_number
+
+    @retry(stop=stop_after_attempt(getTryNumber()), 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/openapi/openapi.py

@@ -5,9 +5,9 @@ from smartpush.base.url_enum import URL
 
 
 class OpenApi(OpenApiRequestBase):
-    def __init__(self, event_id=None, *args, **kwargs):
+    def __init__(self, host, headers, event_id=None, **kwargs):
         """初始化OpenApi，支持传入event_id"""
-        super().__init__(*args, **kwargs)  # 调用父类初始化
+        super().__init__(event_id, host, headers, **kwargs)
         self.event_id = event_id  # 初始化event_id属性
         self.attrTypeList = ('STRING', 'BIGINT', 'BOOLEAN', 'DATE', 'DECIMAL')
 
@@ -37,8 +37,8 @@ class OpenApi(OpenApiRequestBase):
         if code:
             requestParam["code"] = code
         result = self.request(
-            URL.OpenApi.getEventMetaList.url,
-            URL.OpenApi.getEventMetaList.method,
+            path=URL.OpenApi.getEventMetaList.url,
+            method=URL.OpenApi.getEventMetaList.method,
             data=requestParam
         )
         return result
@@ -53,8 +53,8 @@ class OpenApi(OpenApiRequestBase):
             raise ValueError("event_id未初始化，请在实例化时传入")
         requestParam = {"id": self.event_id, "eventCode": eventCode}
         result = self.request(
-            URL.OpenApi.getEventMetaById.url,
-            URL.OpenApi.getEventMetaById.method,
+            path=URL.OpenApi.getEventMetaById.url,
+            method=URL.OpenApi.getEventMetaById.method,
             data=requestParam
         )
         return result
@@ -69,8 +69,8 @@ class OpenApi(OpenApiRequestBase):
             raise ValueError("event_id未初始化，请在实例化时传入")
         requestParam = {"id": self.event_id, "eventCode": eventCode}
         result = self.request(
-            URL.OpenApi.delEventMetaById.url,
-            URL.OpenApi.delEventMetaById.method,
+            path=URL.OpenApi.delEventMetaById.url,
+            method=URL.OpenApi.delEventMetaById.method,
             data=requestParam
         )
         return result
@@ -97,8 +97,8 @@ class OpenApi(OpenApiRequestBase):
             }
         }
         result = self.request(
-            URL.OpenApi.editEventMeta.url,
-            URL.OpenApi.editEventMeta.method,
+            path=URL.OpenApi.editEventMeta.url,
+            method=URL.OpenApi.editEventMeta.method,
             data=requestParam
         )
         return result
@@ -106,15 +106,17 @@ class OpenApi(OpenApiRequestBase):
     def getEventChannel(self):
         # requestParam = {"id": self.event_id, "eventCode": eventCode}
         result = self.request(
-            URL.OpenApi.getEventChannel.url,
-            URL.OpenApi.getEventChannel.method,
+            path=URL.OpenApi.getEventChannel.url,
+            method=URL.OpenApi.getEventChannel.method,
         )
         return result
 
-    def getEventAttr(self):
+    def getEventAttr(self, pageSize=200, pageNumber=1):
+        requestParam = {"pageSize": pageSize, "pageNum": pageNumber}
         result = self.request(
-            URL.OpenApi.getEventAttr.url,
-            URL.OpenApi.getEventAttr.method,
+            path=URL.OpenApi.getEventAttr.url,
+            method=URL.OpenApi.getEventAttr.method,
+            data=requestParam
         )
         return result
 
@@ -157,3 +159,27 @@ class AssertOpenApi(OpenApi):
             if is_delete and event_id:
                 self.event_id = event_id
                 self.deleteEventMetaById(code)
+
+    def assert_event_attr_create_success(self, attr_code):
+        """
+        断言事件字段添加成功，并返回attr的id
+        :param attr_code:
+        :return:
+        :rtype: tuple[bool, Any]
+        """
+        datas = self.getEventAttr().get('resultData', {}).get('datas', []).get('eventAttrs', [])
+        for data in datas:
+            if data.get('attrCode') == attr_code:
+                return True,data.get("attrMetaTabi")
+        assert False, f'{attr_code} 新增失败'
+
+
+if __name__ == '__main__':
+    head = {'Content-Type': 'application/json',
+            'cookie': 'osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000142BLW1n/EjSTsnwj+GuvYaBsRpZKHfrkfcwypZmDI/ehcXOLaz0i6efc9ot2EmTuPrdEdroZb2nq2KcvcvhQsv7AWwcNMOQ2odLp2dSQFxS7HFcanEI1t8t1sDag3Btf/unj8TzEV+7QkfaB97O+8m;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjcxNTM2NTYsImp0aSI6IjUxODM2Y2Q1LTliYmEtNDdkMS1hN2ZkLTRkYWFjMmZlMjdmNSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIiwiaXNGaXJzdEJpbmQiOmZhbHNlfSwibG9naW5UaW1lIjoxNzY0NTYxNjU2NzA1LCJzY29wZSI6WyJlbWFpbC1tYXJrZXQiLCJjb29raWUiLCJzbC1lY29tLWVtYWlsLW1hcmtldC1uZXctdGVzdCIsImVtYWlsLW1hcmtldC1uZXctZGV2LWZzIiwiYXBpLXVjLWVjMiIsImFwaS1zdS1lYzIiLCJhcGktZW0tZWMyIiwiZmxvdy1wbHVnaW4iLCJhcGktc3AtbWFya2V0LWVjMiJdLCJjbGllbnRfaWQiOiJlbWFpbC1tYXJrZXQifQ.bgfuaOJqX2BXDmOorrWrE6iiQswpqYO0bW78pwbP4Wk;',
+            'authorization': 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NjcxNTM2NTYsImp0aSI6IjUxODM2Y2Q1LTliYmEtNDdkMS1hN2ZkLTRkYWFjMmZlMjdmNSIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIiwiaXNGaXJzdEJpbmQiOmZhbHNlfSwibG9naW5UaW1lIjoxNzY0NTYxNjU2NzA1LCJzY29wZSI6WyJlbWFpbC1tYXJrZXQiLCJjb29raWUiLCJzbC1lY29tLWVtYWlsLW1hcmtldC1uZXctdGVzdCIsImVtYWlsLW1hcmtldC1uZXctZGV2LWZzIiwiYXBpLXVjLWVjMiIsImFwaS1zdS1lYzIiLCJhcGktZW0tZWMyIiwiZmxvdy1wbHVnaW4iLCJhcGktc3AtbWFya2V0LWVjMiJdLCJjbGllbnRfaWQiOiJlbWFpbC1tYXJrZXQifQ.bgfuaOJqX2BXDmOorrWrE6iiQswpqYO0bW78pwbP4Wk'}
+    openapi = OpenApi(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
+    # openapi.getEventMetaList(channel= 'Smartpush_API')
+    assertopenapi = AssertOpenApi(headers=head, host='https://test.smartpushedm.com/bff/api-sp-market-ec2')
+    print(assertopenapi.assert_event_attr_create_success('cus_autotest_int'))
+    # assert False

{smartpush-2.0.7.dist-info → smartpush-2.0.9.dist-info}/METADATA

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

{smartpush-2.0.7.dist-info → smartpush-2.0.9.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=ipk2wjPdYlw4xCJw-MPhXuhCJJE1ammiqptlEil6EXU,10647
 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
@@ -28,7 +29,7 @@ smartpush/form/form_assert.py,sha256=wPIRfQHhr7lN1fFd-mp0z_qKMtF4jfrNxRWvp2xfqCg
 smartpush/form/form_before.py,sha256=CCvAC_2yWPlnQGtjEA8LPLy9853Nq3nNjcL2GewFWIs,175
 smartpush/form/form_client_operation.py,sha256=gg-5uHXCyMa_ypBSYPYFVxXdwZdYBJsNtUCqayknMBw,303
 smartpush/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush/openapi/openapi.py,sha256=SFZ4HHjHgEQ5HVZu6-r_97C_dhRe6M8McrgaqGjEG5g,5558
+smartpush/openapi/openapi.py,sha256=8qCTvflRQBI-z1jc2hN8ISah_x9ceTf6HbfkTxSEFsc,9548
 smartpush/utils/DataTypeUtils.py,sha256=BC7ioztO3vAfKd1EOoNvXdVuXYY8qjNskV1DP7LhW-M,1082
 smartpush/utils/EmailUtlis.py,sha256=DAHd73bJ8hiJCLEXtD0xcwxPD7SOPSmBB7Jvlf6gN6s,11201
 smartpush/utils/ListDictUtils.py,sha256=Xc8kfSOZjX_k026Au4cfvtgFh5WoHxw4yRJWASyA_Cc,5041
@@ -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.7.dist-info/METADATA,sha256=O5ZwtC49PI2pCh1dafsPRTGR13CSgWKGlJHMnmQdL5Y,131
-smartpush-2.0.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-2.0.7.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-2.0.7.dist-info/RECORD,,
+smartpush-2.0.9.dist-info/METADATA,sha256=DahI0da_ym32xbQYta6LEthfU9d28O_MV-iErogXzBI,131
+smartpush-2.0.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-2.0.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-2.0.9.dist-info/RECORD,,