Rename the router file name

.github/workflows/build.yml

@@ -26,6 +26,8 @@ on:
     branches:
       - main
       - release-*
+      - feat-*
+      - bugfix-*
 
 jobs:
   build-and-push-builder:
@@ -122,7 +124,7 @@ jobs:
     steps:
       - name: Get build timestamp
         id: ts
-        run: echo "timestamp=$(date '+%y%m%d_%H%M')" >> $GITHUB_OUTPUT
+        run: echo "timestamp=$(date '+%y%m%d_%H%M%S')" >> $GITHUB_OUTPUT
   build-and-push-devlake:
     needs: [build-devlake, build-and-push-base, get-timestamp]
     name: Build and Push devlake image

.github/workflows/golangci-lint.yml

@@ -42,7 +42,7 @@ jobs:
           cd backend
           make mock
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: v1.53.3
           working-directory: ./backend

Makefile

@@ -17,8 +17,8 @@
 # https://stackoverflow.com/questions/920413/make-error-missing-separator
 # https://tutorialedge.net/golang/makefiles-for-go-developers/
 
-SHA ?= $(shell git show -s --format=%h)
-TAG ?= $(shell git tag --points-at HEAD)
+SHA ?= $(shell git show -s --format=%h 2>/dev/null || echo "default_SHA")
+TAG ?= $(shell git tag --points-at HEAD 2>/dev/null || echo "default_TAG")
 IMAGE_REPO ?= "apache"
 VERSION = $(TAG)@$(SHA)
 
@@ -29,7 +29,7 @@ build-config-ui-image:
 	cd config-ui; docker build -t $(IMAGE_REPO)/devlake-config-ui:$(TAG) --file ./Dockerfile .
 
 build-grafana-image:
-	cd grafana; docker build -t $(IMAGE_REPO)/devlake-dashboard:$(TAG) --file ./backend/Dockerfile .
+	cd grafana; docker build -t $(IMAGE_REPO)/devlake-dashboard:$(TAG) --file ./Dockerfile .
 
 build-images: build-server-image build-config-ui-image build-grafana-image
 
@@ -40,7 +40,7 @@ push-config-ui-image: build-config-ui-image
 	docker push $(IMAGE_REPO)/devlake-config-ui:$(TAG)
 
 push-grafana-image: build-grafana-image
-        docker push $(IMAGE_REPO)/devlake-dashboard:$(TAG)
+	docker push $(IMAGE_REPO)/devlake-dashboard:$(TAG)
 
 push-images: push-server-image push-config-ui-image push-grafana-image
 

README.md

@@ -25,7 +25,7 @@ limitations under the License.
 [![Dockerhub pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fapache%2Fdevlake&query=%24.pull_count&label=Dockerhub%20pulls)](https://hub.docker.com/r/apache/devlake)
 [![unit-test](https://github.com/apache/incubator-devlake/actions/workflows/test.yml/badge.svg)](https://github.com/apache/incubator-devlake/actions/workflows/test.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/apache/incubator-devlake)](https://goreportcard.com/report/github.com/apache/incubator-devlake)
-[![Slack](https://img.shields.io/badge/slack-join_chat-success.svg?logo=slack)](https://join.slack.com/t/devlake-io/shared_invite/zt-18uayb6ut-cHOjiYcBwERQ8VVPZ9cQQw)
+[![Slack](https://img.shields.io/badge/slack-join_chat-success.svg?logo=slack)](https://join.slack.com/t/devlake-io/shared_invite/zt-26ulybksw-IDrJYuqY1FrdjlMMJhs53Q)
 [![Twitter](https://badgen.net/badge/icon/twitter?icon=twitter&label)](https://twitter.com/ApacheDevLake)
 
 </div>
@@ -46,7 +46,7 @@ Apache DevLake is used by Engineering Leads, Open Source Software Maintainers an
 
 ## 👉 Live Demos
 
-The main way you interact with DevLake is through the integrated dashboards powered by [Grafana](https://github.com/grafana/grafana). 
+The main way you interact with DevLake is through the integrated dashboards powered by [Grafana](https://github.com/grafana/grafana).
 
 [Live DORA Dashboard](https://grafana-lake.demo.devlake.io/grafana/d/qNo8_0M4z/dora?orgId=1)
 
@@ -58,10 +58,10 @@ The main way you interact with DevLake is through the integrated dashboards powe
 
 DevLake supports connections to many popular development tools, including GitHub, GitLab, Jenkins, Jira, Sonarqube and more. [Here](https://devlake.apache.org/docs/Overview/SupportedDataSources) you can find all data sources supported by DevLake, their scopes, supported versions and more!
 
-
 ## 🚀 Getting Started
 
 ### Installation
+
 You can set up Apache DevLake by following our step-by-step instructions for either Docker Compose or Helm. Feel free to [ask the community](#💙-community) if you get stuck at any point.
 
 - [Install via Docker Compose](https://devlake.apache.org/docs/GettingStarted/DockerComposeSetup)
@@ -92,6 +92,7 @@ Once the first run of the Blueprint is completed, you can view the corresponding
 If the pre-built dashboards are limited for your use cases, you can always customize or create your own metrics or dashboards with SQL.
 
 ## Contributing
+
 Please read the [contribution guidelines](https://devlake.apache.org/community) before you make contribution. The following docs list the resources you might need to know after you decided to make contribution.
 
 - [Create an Issue](https://devlake.apache.org/community/MakingContributions/fix-or-create-issues): Report a bug or feature request to Apache DevLake
@@ -102,15 +103,14 @@ Please read the [contribution guidelines](https://devlake.apache.org/community)
 
 ### 👩🏾‍💻 Contributing Code
 
-If you plan to contribute code to Apache DevLake, we have instructions on how to get started with setting up your Development environemtn.
+If you plan to contribute code to Apache DevLake, we have instructions on how to get started with setting up your Development environment.
 
 - [Developer Setup Instructions](https://devlake.apache.org/docs/DeveloperManuals/DeveloperSetup)
 - [Development Workflow](https://devlake.apache.org/community/MakingContributions/development-workflow)
 
-
 ### 📄 Contributing Documentation
 
-One of the best ways to get started contributing is by improving DevLake's documentation. 
+One of the best ways to get started contributing is by improving DevLake's documentation.
 
 - Apache DevLake's documentation is hosted at [devlake.apache.org](https://devlake.apache.org/)
 - **We have a separate GitHub repository for Apache DevLake's documentation:** [github.com/apache/incubator-devlake-website](https://github.com/apache/incubator-devlake-website)
@@ -121,7 +121,7 @@ One of the best ways to get started contributing is by improving DevLake's docum
 
 ## 💙 Community
 
-- Slack: Message us on <a href="https://join.slack.com/t/devlake-io/shared_invite/zt-18uayb6ut-cHOjiYcBwERQ8VVPZ9cQQw" target="_blank">Slack</a>
+- Slack: Message us on <a href="https://join.slack.com/t/devlake-io/shared_invite/zt-26ulybksw-IDrJYuqY1FrdjlMMJhs53Q" target="_blank">Slack</a>
 - Wechat Community: [Check the barcode](resources/img/wechat_community_barcode.png)
 
 ## 📄 License<a id="license"></a>

backend/Dockerfile

@@ -134,7 +134,7 @@ EXPOSE 8080
 
 RUN useradd -ms /bin/bash -d /app devlake -u 1010
 RUN chown -R devlake:devlake /etc/ssl/certs
-USER devlake
+USER 1010
 ENV PYTHONUNBUFFERED=1
 
 WORKDIR /app
@@ -145,7 +145,8 @@ VOLUME /app/logs
 # Setup Python
 COPY python/ /app/python/
 RUN python3 -m pip install --no-cache --upgrade pip setuptools && \
-    python3 -m pip install --no-cache -r python/requirements.txt
+    python3 -m pip install --no-cache -r python/requirements.txt && \
+    pip install --upgrade pip
 
 # Setup Python Poetry package manager
 RUN curl -sSL https://install.python-poetry.org | python3 -

backend/Makefile

@@ -17,13 +17,12 @@
 # https://stackoverflow.com/questions/920413/make-error-missing-separator
 # https://tutorialedge.net/golang/makefiles-for-go-developers/
 
-SHA ?= $(shell git show -s --format=%h)
-TAG ?= $(shell git tag --points-at HEAD)
+SHA ?= $(shell git show -s --format=%h 2>/dev/null || echo "default_SHA")
+TAG ?= $(shell git tag --points-at HEAD 2>/dev/null || echo "default_TAG")
 IMAGE_REPO ?= "apache"
 VERSION = $(TAG)@$(SHA)
 PYTHON_DIR ?= "./python"
 
-
 all: build
 
 go-dep:

backend/core/dal/dal.go

@@ -167,8 +167,12 @@ type Dal interface {
 	GetPrimaryKeyFields(t reflect.Type) []reflect.StructField
 	// RenameColumn renames column name for specified table
 	RenameColumn(table, oldColumnName, newColumnName string) errors.Error
-	// DropIndexes drops all specified tables
+	// ModifyColumnType modifies column type
+	ModifyColumnType(table, columnName, columnType string) errors.Error
+	// DropIndexes drops indexes by their name
 	DropIndexes(table string, indexes ...string) errors.Error
+	// DropIndex drops the index of specified column names
+	DropIndex(table string, columnNames ...string) errors.Error
 	// Dialect returns the dialect of current database
 	Dialect() string
 	// Session creates a new manual session for special scenarios

backend/core/migration/migrator.go

@@ -81,12 +81,17 @@ func (m *migratorImpl) Register(scripts []plugin.MigrationScript, comment string
 	}
 }
 
+func (m *migratorImpl) Info(stage string) {
+	m.logger.Info("[%s] pending scripts: %d, executed scripts: %d, total: %d", stage, len(m.pending), len(m.executed), len(m.scripts))
+}
+
 // Execute all registered migration script in order and mark them as executed in migration_history table
 func (m *migratorImpl) Execute() errors.Error {
 	// sort the scripts by version
 	sort.Slice(m.pending, func(i, j int) bool {
 		return m.pending[i].script.Version() < m.pending[j].script.Version()
 	})
+	m.Info("Execute")
 	// execute them one by one
 	db := m.basicRes.GetDal()
 	for _, swc := range m.pending {

backend/core/models/blueprint.go

@@ -82,9 +82,22 @@ func (BlueprintScope) TableName() string {
 	return "_devlake_blueprint_scopes"
 }
 
+type TriggerSyncPolicy struct {
+	SkipCollectors bool `json:"skipCollectors"`
+	FullSync       bool `json:"fullSync"`
+}
+
 type SyncPolicy struct {
-	SkipOnFail     bool       `json:"skipOnFail"`
-	SkipCollectors bool       `json:"skipCollectors"`
-	FullSync       bool       `json:"fullSync"`
-	TimeAfter      *time.Time `json:"timeAfter"`
+	SkipOnFail bool       `json:"skipOnFail"`
+	TimeAfter  *time.Time `json:"timeAfter"`
+	TriggerSyncPolicy
 }
+
+type ConnectionTokenCheckResult struct {
+	PluginName   string `json:"pluginName" mapstructure:"pluginName"`
+	ConnectionID uint64 `json:"connectionId" mapstructure:"connectionId"`
+	Success      bool   `json:"success" mapstructure:"success"`
+	Message      string `json:"message" mapstructure:"message"`
+}
+
+type ApiBlueprintConnectionTokenCheck []ConnectionTokenCheckResult

backend/core/models/domainlayer/code/pull_request.go

@@ -18,8 +18,11 @@ limitations under the License.
 package code
 
 import (
+	"fmt"
 	"time"
 
+	"github.com/apache/incubator-devlake/core/models/domainlayer/ticket"
+
 	"github.com/apache/incubator-devlake/core/models/domainlayer"
 )
 
@@ -41,6 +44,8 @@ type PullRequest struct {
 	AuthorName     string `gorm:"type:varchar(100)"`
 	//User		   domainUser.User `gorm:"foreignKey:AuthorId"`
 	AuthorId       string `gorm:"type:varchar(100)"`
+	MergedByName   string `gorm:"type:varchar(100)"`
+	MergedById     string `gorm:"type:varchar(100)"`
 	ParentPrId     string `gorm:"index;type:varchar(100)"`
 	PullRequestKey int
 	CreatedDate    time.Time
@@ -53,8 +58,66 @@ type PullRequest struct {
 	BaseRef        string `gorm:"type:varchar(255)"`
 	BaseCommitSha  string `gorm:"type:varchar(40)"`
 	HeadCommitSha  string `gorm:"type:varchar(40)"`
+	Additions      int
+	Deletions      int
+	IsDraft        bool
 }
 
 func (PullRequest) TableName() string {
 	return "pull_requests"
 }
+
+func (pr PullRequest) ConvertStatusToIncidentStatus() string {
+	switch pr.Status {
+	case OPEN:
+		return ticket.TODO
+	case CLOSED:
+		return ticket.OTHER
+	case MERGED:
+		return ticket.DONE
+	default:
+		return ticket.OTHER
+	}
+}
+
+func (pr PullRequest) ToIncident() (*ticket.Incident, error) {
+	incident := &ticket.Incident{
+		DomainEntity:            pr.DomainEntity,
+		Url:                     pr.Url,
+		IncidentKey:             fmt.Sprintf("%d", pr.PullRequestKey),
+		Title:                   pr.Title,
+		Description:             pr.Description,
+		Status:                  pr.ConvertStatusToIncidentStatus(),
+		OriginalStatus:          pr.OriginalStatus,
+		ResolutionDate:          pr.MergedDate,
+		CreatedDate:             &pr.CreatedDate,
+		OriginalEstimateMinutes: nil,
+		TimeSpentMinutes:        nil,
+		TimeRemainingMinutes:    nil,
+		CreatorId:               pr.AuthorId,
+		CreatorName:             pr.AuthorName,
+		ParentIncidentId:        pr.ParentPrId,
+		Priority:                "",
+		Severity:                "",
+		Urgency:                 "",
+		Component:               pr.Component,
+		OriginalProject:         "",
+		ScopeId:                 pr.BaseRepoId,
+		Table:                   "repos",
+		AssigneeId:              pr.AuthorId,
+		AssigneeName:            pr.AuthorName,
+	}
+
+	if pr.MergedDate != nil {
+		incident.UpdatedDate = pr.MergedDate
+	}
+	if incident.UpdatedDate == nil {
+		incident.UpdatedDate = pr.ClosedDate
+	}
+
+	if pr.MergedDate != nil {
+		temp := uint(pr.MergedDate.Sub(pr.CreatedDate).Minutes())
+		incident.LeadTimeMinutes = &temp
+	}
+	return incident, nil
+}

backend/core/models/domainlayer/codequality/cq_issues.go

@@ -26,7 +26,7 @@ type CqIssue struct {
 	domainlayer.DomainEntity
 	Rule                     string `gorm:"type:varchar(255)"`
 	Severity                 string `gorm:"type:varchar(100)"`
-	Component                string `gorm:"type:varchar(255)"`
+	Component                string
 	ProjectKey               string `gorm:"index;type:varchar(100)"` //domain project key
 	Line                     int
 	Status                   string `gorm:"type:varchar(20)"`
@@ -52,3 +52,14 @@ type CqIssue struct {
 func (CqIssue) TableName() string {
 	return "cq_issues"
 }
+
+type CqIssueImpact struct {
+	common.NoPKModel
+	CqIssueId       string `gorm:"primaryKey;type:varchar(255)"`
+	SoftwareQuality string `gorm:"primaryKey;type:varchar(255)"`
+	Severity        string `gorm:"type:varchar(100)"`
+}
+
+func (CqIssueImpact) TableName() string {
+	return "cq_issue_impacts"
+}

backend/core/models/domainlayer/codequality/cq_projects.go

@@ -26,7 +26,7 @@ import (
 var _ plugin.Scope = (*CqProject)(nil)
 
 type CqProject struct {
-	domainlayer.DomainEntity
+	domainlayer.DomainEntityExtended
 	Name             string `gorm:"type:varchar(255)"`
 	Qualifier        string `gorm:"type:varchar(255)"`
 	Visibility       string `gorm:"type:varchar(64)"`

backend/core/models/domainlayer/crossdomain/project_issue_metric.go → backend/core/models/domainlayer/crossdomain/project_incident_deployment_relationship.go

@@ -21,12 +21,12 @@ import (
 	"github.com/apache/incubator-devlake/core/models/domainlayer"
 )
 
-type ProjectIssueMetric struct {
+type ProjectIncidentDeploymentRelationship struct {
 	domainlayer.DomainEntity
 	ProjectName  string `gorm:"primaryKey;type:varchar(100)"`
 	DeploymentId string
 }
 
-func (ProjectIssueMetric) TableName() string {
-	return "project_issue_metrics"
+func (ProjectIncidentDeploymentRelationship) TableName() string {
+	return "project_incident_deployment_relationships"
 }

backend/core/models/domainlayer/crossdomain/project_pr_metric.go

@@ -18,6 +18,8 @@ limitations under the License.
 package crossdomain
 
 import (
+	"time"
+
 	"github.com/apache/incubator-devlake/core/models/domainlayer"
 )
 
@@ -32,6 +34,12 @@ type ProjectPrMetric struct {
 	DeploymentCommitId string
 	PrDeployTime       *int64
 	PrCycleTime        *int64
+
+	FirstCommitAuthoredDate *time.Time
+	FirstCommentDate        *time.Time
+	PrCreatedDate           *time.Time
+	PrMergedDate            *time.Time
+	PrDeployedDate          *time.Time
 }
 
 func (ProjectPrMetric) TableName() string {

backend/core/models/domainlayer/devops/cicd_pipeline.go

@@ -40,6 +40,7 @@ type CICDPipeline struct {
 	Environment       string `gorm:"type:varchar(255)"`
 	TaskDatesInfo
 	CicdScopeId string `gorm:"index;type:varchar(255)"`
+	IsChild     bool
 }
 
 func (CICDPipeline) TableName() string {

backend/core/models/domainlayer/devops/cicd_task.go

@@ -36,6 +36,16 @@ const (
 
 const ENV_NAME_PATTERN = "ENV_NAME_PATTERN"
 
+type TransformDeployment struct {
+	Name string `json:"name"`
+	URL  string `json:"url"`
+}
+
+type TransformDeploymentResponse struct {
+	Total int                   `json:"total"`
+	Data  []TransformDeployment `json:"data"`
+}
+
 type CICDTask struct {
 	domainlayer.DomainEntity
 	Name              string `gorm:"type:varchar(255)"`