Adjust projectID to projectIDs

Author: tyroneyeh

models/db/search.go

@@ -37,5 +37,4 @@ const (
 	// Which means a condition to filter the records which don't match any id.
 	// It's different from zero which means the condition could be ignored.
 	NoConditionID = -1
-	NoProjectID   = -1
 )

models/issues/issue_project.go

@@ -44,7 +44,7 @@ func (issue *Issue) ProjectColumnID(ctx context.Context) int64 {
 func LoadIssuesFromColumn(ctx context.Context, b *project_model.Column) (IssueList, error) {
 	issueList, err := Issues(ctx, &IssuesOptions{
 		ProjectColumnID: b.ID,
-		ProjectID:       b.ProjectID,
+		ProjectIDs:      []int64{b.ProjectID},
 		SortType:        "project-column-sorting",
 	})
 	if err != nil {
@@ -54,7 +54,7 @@ func LoadIssuesFromColumn(ctx context.Context, b *project_model.Column) (IssueLi
 	if b.Default {
 		issues, err := Issues(ctx, &IssuesOptions{
 			ProjectColumnID: db.NoConditionID,
-			ProjectID:       b.ProjectID,
+			ProjectIDs:      []int64{b.ProjectID},
 			SortType:        "project-column-sorting",
 		})
 		if err != nil {

models/issues/issue_search.go

@@ -32,7 +32,7 @@ type IssuesOptions struct { //nolint
 	ReviewedID         int64
 	SubscriberID       int64
 	MilestoneIDs       []int64
-	ProjectID          int64
+	ProjectIDs         []int64
 	ProjectColumnID    int64
 	IsClosed           optional.Option[bool]
 	IsPull             optional.Option[bool]
@@ -158,11 +158,11 @@ func applyMilestoneCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Sess
 }
 
 func applyProjectCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
-	if opts.ProjectID > 0 { // specific project
-		sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
-			And("project_issue.project_id=?", opts.ProjectID)
-	} else if opts.ProjectID == db.NoConditionID { // show those that are in no project
+	if len(opts.ProjectIDs) == 1 && opts.ProjectIDs[0] == db.NoConditionID { // show those that are in no project
 		sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue").And(builder.Neq{"project_id": 0})))
+	} else if len(opts.ProjectIDs) > 0 { // specific project
+		sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
+			In("project_issue.project_id", opts.ProjectIDs)
 	}
 	// opts.ProjectID == 0 means all projects,
 	// do not need to apply any condition
@@ -174,8 +174,8 @@ func applyProjectColumnCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.
 	// do not need to apply any condition
 	if opts.ProjectColumnID > 0 {
 		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectColumnID}))
-	} else if opts.ProjectID > 0 {
-		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0, "project_id": opts.ProjectID}))
+	} else if len(opts.ProjectIDs) > 0 {
+		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}).And(builder.In("project_id", opts.ProjectIDs)))
 	} else if opts.ProjectColumnID == db.NoConditionID {
 		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}))
 	}

modules/indexer/issues/db/options.go

@@ -60,7 +60,6 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
 		ReviewRequestedID:  convertID(options.ReviewRequestedID),
 		ReviewedID:         convertID(options.ReviewedID),
 		SubscriberID:       convertID(options.SubscriberID),
-		ProjectID:          convertID(options.ProjectIDs),
 		ProjectColumnID:    convertID(options.ProjectColumnID),
 		IsClosed:           options.IsClosed,
 		IsPull:             options.IsPull,
@@ -84,12 +83,10 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
 		opts.MilestoneIDs = options.MilestoneIDs
 	}
 
-	if len(options.ProjectIDs) == 1 {
-		if options.ProjectIDs[0] == 0 {
-			opts.ProjectID = db.NoProjectID
-		} else {
-			opts.ProjectID = options.ProjectIDs[0]
-		}
+	if len(options.ProjectIDs) == 1 && options.ProjectIDs[0] == 0 {
+		opts.ProjectIDs = []int64{db.NoConditionID}
+	} else {
+		opts.ProjectIDs = options.ProjectIDs
 	}
 
 	if options.NoLabelOnly {

modules/indexer/issues/dboptions.go

@@ -38,6 +38,12 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
 		searchOpt.MilestoneIDs = opts.MilestoneIDs
 	}
 
+	if len(opts.ProjectIDs) == 1 && opts.ProjectIDs[0] == db.NoConditionID {
+		searchOpt.ProjectIDs = []int64{0}
+	} else {
+		searchOpt.ProjectIDs = opts.ProjectIDs
+	}
+
 	// See the comment of issues_model.SearchOptions for the reason why we need to convert
 	convertID := func(id int64) optional.Option[int64] {
 		if id > 0 {
@@ -49,12 +55,6 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
 		return nil
 	}
 
-	if opts.ProjectID == db.NoProjectID {
-		searchOpt.ProjectIDs = []int64{0}
-	} else {
-		searchOpt.ProjectIDs = convertID(opts.ProjectID)
-	}
-
 	searchOpt.ProjectColumnID = convertID(opts.ProjectColumnID)
 	searchOpt.PosterID = convertID(opts.PosterID)
 	searchOpt.AssigneeID = convertID(opts.AssigneeID)

routers/web/repo/issue.go

@@ -201,12 +201,17 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		mileIDs = []int64{milestoneID}
 	}
 
+	var projIDs []int64
+	if projectID > 0 || projectID == db.NoConditionID {
+		projIDs = []int64{projectID}
+	}
+
 	var issueStats *issues_model.IssueStats
 	statsOpts := &issues_model.IssuesOptions{
 		RepoIDs:           []int64{repo.ID},
 		LabelIDs:          labelIDs,
 		MilestoneIDs:      mileIDs,
-		ProjectID:         projectID,
+		ProjectIDs:        projIDs,
 		AssigneeID:        assigneeID,
 		MentionedID:       mentionedID,
 		PosterID:          posterID,
@@ -296,7 +301,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			ReviewRequestedID: reviewRequestedID,
 			ReviewedID:        reviewedID,
 			MilestoneIDs:      mileIDs,
-			ProjectID:         projectID,
+			ProjectIDs:        projIDs,
 			IsClosed:          isShowClosed,
 			IsPull:            isPullOption,
 			LabelIDs:          labelIDs,