Skip to content

Commit 245d6e6

Browse files
authored
feat: Add fix version to jira issues (#8473)
1 parent fa80e48 commit 245d6e6

File tree

13 files changed

+153
-87
lines changed

13 files changed

+153
-87
lines changed

backend/core/models/common/iso8601time_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ func TestConvertStringToTime(t *testing.T) {
136136
name: "Valid time string",
137137
input: "2023-03-01T12:30:00+0000",
138138
output: time.Date(2023, 3, 1, 12, 30, 0, 0, time.UTC).Local(),
139-
err: nil,
139+
err: nil,
140140
},
141141
{
142-
name: "Valid date string",
143-
input: "2023-03-01",
144-
output: time.Date(2023, 3, 1, 0, 0, 0, 0, time.UTC),
145-
err: nil,
142+
name: "Valid date string",
143+
input: "2023-03-01",
144+
output: time.Date(2023, 3, 1, 0, 0, 0, 0, time.UTC),
145+
err: nil,
146146
},
147147
{
148148
name: "Invalid time string",
@@ -179,21 +179,21 @@ func TestConvertStringToTimeInLoc(t *testing.T) {
179179
input: "2023-03-01T12:30:00+0800",
180180
loc: loc,
181181
output: time.Date(2023, 3, 1, 12, 30, 0, 0, loc),
182-
err: nil,
182+
err: nil,
183183
},
184184
{
185-
name: "Valid date string with location",
186-
input: "2023-03-01",
187-
loc: loc,
188-
output: time.Date(2023, 3, 1, 0, 0, 0, 0, loc),
189-
err: nil,
185+
name: "Valid date string with location",
186+
input: "2023-03-01",
187+
loc: loc,
188+
output: time.Date(2023, 3, 1, 0, 0, 0, 0, loc),
189+
err: nil,
190190
},
191191
{
192192
name: "Invalid time string with location",
193193
input: "invalid",
194-
loc: loc,
195-
output: time.Time{},
196-
err: fmt.Errorf("parsing time \"invalid\" as \"2006-01-02T15:04:05Z07:00\": cannot parse \"invalid\" as \"2006\""),
194+
loc: loc,
195+
output: time.Time{},
196+
err: fmt.Errorf("parsing time \"invalid\" as \"2006-01-02T15:04:05Z07:00\": cannot parse \"invalid\" as \"2006\""),
197197
},
198198
}
199199
for _, tc := range testCases {

backend/core/models/domainlayer/ticket/issue.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ type Issue struct {
5555
OriginalProject string `gorm:"type:varchar(255)"`
5656
IsSubtask bool
5757
DueDate *time.Time
58+
FixVersions string `gorm:"type:text"`
5859
}
5960

6061
func (Issue) TableName() string {

backend/plugins/gitlab/api/blueprint_V200_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func TestMakeDataSourcePipelinePlanV200(t *testing.T) {
131131
PathWithNamespace: pathWithNamespace,
132132
HttpUrlToRepo: httpUrlToRepo,
133133
Scope: common.Scope{
134-
ConnectionId: connectionID,
134+
ConnectionId: connectionID,
135135
},
136136
},
137137
ScopeConfig: scopeConfig,
@@ -164,13 +164,13 @@ func TestMakeDataSourcePipelinePlanV200(t *testing.T) {
164164
{
165165
Plugin: "gitextractor",
166166
Options: map[string]interface{}{
167-
"proxy": "",
168-
"repoId": expectDomainScopeId,
169-
"name": gitlabProjectName,
170-
"fullName": pathWithNamespace,
171-
"url": "https://git:nddtf@this_is_cloneUrl",
167+
"proxy": "",
168+
"repoId": expectDomainScopeId,
169+
"name": gitlabProjectName,
170+
"fullName": pathWithNamespace,
171+
"url": "https://git:nddtf@this_is_cloneUrl",
172172
"connectionId": connectionID,
173-
"pluginName": pluginName,
173+
"pluginName": pluginName,
174174
},
175175
},
176176
},

backend/plugins/jira/e2e/issue_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ func TestIssueDataFlow(t *testing.T) {
237237
"assignee_name",
238238
"severity",
239239
"component",
240+
"fix_versions",
240241
"original_project",
241242
"due_date",
242243
},
@@ -317,6 +318,7 @@ func TestIssueSubtaskWithoutMapping(t *testing.T) {
317318
"assignee_name",
318319
"severity",
319320
"component",
321+
"fix_versions",
320322
"original_project",
321323
},
322324
)
@@ -454,9 +456,10 @@ func TestIssueCustomizeDueDate(t *testing.T) {
454456
"assignee_name",
455457
"severity",
456458
"component",
459+
"fix_versions",
457460
"original_project",
458461
"due_date",
459462
},
460463
)
461464

462-
}
465+
}

backend/plugins/jira/e2e/snapshot_tables/issues.csv

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
id,url,icon_url,issue_key,title,description,epic_key,type,original_type,status,original_status,story_point,resolution_date,created_date,updated_date,lead_time_minutes,parent_issue_id,priority,original_estimate_minutes,time_spent_minutes,time_remaining_minutes,creator_id,creator_name,assignee_id,assignee_name,severity,component,original_project,due_date
2-
jira:JiraIssue:2:10063,https://merico.atlassian.net/browse/EE-1,https://merico.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10315?size=medium,EE-1,​四个排序图:测试/注释覆盖度、复用度、模块性,,,故事,故事,TODO,已完成,-1,2020-06-19T06:31:18.495+00:00,2020-06-12T00:13:13.360+00:00,2021-03-28T08:06:08.713+00:00,10458,,Medium,,,0,jira:JiraAccount:2:5e9711ba34f7b90c0fbc37d3,Rankin Zheng,jira:JiraAccount:2:5ecfbd0c730ec90c1999cadf,Dingding Zhang,,,Enterprise Edition,2025-03-03T16:00:00.000+00:00
1+
id,url,icon_url,issue_key,title,description,epic_key,type,original_type,status,original_status,story_point,resolution_date,created_date,updated_date,lead_time_minutes,parent_issue_id,priority,original_estimate_minutes,time_spent_minutes,time_remaining_minutes,creator_id,creator_name,assignee_id,assignee_name,severity,component,fix_versions,original_project,due_date
2+
jira:JiraIssue:2:10063,https://merico.atlassian.net/browse/EE-1,https://merico.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10315?size=medium,EE-1,​四个排序图:测试/注释覆盖度、复用度、模块性,,,故事,故事,TODO,已完成,-1,2020-06-19T06:31:18.495+00:00,2020-06-12T00:13:13.360+00:00,2021-03-28T08:06:08.713+00:00,10458,,Medium,,,0,jira:JiraAccount:2:5e9711ba34f7b90c0fbc37d3,Rankin Zheng,jira:JiraAccount:2:5ecfbd0c730ec90c1999cadf,Dingding Zhang,,,v2.7.0,Enterprise Edition,2025-03-03T16:00:00.000+00:00

0 commit comments

Comments
 (0)