change get build detail openAPI logic

Signed-off-by: Min Min <[email protected]>
koderover · Jan 6, 2025 · 3d42beb · 3d42beb
1 parent 8de233c
commit 3d42beb
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 13 deletions.
diff --git a/pkg/microservice/aslan/core/build/handler/openapi.go b/pkg/microservice/aslan/core/build/handler/openapi.go
@@ -217,6 +217,18 @@ func OpenAPIGetBuildModule(c *gin.Context) {
 		return
 	}
 
+	serviceName := c.Query("serviceName")
+	if serviceName == "" {
+		ctx.RespErr = e.ErrInvalidParam.AddDesc("empty serviceName.")
+		return
+	}
+
+	serviceModule := c.Query("serviceModule")
+	if serviceModule == "" {
+		ctx.RespErr = e.ErrInvalidParam.AddDesc("empty serviceModule.")
+		return
+	}
+
 	// authorization checks
 	if !ctx.Resources.IsSystemAdmin {
 		if _, ok := ctx.Resources.ProjectAuthInfo[projectKey]; !ok {
@@ -230,5 +242,5 @@ func OpenAPIGetBuildModule(c *gin.Context) {
 		}
 	}
 
-	ctx.Resp, ctx.RespErr = buildservice.OpenAPIGetBuildModule(name, projectKey, ctx.Logger)
+	ctx.Resp, ctx.RespErr = buildservice.OpenAPIGetBuildModule(name, serviceName, serviceModule, projectKey, ctx.Logger)
 }
diff --git a/pkg/microservice/aslan/core/build/service/openapi.go b/pkg/microservice/aslan/core/build/service/openapi.go
@@ -316,7 +316,7 @@ func OpenAPIListBuildModules(projectName string, pageNum, pageSize int64, logger
 	return resp, nil
 }
 
-func OpenAPIGetBuildModule(name, projectName string, logger *zap.SugaredLogger) (*OpenAPIBuildDetailResp, error) {
+func OpenAPIGetBuildModule(name, serviceName, serviceModule, projectName string, logger *zap.SugaredLogger) (*OpenAPIBuildDetailResp, error) {
 	opt := &commonrepo.BuildFindOption{
 		Name:        name,
 		ProductName: projectName,
@@ -348,18 +348,39 @@ func OpenAPIGetBuildModule(name, projectName string, logger *zap.SugaredLogger)
 	}
 
 	resp.Repos = make([]*OpenAPIRepo, 0)
-	for _, rp := range build.Repos {
-		repo := &OpenAPIRepo{
-			RepoName:     rp.RepoName,
-			Branch:       rp.Branch,
-			Source:       rp.Source,
-			RepoOwner:    rp.RepoOwner,
-			RemoteName:   rp.RemoteName,
-			CheckoutPath: rp.CheckoutPath,
-			Submodules:   rp.SubModules,
-			Hidden:       rp.Hidden,
+	if build.TemplateID == "" {
+		for _, rp := range build.Repos {
+			repo := &OpenAPIRepo{
+				RepoName:     rp.RepoName,
+				Branch:       rp.Branch,
+				Source:       rp.Source,
+				RepoOwner:    rp.RepoOwner,
+				RemoteName:   rp.RemoteName,
+				CheckoutPath: rp.CheckoutPath,
+				Submodules:   rp.SubModules,
+				Hidden:       rp.Hidden,
+			}
+			resp.Repos = append(resp.Repos, repo)
+		}
+	} else {
+		for _, svcBuild := range build.Targets {
+			if svcBuild.ServiceName == serviceName && svcBuild.ServiceModule == serviceModule {
+				for _, rp := range svcBuild.Repos {
+					repo := &OpenAPIRepo{
+						RepoName:     rp.RepoName,
+						Branch:       rp.Branch,
+						Source:       rp.Source,
+						RepoOwner:    rp.RepoOwner,
+						RemoteName:   rp.RemoteName,
+						CheckoutPath: rp.CheckoutPath,
+						Submodules:   rp.SubModules,
+						Hidden:       rp.Hidden,
+					}
+					resp.Repos = append(resp.Repos, repo)
+				}
+				break
+			}
 		}
-		resp.Repos = append(resp.Repos, repo)
 	}
 
 	resp.TargetServices = make([]*commonmodels.ServiceWithModule, 0)