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

all_backend_api/conversation_request.py

@@ -9,13 +9,18 @@ class conversation_request(BaseRequest):
     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"])
+    def detail_messageid(self,os_version,last_msg_id,offset_msg_id):
+        self.params["os_version"] = os_version
+        self.params["last_msg_id"] = last_msg_id
+        self.params["offset_msg_id"] = offset_msg_id
+        return self.api_send(self.messageread["detail_messageid"])
 
 
 if __name__ == '__main__':
     print(conversation_request().message_read("beijing", 1,'[10622,10626,10646,10651]'))
+    print(conversation_request().detail_messageid(10, 0, 0))
 
 
 

all_backend_api/conversation_request.yaml

@@ -8,5 +8,17 @@ message_read:
   data:
     message_ids: ${message_ids}
 
+  json: {}
+  isLogin: 1 #需要登录的接口
+
+detail_messageid:
+  method: get
+  url: /api/conversation/detail/602329_33910245/
+  params:
+    os_version: ${os_version}
+    last_msg_id: ${last_msg_id}
+    offset_msg_id: ${offset_msg_id}
+  data: {}
+
   json: {}
   isLogin: 1 #需要登录的接口
\ No newline at end of file

all_backend_api/private_conversation_request.py

+import path_setting
+from in_common.base_request import BaseRequest
+
+
+class private_conversation_request(BaseRequest):
+    def __init__(self):
+        self.data = self.api_load(path_setting.PRIVATE_CONVERSATION_CONFIG)
+
+    def private_conversation(self, content, target_uid, referrer,referrer_id, is_system, quick_consultation_id, diary_id, from_live):
+        self.params["content"] = content
+        self.params["target_uid"] = target_uid
+        self.params["referrer"] = referrer
+        self.params["referrer_id"] = referrer_id
+        self.params["is_system"] = is_system
+        self.params["quick_consultation_id"] = quick_consultation_id
+        self.params["diary_id"] = diary_id
+        self.params["from_live"] = from_live
+
+        return self.api_send(self.data["private_conversation"])
+
+
+if __name__ == '__main__':
+    print(private_conversation_request().private_conversation("你好", "35874935", "message_home", "", 0, "", "", ""))
\ No newline at end of file

all_backend_api/private_conversation_request.yaml

+private_conversation:
+  method: post
+  url: /api/private_conversation/
+  params: {}
+  data:
+    content: ${content}
+    target_uid: ${target_uid}
+    referrer: ${referrer}
+    referrer_id: ${referrer_id}
+    is_system: ${is_system}
+    quick_consultation_id: ${quick_consultation_id}
+    diary_id: ${diary_id}
+    from_live: ${from_live}
+
+  json: {}
+  isLogin: 1 #需要登录的接口
\ No newline at end of file

path_setting.py

@@ -114,6 +114,26 @@ JANUS_MINE_GUESS_YOU_LIKE = os.path.join(BASE_DIR, "backend_auto/test_backend_da
 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")
 
+#消息
+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")
+DETAIL_MESSAGEID = os.path.join(BASE_DIR, "backend_auto/test_backend_data/conversation_data", "detail_messageid.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")
+#标记为已读
+READALL = os.path.join(BASE_DIR, "backend_auto/test_backend_data/notification_data", "readall.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")
+AUTO_MSG = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "auto_msg.yaml")
+SEND_MSG = os.path.join(BASE_DIR, "backend_auto/test_backend_data/im_data", "send_msg.yaml")
+#发送消息
+PRIVATE_CONVERSATION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "private_conversation_request.yaml")
+PRIVATE_CONVERSATION = os.path.join(BASE_DIR, "backend_auto/test_backend_data/private_conversation_data", "private_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")
 

test_backend_case/conversation_case/test_detail_messageid.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 TestDetailMessageid:
+    data = BaseRequest().api_load(path_setting.DETAIL_MESSAGEID)
+    detailmessageid_case, detailmessageid_data = get_ids(data, "detail_messageid")
+
+
+    @pytest.mark.parametrize("param",detailmessageid_data,ids=detailmessageid_case)
+    def test_detail_messageid(self,param):
+        r = conversation_request().detail_messageid(param["os_version"], param["last_msg_id"], param["offset_msg_id"])
+        if r["error"] == 0:
+            results = r.get("data").get("results", [])
+            assert len(results) <= param["assert"]

test_backend_case/private_conversation/test_private_conversation.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.private_conversation_request import private_conversation_request
+
+
+class TestPrivateConversation:
+    data = BaseRequest().api_load(path_setting.PRIVATE_CONVERSATION)
+    privateconversation_case, privateconversation_data = get_ids(data, "private_conversation")
+
+    @pytest.mark.parametrize("param", privateconversation_data, ids=privateconversation_case)
+    def test_private_conversation(self, param):
+        r = private_conversation_request().private_conversation(param["content"], param["target_uid"],
+                                                                param["referrer"], param["referrer_id"],
+                                                                param["is_system"], param["quick_consultation_id"],
+                                                                param["diary_id"], param["from_live"])
+        print(r)
+        if r["error"] == 0:
+            assert r["message"] == param["assert_message"]
+            assert r["data"]["text"] == param["assert_text"]
+        if r["error"] == 21001:
+            assert r["message"] == param["assert_message1"]
\ No newline at end of file

test_backend_data/conversation_data/detail_messageid.yaml

+detail_messageid:
+#验证成功case
+  -
+    case: "私信详情页最新一页的消息内容"
+    os_version: 10
+    last_msg_id: 0
+    offset_msg_id: 0
+    assert: 20
\ No newline at end of file

test_backend_data/private_conversation_data/private_conversation.yaml

+private_conversation:
+#验证成功case
+  -
+    case: "发送消息成功"
+    content: "你好"
+    target_uid: 35874935
+    referrer: "message_home"
+    referrer_id: ""
+    is_system: 0
+    quick_consultation_id: ""
+    diary_id: ""
+    from_live: ""
+    assert_message: "消息发送成功"
+    assert_text: "你好"
+
+#验证成功case
+  -
+    case: "发送消息成功"
+    content: "你好"
+    target_uid: 358749351
+    referrer: "message_home"
+    referrer_id: ""
+    is_system: 0
+    quick_consultation_id: ""
+    diary_id: ""
+    from_live: ""
+    assert_message1: "请登录"
+
+