feat: make issuer indexer support multiple projects

Author: wolfogre

modules/indexer/issues/bleve/bleve.go

@@ -23,7 +23,7 @@ import (
 const (
 	issueIndexerAnalyzer      = "issueIndexer"
 	issueIndexerDocType       = "issueIndexerDocType"
-	issueIndexerLatestVersion = 4
+	issueIndexerLatestVersion = 5
 )
 
 const unicodeNormalizeName = "unicodeNormalize"
@@ -82,7 +82,8 @@ func generateIssueIndexMapping() (mapping.IndexMapping, error) {
 	docMapping.AddFieldMappingsAt("label_ids", numberFieldMapping)
 	docMapping.AddFieldMappingsAt("no_label", boolFieldMapping)
 	docMapping.AddFieldMappingsAt("milestone_id", numberFieldMapping)
-	docMapping.AddFieldMappingsAt("project_id", numberFieldMapping)
+	docMapping.AddFieldMappingsAt("project_ids", numberFieldMapping)
+	docMapping.AddFieldMappingsAt("no_project", boolFieldMapping)
 	docMapping.AddFieldMappingsAt("project_board_id", numberFieldMapping)
 	docMapping.AddFieldMappingsAt("poster_id", numberFieldMapping)
 	docMapping.AddFieldMappingsAt("assignee_id", numberFieldMapping)
@@ -226,7 +227,11 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	}
 
 	if options.ProjectID.Has() {
-		queries = append(queries, inner_bleve.NumericEqualityQuery(options.ProjectID.Value(), "project_id"))
+		if v := options.ProjectID.Value(); v != 0 {
+			queries = append(queries, inner_bleve.NumericEqualityQuery(v, "project_ids"))
+		} else {
+			queries = append(queries, inner_bleve.BoolFieldQuery(true, "no_project"))
+		}
 	}
 	if options.ProjectBoardID.Has() {
 		queries = append(queries, inner_bleve.NumericEqualityQuery(options.ProjectBoardID.Value(), "project_board_id"))

modules/indexer/issues/elasticsearch/elasticsearch.go

@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	issueIndexerLatestVersion = 1
+	issueIndexerLatestVersion = 2
 	// multi-match-types, currently only 2 types are used
 	// Reference: https://www.elastic.co/guide/en/elasticsearch/reference/7.0/query-dsl-multi-match-query.html#multi-match-types
 	esMultiMatchTypeBestFields   = "best_fields"
@@ -61,7 +61,8 @@ const (
 			"label_ids": { "type": "integer", "index": true },
 			"no_label": { "type": "boolean", "index": true },
 			"milestone_id": { "type": "integer", "index": true },
-			"project_id": { "type": "integer", "index": true },
+			"project_ids": { "type": "integer", "index": true },
+			"no_project": { "type": "boolean", "index": true },
 			"project_board_id": { "type": "integer", "index": true },
 			"poster_id": { "type": "integer", "index": true },
 			"assignee_id": { "type": "integer", "index": true },
@@ -196,7 +197,11 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	}
 
 	if options.ProjectID.Has() {
-		query.Must(elastic.NewTermQuery("project_id", options.ProjectID.Value()))
+		if v := options.ProjectID.Value(); v != 0 {
+			query.Must(elastic.NewTermQuery("project_ids", v))
+		} else {
+			query.Must(elastic.NewTermQuery("no_project", true))
+		}
 	}
 	if options.ProjectBoardID.Has() {
 		query.Must(elastic.NewTermQuery("project_board_id", options.ProjectBoardID.Value()))

modules/indexer/issues/internal/model.go

@@ -27,6 +27,7 @@ type IndexerData struct {
 	NoLabel            bool               `json:"no_label"` // True if LabelIDs is empty
 	MilestoneID        int64              `json:"milestone_id"`
 	ProjectIDs         []int64            `json:"project_ids"`
+	NoProject          bool               `json:"no_project"` // True if ProjectIDs is empty
 	ProjectBoardID     int64              `json:"project_board_id"`
 	PosterID           int64              `json:"poster_id"`
 	AssigneeID         int64              `json:"assignee_id"`
@@ -89,7 +90,7 @@ type SearchOptions struct {
 
 	MilestoneIDs []int64 // milestones the issues have
 
-	ProjectID      optional.Option[int64] // project the issues belong to
+	ProjectID      optional.Option[int64] // project the issues belong to, zero means no project
 	ProjectBoardID optional.Option[int64] // project board the issues belong to
 
 	PosterID optional.Option[int64] // poster of the issues

modules/indexer/issues/internal/tests/tests.go

@@ -312,10 +312,10 @@ var cases = []*testIndexerCase{
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
 			assert.Equal(t, 5, len(result.Hits))
 			for _, v := range result.Hits {
-				assert.Equal(t, int64(1), data[v.ID].ProjectIDs)
+				assert.Contains(t, data[v.ID].ProjectIDs, int64(1))
 			}
 			assert.Equal(t, countIndexerData(data, func(v *internal.IndexerData) bool {
-				return v.ProjectIDs[0] == 1
+				return slices.Contains(v.ProjectIDs, 1)
 			}), result.Total)
 		},
 	},
@@ -330,10 +330,10 @@ var cases = []*testIndexerCase{
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
 			assert.Equal(t, 5, len(result.Hits))
 			for _, v := range result.Hits {
-				assert.Equal(t, int64(0), data[v.ID].ProjectIDs)
+				assert.Empty(t, data[v.ID].ProjectIDs)
 			}
 			assert.Equal(t, countIndexerData(data, func(v *internal.IndexerData) bool {
-				return v.ProjectIDs[0] == 0
+				return len(v.ProjectIDs) == 0
 			}), result.Total)
 		},
 	},
@@ -694,7 +694,7 @@ func generateDefaultIndexerData() []*internal.IndexerData {
 			}
 			projectIDs := make([]int64, id%5)
 			for i := range projectIDs {
-				projectIDs[i] = int64(i) + 1
+				projectIDs[i] = int64(i) + 1 // ProjectID should not be 0
 			}
 
 			data = append(data, &internal.IndexerData{
@@ -710,6 +710,7 @@ func generateDefaultIndexerData() []*internal.IndexerData {
 				NoLabel:            len(labelIDs) == 0,
 				MilestoneID:        issueIndex % 4,
 				ProjectIDs:         projectIDs,
+				NoProject:          len(projectIDs) == 0,
 				ProjectBoardID:     issueIndex % 6,
 				PosterID:           id%10 + 1, // PosterID should not be 0
 				AssigneeID:         issueIndex % 10,

modules/indexer/issues/meilisearch/meilisearch.go

@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	issueIndexerLatestVersion = 3
+	issueIndexerLatestVersion = 4
 
 	// TODO: make this configurable if necessary
 	maxTotalHits = 10000
@@ -64,7 +64,8 @@ func NewIndexer(url, apiKey, indexerName string) *Indexer {
 			"label_ids",
 			"no_label",
 			"milestone_id",
-			"project_id",
+			"project_ids",
+			"no_project",
 			"project_board_id",
 			"poster_id",
 			"assignee_id",
@@ -172,7 +173,11 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	}
 
 	if options.ProjectID.Has() {
-		query.And(inner_meilisearch.NewFilterEq("project_id", options.ProjectID.Value()))
+		if v := options.ProjectID.Value(); v != 0 {
+			query.And(inner_meilisearch.NewFilterEq("project_ids", v))
+		} else {
+			query.And(inner_meilisearch.NewFilterEq("no_label", true))
+		}
 	}
 	if options.ProjectBoardID.Has() {
 		query.And(inner_meilisearch.NewFilterEq("project_board_id", options.ProjectBoardID.Value()))

modules/indexer/issues/util.go

@@ -105,6 +105,7 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
 		NoLabel:            len(labels) == 0,
 		MilestoneID:        issue.MilestoneID,
 		ProjectIDs:         projectIDs,
+		NoProject:          len(projectIDs) == 0,
 		ProjectBoardID:     issue.ProjectBoardID(ctx),
 		PosterID:           issue.PosterID,
 		AssigneeID:         issue.AssigneeID,