You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ly...@apache.org on 2024/08/01 03:16:00 UTC

(incubator-devlake) 01/02: feat(incidents): add assignee_id and assignee_name fields

This is an automated email from the ASF dual-hosted git repository.

lynwee pushed a commit to branch cp102
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 46c28814233048de9635169448ea1d7072c684b6
Author: d4x1 <15...@qq.com>
AuthorDate: Thu Aug 1 11:00:30 2024 +0800

    feat(incidents): add assignee_id and assignee_name fields
---
 backend/core/models/domainlayer/code/pull_request.go |  2 ++
 backend/core/models/domainlayer/ticket/incident.go   |  2 ++
 backend/core/models/domainlayer/ticket/issue.go      |  2 ++
 ...o => 20240731_add_table_scope_id_to_incidents.go} |  0
 ...o => 20240801_add_table_scope_id_to_incidents.go} | 20 ++++++++++----------
 backend/core/models/migrationscripts/register.go     |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/backend/core/models/domainlayer/code/pull_request.go b/backend/core/models/domainlayer/code/pull_request.go
index 3cf9f2a8a..d659a5fdd 100644
--- a/backend/core/models/domainlayer/code/pull_request.go
+++ b/backend/core/models/domainlayer/code/pull_request.go
@@ -103,6 +103,8 @@ func (pr PullRequest) ToIncident() (*ticket.Incident, error) {
 		OriginalProject:         "",
 		ScopeId:                 pr.BaseRepoId,
 		Table:                   "repos",
+		AssigneeId:              pr.AuthorId,
+		AssigneeName:            pr.AuthorName,
 	}
 
 	if pr.MergedDate != nil {
diff --git a/backend/core/models/domainlayer/ticket/incident.go b/backend/core/models/domainlayer/ticket/incident.go
index 781b59072..073e0b2bd 100644
--- a/backend/core/models/domainlayer/ticket/incident.go
+++ b/backend/core/models/domainlayer/ticket/incident.go
@@ -50,6 +50,8 @@ type Incident struct {
 	OriginalProject         string `gorm:"type:varchar(255)"`
 	Table                   string `gorm:"index:idx_table_scope_id;type:varchar(255)"`
 	ScopeId                 string `gorm:"index:idx_table_scope_id;type:varchar(255)"`
+	AssigneeId              string `gorm:"type:varchar(255)"`
+	AssigneeName            string `gorm:"type:varchar(255)"`
 }
 
 func (Incident) TableName() string {
diff --git a/backend/core/models/domainlayer/ticket/issue.go b/backend/core/models/domainlayer/ticket/issue.go
index 715bee648..26e0b600e 100644
--- a/backend/core/models/domainlayer/ticket/issue.go
+++ b/backend/core/models/domainlayer/ticket/issue.go
@@ -144,6 +144,8 @@ func (issue Issue) ToIncident(boardId string) (*Incident, error) {
 		OriginalProject:         issue.OriginalProject,
 		ScopeId:                 boardId,
 		Table:                   "boards",
+		AssigneeId:              issue.AssigneeId,
+		AssigneeName:            issue.AssigneeName,
 	}
 	return incident, nil
 }
diff --git a/backend/core/models/migrationscripts/20240725_add_table_scope_id_to_incidents.go b/backend/core/models/migrationscripts/20240731_add_table_scope_id_to_incidents.go
similarity index 100%
copy from backend/core/models/migrationscripts/20240725_add_table_scope_id_to_incidents.go
copy to backend/core/models/migrationscripts/20240731_add_table_scope_id_to_incidents.go
diff --git a/backend/core/models/migrationscripts/20240725_add_table_scope_id_to_incidents.go b/backend/core/models/migrationscripts/20240801_add_table_scope_id_to_incidents.go
similarity index 69%
rename from backend/core/models/migrationscripts/20240725_add_table_scope_id_to_incidents.go
rename to backend/core/models/migrationscripts/20240801_add_table_scope_id_to_incidents.go
index a9d4b7f34..7e5a2e26c 100644
--- a/backend/core/models/migrationscripts/20240725_add_table_scope_id_to_incidents.go
+++ b/backend/core/models/migrationscripts/20240801_add_table_scope_id_to_incidents.go
@@ -23,27 +23,27 @@ import (
 	"github.com/apache/incubator-devlake/core/plugin"
 )
 
-var _ plugin.MigrationScript = (*addTableScopeIdToIncident)(nil)
+var _ plugin.MigrationScript = (*addAssigneeToIncident)(nil)
 
-type incident20240731 struct {
+type incident20240801 struct {
 	Table   string `gorm:"index:idx_table_scope_id;type:varchar(255)"`
 	ScopeId string `gorm:"index:idx_table_scope_id;type:varchar(255)"`
 }
 
-func (incident20240731) TableName() string {
+func (incident20240801) TableName() string {
 	return "incidents"
 }
 
-type addTableScopeIdToIncident struct{}
+type addAssigneeToIncident struct{}
 
-func (*addTableScopeIdToIncident) Up(basicRes context.BasicRes) errors.Error {
-	return basicRes.GetDal().AutoMigrate(&incident20240731{})
+func (*addAssigneeToIncident) Up(basicRes context.BasicRes) errors.Error {
+	return basicRes.GetDal().AutoMigrate(&incident20240801{})
 }
 
-func (*addTableScopeIdToIncident) Version() uint64 {
-	return 20240731180000
+func (*addAssigneeToIncident) Version() uint64 {
+	return 20240801110000
 }
 
-func (*addTableScopeIdToIncident) Name() string {
-	return "add table and scope_id to incidents"
+func (*addAssigneeToIncident) Name() string {
+	return "add assignee info to incidents"
 }
diff --git a/backend/core/models/migrationscripts/register.go b/backend/core/models/migrationscripts/register.go
index 2c06d3b7f..8b47250c9 100644
--- a/backend/core/models/migrationscripts/register.go
+++ b/backend/core/models/migrationscripts/register.go
@@ -130,5 +130,6 @@ func All() []plugin.MigrationScript {
 		new(renameProjectIssueMetrics),
 		new(addDateFieldsToProjectPrMetric),
 		new(addTableScopeIdToIncident),
+		new(addAssigneeToIncident),
 	}
 }