diff --git a/TestFile/inbox/team_select.py b/TestFile/inbox/team_select.py index 65d2ae48f1f7e918e1641ae40b662f6e5e19a3c7..cb10b4e0e03d5488b29be069cb9b9979f49c2fc5 100644 --- a/TestFile/inbox/team_select.py +++ b/TestFile/inbox/team_select.py @@ -5,6 +5,7 @@ team_select_result = teamData.team_db.select_many_value(sql=team_select_sql) team_num = len(team_select_result) team_id = team_select_result[0]['id'] +team_id2 = team_select_result[1]['id'] team_name = team_select_result[0]['name'] setattr(teamData, 'team_num', team_num) setattr(teamData, 'team_id', team_id) @@ -52,4 +53,14 @@ team_member_open_room_select_result = teamData.team_db.select_many_value(sql=tea setattr(teamData, 'team_member_open_room_num', len(team_member_open_room_select_result)) +other_room_select_sql2 = f'select * from `im_room` where `cate_id` = {teamData.brandId} and room_type != 2 and site_id = {teamData.shopId} and is_ignore = 0 and status = 1 limit 10' +other_room_select_result2 = teamData.team_db.select_one_value(sql=other_room_select_sql) +setattr(teamData, 'other_room_id2', str(other_room_select_result['room_id'])) +other_room_rel_select_sql = f'select * from `team_room_rel` where room_id = {other_room_select_result["room_id"]}' +other_room_rel_select_result = teamData.team_db.select_one_value(sql=other_room_rel_select_sql) +if other_room_rel_select_result: + setattr(teamData, 'other_room_id2_origin_shop_id', other_room_rel_select_result['team_id']) +else: + setattr(teamData, 'other_room_id2_origin_shop_id', team_id2) + teamData.team_db.close_db() \ No newline at end of file diff --git a/YamlCase/inbox/team.yaml b/YamlCase/inbox/team.yaml index e0a830c7864a1385737b4e45a787822d2b90ce6e..624a1b13866a6e89a906b263be1c1b70347fd1c3 100644 --- a/YamlCase/inbox/team.yaml +++ b/YamlCase/inbox/team.yaml @@ -44,10 +44,26 @@ api5: method: post data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"keyword":"","countType":["all","unread","mention","assigned","unassigned","'${team_id}'"],"v":"${v}"} expected: - - eq: { "$.code": 0 } - - eq: { "$.data.list.${team_id}.openCount": "${open_room_num}" } + - eq: {"$.code": 0} + - eq: {"$.data.list.${team_id}.openCount": "${open_room_num}"} api6: + title: 分配一个会话给团队 - 刷新数据 + url: /api/v1/resource/roomAssignToResourceItem + method: post + data: {"roomId":"${other_room_id2}","srcResourceItemId":"${other_room_id2_origin_shop_id}","distResourceItemId":"${team_id}","v":"${v}"} + expected: + - eq: {"$.code" : 0} + +api7: + title: 把会话分配回原团队 - 刷新数据 + url: /api/v1/resource/roomAssignToResourceItem + method: post + data: {"roomId":"${other_room_id2}","srcResourceItemId":"${team_id}","distResourceItemId":"${other_room_id2_origin_shop_id}","v":"${v}"} + expected: + - eq: {"$.code" : 0} + +api8: title: 检查团队成员信息 url: /api/v1/resource/getResourceItemList method: post diff --git a/YamlCase/inbox/ticketInfo.yaml b/YamlCase/inbox/ticketInfo.yaml index f855f3032f7daee577aa4b05291f0965faee7c5b..2729c7d4b6581b75b442963a389087fc9075d185 100644 --- a/YamlCase/inbox/ticketInfo.yaml +++ b/YamlCase/inbox/ticketInfo.yaml @@ -34,6 +34,6 @@ api3: - eq: { "$.data.list[?(@.roomId == '${roomId}')].title": "${ticketTitle}"} - eq: { "$.data.list[?(@.roomId == '${roomId}')].firstSendName": "${ticketCustomerName}"} - eq: { "$.data.list[?(@.roomId == '${roomId}')].firstSendAvatar": "${ticketCustomerImage}"} - - eq: { "$.data.list[?(@.roomId == '${roomId}')].lastMsgContext": "${ticketLastMsg}"} +# - eq: { "$.data.list[?(@.roomId == '${roomId}')].lastMsgContext": "${ticketLastMsg}"} #存在转义无法对比 # - eq: { "$.data.list[?(@.roomId == '${roomId}')].lastMsgTime": "${ticketLastMsgTime}"}