This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 87cc81668 refactor(tapd): adopts timeAfter (#4493)
87cc81668 is described below
commit 87cc81668ea15aeaeb69d9fbcf6bd4c8a051360a
Author: Warren Chen <[email protected]>
AuthorDate: Thu Feb 23 17:55:35 2023 +0800
refactor(tapd): adopts timeAfter (#4493)
---
backend/plugins/tapd/impl/impl.go | 14 +++++++-------
backend/plugins/tapd/tapd.go | 10 +++++-----
backend/plugins/tapd/tasks/bug_changelog_collector.go | 6 +++---
backend/plugins/tapd/tasks/bug_collector.go | 8 ++++----
backend/plugins/tapd/tasks/bug_commit_collector.go | 6 +++---
backend/plugins/tapd/tasks/iteration_collector.go | 8 ++++----
backend/plugins/tapd/tasks/story_bug_collector.go | 6 +++---
backend/plugins/tapd/tasks/story_changelog_collector.go | 6 +++---
backend/plugins/tapd/tasks/story_collector.go | 8 ++++----
backend/plugins/tapd/tasks/story_commit_collector.go | 6 +++---
backend/plugins/tapd/tasks/task_changelog_collector.go | 6 +++---
backend/plugins/tapd/tasks/task_collector.go | 8 ++++----
backend/plugins/tapd/tasks/task_commit_collector.go | 6 +++---
backend/plugins/tapd/tasks/task_data.go | 10 +++++-----
backend/plugins/tapd/tasks/worklog_collector.go | 10 +++++-----
15 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/backend/plugins/tapd/impl/impl.go
b/backend/plugins/tapd/impl/impl.go
index 38a2f1a75..05e7c20b2 100644
--- a/backend/plugins/tapd/impl/impl.go
+++ b/backend/plugins/tapd/impl/impl.go
@@ -197,16 +197,16 @@ func (p Tapd) PrepareTaskData(taskCtx plugin.TaskContext,
options map[string]int
ApiClient: tapdApiClient,
Connection: connection,
}
- var createdDateAfter time.Time
- if op.CreatedDateAfter != "" {
- createdDateAfter, err =
errors.Convert01(time.Parse(time.RFC3339, op.CreatedDateAfter))
+ var timeAfter time.Time
+ if op.TimeAfter != "" {
+ timeAfter, err = errors.Convert01(time.Parse(time.RFC3339,
op.TimeAfter))
if err != nil {
- return nil, errors.BadInput.Wrap(err, "invalid value
for `createdDateAfter`")
+ return nil, errors.BadInput.Wrap(err, "invalid value
for `timeAfter`")
}
}
- if !createdDateAfter.IsZero() {
- taskData.CreatedDateAfter = &createdDateAfter
- logger.Debug("collect data updated createdDateAfter %s",
createdDateAfter)
+ if !timeAfter.IsZero() {
+ taskData.TimeAfter = &timeAfter
+ logger.Debug("collect data updated timeAfter %s", timeAfter)
}
return taskData, nil
}
diff --git a/backend/plugins/tapd/tapd.go b/backend/plugins/tapd/tapd.go
index 29b309c8f..f36fc570d 100644
--- a/backend/plugins/tapd/tapd.go
+++ b/backend/plugins/tapd/tapd.go
@@ -31,7 +31,7 @@ func main() {
connectionId := cmd.Flags().Uint64P("connection", "c", 0, "tapd
connection id")
workspaceId := cmd.Flags().Uint64P("workspace", "w", 0, "tapd workspace
id")
companyId := cmd.Flags().Uint64P("company", "o", 0, "tapd company id")
- createdDateAfter := cmd.Flags().StringP("createdDateAfter", "a", "",
"collect data that are created after specified time, ie 2006-05-06T07:08:09Z")
+ timeAfter := cmd.Flags().StringP("timeAfter", "a", "", "collect data
that are created after specified time, ie 2006-05-06T07:08:09Z")
err := cmd.MarkFlagRequired("connection")
if err != nil {
panic(err)
@@ -43,10 +43,10 @@ func main() {
cmd.Run = func(c *cobra.Command, args []string) {
runner.DirectRun(c, args, PluginEntry, map[string]interface{}{
- "connectionId": *connectionId,
- "workspaceId": *workspaceId,
- "companyId": *companyId,
- "createdDateAfter": *createdDateAfter,
+ "connectionId": *connectionId,
+ "workspaceId": *workspaceId,
+ "companyId": *companyId,
+ "timeAfter": *timeAfter,
})
//
// cfg := config.GetConfig()
diff --git a/backend/plugins/tapd/tasks/bug_changelog_collector.go
b/backend/plugins/tapd/tasks/bug_changelog_collector.go
index 8c7fb5a22..d47459b09 100644
--- a/backend/plugins/tapd/tasks/bug_changelog_collector.go
+++ b/backend/plugins/tapd/tasks/bug_changelog_collector.go
@@ -33,7 +33,7 @@ func CollectBugChangelogs(taskCtx plugin.SubTaskContext)
errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_BUG_CHANGELOG_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect storyChangelogs")
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -50,10 +50,10 @@ func CollectBugChangelogs(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("page", fmt.Sprintf("%v", reqData.Pager.Page))
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("order", "created desc")
- if data.CreatedDateAfter != nil {
+ if data.TimeAfter != nil {
query.Set("created",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("created",
diff --git a/backend/plugins/tapd/tasks/bug_collector.go
b/backend/plugins/tapd/tasks/bug_collector.go
index 882059210..148fffd2d 100644
--- a/backend/plugins/tapd/tasks/bug_collector.go
+++ b/backend/plugins/tapd/tasks/bug_collector.go
@@ -33,7 +33,7 @@ func CollectBugs(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_BUG_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect bugs")
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -51,10 +51,10 @@ func CollectBugs(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("fields", "labels")
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
- query.Set("created",
+ if data.TimeAfter != nil {
+ query.Set("modified",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("modified",
diff --git a/backend/plugins/tapd/tasks/bug_commit_collector.go
b/backend/plugins/tapd/tasks/bug_commit_collector.go
index b48212b6e..2678ab3a5 100644
--- a/backend/plugins/tapd/tasks/bug_commit_collector.go
+++ b/backend/plugins/tapd/tasks/bug_commit_collector.go
@@ -37,7 +37,7 @@ var _ plugin.SubTaskEntryPoint = CollectBugCommits
func CollectBugCommits(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_BUG_COMMIT_TABLE, false)
db := taskCtx.GetDal()
- collectorWithState, err :=
api.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
api.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -49,8 +49,8 @@ func CollectBugCommits(taskCtx plugin.SubTaskContext)
errors.Error {
dal.From(&models.TapdBug{}),
dal.Where("_tool_tapd_bugs.connection_id = ? and
_tool_tapd_bugs.workspace_id = ? ", data.Options.ConnectionId,
data.Options.WorkspaceId),
}
- if collectorWithState.CreatedDateAfter != nil {
- clauses = append(clauses, dal.Where("created > ?",
*collectorWithState.CreatedDateAfter))
+ if collectorWithState.TimeAfter != nil {
+ clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.TimeAfter))
}
if incremental {
clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.LatestState.LatestSuccessStart))
diff --git a/backend/plugins/tapd/tasks/iteration_collector.go
b/backend/plugins/tapd/tasks/iteration_collector.go
index d06d10f36..e5d82d04c 100644
--- a/backend/plugins/tapd/tasks/iteration_collector.go
+++ b/backend/plugins/tapd/tasks/iteration_collector.go
@@ -35,7 +35,7 @@ func CollectIterations(taskCtx plugin.SubTaskContext)
errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_ITERATION_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect iterations")
- collectorWithState, err :=
api.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
api.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -52,10 +52,10 @@ func CollectIterations(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("page", fmt.Sprintf("%v", reqData.Pager.Page))
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
- query.Set("created",
+ if data.TimeAfter != nil {
+ query.Set("modified",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("modified",
diff --git a/backend/plugins/tapd/tasks/story_bug_collector.go
b/backend/plugins/tapd/tasks/story_bug_collector.go
index b508bbe5e..aed26a9ae 100644
--- a/backend/plugins/tapd/tasks/story_bug_collector.go
+++ b/backend/plugins/tapd/tasks/story_bug_collector.go
@@ -35,7 +35,7 @@ var _ plugin.SubTaskEntryPoint = CollectStoryBugs
func CollectStoryBugs(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_STORY_BUG_TABLE, false)
db := taskCtx.GetDal()
- collectorWithState, err :=
api.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
api.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -47,8 +47,8 @@ func CollectStoryBugs(taskCtx plugin.SubTaskContext)
errors.Error {
dal.From(&models.TapdStory{}),
dal.Where("_tool_tapd_stories.connection_id = ? and
_tool_tapd_stories.workspace_id = ? ", data.Options.ConnectionId,
data.Options.WorkspaceId),
}
- if collectorWithState.CreatedDateAfter != nil {
- clauses = append(clauses, dal.Where("created > ?",
*collectorWithState.CreatedDateAfter))
+ if collectorWithState.TimeAfter != nil {
+ clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.TimeAfter))
}
if incremental {
clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.LatestState.LatestSuccessStart))
diff --git a/backend/plugins/tapd/tasks/story_changelog_collector.go
b/backend/plugins/tapd/tasks/story_changelog_collector.go
index a4fbd875b..5f492251c 100644
--- a/backend/plugins/tapd/tasks/story_changelog_collector.go
+++ b/backend/plugins/tapd/tasks/story_changelog_collector.go
@@ -31,7 +31,7 @@ var _ plugin.SubTaskEntryPoint = CollectStoryChangelogs
func CollectStoryChangelogs(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_STORY_CHANGELOG_TABLE, false)
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -50,10 +50,10 @@ func CollectStoryChangelogs(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("page", fmt.Sprintf("%v", reqData.Pager.Page))
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
+ if data.TimeAfter != nil {
query.Set("created",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("created",
diff --git a/backend/plugins/tapd/tasks/story_collector.go
b/backend/plugins/tapd/tasks/story_collector.go
index 090864bfc..7fdf6d184 100644
--- a/backend/plugins/tapd/tasks/story_collector.go
+++ b/backend/plugins/tapd/tasks/story_collector.go
@@ -33,7 +33,7 @@ func CollectStorys(taskCtx plugin.SubTaskContext)
errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_STORY_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect stories")
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -50,10 +50,10 @@ func CollectStorys(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("fields", "labels")
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
- query.Set("created",
+ if data.TimeAfter != nil {
+ query.Set("modified",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("modified",
diff --git a/backend/plugins/tapd/tasks/story_commit_collector.go
b/backend/plugins/tapd/tasks/story_commit_collector.go
index 5a90decf7..910e4d876 100644
--- a/backend/plugins/tapd/tasks/story_commit_collector.go
+++ b/backend/plugins/tapd/tasks/story_commit_collector.go
@@ -37,7 +37,7 @@ var _ plugin.SubTaskEntryPoint = CollectStoryCommits
func CollectStoryCommits(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_STORY_COMMIT_TABLE, false)
db := taskCtx.GetDal()
- collectorWithState, err :=
api.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
api.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -49,8 +49,8 @@ func CollectStoryCommits(taskCtx plugin.SubTaskContext)
errors.Error {
dal.From(&models.TapdStory{}),
dal.Where("_tool_tapd_stories.connection_id = ? and
_tool_tapd_stories.workspace_id = ? ", data.Options.ConnectionId,
data.Options.WorkspaceId),
}
- if collectorWithState.CreatedDateAfter != nil {
- clauses = append(clauses, dal.Where("created > ?",
*collectorWithState.CreatedDateAfter))
+ if collectorWithState.TimeAfter != nil {
+ clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.TimeAfter))
}
if incremental {
clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.LatestState.LatestSuccessStart))
diff --git a/backend/plugins/tapd/tasks/task_changelog_collector.go
b/backend/plugins/tapd/tasks/task_changelog_collector.go
index 91792f077..b9e256794 100644
--- a/backend/plugins/tapd/tasks/task_changelog_collector.go
+++ b/backend/plugins/tapd/tasks/task_changelog_collector.go
@@ -31,7 +31,7 @@ var _ plugin.SubTaskEntryPoint = CollectTaskChangelogs
func CollectTaskChangelogs(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_TASK_CHANGELOG_TABLE, false)
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -50,10 +50,10 @@ func CollectTaskChangelogs(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("page", fmt.Sprintf("%v", reqData.Pager.Page))
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
+ if data.TimeAfter != nil {
query.Set("created",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("created",
diff --git a/backend/plugins/tapd/tasks/task_collector.go
b/backend/plugins/tapd/tasks/task_collector.go
index 290905e76..95d9fcc61 100644
--- a/backend/plugins/tapd/tasks/task_collector.go
+++ b/backend/plugins/tapd/tasks/task_collector.go
@@ -33,7 +33,7 @@ func CollectTasks(taskCtx plugin.SubTaskContext) errors.Error
{
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_TASK_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect tasks")
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -52,10 +52,10 @@ func CollectTasks(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("fields", "labels")
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
- query.Set("created",
+ if data.TimeAfter != nil {
+ query.Set("modified",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
query.Set("modified",
diff --git a/backend/plugins/tapd/tasks/task_commit_collector.go
b/backend/plugins/tapd/tasks/task_commit_collector.go
index 082ebfd5e..b8d006ece 100644
--- a/backend/plugins/tapd/tasks/task_commit_collector.go
+++ b/backend/plugins/tapd/tasks/task_commit_collector.go
@@ -37,7 +37,7 @@ var _ plugin.SubTaskEntryPoint = CollectTaskCommits
func CollectTaskCommits(taskCtx plugin.SubTaskContext) errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_TASK_COMMIT_TABLE, false)
db := taskCtx.GetDal()
- collectorWithState, err :=
api.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
api.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -49,8 +49,8 @@ func CollectTaskCommits(taskCtx plugin.SubTaskContext)
errors.Error {
dal.From(&models.TapdTask{}),
dal.Where("_tool_tapd_tasks.connection_id = ? and
_tool_tapd_tasks.workspace_id = ? ", data.Options.ConnectionId,
data.Options.WorkspaceId),
}
- if collectorWithState.CreatedDateAfter != nil {
- clauses = append(clauses, dal.Where("created > ?",
*collectorWithState.CreatedDateAfter))
+ if collectorWithState.TimeAfter != nil {
+ clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.TimeAfter))
}
if incremental {
clauses = append(clauses, dal.Where("modified > ?",
*collectorWithState.LatestState.LatestSuccessStart))
diff --git a/backend/plugins/tapd/tasks/task_data.go
b/backend/plugins/tapd/tasks/task_data.go
index fc6face85..ed50375de 100644
--- a/backend/plugins/tapd/tasks/task_data.go
+++ b/backend/plugins/tapd/tasks/task_data.go
@@ -28,16 +28,16 @@ type TapdOptions struct {
ConnectionId uint64 `mapstruct:"connectionId"`
WorkspaceId uint64 `mapstruct:"workspaceId"`
CompanyId uint64 `mapstruct:"companyId"`
- CreatedDateAfter string `json:"createdDateAfter"
mapstructure:"createdDateAfter,omitempty"`
+ TimeAfter string `json:"timeAfter"
mapstructure:"timeAfter,omitempty"`
CstZone *time.Location
TransformationRules TransformationRules `json:"transformationRules"`
}
type TapdTaskData struct {
- Options *TapdOptions
- ApiClient *helper.ApiAsyncClient
- CreatedDateAfter *time.Time
- Connection *models.TapdConnection
+ Options *TapdOptions
+ ApiClient *helper.ApiAsyncClient
+ TimeAfter *time.Time
+ Connection *models.TapdConnection
}
type TypeMapping struct {
diff --git a/backend/plugins/tapd/tasks/worklog_collector.go
b/backend/plugins/tapd/tasks/worklog_collector.go
index 03e0eba77..89916416b 100644
--- a/backend/plugins/tapd/tasks/worklog_collector.go
+++ b/backend/plugins/tapd/tasks/worklog_collector.go
@@ -33,7 +33,7 @@ func CollectWorklogs(taskCtx plugin.SubTaskContext)
errors.Error {
rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx,
RAW_WORKLOG_TABLE, false)
logger := taskCtx.GetLogger()
logger.Info("collect worklogs")
- collectorWithState, err :=
helper.NewApiCollectorWithState(*rawDataSubTaskArgs, data.CreatedDateAfter)
+ collectorWithState, err :=
helper.NewStatefulApiCollector(*rawDataSubTaskArgs, data.TimeAfter)
if err != nil {
return err
}
@@ -50,13 +50,13 @@ func CollectWorklogs(taskCtx plugin.SubTaskContext)
errors.Error {
query.Set("page", fmt.Sprintf("%v", reqData.Pager.Page))
query.Set("limit", fmt.Sprintf("%v",
reqData.Pager.Size))
query.Set("order", "created asc")
- if data.CreatedDateAfter != nil {
- query.Set("created",
+ if data.TimeAfter != nil {
+ query.Set("modified",
fmt.Sprintf(">%s",
-
data.CreatedDateAfter.In(data.Options.CstZone).Format("2006-01-02")))
+
data.TimeAfter.In(data.Options.CstZone).Format("2006-01-02")))
}
if incremental {
- query.Set("created",
+ query.Set("modified",
fmt.Sprintf(">%s",
collectorWithState.LatestState.LatestSuccessStart.In(data.Options.CstZone).Format("2006-01-02")))
}
