You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2024/05/09 03:46:59 UTC
(incubator-devlake) branch add-bpid-for-scope-config-projects updated: feat: add blueprintId for projects by scope config
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch add-bpid-for-scope-config-projects
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/add-bpid-for-scope-config-projects by this push:
new c03752fd7 feat: add blueprintId for projects by scope config
c03752fd7 is described below
commit c03752fd769cfbaa4848c41ed5b2df8871877edf
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu May 9 11:46:48 2024 +0800
feat: add blueprintId for projects by scope config
---
backend/core/models/project.go | 5 +++--
backend/helpers/srvhelper/scope_config_service_helper.go | 3 ++-
backend/server/services/remote/plugin/scope_config_api.go | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/backend/core/models/project.go b/backend/core/models/project.go
index 7e67c3420..5014f20b3 100644
--- a/backend/core/models/project.go
+++ b/backend/core/models/project.go
@@ -92,8 +92,9 @@ type ProjectScopeOutput struct {
}
type ProjectScope struct {
- Name string `json:"name"`
- Scopes []struct {
+ Name string `json:"name"`
+ BlueprintId uint64 `json:"blueprintId"`
+ Scopes []struct {
ScopeID string `json:"scopeId"`
ScopeName string `json:"scopeName"`
} `json:"scopes"`
diff --git a/backend/helpers/srvhelper/scope_config_service_helper.go b/backend/helpers/srvhelper/scope_config_service_helper.go
index ede558225..c06354d25 100644
--- a/backend/helpers/srvhelper/scope_config_service_helper.go
+++ b/backend/helpers/srvhelper/scope_config_service_helper.go
@@ -96,7 +96,8 @@ func (scopeConfigSrv *ScopeConfigSrvHelper[C, S, SC]) GetProjectsByScopeConfig(p
})
} else {
projectMap[bp.ProjectName] = &models.ProjectScope{
- Name: bp.ProjectName,
+ Name: bp.ProjectName,
+ BlueprintId: bp.ID,
Scopes: []struct {
ScopeID string `json:"scopeId"`
ScopeName string `json:"scopeName"`
diff --git a/backend/server/services/remote/plugin/scope_config_api.go b/backend/server/services/remote/plugin/scope_config_api.go
index 9646261ff..f3a54fd01 100644
--- a/backend/server/services/remote/plugin/scope_config_api.go
+++ b/backend/server/services/remote/plugin/scope_config_api.go
@@ -136,7 +136,8 @@ func (pa *pluginAPI) GetProjectsByScopeConfig(input *plugin.ApiResourceInput) (*
})
} else {
projectMap[bp.ProjectName] = &coreModels.ProjectScope{
- Name: bp.ProjectName,
+ Name: bp.ProjectName,
+ BlueprintId: bp.ID,
Scopes: []struct {
ScopeID string `json:"scopeId"`
ScopeName string `json:"scopeName"`