You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2022/06/23 01:13:00 UTC
[incubator-devlake] 02/02: refactor(tapd): add e2e for story_bug
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 69cef255de64a47107d624b811b68d109781d40a
Author: Yingchu Chen <yi...@merico.dev>
AuthorDate: Wed Jun 22 23:42:18 2022 +0800
refactor(tapd): add e2e for story_bug
---
devops/lake-builder/Dockerfile | 2 +-
.../e2e/raw_tables/_raw_tapd_api_story_bugs.csv | 13 ++++++
.../e2e/snapshot_tables/_tool_tapd_bug_commits.csv | 34 +++++++++++++-
.../e2e/snapshot_tables/_tool_tapd_story_bugs.csv | 13 ++++++
.../snapshot_tables/_tool_tapd_task_commits.csv | 40 ++++++++++++++++
.../e2e/snapshot_tables/_tool_tapd_worklogs.csv | 16 +++++++
.../tapd/e2e/snapshot_tables/issue_commits_bug.csv | 8 ++++
.../e2e/snapshot_tables/issue_commits_story.csv | 2 -
.../e2e/snapshot_tables/issue_commits_task.csv | 7 +++
.../tapd/e2e/snapshot_tables/issue_worklogs.csv | 16 +++++++
.../{tasks_commit_test.go => story_bug_test.go} | 54 +++++-----------------
plugins/tapd/e2e/tasks_commit_test.go | 2 -
12 files changed, 159 insertions(+), 48 deletions(-)
diff --git a/devops/lake-builder/Dockerfile b/devops/lake-builder/Dockerfile
index e81a8cc2..c8efe134 100644
--- a/devops/lake-builder/Dockerfile
+++ b/devops/lake-builder/Dockerfile
@@ -17,5 +17,5 @@
# current tag: mericodev/lake-builder:0.0.5
FROM golang:1.17-alpine3.15 as builder
#RUN apk add --update gcc=130.2.1_pre1-r3 g++=10.2.1_pre1-r3
-RUN apk update && apk upgrade && apk add --no-cache tzdata libgit2-dev gcc g++ make
+RUN apk update && apk upgrade && apk add --no-cache tzdata libgit2-dev gcc g++ make tar
RUN go install github.com/vektra/mockery/v2@latest
diff --git a/plugins/tapd/e2e/raw_tables/_raw_tapd_api_story_bugs.csv b/plugins/tapd/e2e/raw_tables/_raw_tapd_api_story_bugs.csv
new file mode 100644
index 00000000..6537aa63
--- /dev/null
+++ b/plugins/tapd/e2e/raw_tables/_raw_tapd_api_story_bugs.csv
@@ -0,0 +1,13 @@
+id,params,data,url,input,created_at
+4388,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001011999""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4389,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012003""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4390,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012007""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4391,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012015""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4392,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012020""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4393,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012021""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4394,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012029""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4395,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012035""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4396,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012043""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4397,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012046""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4398,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012066""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
+4399,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}","{""workspace_id"":""991"",""story_id"":""11991001058983"",""bug_id"":""11991001012078""}",https://api.tapd.cn/stories/get_related_bugs?story_id=11991001058983&workspace_id=991,"{""Id"": 11991001058983}",2022-06-13 05:59:24.111
diff --git a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_commits.csv b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_commits.csv
index 2d4a4eb2..14d72e64 100644
--- a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_commits.csv
+++ b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_bug_commits.csv
@@ -1 +1,33 @@
-connection_id,id,user_id,hook_user_name,commit_id,workspace_id,message,path,web_url,hook_project_name,ref,ref_status,git_env,file_commit,commit_time,created,bug_id,created_at,updated_at,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+connection_id,id,user_id,hook_user_name,commit_id,workspace_id,message,path,web_url,hook_project_name,ref,ref_status,git_env,file_commit,commit_time,created,bug_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,1100000001001001392,1024072108,caijianhai,testcommit,991,"--bug=1011638 --user=test1118521test1115efatest1116d77 iostest1117aeftest111ff0ctest1113010exposureOperationPosition-test11166ddtest1115149test1118fd0test1118425test1114f4dtest1113011test1114e8btest1114ef6test111ff0ctest11167d0test1114e9btest1118fd0test1118425test1114f4dtest111201cposition_idtest111201dtest1115c5etest1116027test111503ctest111662f0 https://www.tapd.cn/991/s/1202202
+",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/d0d962c58ec87224d60e75afcce2d085376eafc1,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/General\/SensorsAnalytics\/SATrackEvent.swift""],""R"":[]}",2022-04-27T09:33:08.000+00:00,2022-04-28T03:30:29.000+00:00,11991001011638,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,2,
+1,1100000001001001483,1173580198,zhaopengzheng,testcommit,991,"--bug=1011648 --user=test1118d75test1119e4ftest1116b63 Android/iOS test1115c06H5test1114e13test1119898test111914dtest1117f6etest11181f3test1119891test1119053test1114fe1test111606ftest1116d41test111ff08test1119664test11163a8test1118350test1119891test1119053test111ff0920test1114f4dtest1114e4btest111540etest11165f6test111ff0ctest1114e0dtest1115e94test1115728test1114fe1test111606ftest1116d41test1114e2dtest1115c55test111793a https [...]
+
+fix h5 operation
+",https://code.idc.hexun.com/tech_wzkf/wapi_src/commit/1efca473a919a168619ac67fb46a44d648eb3d4d,https://code.idc.hexun.com/tech_wzkf/wapi_src,wapi_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""src\/main\/java\/com\/hexun\/wapi\/service\/impl\/HfiveChannelServiceImpl.java"",""src\/main\/java\/com\/hexun\/wapi\/util\/Constants.java""],""R"":[]}",2022-04-28T10:25:55.000+00:00,2022-04-28T10:26:30.000+00:00,11991001011648,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd [...]
+1,1100000001001001484,1173580198,zhaopengzheng,testcommit,991,"Merge branch 'develop/7.8.2' into 'dev'
+
+--bug=1011648 --user=test1118d75test1119e4ftest1116b63 Android/iOS test1115c06H5test1114e13test1119898test111914dtest1117f6etest11181f3test1119891test1119053test1114fe1test111606ftest1116d41test111ff08test1119664test11163a8test1118350test1119891test1119053test111ff0920test1114f4dtest1114e4btest111540etest11165f6test111ff0ctest1114e0dtest1115e94test1115728test1114fe1test111606ftest1116d41test1114e2dtest1115c55test111793a...
+
+See merge request tech_wzkf/wapi_src!166",https://code.idc.hexun.com/tech_wzkf/wapi_src/commit/a85883380d8a555855078bb6124d23bb79f3c4b5,https://code.idc.hexun.com/tech_wzkf/wapi_src,wapi_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""src\/main\/java\/com\/hexun\/wapi\/service\/impl\/HfiveChannelServiceImpl.java"",""src\/main\/java\/com\/hexun\/wapi\/util\/Constants.java""],""R"":[]}",2022-04-28T10:26:28.000+00:00,2022-04-28T10:26:30.000+00:00,11991001011648,"{""ConnectionId"":1,""Compan [...]
+1,1100000001001001581,1173580198,zhaopengzheng,testcommit,991,"--bug=1011653 --user=test1118d75test1119e4ftest1116b63 H5test1114e13test1119898test1116a2atest1116ed1test1116837test1115f0ftest111ff0ctest1115f53test11165b0test11195fbtest1116807test1119898test1115728test111540etest11153f0test11188abtest1114feetest1116539test1118fc7test11165f6test111ff0ctest1115e94test1118bfbtest11153d6test1114feetest1116539test111540etest1117684test1116807test1119898test111ff0ctest1115f53test111524dtest1115c [...]
+
+fix slide style error
+",https://code.idc.hexun.com/tech_wzkf/wapi_src/commit/747495cd80c342f06d76bfc24ea69ed0cdf07698,https://code.idc.hexun.com/tech_wzkf/wapi_src,wapi_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""src\/main\/java\/com\/hexun\/wapi\/controller\/ApiController.java"",""src\/main\/java\/com\/hexun\/wapi\/service\/impl\/HfiveChannelServiceImpl.java""],""R"":[]}",2022-04-29T06:52:45.000+00:00,2022-04-29T06:53:32.000+00:00,11991001011653,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}" [...]
+1,1100000001001001813,1024072108,caijianhai,testcommit,991,"--bug=1011620 --user=test1118521test1115efatest1116d77 iostest1117aeftest111795etest1117b56-test1118d22test1119053test11190e8test1115206test111ff0ctest1115404test11179cdtest11165b9test1115f0ftest1116210test111529ftest111767btest1115f55test111540etest111ff0ctest11159cbtest1117ec8test111672atest1118bb0test1115f55finish_logintest1115b8ctest1116210test111767btest1115f55test1114e8btest1114ef6 https://www.tapd.cn/991/s/1203765
+",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/e5c267b19b19fb72f98bfb780b4cd07b375a2799,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/General\/Macro\/HXEnum.h"",""HXEconomics\/HXEconomics\/Reference\/HX_Mine\/Login\/HXLoginManager.m"",""HXEconomics\/HXEconomics\/Reference\/HX_Mine\/Login\/LoginViewController.m"",""HXEconomics\/HXEconomics\/Reference\/HX_Mine\/Login\/TeleLogin\/TeleL [...]
+1,1100000001001001892,1024072108,caijianhai,testcommit,991,"--bug=1011654 --user=test1118521test1115efatest1116d77 Android/iOS APPtest11165b0test11195fbtest1118be6test11160c5test1119875test111ff0ctest1114e00test1116b21test1115206test1114eabtest1113001test1114e8ctest1116b21test1115206test1114eablogotest1114e0dtest1114e00test11181f4test111ff0ctest1118bf7test1114ea7test11154c1test111786etest1118ba4test11165b0logotest1116837test1115f0f https://www.tapd.cn/991/s/1204206 test1119700test1116c42 [...]
+",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/6b244c704cfdfe864fa543b365a0234d361f818b,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/Reference\/ColumnArticleDetails\/ViewController\/HXColumnArticleViewController.swift""],""R"":[]}",2022-04-29T08:46:59.000+00:00,2022-05-05T01:37:47.000+00:00,11991001011654,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug [...]
+1,1100000001001002216,1024072108,caijianhai,testcommit,991,"test11165b0test11195fbtest1115206test1114eabtest111914dtest11156fetest1115f03test1117528 picture test1115b57test1116bb5test111ff0ctest1114f7ftest1117528test1119ed8test1118ba4logo --bug=1011661 --user=test1118521test1115efatest1116d77 android test1114e13test111680ftest11165b0test11195fbtest1118be6test11160c5test1119875test111ff0ctest1115206test1114eabtest1115361test1117247 logotest1115e94test1114e3atest1119ed8test1118ba4test11191 [...]
+",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/4d927eab7a2eb81b1bcb8969e9276df9e0ad30a1,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/Reference\/ColumnArticleDetails\/JSModel\/NewsDetailJSModel.swift""],""R"":[]}",2022-05-06T11:32:48.000+00:00,2022-05-06T11:32:50.000+00:00,11991001011661,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,8,
+1,1100000001001002217,1024072108,caijianhai,testcommit,991,"Merge branch 'caijianhai/fixbug782' into 'develop'
+
+test11165b0test11195fbtest1115206test1114eabtest111914dtest11156fetest1115f03test1117528 picture test1115b57test1116bb5test111ff0ctest1114f7ftest1117528test1119ed8test1118ba4logo --bug=1011661 --user=test1118521test1115efatest1116d77 android test1114e13test111680ftest11165b0test11195fbtest1118be6test11160c5test1119875test111ff0ctest1115206test1114eabtest1115361test1117247 logotest1115e94test1114e3atest1119ed8test1118ba4test111914dtest11156fetest111ff0ctest111800ctest111975etest111548ctes [...]
+
+See merge request tech_mobile/news_ios_src!115",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/45803c9d8f784fa99456cc470a22b31fd29a0d4b,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/Reference\/ColumnArticleDetails\/JSModel\/NewsDetailJSModel.swift""],""R"":[]}",2022-05-06T11:32:48.000+00:00,2022-05-06T11:32:50.000+00:00,11991001011661,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceI [...]
+1,1100000001001002273,73310607,like,testcommit,991,"--bug=1011655 --user=test111674etest11179d1 Android test1118d22test1119053test11189c6test1119891test1116a2atest1115c4ftest11164adtest111653etest11165f6test111ff0ctest1115c06apptest1119000test11181f3test111540etest11153f0test111ff0ctest11189c6test1119891test1115219test111505ctest1116b62test11164adtest111653e https://www.tapd.cn/991/s/1207010
+
+test1114feetest1116539test1116a2atest1115c4ftest1116a21test1115f0ftest1114e0btest111540etest11153f0test1116682test111505ctest11164adtest111653etest11195eetest1119898
+",https://code.idc.hexun.com/tech_mobile/news_android_src/commit/da3fc832df8c9ca115dc0276dc941f5559cfa883,https://code.idc.hexun.com/tech_mobile/news_android_src,news_android_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""NewsBase\/src\/main\/java\/com\/hexun\/training\/activity\/WebActivity.java""],""R"":[]}",2022-05-07T02:54:10.000+00:00,2022-05-07T03:19:42.000+00:00,11991001011655,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,6,
+1,1100000001001005840,1024072108,caijianhai,testcommit,991,"--bug=1011794 --user=test1118521test1115efatest1116d77 iOS test1115173test1116ce8test1119891test1119053test1115173test1116ce8test1115217test1118868test111ff0ctest11170b9test11151fbtest111201dtest11170b9test11151fbtest1116216test1114e0atest11162c9test11152a0test1118f7dtest11166f4test111591atest111201ctest1116309test11194aetest111ff0c https://www.tapd.cn/991/s/1218511
+",https://code.idc.hexun.com/tech_mobile/news_ios_src/commit/df0f588468219edbd7a34d6e238380dca38587b9,https://code.idc.hexun.com/tech_mobile/news_ios_src,news_ios_src,refs/heads/develop,0,Gitlab,"{""A"":[],""M"":[""HXEconomics\/HXEconomics\/Reference\/HX_ZhuanLan\/ColumnChannel\/View\/HXNewsColumnNoMoreDataFooter.swift""],""R"":[]}",2022-05-19T16:33:42.000+00:00,2022-05-21T07:59:08.000+00:00,11991001011794,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,10,
diff --git a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_story_bugs.csv b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_story_bugs.csv
new file mode 100644
index 00000000..9a4e3fe7
--- /dev/null
+++ b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_story_bugs.csv
@@ -0,0 +1,13 @@
+connection_id,workspace_id,story_id,bug_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,991,11991001058983,11991001011999,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4388,
+1,991,11991001058983,11991001012003,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4389,
+1,991,11991001058983,11991001012007,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4390,
+1,991,11991001058983,11991001012015,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4391,
+1,991,11991001058983,11991001012020,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4392,
+1,991,11991001058983,11991001012021,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4393,
+1,991,11991001058983,11991001012029,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4394,
+1,991,11991001058983,11991001012035,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4395,
+1,991,11991001058983,11991001012043,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4396,
+1,991,11991001058983,11991001012046,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4397,
+1,991,11991001058983,11991001012066,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4398,
+1,991,11991001058983,11991001012078,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_bugs,4399,
diff --git a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_task_commits.csv b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_task_commits.csv
index 508ec142..113cffa5 100644
--- a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_task_commits.csv
+++ b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_task_commits.csv
@@ -1 +1,41 @@
connection_id,id,user_id,hook_user_name,commit_id,workspace_id,message,path,web_url,hook_project_name,ref,ref_status,git_env,file_commit,commit_time,created,task_id,created_at,updated_at,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,1100000001001004152,1374634243,zhangxiaoyong,testcommit,991,"edit --task=1057849 --user=test5f20test5c0ftest52c7 test7406test8d22test5ba2test673atest6784test7248test9879test76ee1.0test529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1213824
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/667f4a54f771e05695fd2ccc3adb38e5e1303931,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/asset\/AssetServiceImpl.java""],""R"":[]}",2022-05-16T11:15:09.000+00:00,2022-05-16T11:15:37.000+00:00,11991001057849,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId"" [...]
+1,1100000001001004166,1374634243,zhangxiaoyong,testcommit,991,"edit logs --task=1057849 --user=test5f20test5c0ftest52c7 test7406test8d22test5ba2test673atest6784test7248test9879test76ee1.0test529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1213824
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/9c54a1b22e6bd24d9bb365db7b99e816a120627e,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/resources\/logback.xml""],""R"":[]}",2022-05-16T11:35:45.000+00:00,2022-05-16T11:36:04.000+00:00,11991001057849,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_ta [...]
+1,1100000001001004186,1374634243,zhangxiaoyong,testcommit,991,"edit logpath --task=1057849 --user=test5f20test5c0ftest52c7 test7406test8d22test5ba2test673atest6784test7248test9879test76ee1.0test529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1213824
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/410dc175bcb8680aaa4251fbf5c8bbb7bcd84691,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/resources\/logback.xml""],""R"":[]}",2022-05-16T11:44:33.000+00:00,2022-05-16T11:45:28.000+00:00,11991001057849,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_ta [...]
+1,1100000001001004209,0,haoxiaoqi,testcommit,991,"add trade nofifyemail
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/13c62cba1f18a681882d81c81d696671a11805a3,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/notify\/INotifyService.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/notify\/NotifyServiceImpl.java""],""M"":[""org-trading-system\/src\/main\/java\/com\/licaik [...]
+1,1100000001001004568,2060207111,haoxiaoqi,testcommit,991,"fix purcharse --task=1058010 --user=test90ddtest6653test7426 test673atest6784test7248test7533test8d2dtestff0ctest8d4etest56detest529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1215106
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/bc35777ab8b74557a83bccdcc0b7b0f7701a8f00,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradePurchaseController.java"",""org-trading-common\/src\/main\/java\/com\/licaike\/org\/trading\/common\/core\/controller\/BaseController.java"",""org-trading-system\/src\/main\/java\/co [...]
+1,1100000001001004569,2060207111,haoxiaoqi,testcommit,991,"fix dept_id --task=1058010 --user=test90ddtest6653test7426 test673atest6784test7248test7533test8d2dtestff0ctest8d4etest56detest529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1215106
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/6aeda93d3aaf2cb6a22397575ce9ca308d4d35b6,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradePurchaseController.java"",""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradeRedeemController.java"",""org-trading-system\/src\/main\/j [...]
+1,1100000001001004570,2060207111,haoxiaoqi,testcommit,991,"fix test5b8ctest5584test4ea4test6613 --task=1058010 --user=test90ddtest6653test7426 test673atest6784test7248test7533test8d2dtestff0ctest8d4etest56detest529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1215106
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/f38f2f9d16d0aa6dcb1e938188f2b082086d5534,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradePurchaseController.java"",""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradeRedeemController.java"",""org-trading-system\/src\/main\/j [...]
+1,1100000001001004571,2060207111,haoxiaoqi,testcommit,991,"fix test8f6ctest8d26test901atest77e5test652ftest6301requestNo --task=1058010 --user=test90ddtest6653test7426 test673atest6784test7248test7533test8d2dtestff0ctest8d4etest56detest529ftest80fdtest5f00test53d1 https://www.tapd.cn/991/s/1215106
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/9b2232bdcd7145cb92b90ee783706c303f0f33fa,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/business\/OrderController.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/order\/OrderServiceImpl.java""],""R"":[]}",2022-05-17T12:57:12.000+00:00,2022-05 [...]
+1,1100000001001004654,2060207111,haoxiaoqi,testcommit,991,"add log --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/a871554df852780e72650422364d46c7b1076837,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradePurchaseController.java""],""R"":[]}",2022-05-18T03:46:02.000+00:00,2022-05-18T03:46:27.000+00:00,11991001058064,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""Conne [...]
+1,1100000001001004655,2060207111,haoxiaoqi,testcommit,991,"add log --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/b5197b2fa24c90f1b63f4c37b6f639b125696ed2,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/impl\/ValidateParamServiceImpl.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/purchase\/PurchaseServiceImpl.java""],""R"":[]}",2022-05-18T03:46:21.000+0 [...]
+1,1100000001001004669,2060207111,haoxiaoqi,testcommit,991,"requestNo --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/7094fee94c48918fa46b010a712f4fbaa90e1f95,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/purchase\/PurchaseServiceImpl.java""],""R"":[]}",2022-05-18T04:04:04.000+00:00,2022-05-18T04:04:11.000+00:00,11991001058064,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""Connecti [...]
+1,1100000001001004680,2060207111,haoxiaoqi,testcommit,991,"fix mapper --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/40fc8edfb2712668c6d0443e0fa7cd1eaf802a72,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/resources\/mapper\/order\/OrgRequestMapper.xml""],""R"":[]}",2022-05-18T04:54:24.000+00:00,2022-05-18T04:54:30.000+00:00,11991001058064,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId [...]
+1,1100000001001004751,2060207111,haoxiaoqi,testcommit,991,"fix test94f6test884ctest7a7atest5904test7406testff0cHxShareBean test8f6ctest6362 --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/e3347a267fb284088cdd91796411190663440eb1,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/java\/com\/licaike\/org\/trading\/web\/controller\/purchase\/TradeRedeemController.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/purchase\/PurchaseServiceImpl.java"",""org-trading-system\/src\/main\/java [...]
+1,1100000001001004833,2060207111,haoxiaoqi,testcommit,991,"add test57fatest91d1test5408test540curl --task=1058064 --user=test90ddtest6653test7426 test673atest6784test7248test529ftest80fdtest8054test8c03test6d4btest8bd5 https://www.tapd.cn/991/s/1215629
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/36eb50d7a11037cf434b5bdbf6869425b0728889,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/purchase\/PurchaseServiceImpl.java""],""R"":[]}",2022-05-18T10:57:47.000+00:00,2022-05-18T10:57:59.000+00:00,11991001058064,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""Connecti [...]
+1,1100000001001005024,2060207111,haoxiaoqi,testcommit,991,"fix requestNo --task=1058180 --user=test90ddtest6653test7426 test673atest6784test7248test7533test8d2dtestff0ctest8d4etest56detest529ftest80fdtest6d4btest8bd5test8054test8c03 https://www.tapd.cn/991/s/1217168
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/be81619a03af712254ca685fc11f6db6ebdaa432,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-common\/src\/main\/java\/com\/licaike\/org\/trading\/common\/utils\/TradeUtils.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/purchase\/PurchaseServiceImpl.java"",""org-trading-system\/src\/main\/java\/com\/licaike\/org\/t [...]
+1,1100000001001005758,2060207111,haoxiaoqi,testcommit,991,"add test673atest6784test7533test8d2dtest4ea4test6613test9650test5236testff1b--task=1058288 --user=test90ddtest6653test7426 test673atest6784test7248test8054test8c03test6d4btest8bd5testff0ctest4ea4test6613test9650test5236test529ftest80fdtest5f00test53d1testff1b https://www.tapd.cn/991/s/1220106
+",https://code.idc.hexun.com/tech_lck/licaike_src/commit/f1f23c820f4bb37429d7d1080edb2e0a46f8af7f,https://code.idc.hexun.com/tech_lck/licaike_src,licaike_src,refs/heads/feature/jigou_1.0,0,Gitlab,"{""A"":[],""M"":[""basedata\/basedata-service\/src\/main\/java\/com\/licaike\/basedata\/controller\/FundQueryControllerImpl.java""],""R"":[]}",2022-05-20T14:32:02.000+00:00,2022-05-20T14:32:11.000+00:00,11991001058288,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId" [...]
+1,1100000001001008047,2060207111,haoxiaoqi,testcommit,991,"test4feetest590dtest7167test7247test4e0atest4f20webshelltest6f0ftest6d1e --task=1058993 --user=test90ddtest6653test7426 test673atest6784test7248test90aetest4ef6test529ftest80fdtest5b8ctest5584testff1b https://www.tapd.cn/991/s/1227883
+",https://code.idc.hexun.com/tech_lck/licaike_src/commit/112bb2ce285622a00775dfd4a666915974bbdcd7,https://code.idc.hexun.com/tech_lck/licaike_src,licaike_src,refs/heads/feature/penetration_2022-05-27,0,Gitlab,"{""A"":[],""M"":[""etrading\/src\/main\/java\/com\/licaike\/etrading\/controller\/account\/AccountManageController.java"",""etrading\/src\/main\/resources\/templates\/account\/account_picture.ftl""],""R"":[]}",2022-05-30T08:37:02.000+00:00,2022-05-30T08:40:22.000+00:00,119910010589 [...]
+1,1100000001001008053,2060207111,haoxiaoqi,testcommit,991,"fix test90aetest4ef6test673atest6784test540dtest79f0 --task=1058993 --user=test90ddtest6653test7426 test673atest6784test7248test90aetest4ef6test529ftest80fdtest5b8ctest5584testff1b https://www.tapd.cn/991/s/1227883
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/827a30c3633c8ab289bc48c4835877d53c3ac283,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-system\/src\/main\/java\/com\/licaike\/org\/trading\/system\/service\/notify\/NotifyServiceImpl.java""],""R"":[]}",2022-05-30T08:53:07.000+00:00,2022-05-30T08:53:15.000+00:00,11991001058993,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId [...]
+1,1100000001001008059,2060207111,haoxiaoqi,testcommit,991,"test4feetest590dtest7167test7247test4e0atest4f20webshelltest6f0ftest6d1e --task=1058993 --user=test90ddtest6653test7426 test673atest6784test7248test90aetest4ef6test529ftest80fdtest5b8ctest5584testff1b https://www.tapd.cn/991/s/1227883
+",https://code.idc.hexun.com/tech_lck/licaike_src/commit/17609feaed99e287ab8f2bbbbff61aa722ac6ac5,https://code.idc.hexun.com/tech_lck/licaike_src,licaike_src,refs/heads/feature/penetration_2022-05-27,0,Gitlab,"{""A"":[],""M"":[""etrading\/src\/main\/java\/com\/licaike\/etrading\/controller\/account\/AccountManageController.java"",""etrading\/src\/main\/java\/com\/licaike\/etrading\/utils\/FileUploadUtils.java""],""R"":[]}",2022-05-30T09:05:40.000+00:00,2022-05-30T09:05:46.000+00:00,11991 [...]
+1,1100000001001008130,2060207111,haoxiaoqi,testcommit,991,"fix test8bfbtest53d6nacostest914dtest7f6etest6587test4ef6 --task=1058993 --user=test90ddtest6653test7426 test673atest6784test7248test90aetest4ef6test529ftest80fdtest5b8ctest5584testff1b https://www.tapd.cn/991/s/1227883
+",https://code.idc.hexun.com/tech_lck/org_trading_src/commit/e1c4af88790e55184a9843e4eee694ed9cc63eff,https://code.idc.hexun.com/tech_lck/org_trading_src,org_trading_src,refs/heads/dev,0,Gitlab,"{""A"":[],""M"":[""org-trading-admin\/src\/main\/resources\/bootstrap.yml""],""R"":[]}",2022-05-30T10:05:34.000+00:00,2022-05-30T10:05:41.000+00:00,11991001058993,2022-06-22T16:01:37.959+00:00,2022-06-22T16:01:37.959+00:00,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_ [...]
diff --git a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_worklogs.csv b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_worklogs.csv
index 837954ed..fc112400 100644
--- a/plugins/tapd/e2e/snapshot_tables/_tool_tapd_worklogs.csv
+++ b/plugins/tapd/e2e/snapshot_tables/_tool_tapd_worklogs.csv
@@ -1 +1,17 @@
connection_id,id,workspace_id,entity_type,entity_id,timespent,spentdate,owner,created,memo,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,11991001000026,991,task,11991001000103,8,2019-12-15T16:00:00.000+00:00,test-11test-11test-11,2019-12-16T08:10:25.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,1,
+1,11991001000031,991,task,11991001000099,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:16:07.000+00:00,,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,2,
+1,11991001000032,991,task,11991001000107,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:16:51.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,3,
+1,11991001000033,991,task,11991001000104,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:18:22.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,4,
+1,11991001000034,991,task,11991001000101,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:25:04.000+00:00,"test-11test-11test-11test-11test-11test-11test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11 WCMStest-11test-11test-11test-11test-11test-11test-11test-11test-11tes [...]
+1,11991001000038,991,task,11991001000178,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:32:53.000+00:00,,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,6,
+1,11991001000043,991,task,11991001000140,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T09:52:24.000+00:00,,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,7,
+1,11991001000044,991,task,11991001000189,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T09:55:14.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,8,
+1,11991001000045,991,task,11991001000110,3,2019-12-15T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T10:08:35.000+00:00,test-11test-11 - test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,9,
+1,11991001000046,991,task,11991001000110,8,2019-12-15T16:00:00.000+00:00,test-11test-11,2019-12-17T10:14:12.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,10,
+1,11991001000047,991,task,11991001000112,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T10:16:21.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,11,
+1,11991001000048,991,task,11991001000164,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T10:44:34.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11.,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,12,
+1,11991001000049,991,task,11991001000156,8,2019-12-16T16:00:00.000+00:00,test-11test-11test-11,2019-12-17T10:44:55.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,13,
+1,11991001000050,991,task,11991001000209,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T10:45:37.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,14,
+1,11991001000051,991,task,11991001000171,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T10:47:15.000+00:00,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,15,
+1,11991001000055,991,task,11991001000195,8,2019-12-16T16:00:00.000+00:00,test-11test-11,2019-12-17T11:11:18.000+00:00,,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,16,
diff --git a/plugins/tapd/e2e/snapshot_tables/issue_commits_bug.csv b/plugins/tapd/e2e/snapshot_tables/issue_commits_bug.csv
index 97a7448e..55384b43 100644
--- a/plugins/tapd/e2e/snapshot_tables/issue_commits_bug.csv
+++ b/plugins/tapd/e2e/snapshot_tables/issue_commits_bug.csv
@@ -1 +1,9 @@
issue_id,commit_sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+tapd:TapdIssue:1:11991001011620,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,1,
+tapd:TapdIssue:1:11991001011638,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,2,
+tapd:TapdIssue:1:11991001011648,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,3,
+tapd:TapdIssue:1:11991001011653,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,5,
+tapd:TapdIssue:1:11991001011654,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,7,
+tapd:TapdIssue:1:11991001011655,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,6,
+tapd:TapdIssue:1:11991001011661,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,9,
+tapd:TapdIssue:1:11991001011794,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_bug_commits,10,
diff --git a/plugins/tapd/e2e/snapshot_tables/issue_commits_story.csv b/plugins/tapd/e2e/snapshot_tables/issue_commits_story.csv
deleted file mode 100644
index 9d9ded75..00000000
--- a/plugins/tapd/e2e/snapshot_tables/issue_commits_story.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-issue_id,commit_sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-tapd:TapdIssue:1:11991001049945,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_story_commits,1,
diff --git a/plugins/tapd/e2e/snapshot_tables/issue_commits_task.csv b/plugins/tapd/e2e/snapshot_tables/issue_commits_task.csv
index 97a7448e..d30cda55 100644
--- a/plugins/tapd/e2e/snapshot_tables/issue_commits_task.csv
+++ b/plugins/tapd/e2e/snapshot_tables/issue_commits_task.csv
@@ -1 +1,8 @@
issue_id,commit_sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+tapd:TapdIssue:1:11991001057849,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,10,
+tapd:TapdIssue:1:11991001057934,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,13,
+tapd:TapdIssue:1:11991001058010,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,14,
+tapd:TapdIssue:1:11991001058064,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,18,
+tapd:TapdIssue:1:11991001058180,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,24,
+tapd:TapdIssue:1:11991001058288,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,25,
+tapd:TapdIssue:1:11991001058993,testcommit,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_task_commits,6,
diff --git a/plugins/tapd/e2e/snapshot_tables/issue_worklogs.csv b/plugins/tapd/e2e/snapshot_tables/issue_worklogs.csv
index bd7e3aea..71ede317 100644
--- a/plugins/tapd/e2e/snapshot_tables/issue_worklogs.csv
+++ b/plugins/tapd/e2e/snapshot_tables/issue_worklogs.csv
@@ -1 +1,17 @@
id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,author_id,comment,time_spent_minutes,logged_date,started_date,issue_id
+tapd:TapdWorklog:1:11991001000026,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,1,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-16T08:10:25.000+00:00,,
+tapd:TapdWorklog:1:11991001000031,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,2,,tapd:TapdUser:1:991:test-11test-11test-11,,8,2019-12-17T09:16:07.000+00:00,,
+tapd:TapdWorklog:1:11991001000032,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,3,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T09:16:51.000+00:00,,
+tapd:TapdWorklog:1:11991001000033,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,4,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T09:18:22.000+00:00,,
+tapd:TapdWorklog:1:11991001000034,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,5,,tapd:TapdUser:1:991:test-11test-11test-11,"test-11test-11test-11test-11test-11test-11test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11 WCMStest-11test-11test-11test-11t [...]
+tapd:TapdWorklog:1:11991001000038,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,6,,tapd:TapdUser:1:991:test-11test-11test-11,,8,2019-12-17T09:32:53.000+00:00,,
+tapd:TapdWorklog:1:11991001000043,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,7,,tapd:TapdUser:1:991:test-11test-11,,8,2019-12-17T09:52:24.000+00:00,,
+tapd:TapdWorklog:1:11991001000044,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,8,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T09:55:14.000+00:00,,
+tapd:TapdWorklog:1:11991001000045,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,9,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11 - test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,3,2019-12-17T10:08:35.000+00:00,,
+tapd:TapdWorklog:1:11991001000046,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,10,,tapd:TapdUser:1:991:test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T10:14:12.000+00:00,,
+tapd:TapdWorklog:1:11991001000047,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,11,,tapd:TapdUser:1:991:test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T10:16:21.000+00:00,,
+tapd:TapdWorklog:1:11991001000048,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,12,,tapd:TapdUser:1:991:test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11.,8,2019-12-17T10:44:34.000+00:00,,
+tapd:TapdWorklog:1:11991001000049,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,13,,tapd:TapdUser:1:991:test-11test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T10:44:55.000+00:00,,
+tapd:TapdWorklog:1:11991001000050,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,14,,tapd:TapdUser:1:991:test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T10:45:37.000+00:00,,
+tapd:TapdWorklog:1:11991001000051,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,15,,tapd:TapdUser:1:991:test-11test-11,test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11test-11,8,2019-12-17T10:47:15.000+00:00,,
+tapd:TapdWorklog:1:11991001000055,"{""ConnectionId"":1,""CompanyId"":99,""WorkspaceId"":991}",_raw_tapd_api_worklogs,16,,tapd:TapdUser:1:991:test-11test-11,,8,2019-12-17T11:11:18.000+00:00,,
diff --git a/plugins/tapd/e2e/tasks_commit_test.go b/plugins/tapd/e2e/story_bug_test.go
similarity index 58%
copy from plugins/tapd/e2e/tasks_commit_test.go
copy to plugins/tapd/e2e/story_bug_test.go
index 09b8d09f..a9d4eedf 100644
--- a/plugins/tapd/e2e/tasks_commit_test.go
+++ b/plugins/tapd/e2e/story_bug_test.go
@@ -19,7 +19,6 @@ package e2e
import (
"fmt"
- "github.com/apache/incubator-devlake/models/domainlayer/crossdomain"
"testing"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
@@ -28,7 +27,7 @@ import (
"github.com/apache/incubator-devlake/plugins/tapd/tasks"
)
-func TestTapdTaskCommitDataFlow(t *testing.T) {
+func TestTapdStoryBugDataFlow(t *testing.T) {
var tapd impl.Tapd
dataflowTester := e2ehelper.NewDataFlowTester(t, "tapd", tapd)
@@ -40,51 +39,21 @@ func TestTapdTaskCommitDataFlow(t *testing.T) {
WorkspaceId: 991,
},
}
-
- // task status
// import raw data table
- dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_tapd_api_task_commits.csv",
- "_raw_tapd_api_task_commits")
+ dataflowTester.ImportCsvIntoRawTable("./raw_tables/_raw_tapd_api_story_bugs.csv",
+ "_raw_tapd_api_story_bugs")
+
// verify extraction
- dataflowTester.FlushTabler(&models.TapdTaskCommit{})
- dataflowTester.Subtask(tasks.ExtractTaskCommitMeta, taskData)
+ dataflowTester.FlushTabler(&models.TapdStoryBug{})
+ dataflowTester.Subtask(tasks.ExtractStoryBugsMeta, taskData)
dataflowTester.VerifyTable(
- models.TapdTaskCommit{},
- fmt.Sprintf("./snapshot_tables/%s.csv", models.TapdTaskCommit{}.TableName()),
- []string{"connection_id", "id"},
+ models.TapdStoryBug{},
+ fmt.Sprintf("./snapshot_tables/%s.csv", models.TapdStoryBug{}.TableName()),
[]string{
- "user_id",
- "hook_user_name",
- "commit_id",
+ "connection_id",
"workspace_id",
- "message",
- "path",
- "web_url",
- "hook_project_name",
- "ref",
- "ref_status",
- "git_env",
- "file_commit",
- "commit_time",
- "created",
- "task_id",
- "created_at",
- "updated_at",
- "_raw_data_params",
- "_raw_data_table",
- "_raw_data_id",
- "_raw_data_remark",
- },
- )
-
- dataflowTester.FlushTabler(&crossdomain.IssueCommit{})
- dataflowTester.Subtask(tasks.ConvertTaskCommitMeta, taskData)
- dataflowTester.VerifyTable(
- crossdomain.IssueCommit{},
- fmt.Sprintf("./snapshot_tables/%s_task.csv", crossdomain.IssueCommit{}.TableName()),
- []string{
- "issue_id",
- "commit_sha",
+ "story_id",
+ "bug_id",
},
[]string{
"_raw_data_params",
@@ -93,4 +62,5 @@ func TestTapdTaskCommitDataFlow(t *testing.T) {
"_raw_data_remark",
},
)
+
}
diff --git a/plugins/tapd/e2e/tasks_commit_test.go b/plugins/tapd/e2e/tasks_commit_test.go
index 09b8d09f..64f022d7 100644
--- a/plugins/tapd/e2e/tasks_commit_test.go
+++ b/plugins/tapd/e2e/tasks_commit_test.go
@@ -68,8 +68,6 @@ func TestTapdTaskCommitDataFlow(t *testing.T) {
"commit_time",
"created",
"task_id",
- "created_at",
- "updated_at",
"_raw_data_params",
"_raw_data_table",
"_raw_data_id",