Merge branch 'common_dev' into chenxue_dev

# Conflicts:
#	all_backend_api/janus_request.py
#	all_backend_api/janus_request.yaml
#	all_backend_api/search_request.py
#	all_backend_api/search_request.yaml
#	host.yaml
#	path_setting.py

all_backend_api/answer_request.py

@@ -5,7 +5,7 @@ from in_common.base_request import BaseRequest
 class answer_request(BaseRequest):
     def __init__(self):
         self.abc = self.api_load(path_setting.DETAIL_CONFIG)
-        print(self.data)
+        # print(self.abc)
 
     # 回答详情页
     def detail(self, current_city_id, answer_id=""):

all_backend_api/hybrid_get_gift_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class hybrid_get_gift_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.HYBRID_GET_GIFT_CONFIG)
+
+    #商祥页-美券列表
+    def get_gift_data(self, gift_id):
+        self.params["gift_id"] = gift_id
+        return self.api_send(self.data["get_gift_data"])
+
+
+if __name__ == '__main__':
+    #打印商祥页-优惠券列表-领取
+    print(hybrid_get_gift_request().get_gift_data("63302"))
\ No newline at end of file

all_backend_api/hybrid_get_gift_request.yaml

+#商祥页-优惠券列表-领取
+get_gift_data:
+  method: post
+  url: /hybrid/get_gift/_data
+  params: {}
+  data:
+    gift_id: ${gift_id}
+  json: {}
+  isLogin: 1
\ No newline at end of file

all_backend_api/hybrid_gift_list_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class hybrid_gift_list_request(BaseRequest):
+
+    def __init__(self):
+        self.data = self.api_load(path_setting.HYBRID_GIFT_LIST_CONFIG)
+
+    #商祥页-美券列表
+    def gift_list_data(self, service_id, gift_type, page):
+        self.params["service_id"] = service_id
+        self.params["gift_type"] = gift_type
+        self.params["page"] = page
+        return self.api_send(self.data["gift_list_data"])
+
+
+if __name__ == '__main__':
+    #打印商祥页-美券列表接口返回
+    print(hybrid_gift_list_request().gift_list_data("5857263", 1, 1))
\ No newline at end of file

all_backend_api/hybrid_gift_list_request.yaml

+#商祥页-美券列表
+gift_list_data:
+  method: get
+  url: /hybrid/gift_list/_data
+  params:
+    service_id: ${service_id}
+    gift_type: ${gift_type}
+    page: ${page}
+  data: {}
+  json: {}
+  isLogin: 1
\ No newline at end of file

all_backend_api/janus_request.py

@@ -4,9 +4,21 @@ from in_common.base_request import BaseRequest
 
 class janus_request(BaseRequest):
     def __init__(self):
+        #捜索结果页-综合/百科tab
         self.data = self.api_load(path_setting.CONTENTV7_CONFIG)
+
+        #医院主页捜索
         self.data = self.api_load(path_setting.HOSPITALSEARCH_CONFIG)
 
+        #品类聚合页面商品列表
+        self.data = self.api_load(path_setting.TAG_SERVICE_CONFIG)
+
+        #品类聚合页面标签和专场
+        self.data = self.api_load(path_setting.POLYMER_CONFIG)
+
+        #医生医院sug列表
+        self.data = self.api_load(path_setting.KEYWORDTIP_CONFIG)
+
     #搜索结果页-综合/百科tab
     def content_v7(self, query, device_id, current_city_id, version, is_first, tab_type, offset):
         #搜索词
@@ -48,6 +60,50 @@ class janus_request(BaseRequest):
         return self.api_send(self.data["mine_guess_you_like"])
 
 
+    #商祥页-详情
+    def product_detail(self, service_id, service_item_id, version):
+        self.params["service_id"] = service_id
+        self.params["service_item_id"] = service_item_id
+        self.params["version"] = version
+        return self.api_send(self.data["product_detail"])
+
+    #商祥页-sku信息
+    def sku_info(self, service_id, service_item_id):
+        self.params["service_id"] = service_id
+        self.params["service_item_id"] = service_item_id
+        return self.api_send(self.data["sku_info"])
+
+    # 品类聚合页面商品列表
+    def tag_service(self, size, tag_ids, offset, tag_id, version, device_id):
+        print("fgx")
+        self.params['size'] = size
+        self.params['tag_ids'] = tag_ids
+        self.params['offset'] = offset
+        self.params['tag_id'] = tag_id
+        self.params['version'] = version
+        self.params['device_id'] = device_id
+
+        return self.api_send(self.data["tag_service"])
+
+    # 品类聚合页面标签和专场
+    def polymer(self, version, category_polymer_id, device_id):
+        print("fgx")
+        self.params['version'] = version
+        self.params['category_polymer_id'] = category_polymer_id
+        self.params['device_id'] = device_id
+
+        return self.api_send(self.data["polymer"])
+
+    #医生医院sug列表
+    def keyword_tip(self, query, lat, lng, version, device_id = '97B6764B-2135-4761-9911-701C38CBC272', tab_type = '0'):
+        self.params['query'] = query
+        self.params['lat'] = lat
+        self.params['lng'] = lng
+        self.params['version'] = version
+
+        return  self.api_send(self.data['keyword_tip'])
+
+
 if __name__ == '__main__':
     #打印购物车-猜你喜欢列表接口返回
     print(janus_request().mine_guess_you_like())

all_backend_api/janus_request.yaml

@@ -37,6 +37,66 @@ mine_guess_you_like:
   isLogin: 1
 
 
+#商祥页-详情
+product_detail:
+  method: get
+  url: /api/janus/product/detail
+  params:
+    service_id: ${service_id}
+    service_item_id: ${service_item_id}
+    version: ${version}
+  data: {}
+  json: {}
+
+#商祥页-sku信息
+sku_info:
+  method: get
+  url: /api/janus/product/detail/sku_info
+  params:
+    service_id: ${service_id}
+    service_item_id: ${service_item_id}
+  data: {}
+  json: {}
+
+#品类聚合页面商品列表的
+tag_service:
+  method: GET
+  url: /api/janus/product/tag_service
+  params:
+    size: ${size}
+    tag_ids: ${tag_ids}
+    offset: ${offset}
+    tag_id: ${tag_id}
+    version: ${version}
+    device_id: ${device_id}
+  data: { }
+  json: { }
+
+
+#品类聚合页标签和专场
+polymer:
+  method: GET
+  url: /api/janus/product/polymer
+  params:
+    version: ${version}
+    category_polymer_id: ${category_polymer_id}
+    device_id: ${device_id}
+  data: { }
+  json: { }
+
+#医生医院sug列表
+keyword_tip:
+  method: GET
+  url: /api/janus/search/keyword/tip
+  params:
+    query: ${query}
+    lat: ${lat}
+    lng: ${lng}
+    version: ${version}
+  data: {}
+  json: {}
+
+
 
 
 

all_backend_api/question_request.py

@@ -5,7 +5,7 @@ from in_common.base_request import BaseRequest
 class question_request(BaseRequest):
     def __init__(self):
         self.replyanswer = self.api_load(path_setting.QUESTION_CONFIG)
-        print(self.data)
+        # print(self.replyanswer)
 
     # 回答详情页-  一/二级评论
     def reply_answer(self, current_city_id, answer_id, content, user_id=""):

all_backend_api/search_request.py

@@ -4,10 +4,38 @@ from in_common.base_request import BaseRequest
 
 class search_request(BaseRequest):
     def __init__(self):
-        self.data = self.api_load(path_setting.KEYWORDS_CONFIG)
+        self.data = self.api_load(path_setting.KEYWORDS_CONFIG) #keywords路径
+        self.data = self.api_load(path_setting.CONTENTV6_CONFIG) #content_v6路径
+        self.data = self.api_load(path_setting.HOT_CONFIG)  # hot路径
 
     #搜索首页-热门搜索模块（点击搜索框即调接口）
     def keywords(self,current_city_id,search_tab):
         self.params["current_city_id"] = current_city_id
         self.params["search_tab"] = search_tab
-        return self.api_send(self.data["keywords"])
\ No newline at end of file
+        return self.api_send(self.data["keywords"])
+        return self.api_send(self.data["keywords"])
+
+    #搜索结果页-医生/医院tab
+    def content_v6(self, query, device_id, current_city_id, version, is_first, tab_type, offset, size):
+        #搜索词
+        self.params['query'] = query
+        #设备号
+        self.params['device_id'] = device_id
+        #当前城市
+        self.params['current_city_id'] = current_city_id
+        #APP版本
+        self.params['version'] = version
+        #是否为第一次请求
+        self.params['is_first'] = is_first
+        #类型
+        self.params['tab_type'] = tab_type
+        #请求的页数 0，10，20
+        self.params['offset'] = offset
+        # 请求的size
+        self.params['size'] = size
+        return self.api_send(self.data["content_v6"])
+
+    # 搜索首页-更美热门榜模块（点击搜索框即调接口）
+    def hot(self, version, device_id = '97B6764B-2135-4761-9911-701C38CBC272'):
+        self.params["version"] = version
+        return self.api_send(self.data["hot"])

all_backend_api/search_request.yaml

+#搜索首页-热门搜索模块（点击搜索框即调接口）
 keywords:
   method: get
   #接口地址
@@ -7,4 +8,31 @@ keywords:
     current_city_id: ${current_city_id}
     search_tab: ${search_tab}
   data: {}
-  json: {}
\ No newline at end of file
+  json: {}
+
+#搜索结果页-医生/医院tab
+content_v6:
+  method: get
+  #接口地址
+  url: /api/search/v6/content
+  #列出所有定义函数时的参数
+  params:
+    query: ${query}
+    device_id: ${device_id}
+    current_city_id: ${current_city_id}
+    version: ${version}
+    is_first: ${is_first}
+    tab_type: ${tab_type}
+    offset: ${offset}
+    size: ${size}
+  data: {}
+  json: {}
+
+# 搜索首页-更美热门榜模块（点击搜索框即调接口）
+hot:
+  method: get
+    #接口地址
+  url: /api/search/hot
+    #列出所有定义函数时的参数
+  params:
+    version: ${version}

host.yaml

 develop_host:
-#  backend: http://backend.paas-develop.env
-  doctor: http://doctor.paas-develop.env
 
+  doctor: http://doctor.paas-develop.env
+#  backend: http://backend.paas-develop.env
+#  backend: https://backend.igengmei.com
\ No newline at end of file

path_setting.py

@@ -192,5 +192,70 @@ CANCEL_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/answer_data
 QUESTION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "question_request.yaml")
 REPLY_ANSWER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/question_data", "reply_answer.yaml")
 
+#商祥页-详情
+JANUS_PRODUCT_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "product_detail.yaml")
+#商祥页-sku信息
+JANUS_SKU_INFO = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "sku_info.yaml")
+#商祥页-收藏
+SERVICE_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/service_data", "service_favor.yaml")
+#商祥页-分享
+SERVICES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "services_request.yaml")
+SERVICES_SHARE_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/services_data", "share_data.yaml")
+#商祥页-加入购物车
+SHOPCART_ADD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/shopcart_data", "add.yaml")
+#商祥页-美券列表
+HYBRID_GIFT_LIST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hybrid_gift_list_request.yaml")
+GIFT_LIST_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_gift_list_data", "gift_list_data.yaml")
+#商祥页-优惠券列表-领取
+HYBRID_GET_GIFT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "hybrid_get_gift_request.yaml")
+GET_GIFT_DATA = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hybrid_get_gift_data", "get_gift_data.yaml")
+
+#捜索结果页-医生/医院tab
+CONTENTV6_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
+CONTENTV6 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "content_v6.yaml")
+
+
+#品类聚合页面商品列表
+TAG_SERVICE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
+TAG_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "tag_service.yaml")
+
+#社区tab签到和招募活动
+CONFIG_LIST_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
+CONFIG_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "config_list.yaml")
+
+#社区tabfeed流
+COMMUNITY_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "feed_request.yaml")
+COMMUNITY = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_data", "community.yaml")
+
+#品类聚合页面标签和专场
+POLYMER_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "janus_request.yaml")
+POLYMER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "polymer.yaml")
+
+THIRD_PHONE_LOGIN_CONFIG = os.path.join(BASE_DIR,"backend_auto/all_backend_api", "thirdphonelogin_request")
+THIRD_PHONE_LOGIN =os.path.join(BASE_DIR,"backend_auto/test_backend_data/account_data","login_thirdphone")
+
+
+
+#医生医院sug列表
+KEYWORDTIP_CONFIG = os.path.join(BASE_DIR,"backend_auto/all_backend_api", "janus_request.yaml")
+KEYWORDTIP = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_data", "keyword_tip.yaml")
+
+#搜索首页-更美热门榜
+HOT_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
+HOT = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "hot.yaml")
+
+#回答详情页点赞
+VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/answer_data", "vote.yaml")
+#回答详情页取消点赞
+CANCEL_VOTE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/answer_data", "cancel_vote.yaml")
+#回答详情页-  一/二级评论
+QUESTION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "question_request.yaml")
+REPLY_ANSWER = os.path.join(BASE_DIR, "backend_auto/test_backend_data/question_data", "reply_answer.yaml")
+
+#回答详情页
+DETAIL_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "answer_request.yaml")
+DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/answer_data", "detail.yaml")
+
+
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)

test_backend_case/hybrid_get_gift_case/test_get_gift_data.py

+import pytest
+
+from all_backend_api.hybrid_get_gift_request import hybrid_get_gift_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestGiftListData:
+    data = BaseRequest().api_load(path_setting.GET_GIFT_DATA)
+    get_gift_data_case, get_gift_data_data = get_ids(data, "get_gift_data")
+
+    @pytest.mark.parametrize("param", get_gift_data_data, ids=get_gift_data_case)
+    def test_get_gift_data(self, param):
+        r = hybrid_get_gift_request().get_gift_data(param["gift_id"])
+
+        if r["error"] == 1:
+            assert r["message"] == param["assert_message"]
+
+

test_backend_case/hybrid_gift_list_case/test_gift_list_data.py

+import pytest
+
+from all_backend_api.hybrid_gift_list_request import hybrid_gift_list_request
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class TestGiftListData:
+    data = BaseRequest().api_load(path_setting.GIFT_LIST_DATA)
+    gift_list_data_case, gift_list_data_data = get_ids(data, "gift_list_data")
+
+    @pytest.mark.parametrize("param", gift_list_data_data, ids=gift_list_data_case)
+    def test_gift_list_data(self, param):
+        r = hybrid_gift_list_request().gift_list_data(param["service_id"], param["gift_type"], param["page"])
+
+        if r["error"] == 0:
+            assert r["error"] == param["assert_error"]
+
+

test_backend_case/janus_case/test_keyword_tip.py

+import pytest
+
+import path_setting
+from all_backend_api.janus_request import janus_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+#医生医院sug列表
+class TestKeywordTip:
+    data = BaseRequest().api_load(path_setting.KEYWORDTIP)
+    keywordtip_case, keywordtip_data = get_ids(data, "keyword_tip")
+
+    @pytest.mark.parametrize("param", keywordtip_data, ids=keywordtip_case)
+    def test_keyword_tip(self, param):
+        print(param['query'])
+        r = janus_request().keyword_tip(param["query"], param["lat"], param["lng"], param["version"])
+        if not r["data"]["aggregation_card"]:
+            print('医生医院卡片信息')
+            assert r["data"]["tip_keys"][0]["type_flag"] == param["assert1"]
+            assert r["data"]["tip_keys"][11]["type_flag"] == param["assert2"]
+        if r["data"]["aggregation_card"] :
+            print('百科卡片信息')
+            assert r["data"]["aggregation_card"]["child"][0]["type_flag"] == param["assert1"]
+            assert r["data"]["tip_keys"][0]["type_flag"] == param["assert2"]
\ No newline at end of file

test_backend_case/search_case/test_hot.py

+import pytest
+
+import path_setting
+from all_backend_api.search_request import search_request
+from ids_list import get_ids
+from in_common.base_request import BaseRequest
+
+#搜索首页-更美热门榜
+class TestHot:
+    data = BaseRequest().api_load(path_setting.HOT)
+    hot_case, hot_data = get_ids(data, "hot")
+
+    @pytest.mark.parametrize("param", hot_data, ids=hot_case)
+    def test_hot(self, param):
+        r = search_request().hot(param["version"])
+        if r["error"] == 0:
+            print("接口调用成功了~")
+            assert len(["data"]) != param["assert"]
\ No newline at end of file

test_backend_data/hybrid_get_gift_data/get_gift_data.yaml

+get_gift_data:
+  -
+    case: "校验接口返回成功case"
+    gift_id: "111"
+    assert_message: "来晚咯，美券已领完！"
\ No newline at end of file

test_backend_data/hybrid_gift_list_data/gift_list_data.yaml

+gift_list_data:
+  -
+    case: "校验接口返回成功case"
+    service_id: 5857263
+    gift_type: 1
+    page: 1
+    assert_error: 0
\ No newline at end of file

test_backend_data/janus_data/keyword_tip.yaml

+keyword_tip:
+
+  -
+    #输入北京，接口有数据召回且SUG列表召回北京开头的医院信息
+    case: "输入北京，接口有数据召回且SUG列表召回北京开头的医院信息"
+    query: "北京"
+    lat: "39.9"
+    lng: "116.4"
+    version: "742.0"
+    assert1: unknown
+    assert2: hospital
+
+#  -
+#    #测试环境无法验证该用例
+#    #输入杨，接口有数据召回且SUG列表召回杨开头的医生信息
+#    case: "输入杨，接口有数据召回且SUG列表召回杨开头的医生信息"
+#    query: "杨"
+#    lat: "39.9"
+#    lng: "116.4"
+#    version: "742.0"
+#    assert1: unknown
+#    assert2: doctor
+
+  -
+    #输入双眼皮，接口有数据召回且SUG列表召回双眼皮下的项目百科信息
+    case: "输入双眼皮，接口有数据召回且SUG列表召回双眼皮下的项目百科信息"
+    query: "双眼皮"
+    lat: "39.9"
+    lng: "116.4"
+    version: "742.0"
+    assert1: project
+    assert2: unknown
\ No newline at end of file

test_backend_data/search_data/hot.yaml

+hot:
+  -
+  #进入搜索首页-成功调用搜索首页接口
+    case: "进入搜索首页-成功调用搜索首页接口"
+    version: "743.0"
+    assert: 0