From e4895f4158d95ce91fb5fab4960f448cca2a3e8f Mon Sep 17 00:00:00 2001
From: zhanhuasheng <zhanhuasheng@channelwill.cn>
Date: Fri, 15 Nov 2024 11:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9ai?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TestCase/automation/test_06_ai.py |  26 +++---
 YamlCase/automation/ai.yaml       | 127 +++++++++++++++++-------------
 2 files changed, 87 insertions(+), 66 deletions(-)

diff --git a/TestCase/automation/test_06_ai.py b/TestCase/automation/test_06_ai.py
index e88bd5c..131a052 100644
--- a/TestCase/automation/test_06_ai.py
+++ b/TestCase/automation/test_06_ai.py
@@ -1,13 +1,13 @@
-# import pytest
-# from Utils import yaml_handler
-# from Utils import req_handler
-# from TestData.automation.ai_test_data import AiTestData
-#
-# class TestAi:
-#
-#     yaml_path = r'automation/ai.yaml'
-#     yaml_data = yaml_handler.yaml_handler.get_case(yaml_path)
-#     @pytest.mark.flaky(reruns=AiTestData.rerun, reruns_delay=AiTestData.rerun_delay)
-#     @pytest.mark.parametrize('case',yaml_data)
-#     def test_ai(self,case):
-#         req_handler.ReqHandler.send_requests(case=case,var_class=AiTestData)
+import pytest
+from Utils import yaml_handler
+from Utils import req_handler
+from TestData.automation.ai_test_data import AiTestData
+
+class TestAi:
+
+    yaml_path = r'automation/ai.yaml'
+    yaml_data = yaml_handler.yaml_handler.get_case(yaml_path)
+    @pytest.mark.flaky(reruns=AiTestData.rerun, reruns_delay=AiTestData.rerun_delay)
+    @pytest.mark.parametrize('case',yaml_data)
+    def test_ai(self,case):
+        req_handler.ReqHandler.send_requests(case=case,var_class=AiTestData)
diff --git a/YamlCase/automation/ai.yaml b/YamlCase/automation/ai.yaml
index 95a4db2..6923c58 100644
--- a/YamlCase/automation/ai.yaml
+++ b/YamlCase/automation/ai.yaml
@@ -119,10 +119,10 @@ api13:
     - exec: {"code": "assert res.json()['data']['total'] == str(${url_num})"}
 
 api14:
-  title: 查询QA接口
+  title: 查询in this knowledge中的QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"page":1,"pageSize":10,"shopId":"${shopId}","v":"${v}","category": 2}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   set_value: {"qa_num": "$.data.total"}
   expected:
     - eq: {"$.code": 0}
@@ -131,16 +131,16 @@ api15:
   title: 新增QA
   url: api/v1/willai/local/addAiQa
   method: post
-  data: {"category":2,"shopId":"${shopId}","question":"${new_question}","answer":"${new_answer}","v":"${v}"}
+  data: {"docType":3,"shopId":"${shopId}","question":"${new_question}","answer":"${new_answer}","v":"${v}"}
+  set_value: {"qa_id": "$.data.id"}
   expected:
     - eq: {"$.code": 0}
 
 api16:
-  title: 查询QA接口
+  title: 查询in this knowledge中的QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"page": 1,"pageSize": 100,"shopId": "${shopId}","v": "${v}","category": 2}
-  set_value: {"qa_id": "$.data.list[?(@.question == '${new_question}')].id","qa_num": "$.data.total"}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
     - exec: {"code": "assert res.json()['data']['total'] == str(int('${qa_num}') + 1)"}
@@ -149,7 +149,7 @@ api17:
   title: 编辑QA
   url: api/v1/willai/local/modifyAiQa
   method: post
-  data: {"category":2,"shopId":"${shopId}","question":"${edit_question}","answer":"${edit_answer}","id":"${qa_id}","v":"${v}"}
+  data: {"docType":3,"shopId":"${shopId}","question":"${edit_question}","answer":"${edit_answer}","id":"${qa_id}","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
@@ -157,17 +157,17 @@ api18:
   title: 查询QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"page":1,"pageSize":100,"shopId":"${shopId}","v":"${v}","category": 2}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
     - eq: {"$.data.list[?(@.id == '${qa_id}')].question": "${edit_question}"}
     - eq: {"$.data.list[?(@.id == '${qa_id}')].answer": "${edit_answer}"}
 
 api19:
-  title: 删除QA
-  url: api/v1/willai/local/deleteAiQa
+  title: 关闭QA
+  url: api/v1/willai/local/operateAiQa
   method: post
-  data: {"shopId":"${shopId}","qas":[{"id":"${qa_id}","category":2}],"v":"${v}"}
+  data: { "id": "${qa_id}","shopId": "${shopId}","brandId": "${brandId}","status": 3,"v": "${v}" }
   expected:
     - eq: {"$.code": 0}
 
@@ -175,84 +175,106 @@ api20:
   title: 查询QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"page":1,"pageSize":100,"shopId":"${shopId}","v":"${v}","category": 2}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-    - not_in_list: {"$.data.list[*].id": "${qa_id}"}
+    - eq: {"$.data.list[?(@.id == '${qa_id}')].status": 3}
 
 api21:
-  title: 编辑Email和推荐问题开关
-  url: api/v1/setting/local/updateShopSetting
+  title: 打开QA
+  url: api/v1/willai/local/operateAiQa
   method: post
-  data: {"itemList":[{"shopId":"${shopId}","itemId":204,"itemValue":"${new_email}","itemName":"willAiShopEmail"},{"shopId":"${shopId}","itemId":205,"itemValue":"0","itemName":"willAiEnableSuggestQuestions"}],"brandId":"${brandId}","v":"${v}"}
+  data: { "id": "${qa_id}","shopId": "${shopId}","brandId": "${brandId}","status": 2,"v": "${v}" }
   expected:
-    - eq: {"$.code": 0}
+    - eq: { "$.code": 0 }
 
 api22:
-  title: 检查Email和推荐问题开关是否编辑成功
-  url: api/v1/setting/local/getShopSetting
+  title: 查询QA接口
+  url: api/v1/willai/local/aiQAList
   method: post
-  data: {"v": "${v}"}
+  data: { "shopId": "${shopId}","page": 1,"pageSize": 15,"status": 2,"search": "","lastDayType": 2,"searchType": 1,"timeZone": "Asia/Shanghai","v": "${v}" }
   expected:
-    - eq: {"$.code": 0}
-    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].[?(@.itemId == 204)].itemValue": "${new_email}"}
-    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].[?(@.itemId == 205)].itemValue": "0"}
+    - eq: { "$.code": 0 }
+    - eq: { "$.data.list[?(@.id == '${qa_id}')].status": 2}
 
 api23:
-  title: 新增推荐问题
-  url: api/v1/willai/local/addAiQa
+  title: 删除QA
+  url: api/v1/willai/local/operateAiQa
   method: post
-  data: {"category":2,"shopId":"${shopId}","question":"${new_suggest_question}","answer":"${new_suggest_answer}","v":"${v}"}
-  sleep: 3
+  data: {"id":"${qa_id}","shopId":"${shopId}","brandId":"${brandId}","status":4,"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
 api24:
-  title: 查看推荐问题列表
+  title: 查询dismiss的QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"shopId":"${shopId}","category":1,"v":"${v}"}
-  set_value: {"suggest_qa_id": "$.data.list[?(@.question == '${new_suggest_question}')].id"}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":3,"lastDayType":4,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-    - eq: {"$.data.list[?(@.question == '${new_suggest_question}')].answer": "${new_suggest_answer}"}
+    - in_list: {"$.data.list[*].id": "${qa_id}"}
 
 api25:
-  title: 编辑推荐问题
-  url: api/v1/willai/local/modifyAiQa
+  title: 把qa添加回in this knowledge
+  url: api/v1/willai/local/operateAiQa
   method: post
-  data: {"category":1,"shopId":"${shopId}","question":"${edit_suggest_question}","answer":"${edit_suggest_answer}","id":"${suggest_qa_id}","v":"${v}"}
+  data: { "id": "${qa_id}","shopId": "${shopId}","brandId": "${brandId}","status": 1,"v": "${v}" }
   expected:
-    - eq: {"$.code": 0}
+    - eq: { "$.code": 0 }
 
 api26:
-  title: 查看推荐问题列表
+  title: 查询QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"shopId":"${shopId}","category":1,"v":"${v}"}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-    - eq: {"$.data.list[?(@.id == '${suggest_qa_id}')].answer": "${edit_suggest_answer}"}
-    - eq: {"$.data.list[?(@.id == '${suggest_qa_id}')].question": "${edit_suggest_question}"}
+    - in_list: {"$.data.list[*].id": "${qa_id}"}
 
 api27:
-  title: 删除推荐问题
-  url: api/v1/willai/local/deleteAiQa
+  title: 把qa添加回in this knowledge
+  url: api/v1/willai/local/operateAiQa
   method: post
-  data: {"shopId":"${shopId}","qas":[{"id":"${suggest_qa_id}","category":1}],"v":"${v}"}
+  data: { "id": "${qa_id}","shopId": "${shopId}","brandId": "${brandId}","status": 5,"v": "${v}" }
   expected:
-    - eq: {"$.code": 0}
+    - eq: { "$.code": 0 }
 
 api28:
-  title: 查看推荐问题列表
+  title: 查询in this knowledge的QA接口
   url: api/v1/willai/local/aiQAList
   method: post
-  data: {"shopId":"${shopId}","category":1,"v":"${v}"}
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":2,"search":"","lastDayType":2,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-    - not_in_list: {"$.data.list[*].id": "${suggest_qa_id}"}
+    - not_in_list: {"$.data.list[*].id": "${qa_id}"}
 
 api29:
+  title: 查询dismiss的QA接口
+  url: api/v1/willai/local/aiQAList
+  method: post
+  data: {"shopId":"${shopId}","page":1,"pageSize":15,"status":3,"lastDayType":4,"searchType":1,"timeZone":"Asia/Shanghai","v":"${v}"}
+  expected:
+    - eq: {"$.code": 0}
+    - not_in_list: {"$.data.list[*].id": "${qa_id}"}
+
+api30:
+  title: 编辑Email
+  url: api/v1/setting/local/updateShopSetting
+  method: post
+  data: {"itemList":[{"shopId":"${shopId}","itemId":204,"itemValue":"${new_email}","itemName":"willAiShopEmail"}],"brandId":"${brandId}","v":"${v}"}
+  expected:
+    - eq: {"$.code": 0}
+
+api31:
+  title: 检查Email是否编辑成功
+  url: api/v1/setting/local/getShopSetting
+  method: post
+  data: {"v": "${v}"}
+  expected:
+    - eq: {"$.code": 0}
+    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].[?(@.itemId == 204)].itemValue": "${new_email}"}
+
+api32:
   title: AI训练页面聊天
   url: api/v1/willai/local/knowledgeTestChat
   method: post
@@ -260,15 +282,15 @@ api29:
   expected:
     - eq: {"$.code": 0}
 
-api30:
-  title: 编辑Email和推荐问题开关
+api33:
+  title: 编辑Email
   url: api/v1/setting/local/updateShopSetting
   method: post
-  data: {"itemList":[{"shopId":"${shopId}","itemId":204,"itemValue":"","itemName":"willAiShopEmail"},{"shopId":"${shopId}","itemId":205,"itemValue":"1","itemName":"willAiEnableSuggestQuestions"}],"brandId":"${brandId}","v":"${v}"}
+  data: {"itemList":[{"shopId":"${shopId}","itemId":204,"itemValue":"","itemName":"willAiShopEmail"}],"brandId":"${brandId}","v":"${v}"}
   expected:
     - eq: {"$.code": 0}
 
-api31:
+api344:
   title: 检查Email和推荐问题开关是否编辑成功
   url: api/v1/setting/local/getShopSetting
   method: post
@@ -276,9 +298,8 @@ api31:
   expected:
     - eq: {"$.code": 0}
     - eq: {"$.data.settingInfoMap.mapList['${shopId}'].[?(@.itemId == 204)].itemValue": ""}
-    - eq: {"$.data.settingInfoMap.mapList['${shopId}'].[?(@.itemId == 205)].itemValue": "1"}
 
-api32:
+api35:
   title: 关闭AI开关
   url: api/v1/setting/local/updateShopSetting
   method: post
@@ -286,7 +307,7 @@ api32:
   expected:
     - eq: {"$.code": 0}
 
-api33:
+api36:
   title: 检查AI开关状态
   url: api/v1/setting/local/getShopSetting
   method: post
-- 
GitLab