Add more query params

Author: yousef-ysph

bitbucketapi/api.go

@@ -154,3 +154,30 @@ func FetchToChannelJson(method string, url string, data any, c chan FetchToChanR
 
 	FetchToChannel(method, url, data, "application/json", c)
 }
+
+type UrlQueryParam struct {
+	CmdFlag      string
+	DefaultValue string
+	ParamKey     string
+}
+
+type UrlQueryParams []UrlQueryParam
+
+func FormatUrlQueryParam(cmd *cobra.Command, urlParams UrlQueryParams) (string, error) {
+	queryParamString := ""
+	for _, urlParam := range urlParams {
+		if urlParam.CmdFlag == "" {
+			queryParamString += fmt.Sprintf("%s=%s&", urlParam.ParamKey, urlParam.DefaultValue)
+		}
+
+		paramValue, err := cmd.Flags().GetString(urlParam.CmdFlag)
+		if err != nil {
+			return queryParamString, err
+		}
+		if paramValue == "" {
+			paramValue = urlParam.DefaultValue
+		}
+		queryParamString += fmt.Sprintf("%s=%s&", urlParam.ParamKey, paramValue)
+	}
+	return queryParamString, nil
+}

cmd/pipelines.go

@@ -18,6 +18,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var listPipelinesQueryParams = bitbucketapi.UrlQueryParams{
+	bitbucketapi.UrlQueryParam{CmdFlag: "page", DefaultValue: "1", ParamKey: "page"},
+	bitbucketapi.UrlQueryParam{CmdFlag:"limit", DefaultValue: "20", ParamKey: "pagelen"},
+	bitbucketapi.UrlQueryParam{CmdFlag:"order", DefaultValue: "-created_on", ParamKey: "sort"},
+}
+
 // pipelinesCmd represents the pipelines command
 func listPipelines(cmd *cobra.Command) {
 
@@ -26,11 +32,13 @@ func listPipelines(cmd *cobra.Command) {
 		fmt.Println(cliformat.Error("No repo provided and current directory doesn't have a git remote repo"))
 		return
 	}
-	page, err := cmd.Flags().GetString("page")
+	urlQueryParam, err := bitbucketapi.FormatUrlQueryParam(cmd, listPipelinesQueryParams)
+	
 	if err != nil {
-		page = "1"
+		fmt.Println(cliformat.Error(err.Error()))
+		return
 	}
-	resp, err := bitbucketapi.HttpRequestWithBitbucketAuthJson("GET", repo+"/pipelines?pagelen=20&sort=-created_on&page="+page, map[string]string{})
+	resp, err := bitbucketapi.HttpRequestWithBitbucketAuthJson("GET", repo+"/pipelines?"+urlQueryParam, map[string]string{})
 	defer resp.Body.Close()
 
 	if err != nil {
@@ -343,7 +351,9 @@ func getStepStates(cmd *cobra.Command, args []string, toComplete string) ([]stri
 func init() {
 	rootCmd.AddCommand(pipelinesCmd)
 	pipelinesCmd.Flags().StringP("page", "p", "", "Page number for pipelines pagination")
+	pipelinesCmd.Flags().StringP("limit", "l", "", "Page length (pagelen) param")
 	pipelinesCmd.Flags().StringP("state", "s", "", "Stop by step with state {FAILED|IN_PROGRESS|SUCCESSFUL|COMPLETED}")
+	pipelinesCmd.Flags().StringP("order", "o", "", "Order by")
 	pipelinesCmd.Flags().StringP("format", "f", "", "Output template format")
 	pipelinesCmd.Flags().BoolP("json", "j", false, "Output as json")
 	pipelinesCmd.PersistentFlags().StringP("repo", "r", "", "Repo remote url")

cmd/pullrequests.go

@@ -164,24 +164,26 @@ func getPullRequestDetails(cmd *cobra.Command, args []string) {
 
 }
 
+var listPullRequestsQueryParams = bitbucketapi.UrlQueryParams{
+	bitbucketapi.UrlQueryParam{CmdFlag: "page", DefaultValue: "1", ParamKey: "page"},
+	bitbucketapi.UrlQueryParam{CmdFlag: "limit", DefaultValue: "20", ParamKey: "pagelen"},
+	bitbucketapi.UrlQueryParam{CmdFlag: "order", DefaultValue: "-created_on", ParamKey: "sort"},
+	bitbucketapi.UrlQueryParam{CmdFlag: "state", DefaultValue: "", ParamKey: "state"},
+}
+
 func listPullRequests(cmd *cobra.Command) {
 	repo, err := githelper.GetCurrentRepo(cmd)
 	if err != nil {
 		fmt.Println(cliformat.Error("No repo provided and current directory doesn't have a git remote repo"))
 		return
 	}
-	url := repo + "/pullrequests?pagelen=20&sort=-created_on"
-
-	state, err := cmd.Flags().GetString("state")
-	if err != nil || state != "" {
-		url = url + "&state=" + state
-
+	urlQueryParams, err := bitbucketapi.FormatUrlQueryParam(cmd, listPullRequestsQueryParams)
+	if err != nil {
+		fmt.Println(cliformat.Error(err.Error()))
 	}
-	page, err := cmd.Flags().GetString("page")
-	if err != nil || page != "" {
-		url = url + "&page=" + page
 
-	}
+	url := repo + "/pullrequests?" + urlQueryParams
+
 	resp, err := bitbucketapi.HttpRequestWithBitbucketAuthJson("GET", url, map[string]string{})
 
 	defer resp.Body.Close()
@@ -323,6 +325,8 @@ func init() {
 	pullRequestsCmd.Flags().StringP("page", "p", "", "Page number for pullreuest pagination")
 	pullRequestsCmd.Flags().StringP("format", "f", "", "Output template format")
 	pullRequestsCmd.Flags().BoolP("json", "j", false, "Output as json")
+	pullRequestsCmd.Flags().StringP("order", "o", "", "Order by")
+	pullRequestsCmd.Flags().StringP("limit", "l", "", "Page length (pagelen) param")
 	pullRequestsCmd.Flags().StringP("state", "s", "", "Pull request state")
 	pullRequestCreateCmd.Flags().StringP("source", "s", "", "Pull request source branch")
 	pullRequestCreateCmd.Flags().StringP("title", "t", "", "Pull request title")