This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch release-v0.18
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.18 by this push:
new 52e769c5d cherry-pick fix(zentao): fix completed_date and ended_date
fields (#5971)
52e769c5d is described below
commit 52e769c5d9fe9487be7e4500a73a068b3985946f
Author: Lynwee <[email protected]>
AuthorDate: Tue Aug 29 18:03:06 2023 +0800
cherry-pick fix(zentao): fix completed_date and ended_date fields (#5971)
* fix(zentao): fix `completed_date` and `ended_date` fields
* fix(zentao): fix e2e test
---
backend/plugins/zentao/e2e/snapshot_tables/execution_sprint.csv | 4 ++--
backend/plugins/zentao/tasks/execution_convertor.go | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/backend/plugins/zentao/e2e/snapshot_tables/execution_sprint.csv
b/backend/plugins/zentao/e2e/snapshot_tables/execution_sprint.csv
index 13a04dcab..74bb7e65e 100644
--- a/backend/plugins/zentao/e2e/snapshot_tables/execution_sprint.csv
+++ b/backend/plugins/zentao/e2e/snapshot_tables/execution_sprint.csv
@@ -1,3 +1,3 @@
id,name,url,status,started_date,ended_date,completed_date,original_board_id
-zentao:ZentaoExecution:1:1,企业网站第一期,",7,1,",ACTIVE,,,2022-06-01T00:00:00.000+00:00,zentao:ZentaoProject:1:1
-zentao:ZentaoExecution:1:12,TR5,",1091,12,",CLOSED,2022-07-07T00:00:00.000+00:00,,2022-11-03T00:00:00.000+00:00,zentao:ZentaoProject:1:1
+zentao:ZentaoExecution:1:1,企业网站第一期,",7,1,",ACTIVE,,2022-06-01T00:00:00.000+00:00,,zentao:ZentaoProject:1:1
+zentao:ZentaoExecution:1:12,TR5,",1091,12,",CLOSED,2022-07-07T00:00:00.000+00:00,2022-11-03T00:00:00.000+00:00,,zentao:ZentaoProject:1:1
diff --git a/backend/plugins/zentao/tasks/execution_convertor.go
b/backend/plugins/zentao/tasks/execution_convertor.go
index 46804813f..9324e8eec 100644
--- a/backend/plugins/zentao/tasks/execution_convertor.go
+++ b/backend/plugins/zentao/tasks/execution_convertor.go
@@ -85,8 +85,8 @@ func ConvertExecutions(taskCtx plugin.SubTaskContext)
errors.Error {
Url: toolExecution.Path,
Status: domainStatus,
StartedDate:
toolExecution.RealBegan.ToNullableTime(),
- EndedDate:
toolExecution.RealEnd.ToNullableTime(),
- CompletedDate:
toolExecution.PlanEnd.ToNullableTime(),
+ EndedDate:
toolExecution.PlanEnd.ToNullableTime(),
+ CompletedDate:
toolExecution.RealEnd.ToNullableTime(),
OriginalBoardID:
projectIdGen.Generate(toolExecution.ConnectionId, data.Options.ProjectId),
}
boardSprint := &ticket.BoardSprint{
