This is an automated email from the ASF dual-hosted git repository.
warren 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 8a1995216 fix(zentao): update id field type (#3784)
8a1995216 is described below
commit 8a199521678d65cfce2f0e160a9204858518a27d
Author: Warren Chen <[email protected]>
AuthorDate: Wed Nov 23 10:31:06 2022 +0800
fix(zentao): update id field type (#3784)
---
plugins/zentao/models/account.go | 4 +--
plugins/zentao/models/archived/account.go | 4 +--
plugins/zentao/models/archived/bug.go | 22 +++++++--------
plugins/zentao/models/archived/connection.go | 4 +--
plugins/zentao/models/archived/department.go | 2 +-
plugins/zentao/models/archived/execution.go | 24 ++++++++--------
plugins/zentao/models/archived/product.go | 10 +++----
plugins/zentao/models/archived/project.go | 10 +++----
plugins/zentao/models/archived/story.go | 28 +++++++++----------
plugins/zentao/models/archived/task.go | 26 ++++++++---------
plugins/zentao/models/bug.go | 34 +++++++++++-----------
plugins/zentao/models/connection.go | 4 +--
plugins/zentao/models/department.go | 4 +--
plugins/zentao/models/execution.go | 42 ++++++++++++++--------------
plugins/zentao/models/product.go | 12 ++++----
plugins/zentao/models/project.go | 10 +++----
plugins/zentao/models/story.go | 34 +++++++++++-----------
plugins/zentao/models/task.go | 38 ++++++++++++-------------
plugins/zentao/tasks/bug_convertor.go | 6 ++--
plugins/zentao/tasks/product_extractor.go | 2 +-
plugins/zentao/tasks/shared.go | 2 +-
plugins/zentao/tasks/story_convertor.go | 6 ++--
plugins/zentao/tasks/task_convertor.go | 6 ++--
plugins/zentao/tasks/task_data.go | 12 ++++----
24 files changed, 173 insertions(+), 173 deletions(-)
diff --git a/plugins/zentao/models/account.go b/plugins/zentao/models/account.go
index 98fb5cf6c..07b94c307 100644
--- a/plugins/zentao/models/account.go
+++ b/plugins/zentao/models/account.go
@@ -24,12 +24,12 @@ import (
type ZentaoAccount struct {
common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
Account string `json:"account" gorm:"type:varchar(100);index"`
Avatar string `json:"avatar" gorm:"type:varchar(255)"`
Realname string `json:"realname" gorm:"type:varchar(100);index"`
Role string `json:"role" gorm:"type:varchar(100);index"`
- Dept uint64 `json:"dept" gorm:"type:BIGINT NOT NULL;index"`
+ Dept int64 `json:"dept" gorm:"type:BIGINT NOT NULL;index"`
}
func (ZentaoAccount) TableName() string {
diff --git a/plugins/zentao/models/archived/account.go
b/plugins/zentao/models/archived/account.go
index 87c2a009c..eb7a81d88 100644
--- a/plugins/zentao/models/archived/account.go
+++ b/plugins/zentao/models/archived/account.go
@@ -24,12 +24,12 @@ import (
type ZentaoAccount struct {
archived.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
Account string `json:"account" gorm:"type:varchar(100);index"`
Avatar string `json:"avatar" gorm:"type:varchar(255)"`
Realname string `json:"realname" gorm:"type:varchar(100);index"`
Role string `json:"role" gorm:"type:varchar(100);index"`
- Dept uint64 `json:"dept" gorm:"type:BIGINT NOT NULL;index"`
+ Dept int64 `json:"dept" gorm:"type:BIGINT NOT NULL;index"`
}
func (ZentaoAccount) TableName() string {
diff --git a/plugins/zentao/models/archived/bug.go
b/plugins/zentao/models/archived/bug.go
index 364d319f6..373fabafb 100644
--- a/plugins/zentao/models/archived/bug.go
+++ b/plugins/zentao/models/archived/bug.go
@@ -25,20 +25,20 @@ import (
type ZentaoBug struct {
archived.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- ID uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
- Product uint64 `json:"product"`
+ ID int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
+ Product int64 `json:"product"`
Injection int `json:"injection"`
Identify int `json:"identify"`
Branch int `json:"branch"`
Module int `json:"module"`
- Execution uint64 `json:"execution"`
+ Execution int64 `json:"execution"`
Plan int `json:"plan"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
Task int `json:"task"`
ToTask int `json:"toTask"`
- ToStory uint64 `json:"toStory"`
+ ToStory int64 `json:"toStory"`
Title string `json:"title"`
Keywords string `json:"keywords"`
Severity int `json:"severity"`
@@ -57,19 +57,19 @@ type ZentaoBug struct {
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
FeedbackBy string `json:"feedbackBy"`
NotifyEmail string `json:"notifyEmail"`
- OpenedById uint64
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
OpenedBuild string `json:"openedBuild"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
Deadline string `json:"deadline"`
- ResolvedById uint64
+ ResolvedById int64
Resolution string `json:"resolution"`
ResolvedBuild string `json:"resolvedBuild"`
ResolvedDate *helper.Iso8601Time `json:"resolvedDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
DuplicateBug int `json:"duplicateBug"`
LinkBug string `json:"linkBug"`
@@ -84,7 +84,7 @@ type ZentaoBug struct {
RepoType string `json:"repoType"`
IssueKey string `json:"issueKey"`
Testtask int `json:"testtask"`
- LastEditedById uint64
+ LastEditedById int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
Deleted bool `json:"deleted"`
PriOrder string `json:"priOrder"`
diff --git a/plugins/zentao/models/archived/connection.go
b/plugins/zentao/models/archived/connection.go
index 5a89da666..d4cb2462d 100644
--- a/plugins/zentao/models/archived/connection.go
+++ b/plugins/zentao/models/archived/connection.go
@@ -38,13 +38,13 @@ type TestConnectionRequest struct {
// This object conforms to what the frontend currently expects.
type ZentaoResponse struct {
Name string `json:"name"`
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
ZentaoConnection
}
// Using User because it requires authentication.
type ApiUserResponse struct {
- Id uint64
+ Id int64
Name string `json:"name"`
}
diff --git a/plugins/zentao/models/archived/department.go
b/plugins/zentao/models/archived/department.go
index 70beab771..08738aaaa 100644
--- a/plugins/zentao/models/archived/department.go
+++ b/plugins/zentao/models/archived/department.go
@@ -21,7 +21,7 @@ import
"github.com/apache/incubator-devlake/models/migrationscripts/archived"
type ZentaoDepartment struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
Name string `json:"name" gorm:"type:varchar(100);index"`
Parent int `json:"parent" gorm:"type:varchar(100)"`
Path string `json:"path" gorm:"type:varchar(100)"`
diff --git a/plugins/zentao/models/archived/execution.go
b/plugins/zentao/models/archived/execution.go
index 328097abe..669b38e6a 100644
--- a/plugins/zentao/models/archived/execution.go
+++ b/plugins/zentao/models/archived/execution.go
@@ -24,8 +24,8 @@ import (
type ZentaoExecution struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- Id uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
+ Id int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -36,7 +36,7 @@ type ZentaoExecution struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -53,20 +53,20 @@ type ZentaoExecution struct {
ParentVersion int `json:"parentVersion"`
PlanDuration int `json:"planDuration"`
RealDuration int `json:"realDuration"`
- OpenedById uint64
+ OpenedById int64
OpenedDate *helper.Iso8601Time `json:"openedDate"`
OpenedVersion string `json:"openedVersion"`
- LastEditedById uint64
+ LastEditedById int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
- CanceledById uint64
+ CanceledById int64
CanceledDate *helper.Iso8601Time `json:"canceledDate"`
SuspendedDate *helper.Iso8601Time `json:"suspendedDate"`
- POId uint64
- PMId uint64
- QDId uint64
- RDId uint64
+ POId int64
+ PMId int64
+ QDId int64
+ RDId int64
Team string `json:"team"`
Acl string `json:"acl"`
OrderIn int `json:"order"`
@@ -78,7 +78,7 @@ type ZentaoExecution struct {
TotalEstimate float64 `json:"totalEstimate"`
TotalConsumed float64 `json:"totalConsumed"`
TotalLeft float64 `json:"totalLeft"`
- ProjectId uint64
+ ProjectId int64
Progress float64 `json:"progress"`
CaseReview bool `json:"caseReview"`
archived.NoPKModel
diff --git a/plugins/zentao/models/archived/product.go
b/plugins/zentao/models/archived/product.go
index 36d4e6655..0a1e19cc5 100644
--- a/plugins/zentao/models/archived/product.go
+++ b/plugins/zentao/models/archived/product.go
@@ -24,7 +24,7 @@ import (
type ZentaoProduct struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- Id uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
+ Id int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
Program int `json:"program"`
Name string `json:"name"`
Code string `json:"code"`
@@ -34,12 +34,12 @@ type ZentaoProduct struct {
Status string `json:"status"`
SubStatus string `json:"subStatus"`
Description string `json:"desc"`
- POId uint64
- QDId uint64
- RDId uint64
+ POId int64
+ QDId int64
+ RDId int64
Acl string `json:"acl"`
Reviewer string `json:"reviewer"`
- CreatedById uint64
+ CreatedById int64
CreatedDate *helper.Iso8601Time `json:"createdDate"`
CreatedVersion string `json:"createdVersion"`
OrderIn int `json:"order"`
diff --git a/plugins/zentao/models/archived/project.go
b/plugins/zentao/models/archived/project.go
index 75d72fc78..26ca01df2 100644
--- a/plugins/zentao/models/archived/project.go
+++ b/plugins/zentao/models/archived/project.go
@@ -25,8 +25,8 @@ import (
type ZentaoProject struct {
archived.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- ID uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
+ ID int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -37,7 +37,7 @@ type ZentaoProject struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -89,13 +89,13 @@ type ZentaoProject struct {
TotalReal int `json:"totalReal"`
}
type PM struct {
- PmId uint64 `json:"id"`
+ PmId int64 `json:"id"`
PmAccount string `json:"account"`
PmAvatar string `json:"avatar"`
PmRealname string `json:"realname"`
}
type Whitelist []struct {
- WhitelistID uint64 `json:"id"`
+ WhitelistID int64 `json:"id"`
WhitelistAccount string `json:"account"`
WhitelistAvatar string `json:"avatar"`
WhitelistRealname string `json:"realname"`
diff --git a/plugins/zentao/models/archived/story.go
b/plugins/zentao/models/archived/story.go
index 65fc7b950..6a2b43bd7 100644
--- a/plugins/zentao/models/archived/story.go
+++ b/plugins/zentao/models/archived/story.go
@@ -25,14 +25,14 @@ import (
type ZentaoStory struct {
archived.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL"
`
- Project uint64 `json:"project"`
- Product uint64 `json:"product"`
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL"
`
+ Project int64 `json:"project"`
+ Product int64 `json:"product"`
Branch int `json:"branch"`
Version int `json:"version"`
OrderIn int `json:"order"`
Vision string `json:"vision"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Module int `json:"module"`
Plan string `json:"plan"`
Source string `json:"source"`
@@ -50,24 +50,24 @@ type ZentaoStory struct {
SubStatus string `json:"subStatus"`
Color string `json:"color"`
Stage string `json:"stage"`
- StagedById uint64 `json:"stagedBy"`
+ StagedById int64 `json:"stagedBy"`
//Mailto []interface{} `json:"mailto"`
- Lib int `json:"lib"`
- FromStory uint64 `json:"fromStory"`
- FromVersion int `json:"fromVersion"`
- OpenedById uint64
+ Lib int `json:"lib"`
+ FromStory int64 `json:"fromStory"`
+ FromVersion int `json:"fromVersion"`
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
ApprovedDate *helper.Iso8601Time `json:"approvedDate"`
- LastEditedId uint64
+ LastEditedId int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
ChangedDate *helper.Iso8601Time `json:"changedDate"`
- ReviewedById uint64 `json:"reviewedBy"`
+ ReviewedById int64 `json:"reviewedBy"`
ReviewedDate *helper.Iso8601Time `json:"reviewedDate"`
- ClosedId uint64
+ ClosedId int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
ClosedReason string `json:"closedReason"`
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
@@ -75,7 +75,7 @@ type ZentaoStory struct {
ChildStories string `json:"childStories"`
LinkStories string `json:"linkStories"`
LinkRequirements string `json:"linkRequirements"`
- DuplicateStory uint64 `json:"duplicateStory"`
+ DuplicateStory int64 `json:"duplicateStory"`
StoryChanged string `json:"storyChanged"`
NotifyEmail string `json:"notifyEmail"`
URChanged string `json:"URChanged"`
diff --git a/plugins/zentao/models/archived/task.go
b/plugins/zentao/models/archived/task.go
index 9942d575a..62c9db05f 100644
--- a/plugins/zentao/models/archived/task.go
+++ b/plugins/zentao/models/archived/task.go
@@ -25,14 +25,14 @@ import (
type ZentaoTask struct {
archived.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ExecutionId uint64 `json:"execution_id"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
- Project uint64 `json:"project"`
- Parent uint64 `json:"parent"`
- Execution uint64 `json:"execution"`
+ ExecutionId int64 `json:"execution_id"`
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
+ Project int64 `json:"project"`
+ Parent int64 `json:"parent"`
+ Execution int64 `json:"execution"`
Module int `json:"module"`
Design int `json:"design"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
DesignVersion int `json:"designVersion"`
FromBug int `json:"fromBug"`
@@ -51,25 +51,25 @@ type ZentaoTask struct {
//Mailto interface{} `json:"mailto"`
Description string `json:"desc"`
Version int `json:"version"`
- OpenedById uint64
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
EstStarted string `json:"estStarted"`
RealStarted *helper.Iso8601Time `json:"realStarted"`
- FinishedId uint64
+ FinishedId int64
FinishedDate *helper.Iso8601Time `json:"finishedDate"`
FinishedList string `json:"finishedList"`
- CanceledId uint64
+ CanceledId int64
CanceledDate *helper.Iso8601Time `json:"canceledDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
PlanDuration int `json:"planDuration"`
RealDuration int `json:"realDuration"`
ClosedReason string `json:"closedReason"`
- LastEditedId uint64
+ LastEditedId int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
OrderIn int `json:"order"`
@@ -81,7 +81,7 @@ type ZentaoTask struct {
V2 string `json:"v2"`
Deleted bool `json:"deleted"`
Vision string `json:"vision"`
- StoryID uint64 `json:"storyID"`
+ StoryID int64 `json:"storyID"`
StoryTitle string `json:"storyTitle"`
Branch int `json:"branch"`
LatestStoryVersion int `json:"latestStoryVersion"`
diff --git a/plugins/zentao/models/bug.go b/plugins/zentao/models/bug.go
index da39ee41f..86273234c 100644
--- a/plugins/zentao/models/bug.go
+++ b/plugins/zentao/models/bug.go
@@ -23,20 +23,20 @@ import (
)
type ZentaoBugRes struct {
- ID uint64 `json:"id"`
- Project uint64 `json:"project"`
- Product uint64 `json:"product"`
+ ID int64 `json:"id"`
+ Project int64 `json:"project"`
+ Product int64 `json:"product"`
Injection int `json:"injection"`
Identify int `json:"identify"`
Branch int `json:"branch"`
Module int `json:"module"`
- Execution uint64 `json:"execution"`
+ Execution int64 `json:"execution"`
Plan int `json:"plan"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
Task int `json:"task"`
ToTask int `json:"toTask"`
- ToStory uint64 `json:"toStory"`
+ ToStory int64 `json:"toStory"`
Title string `json:"title"`
Keywords string `json:"keywords"`
Severity int `json:"severity"`
@@ -93,20 +93,20 @@ type ZentaoBugRes struct {
type ZentaoBug struct {
common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- ID uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
- Product uint64 `json:"product"`
+ ID int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
+ Product int64 `json:"product"`
Injection int `json:"injection"`
Identify int `json:"identify"`
Branch int `json:"branch"`
Module int `json:"module"`
- Execution uint64 `json:"execution"`
+ Execution int64 `json:"execution"`
Plan int `json:"plan"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
Task int `json:"task"`
ToTask int `json:"toTask"`
- ToStory uint64 `json:"toStory"`
+ ToStory int64 `json:"toStory"`
Title string `json:"title"`
Keywords string `json:"keywords"`
Severity int `json:"severity"`
@@ -125,19 +125,19 @@ type ZentaoBug struct {
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
FeedbackBy string `json:"feedbackBy"`
NotifyEmail string `json:"notifyEmail"`
- OpenedById uint64
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
OpenedBuild string `json:"openedBuild"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
Deadline string `json:"deadline"`
- ResolvedById uint64
+ ResolvedById int64
Resolution string `json:"resolution"`
ResolvedBuild string `json:"resolvedBuild"`
ResolvedDate *helper.Iso8601Time `json:"resolvedDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
DuplicateBug int `json:"duplicateBug"`
LinkBug string `json:"linkBug"`
@@ -152,7 +152,7 @@ type ZentaoBug struct {
RepoType string `json:"repoType"`
IssueKey string `json:"issueKey"`
Testtask int `json:"testtask"`
- LastEditedById uint64
+ LastEditedById int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
Deleted bool `json:"deleted"`
PriOrder string `json:"priOrder"`
diff --git a/plugins/zentao/models/connection.go
b/plugins/zentao/models/connection.go
index e25f0c3d5..84f608a56 100644
--- a/plugins/zentao/models/connection.go
+++ b/plugins/zentao/models/connection.go
@@ -36,13 +36,13 @@ type TestConnectionRequest struct {
// This object conforms to what the frontend currently expects.
type ZentaoResponse struct {
Name string `json:"name"`
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
ZentaoConnection
}
// Using User because it requires authentication.
type ApiUserResponse struct {
- Id uint64
+ Id int64
Name string `json:"name"`
}
diff --git a/plugins/zentao/models/department.go
b/plugins/zentao/models/department.go
index 036e4289e..08f63c1ac 100644
--- a/plugins/zentao/models/department.go
+++ b/plugins/zentao/models/department.go
@@ -23,9 +23,9 @@ import (
type ZentaoDepartment struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL" `
Name string `json:"name" gorm:"type:varchar(100);index"`
- Parent uint64 `json:"parent" gorm:"type:varchar(100)"`
+ Parent int64 `json:"parent" gorm:"type:varchar(100)"`
Path string `json:"path" gorm:"type:varchar(100)"`
Grade int `json:"grade"`
OrderIn int `json:"order"`
diff --git a/plugins/zentao/models/execution.go
b/plugins/zentao/models/execution.go
index db53227c6..337da46fb 100644
--- a/plugins/zentao/models/execution.go
+++ b/plugins/zentao/models/execution.go
@@ -23,8 +23,8 @@ import (
)
type ZentaoExecutionRes struct {
- ID uint64 `json:"id"`
- Project uint64 `json:"project"`
+ ID int64 `json:"id"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -35,7 +35,7 @@ type ZentaoExecutionRes struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -79,8 +79,8 @@ type ZentaoExecutionRes struct {
TotalConsumed float64 `json:"totalConsumed"`
TotalLeft float64 `json:"totalLeft"`
ProjectInfo struct {
- ID uint64 `json:"id"`
- Project uint64 `json:"project"`
+ ID int64 `json:"id"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -91,7 +91,7 @@ type ZentaoExecutionRes struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -133,7 +133,7 @@ type ZentaoExecutionRes struct {
} `json:"projectInfo"`
Progress float64 `json:"progress"`
TeamMembers []struct {
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
Root int `json:"root"`
Type string `json:"type"`
Account string `json:"account"`
@@ -147,11 +147,11 @@ type ZentaoExecutionRes struct {
Left string `json:"left"`
OrderIn int `json:"order"`
TotalHours float64 `json:"totalHours"`
- UserID uint64 `json:"userID"`
+ UserID int64 `json:"userID"`
Realname string `json:"realname"`
} `json:"teamMembers"`
Products []struct {
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
Name string `json:"name"`
Plans []interface{} `json:"plans"`
} `json:"products"`
@@ -160,8 +160,8 @@ type ZentaoExecutionRes struct {
type ZentaoExecution struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- Id uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
+ Id int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -172,7 +172,7 @@ type ZentaoExecution struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -189,20 +189,20 @@ type ZentaoExecution struct {
ParentVersion int `json:"parentVersion"`
PlanDuration int `json:"planDuration"`
RealDuration int `json:"realDuration"`
- OpenedById uint64
+ OpenedById int64
OpenedDate *helper.Iso8601Time `json:"openedDate"`
OpenedVersion string `json:"openedVersion"`
- LastEditedById uint64
+ LastEditedById int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
- CanceledById uint64
+ CanceledById int64
CanceledDate *helper.Iso8601Time `json:"canceledDate"`
SuspendedDate *helper.Iso8601Time `json:"suspendedDate"`
- POId uint64
- PMId uint64
- QDId uint64
- RDId uint64
+ POId int64
+ PMId int64
+ QDId int64
+ RDId int64
Team string `json:"team"`
Acl string `json:"acl"`
OrderIn int `json:"order"`
@@ -214,7 +214,7 @@ type ZentaoExecution struct {
TotalEstimate float64 `json:"totalEstimate"`
TotalConsumed float64 `json:"totalConsumed"`
TotalLeft float64 `json:"totalLeft"`
- ProjectId uint64
+ ProjectId int64
Progress float64 `json:"progress"`
CaseReview bool `json:"caseReview"`
common.NoPKModel
diff --git a/plugins/zentao/models/product.go b/plugins/zentao/models/product.go
index 85c57b2bd..b9e895f82 100644
--- a/plugins/zentao/models/product.go
+++ b/plugins/zentao/models/product.go
@@ -23,7 +23,7 @@ import (
)
type ZentaoProductRes struct {
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
Program int `json:"program"`
Name string `json:"name"`
Code string `json:"code"`
@@ -68,7 +68,7 @@ type ZentaoProductRes struct {
type ZentaoProduct struct {
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- Id uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
+ Id int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
Program int `json:"program"`
Name string `json:"name"`
Code string `json:"code"`
@@ -78,12 +78,12 @@ type ZentaoProduct struct {
Status string `json:"status"`
SubStatus string `json:"subStatus"`
Description string `json:"desc"`
- POId uint64
- QDId uint64
- RDId uint64
+ POId int64
+ QDId int64
+ RDId int64
Acl string `json:"acl"`
Reviewer string `json:"reviewer"`
- CreatedById uint64
+ CreatedById int64
CreatedDate *helper.Iso8601Time `json:"createdDate"`
CreatedVersion string `json:"createdVersion"`
OrderIn int `json:"order"`
diff --git a/plugins/zentao/models/project.go b/plugins/zentao/models/project.go
index 7e6a6a882..c97130fe2 100644
--- a/plugins/zentao/models/project.go
+++ b/plugins/zentao/models/project.go
@@ -25,8 +25,8 @@ import (
type ZentaoProject struct {
common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT
NULL"`
- ID uint64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
- Project uint64 `json:"project"`
+ ID int64 `json:"id"
gorm:"primaryKey;type:BIGINT NOT NULL"`
+ Project int64 `json:"project"`
Model string `json:"model"`
Type string `json:"type"`
Lifetime string `json:"lifetime"`
@@ -37,7 +37,7 @@ type ZentaoProject struct {
Milestone string `json:"milestone"`
Output string `json:"output"`
Auth string `json:"auth"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Path string `json:"path"`
Grade int `json:"grade"`
Name string `json:"name"`
@@ -89,13 +89,13 @@ type ZentaoProject struct {
TotalReal int `json:"totalReal"`
}
type PM struct {
- PmId uint64 `json:"id"`
+ PmId int64 `json:"id"`
PmAccount string `json:"account"`
PmAvatar string `json:"avatar"`
PmRealname string `json:"realname"`
}
type Whitelist []struct {
- WhitelistID uint64 `json:"id"`
+ WhitelistID int64 `json:"id"`
WhitelistAccount string `json:"account"`
WhitelistAvatar string `json:"avatar"`
WhitelistRealname string `json:"realname"`
diff --git a/plugins/zentao/models/story.go b/plugins/zentao/models/story.go
index 8df779f0a..a737e50e1 100644
--- a/plugins/zentao/models/story.go
+++ b/plugins/zentao/models/story.go
@@ -23,10 +23,10 @@ import (
)
type ZentaoStoryRes struct {
- ID uint64 `json:"id"`
+ ID int64 `json:"id"`
Vision string `json:"vision"`
- Parent uint64 `json:"parent"`
- Product uint64 `json:"product"`
+ Parent int64 `json:"parent"`
+ Product int64 `json:"product"`
Branch int `json:"branch"`
Module int `json:"module"`
Plan string `json:"plan"`
@@ -46,7 +46,7 @@ type ZentaoStoryRes struct {
Stage string `json:"stage"`
Mailto []interface{} `json:"mailto"`
Lib int `json:"lib"`
- FromStory uint64 `json:"fromStory"`
+ FromStory int64 `json:"fromStory"`
FromVersion int `json:"fromVersion"`
OpenedBy *ZentaoAccount `json:"openedBy"`
OpenedDate *helper.Iso8601Time `json:"openedDate"`
@@ -67,7 +67,7 @@ type ZentaoStoryRes struct {
ChildStories string `json:"childStories"`
LinkStories string `json:"linkStories"`
LinkRequirements string `json:"linkRequirements"`
- DuplicateStory uint64 `json:"duplicateStory"`
+ DuplicateStory int64 `json:"duplicateStory"`
Version int `json:"version"`
StoryChanged string `json:"storyChanged"`
FeedbackBy string `json:"feedbackBy"`
@@ -82,13 +82,13 @@ type ZentaoStoryRes struct {
type ZentaoStory struct {
common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL"
`
- Product uint64 `json:"product"`
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT NULL"
`
+ Product int64 `json:"product"`
Branch int `json:"branch"`
Version int `json:"version"`
OrderIn int `json:"order"`
Vision string `json:"vision"`
- Parent uint64 `json:"parent"`
+ Parent int64 `json:"parent"`
Module int `json:"module"`
Plan string `json:"plan"`
Source string `json:"source"`
@@ -106,22 +106,22 @@ type ZentaoStory struct {
Color string `json:"color"`
Stage string `json:"stage"`
//Mailto []interface{} `json:"mailto"`
- Lib int `json:"lib"`
- FromStory uint64 `json:"fromStory"`
- FromVersion int `json:"fromVersion"`
- OpenedById uint64
+ Lib int `json:"lib"`
+ FromStory int64 `json:"fromStory"`
+ FromVersion int `json:"fromVersion"`
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
ApprovedDate *helper.Iso8601Time `json:"approvedDate"`
- LastEditedId uint64
+ LastEditedId int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
ChangedDate *helper.Iso8601Time `json:"changedDate"`
- ReviewedById uint64 `json:"reviewedBy"`
+ ReviewedById int64 `json:"reviewedBy"`
ReviewedDate *helper.Iso8601Time `json:"reviewedDate"`
- ClosedId uint64
+ ClosedId int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
ClosedReason string `json:"closedReason"`
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
@@ -129,7 +129,7 @@ type ZentaoStory struct {
ChildStories string `json:"childStories"`
LinkStories string `json:"linkStories"`
LinkRequirements string `json:"linkRequirements"`
- DuplicateStory uint64 `json:"duplicateStory"`
+ DuplicateStory int64 `json:"duplicateStory"`
StoryChanged string `json:"storyChanged"`
FeedbackBy string `json:"feedbackBy"`
NotifyEmail string `json:"notifyEmail"`
diff --git a/plugins/zentao/models/task.go b/plugins/zentao/models/task.go
index 4f9be832f..47501a239 100644
--- a/plugins/zentao/models/task.go
+++ b/plugins/zentao/models/task.go
@@ -23,13 +23,13 @@ import (
)
type ZentaoTaskRes struct {
- Id uint64 `json:"id"`
- Project uint64 `json:"project"`
- Parent uint64 `json:"parent"`
- Execution uint64 `json:"execution"`
+ Id int64 `json:"id"`
+ Project int64 `json:"project"`
+ Parent int64 `json:"parent"`
+ Execution int64 `json:"execution"`
Module int `json:"module"`
Design int `json:"design"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
DesignVersion int `json:"designVersion"`
FromBug int `json:"fromBug"`
@@ -76,7 +76,7 @@ type ZentaoTaskRes struct {
V2 string `json:"v2"`
Deleted bool `json:"deleted"`
Vision string `json:"vision"`
- StoryID uint64 `json:"storyID"`
+ StoryID int64 `json:"storyID"`
StoryTitle string `json:"storyTitle"`
Branch interface {
} `json:"branch"`
@@ -94,14 +94,14 @@ type ZentaoTaskRes struct {
type ZentaoTask struct {
common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey;type:BIGINT NOT NULL"`
- ExecutionId uint64 `json:"execution_id"`
- ID uint64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
- Project uint64 `json:"project"`
- Parent uint64 `json:"parent"`
- Execution uint64 `json:"execution"`
+ ExecutionId int64 `json:"execution_id"`
+ ID int64 `json:"id" gorm:"primaryKey;type:BIGINT NOT
NULL"`
+ Project int64 `json:"project"`
+ Parent int64 `json:"parent"`
+ Execution int64 `json:"execution"`
Module int `json:"module"`
Design int `json:"design"`
- Story uint64 `json:"story"`
+ Story int64 `json:"story"`
StoryVersion int `json:"storyVersion"`
DesignVersion int `json:"designVersion"`
FromBug int `json:"fromBug"`
@@ -120,25 +120,25 @@ type ZentaoTask struct {
//Mailto interface{} `json:"mailto"`
Description string `json:"desc"`
Version int `json:"version"`
- OpenedById uint64
+ OpenedById int64
OpenedByName string
OpenedDate *helper.Iso8601Time `json:"openedDate"`
- AssignedToId uint64
+ AssignedToId int64
AssignedToName string
AssignedDate *helper.Iso8601Time `json:"assignedDate"`
EstStarted string `json:"estStarted"`
RealStarted *helper.Iso8601Time `json:"realStarted"`
- FinishedId uint64
+ FinishedId int64
FinishedDate *helper.Iso8601Time `json:"finishedDate"`
FinishedList string `json:"finishedList"`
- CanceledId uint64
+ CanceledId int64
CanceledDate *helper.Iso8601Time `json:"canceledDate"`
- ClosedById uint64
+ ClosedById int64
ClosedDate *helper.Iso8601Time `json:"closedDate"`
PlanDuration int `json:"planDuration"`
RealDuration int `json:"realDuration"`
ClosedReason string `json:"closedReason"`
- LastEditedId uint64
+ LastEditedId int64
LastEditedDate *helper.Iso8601Time `json:"lastEditedDate"`
ActivatedDate *helper.Iso8601Time `json:"activatedDate"`
OrderIn int `json:"order"`
@@ -150,7 +150,7 @@ type ZentaoTask struct {
V2 string `json:"v2"`
Deleted bool `json:"deleted"`
Vision string `json:"vision"`
- StoryID uint64 `json:"storyID"`
+ StoryID int64 `json:"storyID"`
StoryTitle string `json:"storyTitle"`
Branch int `json:"branch"`
LatestStoryVersion int `json:"latestStoryVersion"`
diff --git a/plugins/zentao/tasks/bug_convertor.go
b/plugins/zentao/tasks/bug_convertor.go
index 882a1fe2a..ed9735764 100644
--- a/plugins/zentao/tasks/bug_convertor.go
+++ b/plugins/zentao/tasks/bug_convertor.go
@@ -74,7 +74,7 @@ func ConvertBug(taskCtx core.SubTaskContext) errors.Error {
DomainEntity: domainlayer.DomainEntity{
Id:
bugIdGen.Generate(toolEntity.ConnectionId, toolEntity.ID),
},
- IssueKey:
strconv.FormatUint(toolEntity.ID, 10),
+ IssueKey:
strconv.FormatInt(toolEntity.ID, 10),
Title: toolEntity.Title,
Type: ticket.BUG,
OriginalStatus: toolEntity.Status,
@@ -83,9 +83,9 @@ func ConvertBug(taskCtx core.SubTaskContext) errors.Error {
UpdatedDate:
toolEntity.LastEditedDate.ToNullableTime(),
ParentIssueId:
storyIdGen.Generate(data.Options.ConnectionId, toolEntity.Story),
Priority: string(rune(toolEntity.Pri)),
- CreatorId:
strconv.FormatUint(toolEntity.OpenedById, 10),
+ CreatorId:
strconv.FormatInt(toolEntity.OpenedById, 10),
CreatorName: toolEntity.OpenedByName,
- AssigneeId:
strconv.FormatUint(toolEntity.AssignedToId, 10),
+ AssigneeId:
strconv.FormatInt(toolEntity.AssignedToId, 10),
AssigneeName: toolEntity.AssignedToName,
Severity:
string(rune(toolEntity.Severity)),
}
diff --git a/plugins/zentao/tasks/product_extractor.go
b/plugins/zentao/tasks/product_extractor.go
index d5d38582d..88428e37b 100644
--- a/plugins/zentao/tasks/product_extractor.go
+++ b/plugins/zentao/tasks/product_extractor.go
@@ -56,7 +56,7 @@ func ExtractProducts(taskCtx core.SubTaskContext)
errors.Error {
}
product := &models.ZentaoProduct{
ConnectionId: data.Options.ConnectionId,
- Id: uint64(res.ID),
+ Id: int64(res.ID),
Program: res.Program,
Name: res.Name,
Code: res.Code,
diff --git a/plugins/zentao/tasks/shared.go b/plugins/zentao/tasks/shared.go
index eb6afafe2..39fc86318 100644
--- a/plugins/zentao/tasks/shared.go
+++ b/plugins/zentao/tasks/shared.go
@@ -35,7 +35,7 @@ func GetTotalPagesFromResponse(res *http.Response, args
*helper.ApiCollectorArgs
}
-func getAccountId(account *models.ZentaoAccount) uint64 {
+func getAccountId(account *models.ZentaoAccount) int64 {
if account != nil {
return account.ID
}
diff --git a/plugins/zentao/tasks/story_convertor.go
b/plugins/zentao/tasks/story_convertor.go
index 391346b92..239047230 100644
--- a/plugins/zentao/tasks/story_convertor.go
+++ b/plugins/zentao/tasks/story_convertor.go
@@ -74,7 +74,7 @@ func ConvertStory(taskCtx core.SubTaskContext) errors.Error {
DomainEntity: domainlayer.DomainEntity{
Id:
storyIdGen.Generate(toolEntity.ConnectionId, toolEntity.ID),
},
- IssueKey:
strconv.FormatUint(toolEntity.ID, 10),
+ IssueKey:
strconv.FormatInt(toolEntity.ID, 10),
Title: toolEntity.Title,
Type: toolEntity.Type,
OriginalStatus: toolEntity.Stage,
@@ -83,9 +83,9 @@ func ConvertStory(taskCtx core.SubTaskContext) errors.Error {
UpdatedDate:
toolEntity.LastEditedDate.ToNullableTime(),
ParentIssueId:
storyIdGen.Generate(data.Options.ConnectionId, toolEntity.Parent),
Priority: string(rune(toolEntity.Pri)),
- CreatorId:
strconv.FormatUint(toolEntity.OpenedById, 10),
+ CreatorId:
strconv.FormatInt(toolEntity.OpenedById, 10),
CreatorName: toolEntity.OpenedByName,
- AssigneeId:
strconv.FormatUint(toolEntity.AssignedToId, 10),
+ AssigneeId:
strconv.FormatInt(toolEntity.AssignedToId, 10),
AssigneeName: toolEntity.AssignedToName,
}
switch toolEntity.Stage {
diff --git a/plugins/zentao/tasks/task_convertor.go
b/plugins/zentao/tasks/task_convertor.go
index d719c36bc..cccedaa16 100644
--- a/plugins/zentao/tasks/task_convertor.go
+++ b/plugins/zentao/tasks/task_convertor.go
@@ -75,7 +75,7 @@ func ConvertTask(taskCtx core.SubTaskContext) errors.Error {
DomainEntity: domainlayer.DomainEntity{
Id:
taskIdGen.Generate(toolEntity.ConnectionId, toolEntity.ID),
},
- IssueKey:
strconv.FormatUint(toolEntity.ID, 10),
+ IssueKey:
strconv.FormatInt(toolEntity.ID, 10),
Title: toolEntity.Name,
Description: toolEntity.Description,
Type: "TASK",
@@ -85,9 +85,9 @@ func ConvertTask(taskCtx core.SubTaskContext) errors.Error {
UpdatedDate:
toolEntity.LastEditedDate.ToNullableTime(),
ParentIssueId:
storyIdGen.Generate(data.Options.ConnectionId, toolEntity.Parent),
Priority: string(rune(toolEntity.Pri)),
- CreatorId:
strconv.FormatUint(toolEntity.OpenedById, 10),
+ CreatorId:
strconv.FormatInt(toolEntity.OpenedById, 10),
CreatorName: toolEntity.OpenedByName,
- AssigneeId:
strconv.FormatUint(toolEntity.AssignedToId, 10),
+ AssigneeId:
strconv.FormatInt(toolEntity.AssignedToId, 10),
AssigneeName: toolEntity.AssignedToName,
}
switch toolEntity.Status {
diff --git a/plugins/zentao/tasks/task_data.go
b/plugins/zentao/tasks/task_data.go
index 3a3d8ac74..aa75c84f4 100644
--- a/plugins/zentao/tasks/task_data.go
+++ b/plugins/zentao/tasks/task_data.go
@@ -25,9 +25,9 @@ import (
type ZentaoApiParams struct {
ConnectionId uint64
- ProductId uint64
- ExecutionId uint64
- ProjectId uint64
+ ProductId int64
+ ExecutionId int64
+ ProjectId int64
}
type ZentaoOptions struct {
@@ -36,9 +36,9 @@ type ZentaoOptions struct {
// Such As How many rows do your want
// You can use it in sub tasks and you need pass it in main.go and
pipelines.
ConnectionId uint64 `json:"connectionId"`
- ProductId uint64
- ExecutionId uint64
- ProjectId uint64
+ ProductId int64
+ ExecutionId int64
+ ProjectId int64
Tasks []string `json:"tasks,omitempty"`
Since string
}
