Merge branch 'common_dev' into zwn_dev

all_backend_api/im_request.py

@@ -6,14 +6,14 @@ class im_request(BaseRequest):
     def __init__(self):
         self.data = self.api_load(path_setting.CONVERSATION_DETAIL_CONFIG)
 
-    #def conversation_detail(self, current_city_id, begin_msg_id, conversation_type, end_msg_id,referrer):
+    def conversation_detail(self, current_city_id, begin_msg_id, conversation_type, end_msg_id,referrer):
         #咨询师聊天详情页
-        #self.params["current_city_id"] = current_city_id
-        #self.params["begin_msg_id"] = begin_msg_id
-        #self.params["conversation_type"] = conversation_type
-        #self.params["end_msg_id"] = end_msg_id
-        #self.params["referrer"] = referrer
-        #return self.api_send(self.data["conversation_detail"])
+        self.params["current_city_id"] = current_city_id
+        self.params["begin_msg_id"] = begin_msg_id
+        self.params["conversation_type"] = conversation_type
+        self.params["end_msg_id"] = end_msg_id
+        self.params["referrer"] = referrer
+        return self.api_send(self.data["conversation_detail"])
         #该接口已下线
 
     def auto_msg(self, trace_id, conversation_id):

all_backend_api/user_request.py

@@ -148,9 +148,27 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_answers"])
 
+    #忘记密码-设置密码
+    def change_pwd(self,version, change_type,new_password, repeat_password):
+        self.params["version"] = version
+        self.params["change_type"] = change_type
+        self.params["new_password"] = new_password
+        self.params["repeat_password"] = repeat_password
 
+        return self.api_send(self.data["change_pwd"])
 
+    # 修改密码
+    def change_pwdd(self, version, change_type, password, new_password, repeat_password):
+        self.params["version"] = version
+        self.params["change_type"] = change_type
+        self.params["password"] = password
+        self.params["new_password"] = new_password
+        self.params["repeat_password"] = repeat_password
+        return self.api_send(self.data["change_pwdd"])
 
+    #点击修改密码时获取用户信息
+    def check_pwd(self):
+        return self.api_send(self.data["check_pwd"])
 
 if __name__ == '__main__':
     #个人中心
@@ -188,6 +206,15 @@ if __name__ == '__main__':
     # 我的-收藏-日记贴
     print(user_request().favors_topics(0, 10))
 
+    #忘记密码-修改密码
+    print(user_request().change_pwd('7.48.0',1,123456,123456))
+
+    #修改密码
+    print(user_request().change_pwdd('7.48.0',123456,1,123456,123456))
+
+    #修改密码时获取账号信息
+    print(user_request().check_pwd())
+
 
 
 

all_backend_api/user_request.yaml

@@ -210,3 +210,39 @@ favors_answers:
   data: {}
   json: {}
   isLogin: 1
+
+#忘记密码-设置密码
+change_pwd:
+  method: post
+  url: /api/user/change_pwd
+  params:
+    version: ${version}
+  data:
+    change_type: ${change_type}
+    new_password: ${new_password}
+    repeat_password: ${repeat_password}
+  json: {}
+  isLogin: 1
+
+#修改密码
+change_pwdd:
+  method: post
+  url: /api/user/change_pwd
+  params:
+    version: ${version}
+  data:
+    password: ${password}
+    change_type: ${change_type}
+    new_password: ${new_password}
+    repeat_password: ${repeat_password}
+  json: {}
+  isLogin: 1
+
+#修改密码时获取用户信息
+check_pwd:
+  method: get
+  url: /api/user/check_pwd
+  params:
+  data:
+  json: {}
+  isLogin: 1
\ No newline at end of file

all_backend_api/verification_code_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+#获取验证码
+class verification_code_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.VERIFICATION_CODE_REQUEST_CONFIG)
+#获取验证码
+    def verification_code(self, phone,type,verifier):
+        self.params["phone"] = phone
+        self.params["type"] = type
+        self.params["verifier"] = verifier
+        return self.api_send(self.data["verification_code"])
+
+if __name__ == '__main__':
+    print(verification_code_request().verification_code(12345678999,2, 'fd94aa08c242a00496aba1e5b556c436'))
\ No newline at end of file

all_backend_api/verification_code_request.yaml

+verification_code:
+  method: post
+  url: /api/verification_code
+  params: {}
+  data:
+    phone: ${phone}
+    type: ${type}
+    verifier: ${verifier}
+  json: {}
\ No newline at end of file

all_backend_api/visual_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class visual_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.VISUAL_CONFIG)
+
+    # 签到--其他tab 美购feed
+    def service_list(self, unit_id, current_city_id='beijing'):
+        self.params["unit_id"] = unit_id
+        self.params["current_city_id"] = current_city_id
+        return self.api_send(self.data['service_list'])
\ No newline at end of file

all_backend_api/visual_request.yaml

+#签到--其他tab 美购feed
+service_list:
+  method: GET
+  url:  /api/visual/service_list
+  params:
+    #组件id
+    unit_id : ${unit_id}
+    current_city_id : ${current_city_id}
+  data: {}
+  json: {}
+  is_Login: 1

all_doctor_api/web3_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class web3_request(BaseRequest):
+    def __init__(self):
+        self.CONVERSATION_ROBOT = self.api_load(path_setting.CONVERSATION_ROBOT)
+
+    def conversation_robot_get_page(self):
+        return self.api_send(self.CONVERSATION_ROBOT["conversation_robot_get_page"])
+
+
+if __name__ == '__main__':
+    print(web3_request().conversation_robot_get_page())

all_doctor_api/web3_request.yaml

+conversation_robot_get_page:
+  method: get
+  url: /api/web3/conversation/robot/get_page
+  params: {}
+
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录
\ No newline at end of file

all_doctor_api/web_request.py

@@ -15,6 +15,23 @@ class web_request(BaseRequest):
     def doctor_submechanisms(self) :
         return self.api_send(self.ACCOUNT_URL["doctor_submechanisms"])
 
+    # 医生后台-商户管理-医生管理列表
+    def doctor_doctorlist(self,doctor_type):
+        self.params["doctor_type"] = doctor_type
+        return self.api_send(self.ACCOUNT_URL["doctor_doctorlist"])
+
+    # 医生后台-商户管理-医生管理列表--创建医生发送验证码
+    def doctor_verificationcode(self,phone):
+        self.params["phone"] = phone
+        return self.api_send(self.ACCOUNT_URL["doctor_verificationcode"])
+
+    # 医生后台-商户管理-医生管理列表--创建医生上传头像图片
+    def file_upload(self,phone):
+        self.params["phone"] = phone
+        return self.api_send(self.ACCOUNT_URL["file_upload"])
+
+
+
     def service_offline(self,id,csrfmiddlewaretoken):
         self.params["id"] = id
         self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken

all_doctor_api/web_request.yaml

@@ -217,3 +217,34 @@ cpc_community_promote_flows:
   data: {}
   json: {}
   isLogin: 1 #需要登录
+
+#医生后台-商户管理-医生管理列表
+doctor_doctorlist:
+    method: get
+    url: /api/web/doctor/doctorlist
+    params:
+      doctor_type: ${doctor_type}
+    data: { }
+    json: { }
+    isLogin: 1 #需要登录
+
+
+#医生后台-商户管理-医生管理列表--创建医生发送验证码
+doctor_verificationcode:
+  method: post
+  url:  /api/web/doctor/verificationcode
+  params: {}
+  data:
+    phone: ${phone}
+  json: {}
+  isLogin: 1 #需要登录
+
+
+#医生后台-商户管理-医生管理列表--创建医生上传头像图片
+file_upload:
+  method: post
+  url:  /api/web/file/upload
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录
\ No newline at end of file

path_setting.py

@@ -156,10 +156,21 @@ SIGN_EXCHANGED = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_dat
 SIGN_CALENDAR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "sign_calendar.yaml")
 
 
+# 签到--其他 tab feed --也是总的 visual 配置项
+VISUAL_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "visual_request.yaml")
+VISUAL_SERVICE_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/visual_data", "service_list.yaml")
+
+
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")
 
+
+# 医生后台--医生后台-商户管理-医生管理列表
+DOCTORLIST = os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "doctor_doctorlist.yaml")
+# 医生后台-商户管理-医生管理列表--创建医生发送验证码
+DOCTOR_VERIIFICATIONCODE = os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "doctor_verificationcode.yaml")
+
 #医生后台-我的商品
 SERVICE_DATA=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web2_data", "service_list.yaml")
 
@@ -490,6 +501,11 @@ CONVERSATIONCOUPON=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_dat
 #医生后台-发送私信
 CONVERSATIONUSERID=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "conversation_user_id.yaml")
 
+#医生后台-私信机器人
+CONVERSATION_ROBOT = os.path.join(BASE_DIR, "backend_auto/all_doctor_api", "web3_request.yaml")
+ROBOTGETPAGE= os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web3_data", "conversation_robot_get_page.yaml")
+
+
 #医生后台-服务资源
 ADTYPELIST=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "artemis_ad_type_list.yaml")
 #医生后台-我的购物车
@@ -649,7 +665,12 @@ BEAUTY_POST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data"
 #直播关注/取关主播
 FOLLOW_ADD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_add.yaml")
 FOLLOW_DEL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "follow_del.yaml")
-
+#忘记密码-设置密码
+CHANGE_PWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "change_pwd.yaml")
+#修改密码
+CHANGE_PWDD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "change_pwdd.yaml")
+#设置密码时获取用户信息
+CHECK_PWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "check_pwd.yaml")
 
 #主播-推荐袋美购列表展示
 LIVESERVICES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_live_request.yaml")
@@ -792,5 +813,9 @@ FAVORS_ANASWERS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_da
 ACCOUNT_HOMEPAGE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "account_request.yaml")
 ACCOUNT_HOMEPAGE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/account_data", "account_homepage.yaml")
 
+#获取验证码
+VERIFICATION_CODE_REQUEST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "verification_code_request.yaml")
+VERIFICATION_CODE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/verification_code_data", "verification_code.yaml")
+
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)
\ No newline at end of file

test_backend_case/user_case/test_change_pwd.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestChangePwd:
+    data = BaseRequest().api_load(path_setting.CHANGE_PWD)
+    change_pwd_case, change_pwd_data = get_ids(data, "change_pwd")
+
+    @pytest.mark.parametrize("param",change_pwd_data, ids=change_pwd_case)
+    def test_change_pwd(self, param):
+        r = user_request().change_pwd(param["version"], param["change_type"],param["new_password"],param["repeat_password"])
+        if r.get("error_code") == 22006:
+            assert r["message"] == param["assert"]
+        elif r.get("error_code") == -1:
+            assert r["message"] == param["assert"]
+        elif r.get("error") == 0:
+            assert r["error"] == param["assert1"]

test_backend_case/user_case/test_change_pwdd.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestChangePwdd:
+    data = BaseRequest().api_load(path_setting.CHANGE_PWDD)
+    change_pwdd_case, change_pwdd_data = get_ids(data, "change_pwdd")
+
+    @pytest.mark.parametrize("param",change_pwdd_data, ids=change_pwdd_case)
+    def test_change_pwdd(self, param):
+        r = user_request().change_pwdd(param["version"],param["password"] ,param["change_type"],param["new_password"],param["repeat_password"])
+        if r.get("error_code") == 22006:
+            assert r["message"] == param["assert"]
+        elif r.get("error_code") == -1:
+            assert r["message"] == param["assert"]
+        elif r.get("error") == 0:
+            assert r["error"] == param["assert"]
+ #       else:
+  #          assert r["message"] == param["assert2"]

test_backend_case/user_case/test_check_pwd.py

+import pytest
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+class TestCheckPwd:
+    data = BaseRequest().api_load(path_setting.CHECK_PWD)
+    check_pwd_case, check_pwd_data = get_ids(data, "check_pwd")
+
+    @pytest.mark.parametrize("param",check_pwd_data, ids=check_pwd_case)
+    def test_check_pwd(self, param):
+        r = user_request().check_pwd()
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]
\ No newline at end of file

test_backend_case/verification_code_case/test_verification_code.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.verification_code_request import verification_code_request
+
+class TestVerificationCode:
+    data = BaseRequest().api_load(path_setting.VERIFICATION_CODE)
+    verification_code_case, verification_code_data = get_ids(data, "verification_code")
+
+    @pytest.mark.parametrize("param",verification_code_data, ids=verification_code_case)
+    def test_verification_code(self, param):
+        r = verification_code_request().verification_code(param["phone"], param["type"], param["verifier"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert"]

test_backend_case/visual_case/test_service_list.py

+import pytest
+
+import path_setting
+from all_backend_api.visual_request import visual_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+
+class TestServiceList:
+    data = BaseRequest().api_load(path_setting.VISUAL_SERVICE_LIST)
+    service_list_case, service_list_data = get_ids(data, "service_list")
+#
+    @pytest.mark.parametrize("param", service_list_data, ids=service_list_case)
+    def test_service_list(self, param):
+        r = visual_request().service_list(param["unit_id"])
+        assert r["error"] == 0
+        list = r.get("data").get("services",[])
+        assert len(list) == param["len"]
+

test_backend_data/user_data/change_pwd.yaml

+change_pwd:
+#忘记密码-设置密码
+  -
+    case: "新密码不可与旧密码相同"
+    version: 7.47.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert: "新密码不可与旧密码相同"
+    #error_code: 22006
+  -
+    case: "密码不符合要求"
+    version: 7.48.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert: "密码应包含数字、大小写字母、特殊字符的两种或两种以上"
+
+  -
+    case: "密码长度不对"
+    version: 7.48.0
+    change_type: 1
+    new_password: 12345
+    repeat_password: 12345
+    assert: "密码长度在6-16位之间"
+
+  -
+    case: "两次输入密码不一致"
+    version: 7.48.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 1234567
+    assert: "两次输入的密码不一致"
+
+  -
+    case: "修改密码成功"
+    version: 7.48.0
+    change_type: 1
+    new_password: ceshi123
+    repeat_password: ceshi123
+    assert1: 0
+
+  -
+    case: "修改密码成功2"
+    version: 7.47.0
+    change_type: 1
+    new_password: 123456
+    repeat_password: 123456
+    assert1: 0

test_backend_data/user_data/change_pwdd.yaml

+change_pwdd:
+#修改密码
+  -
+    case: "新密码不可与旧密码相同"
+    version: 7.47.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: "新密码不可与旧密码相同"
+
+  -
+    case: "密码不符合要求"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: "密码应包含数字、大小写字母、特殊字符的两种或两种以上"
+
+  -
+    case: "密码长度不对"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 12345
+    repeat_password: 12345
+    assert: "密码长度在6-16位之间"
+
+  -
+    case: "两次输入密码不一致"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 1234567
+    assert: "两次输入的密码不一致"
+
+  -
+    case: "修改密码成功"
+    version: 7.48.0
+    change_type: 0
+    password: 123456
+    new_password: ceshi123
+    repeat_password: ceshi123
+    assert: 0
+
+  -
+    case: "修改密码成功2"
+    version: 7.47.0
+    change_type: 0
+    password: 123456
+    new_password: 123456
+    repeat_password: 123456
+    assert: 0
+
+  -
+    case: "新用户设置密码-密码不符合要求"
+    version: 7.48.0
+    change_type: 0
+    password: {}
+    new_password: 123456
+    repeat_password: 123456
+    assert: "密码应包含数字、大小写字母、特殊字符的两种或两种以上"

test_backend_data/user_data/check_pwd.yaml

+check_pwd:
+#点击修改密码时获取用户信息
+  -
+    case: "点击修改密码时成功获取用户信息"
+    assert: 0
\ No newline at end of file

test_backend_data/verification_code_data/verification_code.yaml

+verification_code:
+  -
+   #发送验证码
+    case: "发送验证码"
+    phone: 12345678999
+    type: 2
+    verifier: 'fd94aa08c242a00496aba1e5b556c436'
+    assert: 0
+
+
+

test_backend_data/visual_data/service_list.yaml

+#签到--其他tab 美购feed
+service_list:
+  -
+    case:  "签到--其他tab 美购feed 校验返回数据数"
+    assert: 0
+    len:  10
+    unit_id:  17923
\ No newline at end of file

test_doctor_case/web3_case/test_conversation_robot_get_page.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web3_request import web3_request
+
+
+class TestConversationRobotGetPage:
+    data = BaseRequest().api_load(path_setting.ROBOTGETPAGE)
+    robot_get_page_case, robot_get_page_data = get_ids(data, "conversation_robot_get_page")
+
+
+    @pytest.mark.parametrize("param",robot_get_page_data,ids=robot_get_page_case)
+    def test_conversation_robot_get_page(self, param):
+        '''私信机器人-获取页面类型'''
+        r = web3_request().conversation_robot_get_page()
+        if r["error"] == 0:
+            #flows_list = r.get("data").get("flows_list", [])
+            assert r["data"]["1"] == param["assert1"]
+            assert r["data"]["2"] == param["assert2"]
+            assert r["data"]["3"] == param["assert3"]

test_doctor_case/web_case/test_doctor_doctorlist.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web_request import web_request
+
+
+class TestDoctorDoctorlist:
+    data = BaseRequest().api_load(path_setting.DOCTORLIST)
+    doctor_doctorlist_case, doctor_doctorlist_data = get_ids(data, "doctor_doctorlist")
+
+
+    @pytest.mark.parametrize("param",doctor_doctorlist_data,ids=doctor_doctorlist_case)
+    def test_doctor_doctorlist(self, param):
+        '''医生列表'''
+        r = web_request().doctor_doctorlist(param['doctor_type'])
+        assert r["error"] == 0
+        assert r["data"]['doctors'] is not None and type(r["data"]['doctors']) is list

test_doctor_case/web_case/test_doctor_verificationcode.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web_request import web_request
+
+
+class TestDoctorVerificationcode:
+    data = BaseRequest().api_load(path_setting.DOCTOR_VERIIFICATIONCODE)
+    doctor_verificationcode_case, doctor_verificationcode_data = get_ids(data, "doctor_verificationcode")
+
+
+    @pytest.mark.parametrize("param",doctor_verificationcode_data,ids=doctor_verificationcode_case)
+    def test_doctor_verificationcode(self, param):
+        '''医生列表'''
+        r = web_request().doctor_verificationcode(param['phone'])
+        assert r["error"] == 0
+        assert r['data']['code'] == param["code"]
+        assert r['data']['message'] == param["message"]
+

test_doctor_data/web3_data/conversation_robot_get_page.yaml

+conversation_robot_get_page:
+  #私信机器人-获取页面类型
+  -
+    case: "私信机器人-获取页面类型"
+    #month: "2021-7"
+    assert1: "商品详情页"
+    assert2: "机构主页"
+    assert3: "医生主页"
+
+

test_doctor_data/web_data/doctor_doctorlist.yaml

+doctor_doctorlist:
+  #医生后台-商户管理-医生管理列表case
+  -
+    case: "医生后台-商户管理-医生管理列表--已创建"
+    assert_size: 10
+    assert: 10
+    doctor_type: 0
+
+  -
+    case: "医生后台-商户管理-医生管理列表--审核中"
+    assert_size: 10
+    assert: 10
+    doctor_type: 1
\ No newline at end of file

test_doctor_data/web_data/doctor_verificationcode.yaml

+doctor_verificationcode:
+  #医生后台-商户管理-医生管理列表--创建医生--医生发送验证码case
+  -
+    case: "医生后台-商户管理-医生管理列表--创建医生--医生发送验证码--发送不存在的用户的手机号"
+    assert_size: 10
+    assert: 10
+    phone: 12341234124
+    message: '请先用该号码在更美pc站或者app注册更美用户账号！'
+    code: 1
+  -
+    case: "医生后台-商户管理-医生管理列表--创建医生--医生发送验证码--发送存在的用户但是已经是医生账号的手机号"
+    assert_size: 10
+    assert: 10
+    phone: 12345654321
+    message: '该手机号已经注册为医生或机构，请更换手机号重新注册！'
+    code: 1
+
+  - case: "医生后台-商户管理-医生管理列表--创建医生--医生发送验证码--发送存在的用户但不是医生账号的手机号"
+    assert_size: 10
+    assert: 10
+    phone: 12341234121
+    message: '发送成功！'
+    code: 0