Merge branch 'common_dev' into zhanghui_dev

all_backend_api/janus_request.py

@@ -31,7 +31,7 @@ class janus_request(BaseRequest):
         return self.api_send(self.data['content_v7'])
 
     #医院主页搜索
-    def hospital_search(self, query, device_id, hospital_id, current_city_id, version, offset):
+    def hospital_search(self, query, device_id, hospital_id, current_city_id, version, offset, size):
         #搜索词
         self.params['query'] = query
         #设备号
@@ -44,6 +44,8 @@ class janus_request(BaseRequest):
         self.params['version'] = version
         #请求的页数 0，10，20
         self.params['offset'] = offset
+        # 单页请求数量
+        self.params['size'] = size
 
         return self.api_send(self.data['hospital_search'])
 

all_backend_api/janus_request.yaml

@@ -23,6 +23,7 @@ hospital_search:
     current_city_id: ${current_city_id}
     version: ${version}
     offset: ${offset}
+    size : ${size}
 
   data: { }
   json: { }

all_backend_api/search_request.py

@@ -4,10 +4,31 @@ 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路径
 
     #搜索首页-热门搜索模块（点击搜索框即调接口）
     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"])
+
+    #搜索结果页-医生/医院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"])
\ No newline at end of file

all_backend_api/search_request.yaml

@@ -7,4 +7,21 @@ keywords:
     current_city_id: ${current_city_id}
     search_tab: ${search_tab}
   data: {}
+  json: {}
+
+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: {}
\ No newline at end of file

path_setting.py

@@ -137,6 +137,10 @@ SERVICE_FAVOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/service_d
 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")
 
+#捜索结果页-医生/医院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")

test_backend_case/janus_case/test_hospital_search.py

@@ -13,9 +13,9 @@ class TestHospitalSearch:
     @pytest.mark.parametrize("param", hospitalsearch_data, ids=hospitalsearch_case)
     def test_hospital_search(self, param):
         print(param['query'])
-        r = janus_request().hospital_search(param["query"], param["device_id"], param["hospital_id"], param["current_city_id"], param["version"], param["offset"])
+        r = janus_request().hospital_search(param["query"], param["device_id"], param["hospital_id"], param["current_city_id"], param["version"], param["offset"], param["size"])
         if r["error"] == 0:
             assert len(r["data"]["search_skus"]) != param["assert1"]
-            assert len(r["data"]["search_skus"]) == param["assert2"]
+            assert len(r["data"]["remai_skus"]) == param["assert2"]
         if r["error"] == 1:
             assert r["message"] == param["assert"]

test_backend_case/search_case/test_content_v6.py

+
+
+#搜索结果页-医生/医院tab
+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 TestContentV6:
+    data = BaseRequest().api_load(path_setting.CONTENTV6)
+    contentv6_case, contentv6_data = get_ids(data, "content_v6")
+
+    @pytest.mark.parametrize("param", contentv6_data, ids=contentv6_case)
+    def test_content_v6(self, param):
+        print(param['query'])
+        r = search_request().content_v6(param["query"], param["device_id"], param["current_city_id"], param["version"], param["is_first"], param["tab_type"], param["offset"], param["size"])
+        if r["error"] == 0:
+            if param["tab_type"] == 3:
+                assert r["data"]["hospitals"][0]["name"] == param["assert"]
+            if param["tab_type"] == 4:
+                assert r["data"]["doctors"][0]["name"] == param["assert"]
+        if r["error"] == 1:
+            assert r["message"] == param["assert"]
\ No newline at end of file

test_backend_data/janus_data/hospital_search.yaml

 hospital_search:
   -
   #医院主页搜索---搜索成功，有数据召回
-    case: "医院主页搜索---搜索成功，有数据召回"
+    case: "医院主页搜索---搜索成功，当前搜索词召回的对应商品不少于5个，不展示热卖推荐商品"
     query: "玻尿酸"
     device_id: "1321222222222222135"
     hospital_id: "96ea37eef81d11e692f800163e000a4a"
     current_city_id: "beijing"
     version: "742.2"
     offset: "0"
+    size: "10"
     assert1: 0
-    assert2: 10
+    assert2: 0
 
   -
   #医院主页搜索---搜索成功，无数据召回
-    case: "医院主页搜索---搜索成功，无数据召回"
+    case: "医院主页搜索---搜索成功，当前搜索词下无对应商品，召回热卖推荐商品"
     query: "美白针"
     device_id: "1321222222222222135"
     hospital_id: "96ea37eef81d11e692f800163e000a4a"
     current_city_id: "beijing"
     version: "742.2"
     offset: "0"
+    size: "10"
     assert1: 10
-    assert2: 0
+    assert2: 10
 
-#  -
-#  #医院主页搜索---搜索成功，无数据召回
-#    case: "医院主页搜索---搜索成功，无数据召回"
-#    query: "瘦脸针"
-#    device_id: "1321222222222222135"
-#    hospital_id: "96ea37eef81d11e692f800163e000a4a"
-#    current_city_id: "beijing"
-#    version: "742.2"
-#    offset: "0"
-#    assert1: 0
-#    assert2: 0
\ No newline at end of file
+  -
+  #医院主页搜索---搜索成功，无数据召回
+    case: "医院主页搜索---搜索成功，当前搜索词召回的对应商品少于5个，展示热卖推荐商品"
+    query: "瘦脸针"
+    device_id: "1321222222222222135"
+    hospital_id: "96ea37eef81d11e692f800163e000a4a"
+    current_city_id: "beijing"
+    version: "742.2"
+    offset: "0"
+    size: "10"
+    assert1: 10
+    assert2: 10
\ No newline at end of file

test_backend_data/search_data/content_v6.yaml

+content_v6:
+  -
+  #医院tab-捜索医院全称，捜索结果只召回该医院
+    case : "医院tab-捜索医院全称，捜索结果只召回该医院"
+    query: "北京画美医院"
+    device_id: "97B6764B-2135-4761-9911-701C38CBC272"
+    current_city_id: "beijing"
+    version: "742.2"
+    is_first: "0"
+    tab_type: "3"
+    offset: "0"
+    size: "10"
+    assert: 北京画美医院
+
+  -
+  #医院tab-捜索医院简称，捜索结果只召回该医院
+    case : "医院tab-捜索医院简称，捜索结果只召回该医院"
+    query: "北京画美"
+    device_id: "97B6764B-2135-4761-9911-701C38CBC272"
+    current_city_id: "beijing"
+    version: "742.2"
+    is_first: "0"
+    tab_type: "3"
+    offset: "0"
+    size: "10"
+    assert: 北京画美医院
+
+  -
+  #医生tab-捜索医生姓名，捜索结果只召回该医生
+    case : "医生tab-捜索医生姓名，捜索结果只召回该医生"
+    query: "崔鑫"
+    device_id: "97B6764B-2135-4761-9911-701C38CBC272"
+    current_city_id: "beijing"
+    version: "742.2"
+    is_first: "0"
+    tab_type: "4"
+    offset: "0"
+    size: "10"
+    assert: 崔鑫
\ No newline at end of file