Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev

all_backend_api/conversation_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class conversation_request(BaseRequest):
+    def __init__(self):
+        self.messageread = self.api_load(path_setting.MESSAGE_READ_CONFIG)
+
+    def message_read(self,current_city_id,release,message_ids):
+        self.params["current_city_id"] = current_city_id
+        self.params["release"] = release
+        #self.params["uqid"] = uqid
+        self.params["message_ids"] = message_ids
+        return self.api_send(self.messageread["message_read"])
+
+
+if __name__ == '__main__':
+    print(conversation_request().message_read("beijing", 1,'[10622,10626,10646,10651]'))
+
+
+
+
+

all_backend_api/conversation_request.yaml

+message_read:
+  method: post
+  url: /api/conversation/message/read
+  params:
+    current_city_id: ${current_city_id}
+    release: ${release}
+    #uqid: ${uqid}
+  data:
+    message_ids: ${message_ids}
+
+  json: {}
+  isLogin: 1 #需要登录的接口
\ No newline at end of file

all_backend_api/im_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+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):
+        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"])
+
+
+if __name__ == '__main__':
+    print(im_request().conversation_detail("beijing", 0, 4, 0,  "message_home"))
+
+
+
+
+

all_backend_api/im_request.yaml

+conversation_detail:
+  method: get
+  url: /api/im/conversation/detail
+  params:
+    current_city_id: ${current_city_id}
+    begin_msg_id: ${begin_msg_id}
+    conversation_type: ${conversation_type}
+    end_msg_id: ${begin_msg_id}
+    referrer: ${referrer}
+  data: {}
+
+  json: {}
+  isLogin: 1 #需要登录的接口
\ No newline at end of file

all_backend_api/my_conversation_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class my_conversation_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.MY_CONVERSATION_CONFIG)
+
+    def my_conversation(self,current_city_id,start_num,count,):
+        self.params["current_city_id"] = current_city_id
+        self.params["start_num"] = start_num
+        self.params["count"] = count
+        return self.api_send(self.data["my_conversation"])
+
+
+if __name__ == '__main__':
+    print(my_conversation_request().my_conversation("beijing", "0", 10))
\ No newline at end of file

all_backend_api/my_conversation_request.yaml

+my_conversation:
+  method: get
+  url: /api/my_conversation/
+  params:
+    current_city_id: ${current_city_id}
+    start_num: ${start_num}
+    count: 10
+  data: {}
+
+  json: {}
+  isLogin: 1 #需要登录的接口
\ No newline at end of file

all_backend_api/notification_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class notification_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.UNREAD_CONFIG)
+
+    def unread(self,uqid,trace_id,):
+        self.params["uqid"] = uqid
+        self.params["trace_id"] = trace_id
+        return self.api_send(self.data["unread"])
+
+
+if __name__ == '__main__':
+    print(notification_request().unread("1B519701-A4F5-453E-9D99-140B5AF697A0", "2021/04/22/1722/46cf97b999b0"))

all_backend_api/notification_request.yaml

+unread:
+  method: get
+  url: /api/notification/unread
+  params:
+    uqid: ${uqid}
+    trace_id: ${trace_id}
+
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录的接口
+

path_setting.py

@@ -59,6 +59,9 @@ HOSPITAL_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hospita
 #医院主页医生列表
 HOSPITAL_DOCTOR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/hospitals_data", "doctor.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")
 
 HOME_V5_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "service_request.yaml")
 HOME_V5=os.path.join(BASE_DIR,"backend_auto/test_backend_data/service_data","home_v5.yaml")
@@ -70,6 +73,17 @@ DANMU_V2 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/live_data", "d
 #直播-主播开播
 PUSH_LIVE_INFO = os.path.join(BASE_DIR, "backend_auto/test_backend_data/live_data", "pushlive_info.yaml")
 
+#消息
+MESSAGE_READ_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "conversation_request.yaml")
+MESSAGE_READ = os.path.join(BASE_DIR, "backend_auto/test_backend_data/conversation_data", "message_read.yaml")
+
+#咨询顾问
+CONVERSATION_DETAIL_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "im_request.yaml")
+CONVERSATION_DETAIL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "conversation_detail.yaml")
+
+#消息页未读数
+UNREAD_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "notification_request.yaml")
+UNREAD = os.path.join(BASE_DIR, "backend_auto/test_backend_data/notification_data", "unread.yaml")
 
 
 if __name__ == '__main__':

test_backend_case/conversation_case/test_message_read.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.conversation_request import conversation_request
+
+
+class TestMessageRead:
+    data = BaseRequest().api_load(path_setting.MESSAGE_READ)
+    #conversation_case, conversation_data = get_ids(data, "message_read")
+    messageread_case, messageread_data = get_ids(data, "message_read")
+
+
+    @pytest.mark.parametrize("param",messageread_data,ids=messageread_case)
+    def test_message_read(self,param):
+        r = conversation_request().message_read(param["current_city_id"], param["release"], param["message_ids"])
+        if r["error"] == 0:
+            assert r["data"]["success"] == param["assert"]
+        #if r["error"] == 0:
+           # success = r.get("data").get("success", "")
+

test_backend_case/im_case/test_conversation_detail.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.im_request import im_request
+
+
+class TestConversationDetail:
+    data = BaseRequest().api_load(path_setting.CONVERSATION_DETAIL)
+    conversationdetail_case, conversationdetail_data = get_ids(data, "conversation_detail")
+
+    @pytest.mark.parametrize("param",conversationdetail_data,ids=conversationdetail_case)
+    def test_conversation_detail(self,param):
+        r = im_request().conversation_detail(param["current_city_id"], param["begin_msg_id"], param["conversation_type"], param["end_msg_id"], param["referrer"])
+        if r["error"] == 0:
+            msg_list = r.get("data").get("msg_list",[])
+            assert len(msg_list) > param["assert"]
+

test_backend_case/my_conversation_case/test_my_conversation.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.my_conversation_request import my_conversation_request
+
+
+class TestMyConversation:
+    data = BaseRequest().api_load(path_setting.MY_CONVERSATION)
+    my_conversation_case, my_conversation_data = get_ids(data, "my_conversation")
+
+
+    @pytest.mark.parametrize("param",my_conversation_data,ids=my_conversation_case)
+    def test_my_conversation(self,param):
+        '''私信列表'''
+        r = my_conversation_request().my_conversation(param["current_city_id"], param["start_num"], param["count"])
+        if r["error"] == 0:
+            conversation_list = r.get("data").get("conversation_list", [])
+            assert len(conversation_list) <= param["assert"]
+

test_backend_case/notification_case/test_unread.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.notification_request import notification_request
+
+
+class TestUnread:
+    data = BaseRequest().api_load(path_setting.UNREAD)
+    unread_case, unread_data = get_ids(data, "unread")
+
+    @pytest.mark.parametrize("param",unread_data,ids=unread_case)
+    def test_unread(self,param):
+        r = notification_request().unread(param["uqid"], param["trace_id"])
+        #print("返回结果是：%s" % r)
+        total_count = r["data"]["unread_count"]["total_count"]
+        print("总数量是：%s" % total_count)
+        total_unread = r.get("data").get("unread_count").get("follow_count").get("total_unread")#关注总未读数
+        #print("总数量1是：%s" % total_unread)
+        message_count = r["data"]["unread_count"]["message_count"]#私信列表总未读数
+        #print("私信列表总未读数是：%s" % message_count)
+        vote_favor = r["data"]["unread_count"]["vote_favor_count"]["vote_favor"]#赞/收藏总未读数
+        #print("赞/收藏总未读数是：%s" % vote_favor)
+        reply_count = r["data"]["unread_count"]["reply_count"]  #回复总未读数
+        #print("回复总未读数是：%s" % reply_count)
+        count = total_unread + message_count + vote_favor + reply_count
+        #print("相加总数是是：%s" % count)
+        if r["error"] == 0:
+            assert r["data"]["unread_count"]["total_count"] >= param["assert"]
+            assert r["data"]["unread_count"]["total_count"] == count
+

test_backend_case/oneimage_case/test_recomend_services.py

@@ -10,10 +10,15 @@ class TestRecomendServices:
     data = BaseRequest().api_load(path_setting.ONEIMAGE_RECOMEND_SERVICES_DATA)
     recomendservice_case, recomendservice_data = get_ids(data, "recomend_services")
 
-    @pytest.mark.skip("跳过测颜值根据五官推荐美购，目前数据是参数是线上的-------------------")
+    # @pytest.mark.skip("跳过测颜值根据五官推荐美购，目前数据是参数是线上的-------------------")
     @pytest.mark.parametrize("param",recomendservice_data,ids=recomendservice_case)
     def test_recomend_services(self,param):
         r = oneimage_request().recomend_services(param["version"], param["business_tags_names"])
-        assert r["error"] == param["assert"]
+        if r["error"] == 0:
+            data = r.get("data")
+            assert len(data) == param["assert"]
+            gm_url = data[0].get("gm_url")
+            assert gm_url.startswith("gengmei://search_result?searchTabType=0") == True, f'返回并非搜索协议,实际是{gm_url}'
+            assert len(data[0].get("service")) > 0, f'根据五官返回美购个数有误，实际是{len(data[0].get("service"))}'
 
 

test_backend_case/oneimage_case/test_share_v4.py

@@ -13,12 +13,10 @@ class TestShareV4:
     data = BaseRequest().api_load(path_setting.ONEIMAGE_SHARE_V4_DATA)
     sharev4_case, sharev4_data = get_ids(data, "share_v4")
 
-    @pytest.mark.skip("跳过，测颜值结果v4，目前数据是线上的-------------------")
+    # @pytest.mark.skip("跳过，测颜值结果v4，目前数据是线上的-------------------")
     @pytest.mark.parametrize("param",sharev4_data,ids=sharev4_case)
     def test_share_v4(self,param):
         r = oneimage_request().share_v4(param["version"], param["face_id"])
-        if r["error"] == 0:
-            data = r.get("data")
-            assert 1 == 1
+        assert r["error"] == 0
 
 

test_backend_data/conversation_data/message_read.yaml

+message_read:
+#验证成功case
+  -
+    case: "请求成功case"
+    current_city_id: "beijing"
+    release: 1
+    #uqid: "1B519701-A4F5-453E-9D99-140B5AF697A0"
+    message_ids: [10622,10626,10646,10651]
+    assert: "true"
\ No newline at end of file

test_backend_data/im_data/conversation_detail.yaml

+conversation_detail:
+#验证成功case
+  -
+    case: "请求成功，有数据返回"
+    current_city_id: "beijing"
+    begin_msg_id: 0
+    conversation_type: 4
+    end_msg_id: 0
+    referrer: message_home
+    assert: 0

test_backend_data/my_conversation_data/my_conversation.yaml

+my_conversation:
+#验证成功case
+  -
+    case: "请求成功，有数据返回的第一页数据"
+    current_city_id: "beijing"
+    start_num: 0
+    count: 10
+    assert: 10
+

test_backend_data/notification_data/unread.yaml

+unread:
+#验证成功case
+  -
+    case: "请求成功，消息页各icon未读消息数等于总数"
+    uqid: "1B519701-A4F5-453E-9D99-140B5AF697A0"
+    trace_id: "2021/04/22/1722/46cf97b999b0"
+    #total_count：
+    assert: 0

test_backend_data/oneimage_data/recomend_services.yaml

 recomend_services:
-#成功登录case
+#测颜值根据五官推荐美购
   -
-    case: "请求成功，有数据返回"
+    case: "请求成功，返回个数正确"
     version: "7.42.2"
-    business_tags_names: '[[],[],["玻尿酸垫下巴","自体脂肪垫下巴","硅胶垫下巴","膨体垫下巴"],["半永久纹眉","植眉"],["玻尿酸丰唇","胶原蛋白填充丰唇","自体脂肪丰唇"],[],["开内眼角"],["射频提升","热拉提","热拉提plus","热玛吉","超声提升"],["热玛吉"],[],["注射瘦脸","激光溶脂瘦脸","取颊脂垫瘦脸","光纤溶脂瘦脸","下颌角整形"]]'
-    assert: 0
\ No newline at end of file
+    business_tags_names: '[["鼻翼缩小","玻尿酸隆鼻","耳软骨隆鼻","鼻中隔软骨隆鼻"]]'
+    assert: 1
\ No newline at end of file

test_backend_data/oneimage_data/share_v4.yaml

 share_v4:
-#成功登录case
+#测颜值结果
   -
     case: "请求成功，有数据返回"
     version: "7.42.2"
-    face_id: "27320150"
+    face_id: "15844721"
     assert: 0
\ No newline at end of file