mirror of https://github.com/harness/drone.git
fix: [CODE-2134]: replace include_description with exclude_description param (#2808)
parent
a98a695634
commit
4d577bb378
app
api
store/database
types
|
@ -225,6 +225,8 @@ func (c *Controller) suggestPullRequest(
|
||||||
States: []enum.PullReqState{enum.PullReqStateOpen},
|
States: []enum.PullReqState{enum.PullReqStateOpen},
|
||||||
Order: enum.OrderAsc,
|
Order: enum.OrderAsc,
|
||||||
Sort: enum.PullReqSortCreated,
|
Sort: enum.PullReqSortCreated,
|
||||||
|
// don't care about the PR description, omit it from the response
|
||||||
|
ExcludeDescription: true,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Ctx(ctx).Warn().Err(err).Msgf(
|
log.Ctx(ctx).Warn().Err(err).Msgf(
|
||||||
|
|
|
@ -288,14 +288,15 @@ func (c *Controller) checkIfAlreadyExists(ctx context.Context,
|
||||||
targetRepoID, sourceRepoID int64, targetBranch, sourceBranch string,
|
targetRepoID, sourceRepoID int64, targetBranch, sourceBranch string,
|
||||||
) error {
|
) error {
|
||||||
existing, err := c.pullreqStore.List(ctx, &types.PullReqFilter{
|
existing, err := c.pullreqStore.List(ctx, &types.PullReqFilter{
|
||||||
SourceRepoID: sourceRepoID,
|
SourceRepoID: sourceRepoID,
|
||||||
SourceBranch: sourceBranch,
|
SourceBranch: sourceBranch,
|
||||||
TargetRepoID: targetRepoID,
|
TargetRepoID: targetRepoID,
|
||||||
TargetBranch: targetBranch,
|
TargetBranch: targetBranch,
|
||||||
States: []enum.PullReqState{enum.PullReqStateOpen},
|
States: []enum.PullReqState{enum.PullReqStateOpen},
|
||||||
Size: 1,
|
Size: 1,
|
||||||
Sort: enum.PullReqSortNumber,
|
Sort: enum.PullReqSortNumber,
|
||||||
Order: enum.OrderAsc,
|
Order: enum.OrderAsc,
|
||||||
|
ExcludeDescription: true,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to get existing pull requests: %w", err)
|
return fmt.Errorf("failed to get existing pull requests: %w", err)
|
||||||
|
|
|
@ -378,11 +378,11 @@ var QueryParameterValueID = openapi3.ParameterOrRef{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var queryParameterIncludeDescription = openapi3.ParameterOrRef{
|
var queryParameterExcludeDescription = openapi3.ParameterOrRef{
|
||||||
Parameter: &openapi3.Parameter{
|
Parameter: &openapi3.Parameter{
|
||||||
Name: request.QueryParamIncludeDescription,
|
Name: request.QueryParamExcludeDescription,
|
||||||
In: openapi3.ParameterInQuery,
|
In: openapi3.ParameterInQuery,
|
||||||
Description: ptr.String("By providing this parameter the description would be included in the response."),
|
Description: ptr.String("By providing this parameter the description would be excluded from the response."),
|
||||||
Required: ptr.Bool(false),
|
Required: ptr.Bool(false),
|
||||||
Schema: &openapi3.SchemaOrRef{
|
Schema: &openapi3.SchemaOrRef{
|
||||||
Schema: &openapi3.Schema{
|
Schema: &openapi3.Schema{
|
||||||
|
@ -494,7 +494,7 @@ func pullReqOperations(reflector *openapi3.Reflector) {
|
||||||
queryParameterQueryPullRequest, queryParameterCreatedByPullRequest,
|
queryParameterQueryPullRequest, queryParameterCreatedByPullRequest,
|
||||||
queryParameterOrder, queryParameterSortPullRequest,
|
queryParameterOrder, queryParameterSortPullRequest,
|
||||||
queryParameterCreatedLt, queryParameterCreatedGt, queryParameterUpdatedLt, queryParameterUpdatedGt,
|
queryParameterCreatedLt, queryParameterCreatedGt, queryParameterUpdatedLt, queryParameterUpdatedGt,
|
||||||
queryParameterIncludeDescription,
|
queryParameterExcludeDescription,
|
||||||
QueryParameterPage, QueryParameterLimit,
|
QueryParameterPage, QueryParameterLimit,
|
||||||
QueryParameterLabelID, QueryParameterValueID,
|
QueryParameterLabelID, QueryParameterValueID,
|
||||||
queryParameterAuthorID, queryParameterCommenterID, queryParameterMentionedID,
|
queryParameterAuthorID, queryParameterCommenterID, queryParameterMentionedID,
|
||||||
|
|
|
@ -595,7 +595,7 @@ func spaceOperations(reflector *openapi3.Reflector) {
|
||||||
queryParameterSourceBranchPullRequest, queryParameterTargetBranchPullRequest,
|
queryParameterSourceBranchPullRequest, queryParameterTargetBranchPullRequest,
|
||||||
queryParameterQueryPullRequest, queryParameterCreatedByPullRequest,
|
queryParameterQueryPullRequest, queryParameterCreatedByPullRequest,
|
||||||
queryParameterCreatedLt, queryParameterCreatedGt, queryParameterUpdatedLt,
|
queryParameterCreatedLt, queryParameterCreatedGt, queryParameterUpdatedLt,
|
||||||
queryParameterIncludeDescription, queryParameterIncludeSubspaces,
|
queryParameterExcludeDescription, queryParameterIncludeSubspaces,
|
||||||
QueryParameterLimit,
|
QueryParameterLimit,
|
||||||
QueryParameterLabelID, QueryParameterValueID,
|
QueryParameterLabelID, QueryParameterValueID,
|
||||||
queryParameterAuthorID, queryParameterCommenterID, queryParameterMentionedID,
|
queryParameterAuthorID, queryParameterCommenterID, queryParameterMentionedID,
|
||||||
|
|
|
@ -34,7 +34,7 @@ const (
|
||||||
QueryParamReviewerID = "reviewer_id"
|
QueryParamReviewerID = "reviewer_id"
|
||||||
QueryParamReviewDecision = "review_decision"
|
QueryParamReviewDecision = "review_decision"
|
||||||
QueryParamMentionedID = "mentioned_id"
|
QueryParamMentionedID = "mentioned_id"
|
||||||
QueryParamIncludeDescription = "include_description"
|
QueryParamExcludeDescription = "exclude_description"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetPullReqNumberFromPath(r *http.Request) (int64, error) {
|
func GetPullReqNumberFromPath(r *http.Request) (int64, error) {
|
||||||
|
@ -125,7 +125,7 @@ func ParsePullReqFilter(r *http.Request) (*types.PullReqFilter, error) {
|
||||||
return nil, fmt.Errorf("encountered error parsing pr edited filter: %w", err)
|
return nil, fmt.Errorf("encountered error parsing pr edited filter: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
includeDescription, err := QueryParamAsBoolOrDefault(r, QueryParamIncludeDescription, false)
|
excludeDescription, err := QueryParamAsBoolOrDefault(r, QueryParamExcludeDescription, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("encountered error parsing include description filter: %w", err)
|
return nil, fmt.Errorf("encountered error parsing include description filter: %w", err)
|
||||||
}
|
}
|
||||||
|
@ -173,7 +173,7 @@ func ParsePullReqFilter(r *http.Request) (*types.PullReqFilter, error) {
|
||||||
ReviewerID: reviewerID,
|
ReviewerID: reviewerID,
|
||||||
ReviewDecisions: reviewDecisions,
|
ReviewDecisions: reviewDecisions,
|
||||||
MentionedID: mentionedID,
|
MentionedID: mentionedID,
|
||||||
IncludeDescription: includeDescription,
|
ExcludeDescription: excludeDescription,
|
||||||
CreatedFilter: createdFilter,
|
CreatedFilter: createdFilter,
|
||||||
UpdatedFilter: updatedFilter,
|
UpdatedFilter: updatedFilter,
|
||||||
EditedFilter: editedFilter,
|
EditedFilter: editedFilter,
|
||||||
|
|
|
@ -556,9 +556,9 @@ func (s *PullReqStore) Stream(ctx context.Context, opts *types.PullReqFilter) (<
|
||||||
func (s *PullReqStore) listQuery(opts *types.PullReqFilter) squirrel.SelectBuilder {
|
func (s *PullReqStore) listQuery(opts *types.PullReqFilter) squirrel.SelectBuilder {
|
||||||
var stmt squirrel.SelectBuilder
|
var stmt squirrel.SelectBuilder
|
||||||
|
|
||||||
columns := pullReqColumnsNoDescription
|
columns := pullReqColumns
|
||||||
if opts.IncludeDescription {
|
if opts.ExcludeDescription {
|
||||||
columns = pullReqColumns
|
columns = pullReqColumnsNoDescription
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(opts.LabelID) > 0 || len(opts.ValueID) > 0 || opts.CommenterID > 0 || opts.MentionedID > 0 {
|
if len(opts.LabelID) > 0 || len(opts.ValueID) > 0 || opts.CommenterID > 0 || opts.MentionedID > 0 {
|
||||||
|
|
|
@ -163,7 +163,7 @@ type PullReqFilter struct {
|
||||||
ReviewerID int64 `json:"reviewer_id"`
|
ReviewerID int64 `json:"reviewer_id"`
|
||||||
ReviewDecisions []enum.PullReqReviewDecision `json:"review_decisions"`
|
ReviewDecisions []enum.PullReqReviewDecision `json:"review_decisions"`
|
||||||
MentionedID int64 `json:"mentioned_id"`
|
MentionedID int64 `json:"mentioned_id"`
|
||||||
IncludeDescription bool `json:"include_description"`
|
ExcludeDescription bool `json:"exclude_description"`
|
||||||
CreatedFilter
|
CreatedFilter
|
||||||
UpdatedFilter
|
UpdatedFilter
|
||||||
EditedFilter
|
EditedFilter
|
||||||
|
|
Loading…
Reference in New Issue