Merge branch 'master' into cuixin_dev

all_backend_api/doctor_request.py

@@ -12,7 +12,22 @@ class doctor_request(BaseRequest):
         self.params["doctor_id"] = doctor_id
         return self.api_send(self.data["article"])
 
+    #医生主页详情
+    def detail(self):
+        return self.api_send(self.data["detail"])
+
+    #医生主页案例列表
+    def diary(self, doctor_id):
+        self.params["doctor_id"] = doctor_id
+        return self.api_send(self.data["diary"])
+
 
 if __name__ == '__main__':
     #打印医生/医院主页-医生说/医院说列表接口返回
-    print(doctor_request().article("9918ad7eb8f511e58f8200163e000a4a"))
\ No newline at end of file
+    print(doctor_request().article("9918ad7eb8f511e58f8200163e000a4a"))
+
+    #打印医生主页详情接口返回
+    print(doctor_request.detail())
+
+    #打印医生主页案例列表接口返回
+    print(doctor_request.diary("5bd9f05cad51403d853ba8c881989e23"))
\ No newline at end of file

all_backend_api/doctor_request.yaml

@@ -9,4 +9,23 @@ article:
     own_page: 0
     doctor_type: 0
   data: {}
+  json: {}
+
+#医生主页详情
+detail:
+  method: get
+  url: /api/doctor/5bd9f05cad51403d853ba8c881989e23/detail
+  params: {}
+  data: {}
+  json: {}
+
+#医生主页案例列表
+diary:
+  method: get
+  url: /api/doctor/diary
+  params:
+    doctor_id: ${doctor_id}
+    count: 4
+    page: 1
+  data: {}
   json: {}
\ No newline at end of file

all_backend_api/doctor_v2_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class doctor_v2_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.DOCTOR_V2_CONFIG)
+
+    #医生主页商品列表
+    def services(self):
+        return self.api_send(self.data["services"])
+
+
+if __name__ == '__main__':
+    #打印医生主页商品列表接口返回
+    print(doctor_v2_request().services())
\ No newline at end of file

all_backend_api/doctor_v2_request.yaml

+#医生主页商品列表
+services:
+  method: get
+  url: /api/doctor_v2/5bd9f05cad51403d853ba8c881989e23/services
+  params:
+    offset: 0
+    show_tag_distro: 1
+    tag_id: all
+    size: 10
+  data: {}
+  json: {}
\ No newline at end of file

all_backend_api/gmai_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class gmai_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.GMAI_SKIN_NEWREPORT_CONFIG)
+
+    # 测颜值结果页
+    def skin_newReport(self,version,image_url):
+        self.params["version"] = version
+        self.params["image_url"] = image_url
+
+        return self.api_send(self.data["skin_newReport"])
+
+    # 模拟双眼皮
+    def eyelids_plastic(self,version,image_url,style_id):
+        self.params["version"] = version
+        self.params["image_url"] = image_url
+        self.params["style_id"] = style_id
+
+        return self.api_send(self.data["eyelids_plastic"])
+
+
+
+# if __name__ == '__main__':
+#     # print(gmai_request().skin_newReport("7.43.0","https://pic.igengmei.com/2021/05/11/1440/25e4bf45673f-s"))
+#     # print(gmai_request().eyelids_plastic("7.43.0", "2021/05/12/1457/cdbe8652117d","3"))

all_backend_api/gmai_request.yaml

+skin_newReport:
+  method: post
+  url: /gm_ai/skin/new_report
+  params:
+    version: ${version}
+  data:
+    image_url: ${image_url}
+
+
+eyelids_plastic:
+  method: post
+  url: /gm_ai/eyelids/plastic
+  params:
+    version: ${version}
+  data:
+    image_url: ${image_url}
+    style_id: ${style_id}

all_backend_api/janus_request.py

@@ -45,5 +45,13 @@ class janus_request(BaseRequest):
 
         return self.api_send(self.data['hospital_search'])
 
+    #购物车-猜你喜欢列表
+    def mine_guess_you_like(self):
+        return self.api_send(self.data["mine_guess_you_like"])
+
+
+if __name__ == '__main__':
+    #打印购物车-猜你喜欢列表接口返回
+    print(janus_request().mine_guess_you_like())
 
 

all_backend_api/janus_request.yaml

@@ -28,6 +28,16 @@ hospital_search:
   data: { }
   json: { }
 
+#购物车-猜你喜欢
+mine_guess_you_like:
+  method: get
+  url: /api/janus/product/mine_guess_you_like
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1
+
+
 
 
 

all_backend_api/shopcart_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class shopcart_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.SHOPCART_CONFIG)
+
+    #购物车列表
+    def list(self):
+        return self.api_send(self.data["list"])
+
+
+if __name__ == '__main__':
+    #打印购物车列表接口返回
+    print(shopcart_request().list())
\ No newline at end of file

all_backend_api/shopcart_request.yaml

+#购物车列表
+list:
+  method: get
+  url: /api/shopcart/list/v2
+  params: {}
+  data: {}
+  json: {}
+  isLogin: 1
\ No newline at end of file

in_common/base_request.py

@@ -64,9 +64,9 @@ class BaseRequest:
         host = self.api_load(path_setting.HOSTYAML_CONFIG)
         url_host = ""
 
-        if host["develop_host"].get("doctor") == "http://doctor.paas-develop.env":
+        if host["develop_host"].get("doctor") is not None:
             url_host = host['develop_host']['doctor']
-        elif host["develop_host"].get("backend") == "http://backend.paas-develop.env":
+        elif host["develop_host"].get("backend") is not None:
             url_host = host['develop_host']['backend']
 
         raw = yaml.dump(req)  # 将一个python对象生成为yaml文档

path_setting.py

@@ -50,6 +50,12 @@ ONEIMAGE_SHARE_V4_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/
 # 测颜值根据五官推荐美购
 ONEIMAGE_RECOMEND_SERVICES_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/oneimage_data", "recomend_services.yaml")
 
+# 测肤结果页
+GMAI_SKIN_NEWREPORT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "gmai_request.yaml")
+GMAI_SKIN_NEWREPORT_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "skin_newReport.yaml")
+# 模拟双眼皮
+GMAI_EYELIDS_PLASTIC_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/gmai_data", "eyelids_plastic.yaml")
+
 LOGIN_PASSWD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/accounts_data", "login_passwd.yaml")
 LOGIN_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "accounts_request.yaml")
 
@@ -67,10 +73,23 @@ HOSPITAL_DIARY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hospital
 #医生/医院主页-医生/医院说列表
 DOCTOR_ARTICLE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "doctor_request.yaml")
 DOCTOR_ARTICLE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/doctor_data", "article.yaml")
+#医生主页详情
+DOCTOR_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/doctor_data", "detail.yaml")
+#医生主页案例列表
+DOCTOR_DIARY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/doctor_data", "diary.yaml")
+#医生主页商品列表
+DOCTOR_V2_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "doctor_v2_request.yaml")
+DOCTOR_V2_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/doctor_v2_data", "services.yaml")
 #医生/医院主页-问答列表
 USER_ANSWER_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
 USER_ANSWER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "answer.yaml")
 
+#购物车列表
+SHOPCART_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "shopcart_request.yaml")
+SHOPCART_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/shopcart_data", "list.yaml")
+#购物车-猜你喜欢列表
+JANUS_MINE_GUESS_YOU_LIKE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "mine_guess_you_like.yaml")
+
 #消息列表
 MY_CONVERSATION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "my_conversation_request.yaml")
 MY_CONVERSATION = os.path.join(BASE_DIR, "backend_auto/test_backend_data/my_conversation_data", "my_conversation.yaml")

test_backend_case/doctor_case/test_detail.py

+import pytest
+
+from all_backend_api.doctor_request import doctor_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestDetail:
+    data = BaseRequest().api_load(path_setting.DOCTOR_DETAIL)
+    detail_case, detail_data = get_ids(data, "detail")
+
+    @pytest.mark.parametrize("param", detail_data, ids=detail_case)
+    def test_detail(self, param):
+        r = doctor_request().detail()
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_case/doctor_case/test_diary.py

+import pytest
+
+from all_backend_api.doctor_request import doctor_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestDiary:
+    data = BaseRequest().api_load(path_setting.DOCTOR_DIARY)
+    diary_case, diary_data = get_ids(data, "diary")
+
+    @pytest.mark.parametrize("param", diary_data, ids=diary_case)
+    def test_diary(self, param):
+        r = doctor_request().diary(param["doctor_id"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_case/doctor_v2_case/test_services.py

+import pytest
+
+from all_backend_api.doctor_v2_request import doctor_v2_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestServices:
+    data = BaseRequest().api_load(path_setting.DOCTOR_V2_SERVICE)
+    services_case, services_data = get_ids(data, "services")
+
+    @pytest.mark.parametrize("param", services_data, ids=services_case)
+    def test_services(self, param):
+        r = doctor_v2_request().services()
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_case/gmai_case/test_eyelids_plastic.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.gmai_request import gmai_request
+
+# 模拟双眼皮效果
+class TestEyelidsPlastic:
+    data = BaseRequest().api_load(path_setting.GMAI_EYELIDS_PLASTIC_DATA)
+    eyelidsplastic_case, eyelidsplastic_data = get_ids(data, "eyelids_plastic")
+
+    @pytest.mark.parametrize("param",eyelidsplastic_data,ids=eyelidsplastic_case)
+    def test_skinnewReport(self,param):
+        r = gmai_request().eyelids_plastic(param["version"], param["image_url"],param["style_id"])
+        assert r["error"] == 0
+        print("模拟双眼皮效果图片：  ",r["data"]["plastic_image_url"])
\ No newline at end of file

test_backend_case/gmai_case/test_skin_newreport.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.gmai_request import gmai_request
+
+# 测肤结果页
+class TestSkinNewReport:
+    data = BaseRequest().api_load(path_setting.GMAI_SKIN_NEWREPORT_DATA)
+    skinnewReport_case, skinnewReport_data = get_ids(data, "skin_newReport")
+
+    @pytest.mark.parametrize("param",skinnewReport_data,ids=skinnewReport_case)
+    def test_skinnewReport(self,param):
+        r = gmai_request().skin_newReport(param["version"], param["image_url"])
+        if r["error"] == 0:
+            data = r.get("data")
+
+            # 大家都在买
+            packages = data.get("packages")
+            assert len(packages) == 6
+
+            # 皮肤检测结果
+            disadvantage_tabs = data.get("disadvantage_tabs")
+            result_word = disadvantage_tabs[0].get("result_word")
+            assert result_word == "色素型黑眼圈"
+
+
+

test_backend_case/janus_case/test_mine_guess_you_like.py

+import pytest
+
+from all_backend_api.janus_request import janus_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestMineGuessYouLike:
+    data = BaseRequest().api_load(path_setting.JANUS_MINE_GUESS_YOU_LIKE)
+    mine_guess_you_like_case, mine_guess_you_like_data = get_ids(data, "mine_guess_you_like")
+
+    @pytest.mark.parametrize("param", mine_guess_you_like_data, ids=mine_guess_you_like_case)
+    def test_mine_guess_you_like(self, param):
+        r = janus_request().mine_guess_you_like()
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_case/shopcart_case/test_list.py

+import pytest
+
+from all_backend_api.shopcart_request import shopcart_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestList:
+    data = BaseRequest().api_load(path_setting.SHOPCART_LIST)
+    list_case, list_data = get_ids(data, "list")
+
+    @pytest.mark.parametrize("param", list_data, ids=list_case)
+    def test_list(self, param):
+        r = shopcart_request().list()
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]

test_backend_data/doctor_data/detail.yaml

+detail:
+  -
+    case: "校验接口返回成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/doctor_data/diary.yaml

+diary:
+  -
+    case: "校验接口返回成功case"
+    doctor_id: 5bd9f05cad51403d853ba8c881989e23
+    assert_error: 0
\ No newline at end of file

test_backend_data/doctor_v2_data/services.yaml

+services:
+  -
+    case: "校验接口返回成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/gmai_data/eyelids_plastic.yaml

+eyelids_plastic:
+#模拟双眼皮效果
+  -
+    case: "平行双眼皮效果"
+    version: "7.43.0"
+    image_url: "2021/05/12/1457/cdbe8652117d"
+    style_id: "1"
+
+
+  -
+    case: "开扇双眼皮效果"
+    version: "7.43.0"
+    image_url: "2021/05/12/1457/cdbe8652117d"
+    style_id: "3"
\ No newline at end of file

test_backend_data/gmai_data/skin_newReport.yaml

+skin_newReport:
+#测颜值根据五官推荐美购
+  -
+    case: "请求成功"
+    version: "7.43.0"
+    image_url: "https://pic.igengmei.com/2021/05/11/1440/25e4bf45673f-s"
+    assert: 1
\ No newline at end of file

test_backend_data/hospitals_v2_data/services.yaml

@@ -2,31 +2,31 @@ services:
   -
     case: "校验接口调用成功case"
     assert_error: 0
-    assert_sku: 546450
-    assert_spu: 5866530
+    assert_sku: 608136
+    assert_spu: 5844882
     assert_discount: True
     assert_sales: 3
     assert_card_type: "card"
-    assert_title: "【G点注射】G点注射激活修复，G点玻尿酸注射唤醒 提升G点敏感度 提升塑造敏感G点 G点增厚 小阴唇整形 修复矫正"
+    assert_title: "【阴道紧缩】菲蜜丽激光外阴收紧，【激光阴道紧缩】进口菲蜜丽 外阴收紧 小阴唇整形+私密清洁 阴道紧致 紧致润滑 产后修复 改善松弛"
     assert_tagselected: true
   -
     case: "校验商品数据case"
     assert_error: 0
-    assert_sku: 546450
-    assert_spu: 5866530
+    assert_sku: 608136
+    assert_spu: 5844882
     assert_discount: True
     assert_sales: 3
     assert_card_type: "card"
-    assert_title: "【G点注射】G点注射激活修复，G点玻尿酸注射唤醒 提升G点敏感度 提升塑造敏感G点 G点增厚 小阴唇整形 修复矫正"
+    assert_title: "【阴道紧缩】菲蜜丽激光外阴收紧，【激光阴道紧缩】进口菲蜜丽 外阴收紧 小阴唇整形+私密清洁 阴道紧致 紧致润滑 产后修复 改善松弛"
     assert_tagselected: true
   -
     case: "校验商品标签数据case"
     assert_error: 0
-    assert_sku: 546450
-    assert_spu: 5866530
+    assert_sku: 608136
+    assert_spu: 5844882
     assert_discount: True
     assert_sales: 3
     assert_card_type: "card"
-    assert_title: "【G点注射】G点注射激活修复，G点玻尿酸注射唤醒 提升G点敏感度 提升塑造敏感G点 G点增厚 小阴唇整形 修复矫正"
+    assert_title: "【阴道紧缩】菲蜜丽激光外阴收紧，【激光阴道紧缩】进口菲蜜丽 外阴收紧 小阴唇整形+私密清洁 阴道紧致 紧致润滑 产后修复 改善松弛"
     assert_tagselected: true
 

test_backend_data/janus_data/mine_guess_you_like.yaml

+mine_guess_you_like:
+  -
+    case: "校验接口返回成功case"
+    assert_error: 0
\ No newline at end of file

test_backend_data/oneimage_data/recomend_services.yaml

@@ -3,5 +3,5 @@ recomend_services:
   -
     case: "请求成功，返回个数正确"
     version: "7.42.2"
-    business_tags_names: '[["鼻翼缩小","玻尿酸隆鼻","耳软骨隆鼻","鼻中隔软骨隆鼻"]]'
-    assert: 1
\ No newline at end of file
+    business_tags_names: '[["玻尿酸垫下巴","自体脂肪垫下巴","硅胶垫下巴","膨体垫下巴"],["半永久纹眉","植眉"]]'
+    assert: 2
\ No newline at end of file

test_backend_data/shopcart_data/list.yaml

+list:
+  -
+    case: "校验接口返回成功case"
+    assert_error: 0
\ No newline at end of file