From 0e0755b6f67d1295e01d1551305b910bbf9f11a4 Mon Sep 17 00:00:00 2001 From: leozhang2018 Date: Fri, 22 May 2026 09:35:41 +0800 Subject: [PATCH] feat: add env_name field to ServiceDeployCountWithStatus. Signed-off-by: leozhang2018 --- .../aslan/core/common/repository/models/job_info.go | 1 + .../aslan/core/common/repository/mongodb/job_info.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/pkg/microservice/aslan/core/common/repository/models/job_info.go b/pkg/microservice/aslan/core/common/repository/models/job_info.go index 959dcd598d..f25b3d6851 100644 --- a/pkg/microservice/aslan/core/common/repository/models/job_info.go +++ b/pkg/microservice/aslan/core/common/repository/models/job_info.go @@ -52,6 +52,7 @@ type ServiceDeployCountWithStatus struct { ServiceName string `bson:"service_name" json:"service_name"` ProductName string `bson:"product_name" json:"project_key"` ProjectName string `bson:"project_name,omitempty" json:"project_name,omitempty"` + EnvName string `bson:"env_name" json:"env_name"` Count int `bson:"count" json:"count"` Success int `bson:"success" json:"success"` Failed int `bson:"failed" json:"failed"` diff --git a/pkg/microservice/aslan/core/common/repository/mongodb/job_info.go b/pkg/microservice/aslan/core/common/repository/mongodb/job_info.go index b80fcc9f66..8ee6f14f35 100644 --- a/pkg/microservice/aslan/core/common/repository/mongodb/job_info.go +++ b/pkg/microservice/aslan/core/common/repository/mongodb/job_info.go @@ -374,6 +374,7 @@ func (c *JobInfoColl) GetTopDeployedService(startTime, endTime int64, projectNam "production": "$production", "service_name": "$service_name", "product_name": "$product_name", + "env_name": "$target_env", }, "count": bson.M{"$sum": 1}, "success": bson.M{"$sum": bson.M{ @@ -400,6 +401,7 @@ func (c *JobInfoColl) GetTopDeployedService(startTime, endTime int64, projectNam "production": "$_id.production", "service_name": "$_id.service_name", "product_name": "$_id.product_name", + "env_name": "$_id.env_name", "count": 1, "success": 1, "failed": 1, @@ -427,6 +429,7 @@ func (c *JobInfoColl) GetTopDeployedService(startTime, endTime int64, projectNam "production": 1, "service_name": 1, "product_name": 1, + "env_name": 1, "count": 1, "success": 1, "failed": 1, @@ -486,6 +489,7 @@ func (c *JobInfoColl) GetTopDeployFailedService(startTime, endTime int64, projec "production": "$production", "service_name": "$service_name", "product_name": "$product_name", + "env_name": "$target_env", }, "count": bson.M{"$sum": bson.M{ "$cond": bson.D{ @@ -504,6 +508,7 @@ func (c *JobInfoColl) GetTopDeployFailedService(startTime, endTime int64, projec "production": "$_id.production", "service_name": "$_id.service_name", "product_name": "$_id.product_name", + "env_name": "$_id.env_name", "count": 1, }, }) @@ -528,6 +533,7 @@ func (c *JobInfoColl) GetTopDeployFailedService(startTime, endTime int64, projec "production": 1, "service_name": 1, "product_name": 1, + "env_name": 1, "count": 1, "project_name": bson.M{"$first": "$template_product_info.project_name"}, },