Mohammed Nafees 3 лет назад
Родитель
Сommit
3f98a70d7b

+ 1 - 1
api/server/handlers/environment/enable_pull_request.go

@@ -35,7 +35,7 @@ func NewEnablePullRequestHandler(
 func (c *EnablePullRequestHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	project, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 	cluster, _ := r.Context().Value(types.ClusterScope).(*models.Cluster)
-	request := &types.EnablePullRequestRequest{}
+	request := &types.PullRequest{}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 4 - 4
api/server/handlers/environment/list_deployments_by_cluster.go

@@ -41,7 +41,7 @@ func (c *ListDeploymentsByClusterHandler) ServeHTTP(w http.ResponseWriter, r *ht
 	}
 
 	var deployments []*types.Deployment
-	var pullRequests []*types.EnablePullRequestRequest
+	var pullRequests []*types.PullRequest
 
 	if req.EnvironmentID == 0 {
 		depls, err := c.Repo().Environment().ListDeploymentsByCluster(project.ID, cluster.ID)
@@ -232,7 +232,7 @@ func fetchOpenPullRequests(
 	client *github.Client,
 	env *models.Environment,
 	deplInfoMap map[string]bool,
-) ([]*types.EnablePullRequestRequest, error) {
+) ([]*types.PullRequest, error) {
 	openPRs, resp, err := client.PullRequests.List(ctx, env.GitRepoOwner, env.GitRepoName,
 		&github.PullRequestListOptions{
 			ListOptions: github.ListOptions{
@@ -241,7 +241,7 @@ func fetchOpenPullRequests(
 		},
 	)
 
-	var prs []*types.EnablePullRequestRequest
+	var prs []*types.PullRequest
 
 	if resp != nil && resp.StatusCode == 404 {
 		return prs, nil
@@ -268,7 +268,7 @@ func fetchOpenPullRequests(
 
 	for _, pr := range openPRs {
 		if _, ok := deplInfoMap[fmt.Sprintf("%s-%s-%d", env.GitRepoOwner, env.GitRepoName, pr.GetNumber())]; !ok {
-			prs = append(prs, &types.EnablePullRequestRequest{
+			prs = append(prs, &types.PullRequest{
 				Title:      pr.GetTitle(),
 				Number:     uint(pr.GetNumber()),
 				RepoOwner:  env.GitRepoOwner,

+ 1 - 1
api/types/environment.go

@@ -103,7 +103,7 @@ type GetDeploymentRequest struct {
 	Namespace string `schema:"namespace" form:"required"`
 }
 
-type EnablePullRequestRequest struct {
+type PullRequest struct {
 	Title      string `json:"pr_title"`
 	Number     uint   `json:"pr_number"`
 	RepoOwner  string `json:"repo_owner"`