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

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.8.dist-info}/METADATA

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

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

@@ -28,7 +28,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 +36,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.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,,