Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: milestone created_at and updated_at #6274

Merged
merged 1 commit into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package migrationscripts

import (
"time"

"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/core/errors"
"github.com/apache/incubator-devlake/core/models/migrationscripts/archived"
"github.com/apache/incubator-devlake/helpers/migrationhelper"
githubArchived "github.com/apache/incubator-devlake/plugins/github/models/migrationscripts/archived"
)

type modifyGithubMilestone struct{}

type GithubMilestone20231018 struct {
ConnectionId uint64 `gorm:"primaryKey"`
MilestoneId int `gorm:"primaryKey;autoIncrement:false"`
RepoId int
Number int
URL string
Title string
OpenIssues int
ClosedIssues int
State string
GithubCreatedAt time.Time
GithubUpdatedAt time.Time
ClosedAt *time.Time

archived.NoPKModel
}

func (GithubMilestone20231018) TableName() string {
return "_tool_github_milestones"
}

func (script *modifyGithubMilestone) Up(basicRes context.BasicRes) errors.Error {
err := basicRes.GetDal().DropTables(&githubArchived.GithubMilestone{})
if err != nil {
return err
}
return migrationhelper.AutoMigrateTables(
basicRes,
&GithubMilestone20231018{},
)
}

func (*modifyGithubMilestone) Version() uint64 {
return 20231018122537
}

func (*modifyGithubMilestone) Name() string {
return "modify _tool_github_milestones table created_at and updated_at"
}
1 change: 1 addition & 0 deletions backend/plugins/github/models/migrationscripts/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ func All() []plugin.MigrationScript {
new(addFullName),
new(addRawParamTableForScope),
new(addDeploymentTable),
new(modifyGithubMilestone),
}
}
27 changes: 14 additions & 13 deletions backend/plugins/github/models/milestone.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,24 @@ limitations under the License.
package models

import (
"github.com/apache/incubator-devlake/core/models/common"
"time"

"github.com/apache/incubator-devlake/core/models/common"
)

type GithubMilestone struct {
ConnectionId uint64 `gorm:"primaryKey"`
MilestoneId int `gorm:"primaryKey;autoIncrement:false"`
RepoId int
Number int
URL string
Title string
OpenIssues int
ClosedIssues int
State string
CreatedAt time.Time
UpdatedAt time.Time
ClosedAt *time.Time
ConnectionId uint64 `gorm:"primaryKey"`
MilestoneId int `gorm:"primaryKey;autoIncrement:false"`
RepoId int
Number int
URL string
Title string
OpenIssues int
ClosedIssues int
State string
GithubCreatedAt time.Time
GithubUpdatedAt time.Time
ClosedAt *time.Time
common.NoPKModel
}

Expand Down
2 changes: 1 addition & 1 deletion backend/plugins/github/tasks/milestone_converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func ConvertMilestones(taskCtx plugin.SubTaskContext) errors.Error {
Name: response.GithubMilestone.Title,
Url: response.GithubMilestone.URL,
Status: response.GithubMilestone.State,
StartedDate: &response.GithubMilestone.CreatedAt, //GitHub doesn't give us a "start date"
StartedDate: &response.GithubMilestone.GithubCreatedAt, //GitHub doesn't give us a "start date"
EndedDate: response.GithubMilestone.ClosedAt,
CompletedDate: response.GithubMilestone.ClosedAt,
OriginalBoardID: domainBoardId,
Expand Down
24 changes: 12 additions & 12 deletions backend/plugins/github/tasks/milestone_extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,18 @@ func ExtractMilestones(taskCtx plugin.SubTaskContext) errors.Error {

func convertGithubMilestone(response *MilestonesResponse, connectionId uint64, repositoryId int) *models.GithubMilestone {
milestone := &models.GithubMilestone{
ConnectionId: connectionId,
MilestoneId: response.Id,
RepoId: repositoryId,
Number: response.Number,
URL: response.Url,
Title: response.Title,
OpenIssues: response.OpenIssues,
ClosedIssues: response.ClosedIssues,
State: response.State,
ClosedAt: common.Iso8601TimeToTime(response.ClosedAt),
CreatedAt: response.CreatedAt.ToTime(),
UpdatedAt: response.UpdatedAt.ToTime(),
ConnectionId: connectionId,
MilestoneId: response.Id,
RepoId: repositoryId,
Number: response.Number,
URL: response.Url,
Title: response.Title,
OpenIssues: response.OpenIssues,
ClosedIssues: response.ClosedIssues,
State: response.State,
ClosedAt: common.Iso8601TimeToTime(response.ClosedAt),
GithubCreatedAt: response.CreatedAt.ToTime(),
GithubUpdatedAt: response.UpdatedAt.ToTime(),
}
return milestone
}
Loading