Merge branch 'common_dev' into cuixin_dev

all_backend_api/user_request.py

@@ -52,9 +52,10 @@ class user_request(BaseRequest):
         self.params["count"] = count
 
 
+
         return self.api_send(self.data["my_diary_v2"])
 
-     # 我的-日记
+     # 我的-帖子-我发布的
     def user_tractate(self, page, count):
 
         self.params["page"] = page
@@ -63,6 +64,38 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["user_tractate"])
 
+     # 我的-帖子-我回复的
+    def reply_tractate(self, page, count, version):
+
+        self.params["page"] = page
+        self.params["count"] = count
+        self.params["version"] = version
+
+
+        return self.api_send(self.data["reply_tractate"])
+
+
+     # 我的-问题
+    def my_question(self, start_num, count):
+
+        self.params["start_num"] = start_num
+        self.params["count"] = count
+
+
+        return self.api_send(self.data["my_question"])
+
+     # 我的-收藏
+    def favors_services(self, start_num, count, current_city_id, device_id, version):
+
+        self.params["start_num"] = start_num
+        self.params["count"] = count
+        self.params["current_city_id"] = current_city_id
+        self.params["device_id"] = device_id
+        self.params["version"] = version
+
+        return self.api_send(self.data["favors_services"])
+
+
 if __name__ == '__main__':
     #个人中心
     print(user_request().personal_center())
@@ -79,6 +112,15 @@ if __name__ == '__main__':
     #我的-日记
     print(user_request().my_diary_v2(0, 10))
 
-    #我的-帖子
+    #我的-帖子-我发布的
     print(user_request().user_tractate(1, 10))
 
+    #我的-问题
+    print(user_request().my_question(0, 10))
+
+    #我的-问题
+    print(user_request().favors_services(0, 10, "beijing", "androidid_16a95f3fa31a4c0b", "7.46.0"))
+    #我的-帖子-我回复的
+    print(user_request().reply_tractate(1, 10, "7.46.0"))
+
+

all_backend_api/user_request.yaml

@@ -72,7 +72,7 @@ my_diary_v2:
   isLogin: 1
 
 
-# 我的-帖子
+# 我的-帖子-我发布的
 user_tractate:
   method: GET
   url: /api/user/tractate
@@ -83,3 +83,41 @@ user_tractate:
   json: {}
   isLogin: 1
 
+# 我的-问题
+my_question:
+  method: GET
+  url: /api/user/my_question
+  params:
+    start_num: ${start_num}
+    count: ${count}
+  data: {}
+  json: {}
+  isLogin: 1
+
+# 我的-收藏
+favors_services:
+  method: GET
+  url: /api/user/favors/services
+  params:
+    start_num: ${start_num}
+    count: ${count}
+    current_city_id: ${current_city_id}
+    device_id: ${device_id}
+    version: ${version}
+  data: {}
+  json: {}
+  isLogin: 1
+
+# 我的-帖子-我回复的
+reply_tractate:
+  method: GET
+  url: /api/user/reply/tractate
+  params:
+    page: ${page}
+    count: ${count}
+    version: ${version}
+  data: {}
+  json: {}
+  isLogin: 1
+
+

all_doctor_api/web_request.py

@@ -84,6 +84,10 @@ class web_request(BaseRequest):
         self.params["start_time"] = start_time
         self.params["end_time"] = end_time
         return self.api_send(self.ACCOUNT_URL["cpc_community_data_info"])
+    def cpc_community_click_logs(self,page):
+        "点点通-内容-推广明细"
+        self.params["page"] = page
+        return self.api_send(self.ACCOUNT_URL["cpc_community_click_logs"])
 
 
 
@@ -114,3 +118,4 @@ if __name__ == '__main__':
     print(web_request().cpc_community_homepage())
     print(web_request().cpc_community_diaries())
     print(web_request().cpc_community_data_info("15604767","2021-07-02","2021-07-12"))
+    print(web_request().cpc_community_click_logs(1))
\ No newline at end of file

all_doctor_api/web_request.yaml

@@ -181,3 +181,12 @@ cpc_community_data_info:
   data: {}
   json: {}
   isLogin: 1 #需要登录
+
+cpc_community_click_logs:
+  method: get
+  url: /api/web/cpc_community/click_logs
+  params:
+    page: ${page}
+  data: {}
+  json: {}
+  isLogin: 1 #需要登录

path_setting.py

@@ -443,6 +443,8 @@ CPCCOMMUNITYHOMEPAGE=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_d
 CPCCOMMUNITYDIARIES=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "cpc_community_diaries.yaml")
 #医生后台-点点通内容-数据统计
 CPCCOMMUNITYDATAINFO=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "cpc_community_data_info.yaml")
+#医生后台-点点通内容-推广明细
+CPCCOMMUNITYCLICKLOGS=os.path.join(BASE_DIR, "backend_auto/test_doctor_data/web_data", "cpc_community_click_logs.yaml")
 
 
 #更美次卡橱窗组件商品
@@ -601,10 +603,21 @@ WINNING_USER_LIST = os.path.join(BASE_DIR, "backend_auto/test_backend_data/feed_
 MY_DIARY_V2_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
 MY_DIARY_V2 = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "my_diary_v2.yaml")
 
-#我的-帖子
+#我的-帖子-我发布的
 USER_TRACTATE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
 USER_TRACTATE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "user_tractate.yaml")
 
 
+#我的-问题
+MY_QUESTION_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
+MY_QUESTION = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "my_question.yaml")
+
+#我的-收藏
+FAVORS_SERVICES_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
+FAVORS_SERVICES = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "favors_services.yaml")
+
+#我的-帖子-我回复的
+REPLY_TRACTATE_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "user_request.yaml")
+REPLY_TRACTATE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "reply_tractate.yaml")
 if __name__ == '__main__':
     print("==========",LIVEYAML_CONFIG)

test_backend_case/gmai_case/test_plastic_analysis_v3.py

@@ -12,5 +12,33 @@ class TestPlasticnAnalysisV3:
 
     @pytest.mark.parametrize("param",plasticanalysisv3_data,ids=plasticanalysisv3_case)
     def test_plastic_analysis_v3(self,param):
-        r = gmai_request().plastic_analysis_v3(param["device_id"], param["image_url"], param["landmark"] ,param["cheek_style_classify_id"])
+        r = gmai_request().plastic_analysis_v3(param["device_id"], param["image_url"], param["landmark"],param["cheek_style_classify_id"])
         assert r["error"] == 0
+        # 风格脸
+        face_analytics_info = r["data"]["face_analytics_info"]
+        assert len(face_analytics_info) > 0
+        for item in face_analytics_info:
+            name = item["name"]
+            # 脸型科普
+            kepu_text = item["analytics_info"]["unscramble"][0]["content_items"][0]["text"]
+            # print(name,kepu_text)
+            assert name not in (None, "")
+            assert kepu_text not in (None, "")
+            # 模拟整形方向
+            content_items = item["analytics_info"]["unscramble"][1]["content_items"]
+            for con in content_items:
+                text = con["text"]
+                # print(text)
+                assert text not in (None, "")
+            # 模拟整形方案
+            recommends = item["analytics_info"]["project"]["recommends"]
+            assert len(recommends) == 8
+            for ser in recommends:
+                text = ser["text"]
+                tag_name = ser["tag_name"]
+                gengmei_url = ser["gengmei_url"]
+                assert text not in (None, "")
+                assert tag_name not in (None, "")
+                assert gengmei_url == "gengmei://search_result?q={}&searchTabType=8".format(tag_name)
+
+

test_backend_case/gmai_case/test_simulate_analyze.py

@@ -14,4 +14,8 @@ class TestSimulateAnalyze:
     def test_plastic_analysis_v3(self,param):
         r = gmai_request().simulate_analyze(param["device_id"], param["image_url"], param["style_id"] ,param["type_id"])
         assert r["error"] == 0
-        print("效果图:  ", r["data"]["plastic_image_url"])
\ No newline at end of file
+        gm_url = r["data"]["plastic_image_url"]
+        print("效果图:  ", gm_url)
+        before_charm_val = r["data"]["before_charm_val"]
+        after_charm_val = r["data"]["after_charm_val"]
+        assert before_charm_val < after_charm_val
\ No newline at end of file

test_backend_case/gmai_case/test_skin_newreport.py

@@ -10,7 +10,7 @@ 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)
+    @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:
@@ -19,11 +19,45 @@ class TestSkinNewReport:
             # 大家都在买
             packages = data.get("packages")
             assert len(packages) == 6
-
-            # 皮肤检测结果
+            for item in packages:
+                package_id = item["package_id"]
+                package_name = item["package_name"]
+                tag_name = item["tag_name"]
+                gengmei_url = item["gengmei_url"]
+                print(package_id,package_name,tag_name,gengmei_url)
+                assert package_id not in (None, "")
+                assert package_name not in (None, "")
+                assert tag_name not in (None, "")
+                assert gengmei_url == "gengmei://service?service_id={}&has_task=0&sign_task_seconds=10&sign_points=20".format(package_id)
+
+            # 皮肤检测结果，重点关注部分
             disadvantage_tabs = data.get("disadvantage_tabs")
             result_word = disadvantage_tabs[0].get("result_word")
-            assert result_word == "色素型黑眼圈"
-
-
-
+            analysis = disadvantage_tabs[0]["tab_data"]["analysis"]
+            seriousness = disadvantage_tabs[0]["tab_data"]["seriousness"]
+            print(result_word, analysis, seriousness)
+            assert result_word not in (None, "")
+            assert analysis not in (None, "")
+            assert seriousness not in (None, "")
+
+            # 皮肤检测结果，其他部分
+            advantage_tabs = data.get("advantage_tabs")
+            for item in advantage_tabs:
+                result_word = item.get("result_word")
+                analysis = item["tab_data"]["analysis"]
+                seriousness = item["tab_data"]["seriousness"]
+                print(result_word, analysis, seriousness)
+                # assert result_word not in (None, "")   测试环境有部分数据没有配置
+                # assert analysis not in (None, "")
+                # assert seriousness not in (None, "")
+
+            # 用户信息部分
+            user_info = r["data"]["user_info"]
+            count = user_info["count"]
+            assert count == 1
+            # 底部按钮
+            bottom_buttons = r["data"]["bottom_buttons"]
+            assert bottom_buttons[0]["gm_url"] == "gengmei://scan_faceimage?face_skin_tab_index=0&has_task=0"
+            assert bottom_buttons[0]["name"] == "AI测颜值"
+            assert bottom_buttons[1]["gm_url"] == "gengmei://transfer_consult?conversation_type=4"
+            assert bottom_buttons[1]["name"] == "变美1V1咨询"

test_backend_case/hospitals_case/test_doctor.py

@@ -18,7 +18,7 @@ class TestDoctor:
         assert r["data"][0]["id"] == param["assert_id"]
         assert r["data"][0]["doctor_name"] == param["assert_name"]
         assert r["data"][0]["good_at"][0] == param["assert_good_at"]
-        assert r["data"][0]["cases"][0]["name"] == param["assert_cases"]
+        # assert r["data"][0]["cases"][0]["name"] == param["assert_cases"]
         assert r["data"][0]["title"] == param["assert_title"]
 
 

test_backend_case/janus_case/test_beauty_card_refund_submit.py

@@ -15,6 +15,8 @@ class TestBeautyCardRefundSubmit:
         r = janus_request().beauty_card_refund_submit(param["order_id"], param["reason_id"], param["reason_text"],
                                                       param["reason_type"])
 
-        if r["error"] == 1:
+        if param["reason_id"] == -1:
+            assert r["message"] == param["assert_message"]
+        if param["reason_id"] != -1:
             assert r["message"] == param["assert_message"]
 

test_backend_case/oneimage_case/test_share_v4.py

@@ -24,10 +24,23 @@ class TestShareV4:
         classification_info = r["data"]["classification_info"]
         # 测颜值结果,保证五官有值
         for key,value in classification_info.items():
-            print(key, value["name"], value["param"])
+            # print(key, value["name"], value["param"])
             assert value["name"] is not None
             assert value["param"] is not None
         # 颜值报告
         content = r["data"]["tractate_info"]["content"]
-        print(content)
+        # print(content)
         assert content is not None
+        # 五官描述
+        info_list = r["data"]["facial_feature"]["info_list"]
+        for item in info_list:
+            print(item["family"], item["description"])
+            assert item["family"] is not None
+            assert item["description"] is not None
+
+        # 底部按钮
+        bottom_buttons = r["data"]["bottom_buttons"]
+        assert bottom_buttons[0]["gm_url"] == param["skin_url"]
+        assert bottom_buttons[0]["name"] == param["skin_name"]
+        assert bottom_buttons[1]["gm_url"] == param["con_url"]
+        assert bottom_buttons[1]["name"] == param["con_name"]
\ No newline at end of file

test_backend_case/user_case/test_favors_services.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestFavorsServices:
+    data = BaseRequest().api_load(path_setting.FAVORS_SERVICES)
+    favors_services_case, favors_services_data = get_ids(data, "favors_services")
+
+    @pytest.mark.parametrize("param", favors_services_data, ids=favors_services_case)
+    def test_favors_services(self, param):
+        r = user_request().favors_services(param["start_num"], param["count"], param["current_city_id"], param["device_id"], param["version"])
+
+        assert r["error"] == param["assert"]
+

test_backend_case/user_case/test_my_question.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestMyQuestion:
+    data = BaseRequest().api_load(path_setting.MY_QUESTION)
+    my_question_case, my_question_data = get_ids(data, "my_question")
+
+    @pytest.mark.parametrize("param", my_question_data, ids=my_question_case)
+    def test_my_question(self, param):
+        r = user_request().my_question(param["start_num"], param["count"])
+
+        assert r["error"] == param["assert"]
+

test_backend_case/user_case/test_reply_tractate.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestReplyTractate:
+    data = BaseRequest().api_load(path_setting.REPLY_TRACTATE)
+    reply_tractate_case,  reply_tractate_data = get_ids(data, "reply_tractate")
+
+    @pytest.mark.parametrize("param",  reply_tractate_data, ids= reply_tractate_case)
+    def test_reply_tractate(self, param):
+        r = user_request().reply_tractate(param["page"], param["count"], param["version"])
+
+        assert r["error"] == param["assert"]
+

test_backend_data/hospitals_data/doctor.yaml

@@ -5,7 +5,7 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
   -
     case: "校验医生id case"
@@ -13,7 +13,7 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
   -
     case: "校验医生名称case"
@@ -21,7 +21,7 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
   -
     case: "校验医生明星项目case"
@@ -29,7 +29,7 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
   -
     case: "校验医生案例case"
@@ -37,7 +37,7 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
   -
     case: "校验医生title case"
@@ -45,5 +45,5 @@ doctor:
     assert_id: "ad99d0b0b6eb4a2c97ffadad48b7cdfd"
     assert_name: "赵希军"
     assert_good_at: "吸脂瘦身"
-    assert_cases: "自体脂肪填充面部 80例"
+#    assert_cases: "自体脂肪填充面部 80例"
     assert_title: "副主任"
\ No newline at end of file

test_backend_data/janus_data/beauty_card_refund_submit.yaml

 beauty_card_refund_submit:
   -
-    case: "次卡-提交退款申请-接口调用成功case"
+    case: "次卡-提交退款申请-非其他原因case"
     order_id: "102813852173916"
     reason_id: 3
     reason_text: "个人身体原因"
     reason_type: 0
     assert_message: "订单已经退款"
+  -
+    case: "次卡-提交退款申请-其他原因case"
+    order_id: "102813852173916"
+    reason_id: -1
+    reason_text: "其他原因不得少于10个字"
+    reason_type: 0
+    assert_message: "订单已经退款"
\ No newline at end of file

test_backend_data/oneimage_data/share_v4.yaml

@@ -5,3 +5,7 @@ share_v4:
     version: "7.42.2"
     face_id: "15844721"
     assert: 0
+    skin_url: "gengmei://scan_faceimage?face_skin_tab_index=1"
+    skin_name: "AI测肤质"
+    con_url: "gengmei://transfer_consult?conversation_type=4"
+    con_name: "变美1V1咨询"
\ No newline at end of file

test_backend_data/user_data/favors_services.yaml

+favors_services:
+  #我的-收藏
+  -
+    case: "我的页面-收藏"
+    start_num: 0
+    count: 10
+    current_city_id: "beijing"
+    device_id: "androidid_16a95f3fa31a4c0b"
+    version: "7.46.0"
+    assert: 0
+
+
+
+
+
+
+
+
+

test_backend_data/user_data/my_question.yaml

+my_question:
+  #我的-问题
+  -
+    case: "我的页面-问题"
+    start_num: 0
+    count: 10
+    assert: 0
+
+
+
+
+
+
+

test_backend_data/user_data/reply_tractate.yaml

+reply_tractate:
+  #我的-帖子
+  -
+    case: "我的页面-帖子-我回复的"
+    page: 1
+    count: 10
+    version: 7.46.0
+    assert: 0
+
+
+
+
+
+
+

test_backend_data/user_data/user_tractate.yaml

 user_tractate:
   -
-   #我的-帖子
-    case: "我的页面-帖子"
+   #我的-帖子-我发布的
+    case: "我的页面-帖子-我发布的"
     page: 1
     count: 10
     assert: 0

test_doctor_case/web_case/test_cpc_community_click_logs.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_doctor_api.web_request import web_request
+
+
+class TestCpcCommunityClickLogs:
+    data = BaseRequest().api_load(path_setting.CPCCOMMUNITYCLICKLOGS)
+    cpccommunityclicklogs_case, cpccommunityclicklogs_data = get_ids(data, "cpc_community_click_logs")
+
+
+    @pytest.mark.parametrize("param",cpccommunityclicklogs_data,ids=cpccommunityclicklogs_case)
+    def test_cpc_community_click_logs(self, param):
+        '''点点通内容-数据统计'''
+        r = web_request().cpc_community_click_logs(param["page"])
+        if r["error"] == 0:
+            click_list = r.get("data").get("click_list", [])
+            assert len(click_list) >= param["assert"]
+
+
+

test_doctor_data/web_data/cpc_community_click_logs.yaml

+cpc_community_click_logs:
+  #点点通内容-推广明细case
+  -
+    case: "点点通内容-推广明细"
+    page: 1
+    assert: 0