You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by zh...@apache.org on 2022/10/18 07:30:29 UTC
[incubator-devlake] branch release-v0.14 updated: fix: cherry pick The SQL is missing the connection_id filter in the ON clause
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch release-v0.14
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.14 by this push:
new dc229d5b fix: cherry pick The SQL is missing the connection_id filter in the ON clause
dc229d5b is described below
commit dc229d5b3a56e7a95131629993889254a6803e4d
Author: zhangliang <li...@merico.dev>
AuthorDate: Mon Oct 17 21:00:32 2022 +0800
fix: cherry pick The SQL is missing the connection_id filter in the ON clause
---
.../_tool_jira_board_sprints_for_convertor.csv | 61 ++++++++++++++++++++++
.../_tool_jira_sprints_for_convertor.csv | 31 +++++++++++
.../_tool_jira_worklogs_for_convertor.csv | 31 +++++++++++
plugins/jira/e2e/snapshot_tables/sprints.csv | 61 +++++++++++-----------
plugins/jira/e2e/snapshot_tables/worklogs.csv | 13 +++--
plugins/jira/e2e/sprint_test.go | 2 +
plugins/jira/e2e/worklog_test.go | 1 +
plugins/jira/tasks/sprint_convertor.go | 6 ++-
plugins/jira/tasks/worklog_convertor.go | 4 +-
9 files changed, 169 insertions(+), 41 deletions(-)
diff --git a/plugins/jira/e2e/snapshot_tables/_tool_jira_board_sprints_for_convertor.csv b/plugins/jira/e2e/snapshot_tables/_tool_jira_board_sprints_for_convertor.csv
new file mode 100644
index 00000000..6619a7b0
--- /dev/null
+++ b/plugins/jira/e2e/snapshot_tables/_tool_jira_board_sprints_for_convertor.csv
@@ -0,0 +1,61 @@
+connection_id,board_id,sprint_id
+2,8,7
+2,8,9
+2,8,15
+2,8,17
+2,8,18
+2,8,19
+2,8,20
+2,8,21
+2,8,25
+2,8,26
+2,8,27
+2,8,28
+2,8,30
+2,8,31
+2,8,32
+2,8,33
+2,8,34
+2,8,35
+2,8,36
+2,8,37
+2,8,38
+2,8,40
+2,8,41
+2,8,42
+2,8,43
+2,8,46
+2,8,47
+2,8,50
+2,8,57
+2,8,60
+1,8,7
+1,8,9
+1,8,15
+1,8,17
+1,8,18
+1,8,19
+1,8,20
+1,8,21
+1,8,25
+1,8,26
+1,8,27
+1,8,28
+1,8,30
+1,8,31
+1,8,32
+1,8,33
+1,8,34
+1,8,35
+1,8,36
+1,8,37
+1,8,38
+1,8,40
+1,8,41
+1,8,42
+1,8,43
+1,8,46
+1,8,47
+1,8,50
+1,8,57
+1,8,60
diff --git a/plugins/jira/e2e/snapshot_tables/_tool_jira_sprints_for_convertor.csv b/plugins/jira/e2e/snapshot_tables/_tool_jira_sprints_for_convertor.csv
new file mode 100644
index 00000000..297c0155
--- /dev/null
+++ b/plugins/jira/e2e/snapshot_tables/_tool_jira_sprints_for_convertor.csv
@@ -0,0 +1,31 @@
+connection_id,sprint_id,self,state,name,start_date,end_date,complete_date,origin_board_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+2,7,https://merico.atlassian.net/rest/agile/1.0/sprint/7,closed,EE Sprint 7,2020-06-12T00:38:51.882+00:00,2020-06-26T00:38:00.000+00:00,2020-06-22T05:59:58.980+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1220,
+2,9,https://merico.atlassian.net/rest/agile/1.0/sprint/9,closed,EE Sprint 8,2020-06-22T06:00:33.769+00:00,2020-07-10T06:00:00.000+00:00,2020-07-13T01:21:57.062+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1221,
+2,15,https://merico.atlassian.net/rest/agile/1.0/sprint/15,closed,Emma Sprint 1,2020-06-22T01:32:04.664+00:00,2020-07-06T01:32:52.000+00:00,2020-06-29T02:50:44.043+00:00,13,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1222,
+2,17,https://merico.atlassian.net/rest/agile/1.0/sprint/17,closed,EE Sprint 9,2020-07-13T01:22:22.745+00:00,2020-07-27T01:22:00.000+00:00,2020-07-27T01:23:43.083+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1223,
+2,18,https://merico.atlassian.net/rest/agile/1.0/sprint/18,closed,EE Sprint 10,2020-07-27T01:26:13.465+00:00,2020-08-10T01:26:00.000+00:00,2020-08-10T02:29:10.811+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1224,
+2,19,https://merico.atlassian.net/rest/agile/1.0/sprint/19,closed,EE Sprint 11,2020-08-09T01:15:11.205+00:00,2020-08-21T01:15:00.000+00:00,2020-08-31T01:34:04.666+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1225,
+2,20,https://merico.atlassian.net/rest/agile/1.0/sprint/20,closed,EE Sprint 14,2020-08-31T01:35:38.626+00:00,2020-09-07T01:35:00.000+00:00,2020-11-05T07:46:55.346+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1226,
+2,21,https://merico.atlassian.net/rest/agile/1.0/sprint/21,closed,EE Sprint 15,2020-11-09T08:29:00.529+00:00,2020-11-16T08:29:00.000+00:00,2020-11-16T23:07:33.015+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1227,
+1,25,https://merico.atlassian.net/rest/agile/1.0/sprint/25,open,EE Sprint 16,2020-11-16T23:14:57.590+00:00,2020-11-23T23:14:00.000+00:00,2020-11-24T03:56:42.281+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1228,
+2,26,https://merico.atlassian.net/rest/agile/1.0/sprint/26,closed,EE Sprint 17,2020-11-20T03:56:12.414+00:00,2020-11-27T03:56:00.000+00:00,2020-11-30T02:48:49.378+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1229,
+2,27,https://merico.atlassian.net/rest/agile/1.0/sprint/27,closed,EE Sprint 18,2020-11-30T02:49:24.536+00:00,2020-12-07T02:49:00.000+00:00,2020-12-07T01:41:17.786+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1230,
+2,28,https://merico.atlassian.net/rest/agile/1.0/sprint/28,closed,EE Sprint 19,2020-12-07T01:41:40.676+00:00,2020-12-14T01:41:00.000+00:00,2020-12-14T01:00:22.218+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1231,
+2,30,https://merico.atlassian.net/rest/agile/1.0/sprint/30,closed,EE Sprint 20,2020-12-14T01:54:34.826+00:00,2020-12-28T01:54:00.000+00:00,2020-12-28T06:11:27.241+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1232,
+2,31,https://merico.atlassian.net/rest/agile/1.0/sprint/31,closed,EE Sprint 21,2020-12-28T06:11:46.433+00:00,2021-01-10T18:11:00.000+00:00,2021-01-11T02:52:38.721+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1233,
+2,32,https://merico.atlassian.net/rest/agile/1.0/sprint/32,closed,EE Sprint 22,2021-01-11T04:09:10.389+00:00,2021-01-18T04:09:00.000+00:00,2021-01-18T03:10:51.076+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1234,
+2,33,https://merico.atlassian.net/rest/agile/1.0/sprint/33,closed,EE Sprint 23,2021-01-18T03:45:20.174+00:00,2021-01-25T03:45:00.000+00:00,2021-01-25T03:03:10.386+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1235,
+2,34,https://merico.atlassian.net/rest/agile/1.0/sprint/34,closed,EE Sprint 24,2021-01-25T03:56:45.942+00:00,2021-02-01T03:56:00.000+00:00,2021-02-01T03:05:30.868+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1236,
+2,35,https://merico.atlassian.net/rest/agile/1.0/sprint/35,closed,EE Sprint 25,2021-02-01T03:39:40.472+00:00,2021-02-08T03:39:00.000+00:00,2021-02-07T03:01:13.596+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1237,
+2,36,https://merico.atlassian.net/rest/agile/1.0/sprint/36,closed,EE Sprint 26,2021-02-07T03:44:55.158+00:00,2021-02-14T03:44:00.000+00:00,2021-02-22T03:05:16.997+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1238,
+2,37,https://merico.atlassian.net/rest/agile/1.0/sprint/37,closed,EE Sprint 27,2021-02-22T03:30:53.407+00:00,2021-03-01T03:30:00.000+00:00,2021-02-26T08:15:20.988+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1239,
+2,38,https://merico.atlassian.net/rest/agile/1.0/sprint/38,closed,EE Sprint 28,2021-03-01T03:50:54.464+00:00,2021-03-08T03:50:00.000+00:00,2021-03-05T08:03:48.144+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1240,
+2,40,https://merico.atlassian.net/rest/agile/1.0/sprint/40,closed,EE Sprint 29,2021-03-08T05:34:15.296+00:00,2021-03-14T17:34:00.000+00:00,2021-03-15T06:53:34.924+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1241,
+2,41,https://merico.atlassian.net/rest/agile/1.0/sprint/41,closed,EE Sprint 30,2021-03-15T07:23:47.468+00:00,2021-03-21T19:23:00.000+00:00,2021-03-19T08:57:51.706+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1242,
+2,42,https://merico.atlassian.net/rest/agile/1.0/sprint/42,closed,EE Sprint 31,2021-03-22T03:00:03.936+00:00,2021-03-28T15:00:00.000+00:00,2021-03-26T08:06:09.772+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1243,
+2,43,https://merico.atlassian.net/rest/agile/1.0/sprint/43,closed,EE Sprint 32,2021-03-29T02:54:16.155+00:00,2021-04-04T14:54:00.000+00:00,2021-04-06T03:29:56.386+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1244,
+2,46,https://merico.atlassian.net/rest/agile/1.0/sprint/46,closed,EE Sprint 33,2021-04-06T09:59:28.107+00:00,2021-04-12T21:59:00.000+00:00,2021-04-12T02:57:53.585+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1245,
+2,47,https://merico.atlassian.net/rest/agile/1.0/sprint/47,closed,EE Sprint 34,2021-04-12T02:58:51.011+00:00,2021-04-19T02:58:00.000+00:00,2021-04-16T08:43:09.709+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1246,
+2,50,https://merico.atlassian.net/rest/agile/1.0/sprint/50,closed,EE Sprint 35,2021-04-19T03:17:29.791+00:00,2021-04-26T03:17:00.000+00:00,2021-04-25T04:44:34.414+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1247,
+2,57,https://merico.atlassian.net/rest/agile/1.0/sprint/57,closed,EE Sprint 36,2021-04-25T04:45:23.592+00:00,2021-04-30T04:44:00.000+00:00,2021-05-06T05:43:54.939+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1248,
+2,60,https://merico.atlassian.net/rest/agile/1.0/sprint/60,closed,EE Sprint 37,2021-05-05T17:55:31.879+00:00,2021-05-14T15:59:00.000+00:00,2021-05-17T01:51:41.754+00:00,8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1249,
diff --git a/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs_for_convertor.csv b/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs_for_convertor.csv
new file mode 100644
index 00000000..5ab6543d
--- /dev/null
+++ b/plugins/jira/e2e/snapshot_tables/_tool_jira_worklogs_for_convertor.csv
@@ -0,0 +1,31 @@
+connection_id,issue_id,worklog_id,author_id,update_author_id,time_spent,time_spent_seconds,updated,started,issue_updated,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,10076,10006,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1d 2h,36000,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1252,
+2,10077,10007,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,4h,14400,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1250,
+2,10077,10008,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,4h,14400,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1251,
+2,10078,10009,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1h,3600,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1253,
+2,10079,10218,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,2h,7200,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1249,
+2,10085,10010,5ecfbd0a47d31e0c2a15fd87,5ecfbd0a47d31e0c2a15fd87,1h,3600,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,2022-04-18T13:49:16.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1248,
+2,11956,10713,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-11T10:01:03.628+00:00,2021-01-11T06:58:43.580+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1330,
+2,11956,10717,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h 30m,9000,2021-01-12T03:53:41.936+00:00,2021-01-12T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1331,
+2,11956,10718,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-12T05:11:25.368+00:00,2021-01-12T04:40:51.604+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1332,
+2,11956,10719,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,4h,14400,2021-01-12T09:59:08.739+00:00,2021-01-12T05:58:22.015+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1333,
+2,11956,10720,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-12T12:09:23.539+00:00,2021-01-12T11:08:46.608+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1334,
+2,11956,10726,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h 30m,9000,2021-01-13T03:55:02.070+00:00,2021-01-13T01:24:41.786+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1335,
+2,11956,10729,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,20m,1200,2021-01-13T07:26:34.565+00:00,2021-01-13T07:06:14.927+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1336,
+2,11956,10733,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h,7200,2021-01-13T11:10:46.917+00:00,2021-01-13T08:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1337,
+2,12083,10611,5e9711ba34f7b90c0fbc37d3,5e9711ba34f7b90c0fbc37d3,1d,28800,2020-11-20T03:41:21.160+00:00,2020-11-19T19:41:16.606+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1338,
+2,12263,10809,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-27T01:54:00.883+00:00,2021-01-26T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1339,
+2,12263,10810,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-27T01:54:29.081+00:00,2021-01-27T01:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1340,
+2,12263,10811,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-27T03:34:04.537+00:00,2021-01-27T02:33:41.693+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1341,
+2,12263,10922,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,6h,21600,2021-02-19T11:33:52.222+00:00,2021-02-19T05:33:21.257+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1342,
+2,12351,10946,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-03-02T09:20:19.608+00:00,2021-03-02T08:20:02.371+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1343,
+2,12411,10708,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,2h,7200,2021-01-11T03:53:25.692+00:00,2021-01-11T01:52:40.264+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1344,
+2,12604,10714,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,20m,1200,2021-01-11T11:35:33.757+00:00,2021-01-11T11:15:00.400+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1345,
+2,12604,10728,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,45m,2700,2021-01-13T06:18:35.726+00:00,2021-01-13T05:33:16.447+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1346,
+2,12692,10761,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-20T09:55:38.918+00:00,2021-01-20T08:55:12.424+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1347,
+2,12760,10738,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-15T01:17:13.517+00:00,2021-01-14T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1348,
+2,12760,10743,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-18T01:13:18.808+00:00,2021-01-15T06:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1349,
+2,12760,10750,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,3h,10800,2021-01-18T09:05:08.848+00:00,2021-01-18T07:00:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1350,
+2,12760,10759,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,1h,3600,2021-01-20T05:21:40.077+00:00,2021-01-19T16:30:00.000+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1351,
+2,12796,10732,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-13T11:10:00.634+00:00,2021-01-13T10:39:45.227+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1352,
+2,12796,10736,5fa8b6d142ab3b006eaa6f42,5fa8b6d142ab3b006eaa6f42,30m,1800,2021-01-14T06:30:51.411+00:00,2021-01-14T06:00:32.784+00:00,2022-04-19T16:29:51.000+00:00,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1353,
diff --git a/plugins/jira/e2e/snapshot_tables/sprints.csv b/plugins/jira/e2e/snapshot_tables/sprints.csv
index b796c54a..dce53fcc 100644
--- a/plugins/jira/e2e/snapshot_tables/sprints.csv
+++ b/plugins/jira/e2e/snapshot_tables/sprints.csv
@@ -1,31 +1,30 @@
-id,url,status,name,started_date,ended_date,completed_date,original_board_id
-jira:JiraSprint:2:15,https://merico.atlassian.net/rest/agile/1.0/sprint/15,CLOSED,Emma Sprint 1,2020-06-22T01:32:04.664+00:00,2020-07-06T01:32:52.000+00:00,2020-06-29T02:50:44.043+00:00,jira:JiraBoard:2:13
-jira:JiraSprint:2:17,https://merico.atlassian.net/rest/agile/1.0/sprint/17,CLOSED,EE Sprint 9,2020-07-13T01:22:22.745+00:00,2020-07-27T01:22:00.000+00:00,2020-07-27T01:23:43.083+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:18,https://merico.atlassian.net/rest/agile/1.0/sprint/18,CLOSED,EE Sprint 10,2020-07-27T01:26:13.465+00:00,2020-08-10T01:26:00.000+00:00,2020-08-10T02:29:10.811+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:19,https://merico.atlassian.net/rest/agile/1.0/sprint/19,CLOSED,EE Sprint 11,2020-08-09T01:15:11.205+00:00,2020-08-21T01:15:00.000+00:00,2020-08-31T01:34:04.666+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:20,https://merico.atlassian.net/rest/agile/1.0/sprint/20,CLOSED,EE Sprint 14,2020-08-31T01:35:38.626+00:00,2020-09-07T01:35:00.000+00:00,2020-11-05T07:46:55.346+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:21,https://merico.atlassian.net/rest/agile/1.0/sprint/21,CLOSED,EE Sprint 15,2020-11-09T08:29:00.529+00:00,2020-11-16T08:29:00.000+00:00,2020-11-16T23:07:33.015+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:25,https://merico.atlassian.net/rest/agile/1.0/sprint/25,CLOSED,EE Sprint 16,2020-11-16T23:14:57.590+00:00,2020-11-23T23:14:00.000+00:00,2020-11-24T03:56:42.281+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:26,https://merico.atlassian.net/rest/agile/1.0/sprint/26,CLOSED,EE Sprint 17,2020-11-20T03:56:12.414+00:00,2020-11-27T03:56:00.000+00:00,2020-11-30T02:48:49.378+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:27,https://merico.atlassian.net/rest/agile/1.0/sprint/27,CLOSED,EE Sprint 18,2020-11-30T02:49:24.536+00:00,2020-12-07T02:49:00.000+00:00,2020-12-07T01:41:17.786+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:28,https://merico.atlassian.net/rest/agile/1.0/sprint/28,CLOSED,EE Sprint 19,2020-12-07T01:41:40.676+00:00,2020-12-14T01:41:00.000+00:00,2020-12-14T01:00:22.218+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:30,https://merico.atlassian.net/rest/agile/1.0/sprint/30,CLOSED,EE Sprint 20,2020-12-14T01:54:34.826+00:00,2020-12-28T01:54:00.000+00:00,2020-12-28T06:11:27.241+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:31,https://merico.atlassian.net/rest/agile/1.0/sprint/31,CLOSED,EE Sprint 21,2020-12-28T06:11:46.433+00:00,2021-01-10T18:11:00.000+00:00,2021-01-11T02:52:38.721+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:32,https://merico.atlassian.net/rest/agile/1.0/sprint/32,CLOSED,EE Sprint 22,2021-01-11T04:09:10.389+00:00,2021-01-18T04:09:00.000+00:00,2021-01-18T03:10:51.076+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:33,https://merico.atlassian.net/rest/agile/1.0/sprint/33,CLOSED,EE Sprint 23,2021-01-18T03:45:20.174+00:00,2021-01-25T03:45:00.000+00:00,2021-01-25T03:03:10.386+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:34,https://merico.atlassian.net/rest/agile/1.0/sprint/34,CLOSED,EE Sprint 24,2021-01-25T03:56:45.942+00:00,2021-02-01T03:56:00.000+00:00,2021-02-01T03:05:30.868+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:35,https://merico.atlassian.net/rest/agile/1.0/sprint/35,CLOSED,EE Sprint 25,2021-02-01T03:39:40.472+00:00,2021-02-08T03:39:00.000+00:00,2021-02-07T03:01:13.596+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:36,https://merico.atlassian.net/rest/agile/1.0/sprint/36,CLOSED,EE Sprint 26,2021-02-07T03:44:55.158+00:00,2021-02-14T03:44:00.000+00:00,2021-02-22T03:05:16.997+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:37,https://merico.atlassian.net/rest/agile/1.0/sprint/37,CLOSED,EE Sprint 27,2021-02-22T03:30:53.407+00:00,2021-03-01T03:30:00.000+00:00,2021-02-26T08:15:20.988+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:38,https://merico.atlassian.net/rest/agile/1.0/sprint/38,CLOSED,EE Sprint 28,2021-03-01T03:50:54.464+00:00,2021-03-08T03:50:00.000+00:00,2021-03-05T08:03:48.144+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:40,https://merico.atlassian.net/rest/agile/1.0/sprint/40,CLOSED,EE Sprint 29,2021-03-08T05:34:15.296+00:00,2021-03-14T17:34:00.000+00:00,2021-03-15T06:53:34.924+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:41,https://merico.atlassian.net/rest/agile/1.0/sprint/41,CLOSED,EE Sprint 30,2021-03-15T07:23:47.468+00:00,2021-03-21T19:23:00.000+00:00,2021-03-19T08:57:51.706+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:42,https://merico.atlassian.net/rest/agile/1.0/sprint/42,CLOSED,EE Sprint 31,2021-03-22T03:00:03.936+00:00,2021-03-28T15:00:00.000+00:00,2021-03-26T08:06:09.772+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:43,https://merico.atlassian.net/rest/agile/1.0/sprint/43,CLOSED,EE Sprint 32,2021-03-29T02:54:16.155+00:00,2021-04-04T14:54:00.000+00:00,2021-04-06T03:29:56.386+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:46,https://merico.atlassian.net/rest/agile/1.0/sprint/46,CLOSED,EE Sprint 33,2021-04-06T09:59:28.107+00:00,2021-04-12T21:59:00.000+00:00,2021-04-12T02:57:53.585+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:47,https://merico.atlassian.net/rest/agile/1.0/sprint/47,CLOSED,EE Sprint 34,2021-04-12T02:58:51.011+00:00,2021-04-19T02:58:00.000+00:00,2021-04-16T08:43:09.709+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:50,https://merico.atlassian.net/rest/agile/1.0/sprint/50,CLOSED,EE Sprint 35,2021-04-19T03:17:29.791+00:00,2021-04-26T03:17:00.000+00:00,2021-04-25T04:44:34.414+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:57,https://merico.atlassian.net/rest/agile/1.0/sprint/57,CLOSED,EE Sprint 36,2021-04-25T04:45:23.592+00:00,2021-04-30T04:44:00.000+00:00,2021-05-06T05:43:54.939+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:60,https://merico.atlassian.net/rest/agile/1.0/sprint/60,CLOSED,EE Sprint 37,2021-05-05T17:55:31.879+00:00,2021-05-14T15:59:00.000+00:00,2021-05-17T01:51:41.754+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:7,https://merico.atlassian.net/rest/agile/1.0/sprint/7,CLOSED,EE Sprint 7,2020-06-12T00:38:51.882+00:00,2020-06-26T00:38:00.000+00:00,2020-06-22T05:59:58.980+00:00,jira:JiraBoard:2:8
-jira:JiraSprint:2:9,https://merico.atlassian.net/rest/agile/1.0/sprint/9,CLOSED,EE Sprint 8,2020-06-22T06:00:33.769+00:00,2020-07-10T06:00:00.000+00:00,2020-07-13T01:21:57.062+00:00,jira:JiraBoard:2:8
+id,url,status,name,started_date,ended_date,completed_date,original_board_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+jira:JiraSprint:2:15,https://merico.atlassian.net/rest/agile/1.0/sprint/15,CLOSED,Emma Sprint 1,2020-06-22T01:32:04.664+00:00,2020-07-06T01:32:52.000+00:00,2020-06-29T02:50:44.043+00:00,jira:JiraBoard:2:13,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1222,
+jira:JiraSprint:2:17,https://merico.atlassian.net/rest/agile/1.0/sprint/17,CLOSED,EE Sprint 9,2020-07-13T01:22:22.745+00:00,2020-07-27T01:22:00.000+00:00,2020-07-27T01:23:43.083+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1223,
+jira:JiraSprint:2:18,https://merico.atlassian.net/rest/agile/1.0/sprint/18,CLOSED,EE Sprint 10,2020-07-27T01:26:13.465+00:00,2020-08-10T01:26:00.000+00:00,2020-08-10T02:29:10.811+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1224,
+jira:JiraSprint:2:19,https://merico.atlassian.net/rest/agile/1.0/sprint/19,CLOSED,EE Sprint 11,2020-08-09T01:15:11.205+00:00,2020-08-21T01:15:00.000+00:00,2020-08-31T01:34:04.666+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1225,
+jira:JiraSprint:2:20,https://merico.atlassian.net/rest/agile/1.0/sprint/20,CLOSED,EE Sprint 14,2020-08-31T01:35:38.626+00:00,2020-09-07T01:35:00.000+00:00,2020-11-05T07:46:55.346+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1226,
+jira:JiraSprint:2:21,https://merico.atlassian.net/rest/agile/1.0/sprint/21,CLOSED,EE Sprint 15,2020-11-09T08:29:00.529+00:00,2020-11-16T08:29:00.000+00:00,2020-11-16T23:07:33.015+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1227,
+jira:JiraSprint:2:26,https://merico.atlassian.net/rest/agile/1.0/sprint/26,CLOSED,EE Sprint 17,2020-11-20T03:56:12.414+00:00,2020-11-27T03:56:00.000+00:00,2020-11-30T02:48:49.378+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1229,
+jira:JiraSprint:2:27,https://merico.atlassian.net/rest/agile/1.0/sprint/27,CLOSED,EE Sprint 18,2020-11-30T02:49:24.536+00:00,2020-12-07T02:49:00.000+00:00,2020-12-07T01:41:17.786+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1230,
+jira:JiraSprint:2:28,https://merico.atlassian.net/rest/agile/1.0/sprint/28,CLOSED,EE Sprint 19,2020-12-07T01:41:40.676+00:00,2020-12-14T01:41:00.000+00:00,2020-12-14T01:00:22.218+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1231,
+jira:JiraSprint:2:30,https://merico.atlassian.net/rest/agile/1.0/sprint/30,CLOSED,EE Sprint 20,2020-12-14T01:54:34.826+00:00,2020-12-28T01:54:00.000+00:00,2020-12-28T06:11:27.241+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1232,
+jira:JiraSprint:2:31,https://merico.atlassian.net/rest/agile/1.0/sprint/31,CLOSED,EE Sprint 21,2020-12-28T06:11:46.433+00:00,2021-01-10T18:11:00.000+00:00,2021-01-11T02:52:38.721+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1233,
+jira:JiraSprint:2:32,https://merico.atlassian.net/rest/agile/1.0/sprint/32,CLOSED,EE Sprint 22,2021-01-11T04:09:10.389+00:00,2021-01-18T04:09:00.000+00:00,2021-01-18T03:10:51.076+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1234,
+jira:JiraSprint:2:33,https://merico.atlassian.net/rest/agile/1.0/sprint/33,CLOSED,EE Sprint 23,2021-01-18T03:45:20.174+00:00,2021-01-25T03:45:00.000+00:00,2021-01-25T03:03:10.386+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1235,
+jira:JiraSprint:2:34,https://merico.atlassian.net/rest/agile/1.0/sprint/34,CLOSED,EE Sprint 24,2021-01-25T03:56:45.942+00:00,2021-02-01T03:56:00.000+00:00,2021-02-01T03:05:30.868+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1236,
+jira:JiraSprint:2:35,https://merico.atlassian.net/rest/agile/1.0/sprint/35,CLOSED,EE Sprint 25,2021-02-01T03:39:40.472+00:00,2021-02-08T03:39:00.000+00:00,2021-02-07T03:01:13.596+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1237,
+jira:JiraSprint:2:36,https://merico.atlassian.net/rest/agile/1.0/sprint/36,CLOSED,EE Sprint 26,2021-02-07T03:44:55.158+00:00,2021-02-14T03:44:00.000+00:00,2021-02-22T03:05:16.997+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1238,
+jira:JiraSprint:2:37,https://merico.atlassian.net/rest/agile/1.0/sprint/37,CLOSED,EE Sprint 27,2021-02-22T03:30:53.407+00:00,2021-03-01T03:30:00.000+00:00,2021-02-26T08:15:20.988+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1239,
+jira:JiraSprint:2:38,https://merico.atlassian.net/rest/agile/1.0/sprint/38,CLOSED,EE Sprint 28,2021-03-01T03:50:54.464+00:00,2021-03-08T03:50:00.000+00:00,2021-03-05T08:03:48.144+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1240,
+jira:JiraSprint:2:40,https://merico.atlassian.net/rest/agile/1.0/sprint/40,CLOSED,EE Sprint 29,2021-03-08T05:34:15.296+00:00,2021-03-14T17:34:00.000+00:00,2021-03-15T06:53:34.924+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1241,
+jira:JiraSprint:2:41,https://merico.atlassian.net/rest/agile/1.0/sprint/41,CLOSED,EE Sprint 30,2021-03-15T07:23:47.468+00:00,2021-03-21T19:23:00.000+00:00,2021-03-19T08:57:51.706+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1242,
+jira:JiraSprint:2:42,https://merico.atlassian.net/rest/agile/1.0/sprint/42,CLOSED,EE Sprint 31,2021-03-22T03:00:03.936+00:00,2021-03-28T15:00:00.000+00:00,2021-03-26T08:06:09.772+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1243,
+jira:JiraSprint:2:43,https://merico.atlassian.net/rest/agile/1.0/sprint/43,CLOSED,EE Sprint 32,2021-03-29T02:54:16.155+00:00,2021-04-04T14:54:00.000+00:00,2021-04-06T03:29:56.386+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1244,
+jira:JiraSprint:2:46,https://merico.atlassian.net/rest/agile/1.0/sprint/46,CLOSED,EE Sprint 33,2021-04-06T09:59:28.107+00:00,2021-04-12T21:59:00.000+00:00,2021-04-12T02:57:53.585+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1245,
+jira:JiraSprint:2:47,https://merico.atlassian.net/rest/agile/1.0/sprint/47,CLOSED,EE Sprint 34,2021-04-12T02:58:51.011+00:00,2021-04-19T02:58:00.000+00:00,2021-04-16T08:43:09.709+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1246,
+jira:JiraSprint:2:50,https://merico.atlassian.net/rest/agile/1.0/sprint/50,CLOSED,EE Sprint 35,2021-04-19T03:17:29.791+00:00,2021-04-26T03:17:00.000+00:00,2021-04-25T04:44:34.414+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1247,
+jira:JiraSprint:2:57,https://merico.atlassian.net/rest/agile/1.0/sprint/57,CLOSED,EE Sprint 36,2021-04-25T04:45:23.592+00:00,2021-04-30T04:44:00.000+00:00,2021-05-06T05:43:54.939+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1248,
+jira:JiraSprint:2:60,https://merico.atlassian.net/rest/agile/1.0/sprint/60,CLOSED,EE Sprint 37,2021-05-05T17:55:31.879+00:00,2021-05-14T15:59:00.000+00:00,2021-05-17T01:51:41.754+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1249,
+jira:JiraSprint:2:7,https://merico.atlassian.net/rest/agile/1.0/sprint/7,CLOSED,EE Sprint 7,2020-06-12T00:38:51.882+00:00,2020-06-26T00:38:00.000+00:00,2020-06-22T05:59:58.980+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1220,
+jira:JiraSprint:2:9,https://merico.atlassian.net/rest/agile/1.0/sprint/9,CLOSED,EE Sprint 8,2020-06-22T06:00:33.769+00:00,2020-07-10T06:00:00.000+00:00,2020-07-13T01:21:57.062+00:00,jira:JiraBoard:2:8,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_sprints,1221,
diff --git a/plugins/jira/e2e/snapshot_tables/worklogs.csv b/plugins/jira/e2e/snapshot_tables/worklogs.csv
index 5906d9a7..5a564f15 100644
--- a/plugins/jira/e2e/snapshot_tables/worklogs.csv
+++ b/plugins/jira/e2e/snapshot_tables/worklogs.csv
@@ -1,7 +1,6 @@
-id,author_id,comment,time_spent_minutes,logged_date,started_date,issue_id
-jira:JiraWorklog:2:10076:10006,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,600,2020-06-15T08:59:51.302+00:00,2020-06-05T20:59:00.000+00:00,jira:JiraIssue:2:10076
-jira:JiraWorklog:2:10077:10007,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,jira:JiraIssue:2:10077
-jira:JiraWorklog:2:10077:10008,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,jira:JiraIssue:2:10077
-jira:JiraWorklog:2:10078:10009,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,jira:JiraIssue:2:10078
-jira:JiraWorklog:2:10079:10218,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,120,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,jira:JiraIssue:2:10079
-jira:JiraWorklog:2:10085:10010,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,jira:JiraIssue:2:10085
+id,author_id,comment,time_spent_minutes,logged_date,started_date,issue_id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+jira:JiraWorklog:2:10077:10007,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:00:26.952+00:00,2020-06-15T09:00:00.000+00:00,jira:JiraIssue:2:10077,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1250,
+jira:JiraWorklog:2:10077:10008,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,240,2020-06-15T09:01:06.211+00:00,2020-06-15T05:00:42.836+00:00,jira:JiraIssue:2:10077,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1251,
+jira:JiraWorklog:2:10078:10009,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:01:44.154+00:00,2020-06-15T09:01:00.000+00:00,jira:JiraIssue:2:10078,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1253,
+jira:JiraWorklog:2:10079:10218,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,120,2020-07-22T07:25:29.102+00:00,2020-07-22T07:24:00.000+00:00,jira:JiraIssue:2:10079,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1249,
+jira:JiraWorklog:2:10085:10010,jira:JiraAccount:2:5ecfbd0a47d31e0c2a15fd87,,60,2020-06-15T09:07:56.793+00:00,2020-06-15T09:07:00.000+00:00,jira:JiraIssue:2:10085,"{""ConnectionId"":2,""BoardId"":8}",_raw_jira_api_worklogs,1248,
diff --git a/plugins/jira/e2e/sprint_test.go b/plugins/jira/e2e/sprint_test.go
index baad6d3a..9433f02f 100644
--- a/plugins/jira/e2e/sprint_test.go
+++ b/plugins/jira/e2e/sprint_test.go
@@ -74,6 +74,8 @@ func TestSprintDataFlow(t *testing.T) {
// verify sprint conversion
dataflowTester.FlushTabler(&ticket.Sprint{})
dataflowTester.FlushTabler(&ticket.BoardSprint{})
+ dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_board_sprints_for_convertor.csv", &models.JiraBoardSprint{})
+ dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_sprints_for_convertor.csv", &models.JiraSprint{})
dataflowTester.Subtask(tasks.ConvertSprintsMeta, taskData)
dataflowTester.VerifyTable(
ticket.Sprint{},
diff --git a/plugins/jira/e2e/worklog_test.go b/plugins/jira/e2e/worklog_test.go
index fc5efb67..baf6308a 100644
--- a/plugins/jira/e2e/worklog_test.go
+++ b/plugins/jira/e2e/worklog_test.go
@@ -66,6 +66,7 @@ func TestWorklogDataFlow(t *testing.T) {
)
// verify worklog conversion
+ dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_worklogs_for_convertor.csv", &models.JiraWorklog{})
dataflowTester.ImportCsvIntoTabler("./snapshot_tables/_tool_jira_board_issues_for_worklog.csv", &models.JiraBoardIssue{})
dataflowTester.FlushTabler(&ticket.IssueWorklog{})
dataflowTester.Subtask(tasks.ConvertWorklogsMeta, taskData)
diff --git a/plugins/jira/tasks/sprint_convertor.go b/plugins/jira/tasks/sprint_convertor.go
index e684ddc5..5a2e59eb 100644
--- a/plugins/jira/tasks/sprint_convertor.go
+++ b/plugins/jira/tasks/sprint_convertor.go
@@ -49,8 +49,10 @@ func ConvertSprints(taskCtx core.SubTaskContext) errors.Error {
clauses := []dal.Clause{
dal.Select("*"),
dal.From(&models.JiraSprint{}),
- dal.Join("left join _tool_jira_board_sprints on _tool_jira_board_sprints.sprint_id = _tool_jira_sprints.sprint_id"),
- dal.Where("_tool_jira_board_sprints.connection_id = ? AND _tool_jira_board_sprints.board_id = ?", connectionId, boardId),
+ dal.Join(`LEFT JOIN _tool_jira_board_sprints
+ ON _tool_jira_board_sprints.sprint_id = _tool_jira_sprints.sprint_id
+ AND _tool_jira_board_sprints.connection_id = _tool_jira_sprints.connection_id`),
+ dal.Where("_tool_jira_sprints.connection_id = ? AND _tool_jira_board_sprints.board_id = ?", connectionId, boardId),
}
cursor, err := db.Cursor(clauses...)
if err != nil {
diff --git a/plugins/jira/tasks/worklog_convertor.go b/plugins/jira/tasks/worklog_convertor.go
index 95155b97..daa1efbc 100644
--- a/plugins/jira/tasks/worklog_convertor.go
+++ b/plugins/jira/tasks/worklog_convertor.go
@@ -50,7 +50,9 @@ func ConvertWorklogs(taskCtx core.SubTaskContext) errors.Error {
clauses := []dal.Clause{
dal.From(&models.JiraWorklog{}),
dal.Select("_tool_jira_worklogs.*"),
- dal.Join(`left join _tool_jira_board_issues on (_tool_jira_board_issues.issue_id = _tool_jira_worklogs.issue_id)`),
+ dal.Join(`LEFT JOIN _tool_jira_board_issues
+ ON _tool_jira_board_issues.connection_id = _tool_jira_worklogs.connection_id
+ AND _tool_jira_board_issues.issue_id = _tool_jira_worklogs.issue_id`),
dal.Where("_tool_jira_board_issues.connection_id = ? AND _tool_jira_board_issues.board_id = ?", connectionId, boardId),
}
cursor, err := db.Cursor(clauses...)