2017-02-28 07:05:55 +05:30
|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
2022-11-27 23:50:29 +05:30
|
|
|
// SPDX-License-Identifier: MIT
|
2017-02-28 07:05:55 +05:30
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
package issues_test
|
2017-02-28 07:05:55 +05:30
|
|
|
|
|
|
|
import (
|
2022-01-27 14:00:51 +05:30
|
|
|
"context"
|
2021-09-19 17:19:59 +05:30
|
|
|
"fmt"
|
2017-03-16 07:04:24 +05:30
|
|
|
"sort"
|
2021-09-19 17:19:59 +05:30
|
|
|
"sync"
|
2017-02-28 07:05:55 +05:30
|
|
|
"testing"
|
2017-07-27 06:50:38 +05:30
|
|
|
"time"
|
2017-02-28 07:05:55 +05:30
|
|
|
|
2021-09-19 17:19:59 +05:30
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-04-08 14:41:15 +05:30
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
2022-05-16 15:19:17 +05:30
|
|
|
"code.gitea.io/gitea/models/organization"
|
2021-12-10 06:57:50 +05:30
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-12 20:06:47 +05:30
|
|
|
"code.gitea.io/gitea/models/unittest"
|
2021-11-24 15:19:20 +05:30
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2023-07-12 19:40:35 +05:30
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2023-05-19 19:47:48 +05:30
|
|
|
"code.gitea.io/gitea/modules/util"
|
2021-11-17 18:04:35 +05:30
|
|
|
|
2017-02-28 07:05:55 +05:30
|
|
|
"github.com/stretchr/testify/assert"
|
2022-04-25 19:36:24 +05:30
|
|
|
"xorm.io/builder"
|
2017-02-28 07:05:55 +05:30
|
|
|
)
|
|
|
|
|
|
|
|
func TestIssue_ReplaceLabels(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2017-02-28 07:05:55 +05:30
|
|
|
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
testSuccess := func(issueID int64, labelIDs, expectedLabelIDs []int64) {
|
2022-08-16 07:52:25 +05:30
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issueID})
|
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: issue.RepoID})
|
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
2017-02-28 07:05:55 +05:30
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
labels := make([]*issues_model.Label, len(labelIDs))
|
2017-02-28 07:05:55 +05:30
|
|
|
for i, labelID := range labelIDs {
|
2022-08-16 07:52:25 +05:30
|
|
|
labels[i] = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: labelID, RepoID: repo.ID})
|
2017-02-28 07:05:55 +05:30
|
|
|
}
|
2022-06-13 15:07:59 +05:30
|
|
|
assert.NoError(t, issues_model.ReplaceIssueLabels(issue, labels, doer))
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
unittest.AssertCount(t, &issues_model.IssueLabel{IssueID: issueID}, len(expectedLabelIDs))
|
|
|
|
for _, labelID := range expectedLabelIDs {
|
2022-06-13 15:07:59 +05:30
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issueID, LabelID: labelID})
|
2017-02-28 07:05:55 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2023-02-19 00:47:39 +05:30
|
|
|
testSuccess(1, []int64{2}, []int64{2})
|
|
|
|
testSuccess(1, []int64{1, 2}, []int64{1, 2})
|
|
|
|
testSuccess(1, []int64{}, []int64{})
|
|
|
|
|
|
|
|
// mutually exclusive scoped labels 7 and 8
|
|
|
|
testSuccess(18, []int64{6, 7}, []int64{6, 7})
|
|
|
|
testSuccess(18, []int64{7, 8}, []int64{8})
|
|
|
|
testSuccess(18, []int64{6, 8, 7}, []int64{6, 7})
|
2017-02-28 07:05:55 +05:30
|
|
|
}
|
2017-03-03 20:05:42 +05:30
|
|
|
|
2021-06-10 05:38:19 +05:30
|
|
|
func Test_GetIssueIDsByRepoID(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2021-06-10 05:38:19 +05:30
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
ids, err := issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
|
2021-06-10 05:38:19 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, ids, 5)
|
|
|
|
}
|
|
|
|
|
2017-03-03 20:05:42 +05:30
|
|
|
func TestIssueAPIURL(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
2022-06-13 15:07:59 +05:30
|
|
|
err := issue.LoadAttributes(db.DefaultContext)
|
2017-03-03 20:05:42 +05:30
|
|
|
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/issues/1", issue.APIURL())
|
|
|
|
}
|
2017-03-15 06:40:35 +05:30
|
|
|
|
|
|
|
func TestGetIssuesByIDs(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2021-03-15 00:22:12 +05:30
|
|
|
testSuccess := func(expectedIssueIDs, nonExistentIssueIDs []int64) {
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
issues, err := issues_model.GetIssuesByIDs(db.DefaultContext, append(expectedIssueIDs, nonExistentIssueIDs...), true)
|
2017-03-15 06:40:35 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
actualIssueIDs := make([]int64, len(issues))
|
|
|
|
for i, issue := range issues {
|
|
|
|
actualIssueIDs[i] = issue.ID
|
|
|
|
}
|
|
|
|
assert.Equal(t, expectedIssueIDs, actualIssueIDs)
|
|
|
|
}
|
|
|
|
testSuccess([]int64{1, 2, 3}, []int64{})
|
2021-11-16 14:23:21 +05:30
|
|
|
testSuccess([]int64{1, 2, 3}, []int64{unittest.NonexistentID})
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
testSuccess([]int64{3, 2, 1}, []int64{})
|
2017-03-15 06:40:35 +05:30
|
|
|
}
|
2017-03-16 07:04:24 +05:30
|
|
|
|
2020-02-28 13:46:41 +05:30
|
|
|
func TestGetParticipantIDsByIssue(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2017-03-16 07:04:24 +05:30
|
|
|
|
2017-06-04 23:09:08 +05:30
|
|
|
checkParticipants := func(issueID int64, userIDs []int) {
|
2022-06-13 15:07:59 +05:30
|
|
|
issue, err := issues_model.GetIssueByID(db.DefaultContext, issueID)
|
2020-02-28 13:46:41 +05:30
|
|
|
assert.NoError(t, err)
|
2022-06-13 15:07:59 +05:30
|
|
|
participants, err := issue.GetParticipantIDsByIssue(db.DefaultContext)
|
2017-03-16 07:04:24 +05:30
|
|
|
if assert.NoError(t, err) {
|
2017-06-04 23:09:08 +05:30
|
|
|
participantsIDs := make([]int, len(participants))
|
2020-02-28 13:46:41 +05:30
|
|
|
for i, uid := range participants {
|
|
|
|
participantsIDs[i] = int(uid)
|
2017-03-21 06:25:00 +05:30
|
|
|
}
|
2017-06-04 23:09:08 +05:30
|
|
|
sort.Ints(participantsIDs)
|
2017-03-16 07:04:24 +05:30
|
|
|
sort.Ints(userIDs)
|
2017-06-04 23:09:08 +05:30
|
|
|
assert.Equal(t, userIDs, participantsIDs)
|
2017-03-16 07:04:24 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// User 1 is issue1 poster (see fixtures/issue.yml)
|
|
|
|
// User 2 only labeled issue1 (see fixtures/comment.yml)
|
|
|
|
// Users 3 and 5 made actual comments (see fixtures/comment.yml)
|
2017-09-16 05:48:25 +05:30
|
|
|
// User 3 is inactive, thus not active participant
|
2020-02-28 13:46:41 +05:30
|
|
|
checkParticipants(1, []int{1, 5})
|
2017-03-16 07:04:24 +05:30
|
|
|
}
|
2017-07-26 12:46:45 +05:30
|
|
|
|
|
|
|
func TestIssue_ClearLabels(t *testing.T) {
|
2021-03-15 00:22:12 +05:30
|
|
|
tests := []struct {
|
2017-07-26 12:46:45 +05:30
|
|
|
issueID int64
|
|
|
|
doerID int64
|
|
|
|
}{
|
|
|
|
{1, 2}, // non-pull-request, has labels
|
|
|
|
{2, 2}, // pull-request, has labels
|
|
|
|
{3, 2}, // pull-request, has no labels
|
|
|
|
}
|
|
|
|
for _, test := range tests {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: test.issueID})
|
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: test.doerID})
|
2022-06-13 15:07:59 +05:30
|
|
|
assert.NoError(t, issues_model.ClearIssueLabels(issue, doer))
|
|
|
|
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: test.issueID})
|
2017-07-26 12:46:45 +05:30
|
|
|
}
|
|
|
|
}
|
2017-07-27 06:50:38 +05:30
|
|
|
|
|
|
|
func TestUpdateIssueCols(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{})
|
2017-07-27 06:50:38 +05:30
|
|
|
|
|
|
|
const newTitle = "New Title for unit test"
|
|
|
|
issue.Title = newTitle
|
|
|
|
|
|
|
|
prevContent := issue.Content
|
|
|
|
issue.Content = "This should have no effect"
|
|
|
|
|
|
|
|
now := time.Now().Unix()
|
2022-06-13 15:07:59 +05:30
|
|
|
assert.NoError(t, issues_model.UpdateIssueCols(db.DefaultContext, issue, "name"))
|
2017-07-27 06:50:38 +05:30
|
|
|
then := time.Now().Unix()
|
|
|
|
|
2022-08-16 07:52:25 +05:30
|
|
|
updatedIssue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
|
2017-07-27 06:50:38 +05:30
|
|
|
assert.EqualValues(t, newTitle, updatedIssue.Title)
|
|
|
|
assert.EqualValues(t, prevContent, updatedIssue.Content)
|
2021-11-16 14:23:21 +05:30
|
|
|
unittest.AssertInt64InRange(t, now, then, int64(updatedIssue.UpdatedUnix))
|
2017-07-27 06:50:38 +05:30
|
|
|
}
|
2017-12-26 04:55:16 +05:30
|
|
|
|
|
|
|
func TestIssues(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2017-12-26 04:55:16 +05:30
|
|
|
for _, test := range []struct {
|
2022-06-13 15:07:59 +05:30
|
|
|
Opts issues_model.IssuesOptions
|
2017-12-26 04:55:16 +05:30
|
|
|
ExpectedIssueIDs []int64
|
|
|
|
}{
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2017-12-26 04:55:16 +05:30
|
|
|
AssigneeID: 1,
|
|
|
|
SortType: "oldest",
|
|
|
|
},
|
|
|
|
[]int64{1, 6},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2022-04-25 19:36:24 +05:30
|
|
|
RepoCond: builder.In("repo_id", 1, 3),
|
2017-12-26 04:55:16 +05:30
|
|
|
SortType: "oldest",
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
Paginator: &db.ListOptions{
|
2020-01-25 00:30:29 +05:30
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
|
|
|
[]int64{1, 2, 3, 5},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2019-01-23 09:40:38 +05:30
|
|
|
LabelIDs: []int64{1},
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
Paginator: &db.ListOptions{
|
2020-01-25 00:30:29 +05:30
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
2019-01-23 09:40:38 +05:30
|
|
|
[]int64{2, 1},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2019-01-23 09:40:38 +05:30
|
|
|
LabelIDs: []int64{1, 2},
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
Paginator: &db.ListOptions{
|
2020-01-25 00:30:29 +05:30
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2019-01-23 09:40:38 +05:30
|
|
|
},
|
|
|
|
[]int64{}, // issues with **both** label 1 and 2, none of these issues matches, TODO: add more tests
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
|
|
|
} {
|
2022-11-19 13:42:33 +05:30
|
|
|
issues, err := issues_model.Issues(db.DefaultContext, &test.Opts)
|
2017-12-26 04:55:16 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
if assert.Len(t, issues, len(test.ExpectedIssueIDs)) {
|
|
|
|
for i, issue := range issues {
|
|
|
|
assert.EqualValues(t, test.ExpectedIssueIDs[i], issue.ID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGetUserIssueStats(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2017-12-26 04:55:16 +05:30
|
|
|
for _, test := range []struct {
|
2023-05-19 19:47:48 +05:30
|
|
|
FilterMode int
|
|
|
|
Opts issues_model.IssuesOptions
|
2022-06-13 15:07:59 +05:30
|
|
|
ExpectedIssueStats issues_model.IssueStats
|
2017-12-26 04:55:16 +05:30
|
|
|
}{
|
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeAll,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
RepoIDs: []int64{1},
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 6
|
|
|
|
AssignCount: 1, // 6
|
|
|
|
CreateCount: 1, // 6
|
|
|
|
OpenCount: 1, // 6
|
|
|
|
ClosedCount: 1, // 1
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeAll,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
RepoIDs: []int64{1},
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
|
|
|
IsClosed: util.OptionalBoolTrue,
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 6
|
|
|
|
AssignCount: 0,
|
|
|
|
CreateCount: 0,
|
|
|
|
OpenCount: 1, // 6
|
|
|
|
ClosedCount: 1, // 1
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeAssign,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 6
|
|
|
|
AssignCount: 1, // 6
|
|
|
|
CreateCount: 1, // 6
|
|
|
|
OpenCount: 1, // 6
|
2017-12-26 04:55:16 +05:30
|
|
|
ClosedCount: 0,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeCreate,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 6
|
|
|
|
AssignCount: 1, // 6
|
|
|
|
CreateCount: 1, // 6
|
|
|
|
OpenCount: 1, // 6
|
|
|
|
ClosedCount: 0,
|
2017-12-26 04:55:16 +05:30
|
|
|
},
|
|
|
|
},
|
2019-10-03 05:33:18 +05:30
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeMention,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2019-10-03 05:33:18 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 6
|
|
|
|
AssignCount: 1, // 6
|
|
|
|
CreateCount: 1, // 6
|
|
|
|
MentionCount: 0,
|
2019-10-03 05:33:18 +05:30
|
|
|
OpenCount: 0,
|
|
|
|
ClosedCount: 0,
|
|
|
|
},
|
|
|
|
},
|
2020-02-29 12:22:05 +05:30
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeCreate,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}),
|
|
|
|
IssueIDs: []int64{1},
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2020-02-29 12:22:05 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2021-12-29 18:32:12 +05:30
|
|
|
YourRepositoriesCount: 1, // 1
|
|
|
|
AssignCount: 1, // 1
|
|
|
|
CreateCount: 1, // 1
|
|
|
|
OpenCount: 1, // 1
|
2020-02-29 12:22:05 +05:30
|
|
|
ClosedCount: 0,
|
|
|
|
},
|
|
|
|
},
|
2022-05-16 15:19:17 +05:30
|
|
|
{
|
2023-05-19 19:47:48 +05:30
|
|
|
issues_model.FilterModeAll,
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
User: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}),
|
|
|
|
Org: unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3}),
|
|
|
|
Team: unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 7}),
|
|
|
|
IsPull: util.OptionalBoolFalse,
|
2022-05-16 15:19:17 +05:30
|
|
|
},
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssueStats{
|
2022-05-16 15:19:17 +05:30
|
|
|
YourRepositoriesCount: 2,
|
|
|
|
AssignCount: 1,
|
|
|
|
CreateCount: 1,
|
|
|
|
OpenCount: 2,
|
|
|
|
},
|
|
|
|
},
|
2017-12-26 04:55:16 +05:30
|
|
|
} {
|
2021-12-29 18:32:12 +05:30
|
|
|
t.Run(fmt.Sprintf("%#v", test.Opts), func(t *testing.T) {
|
2023-05-19 19:47:48 +05:30
|
|
|
stats, err := issues_model.GetUserIssueStats(test.FilterMode, test.Opts)
|
2021-12-29 18:32:12 +05:30
|
|
|
if !assert.NoError(t, err) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
assert.Equal(t, test.ExpectedIssueStats, *stats)
|
|
|
|
})
|
2017-12-26 04:55:16 +05:30
|
|
|
}
|
|
|
|
}
|
2018-04-29 11:28:47 +05:30
|
|
|
|
|
|
|
func TestIssue_loadTotalTimes(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-06-13 15:07:59 +05:30
|
|
|
ms, err := issues_model.GetIssueByID(db.DefaultContext, 2)
|
2018-04-29 11:28:47 +05:30
|
|
|
assert.NoError(t, err)
|
2022-06-13 15:07:59 +05:30
|
|
|
assert.NoError(t, ms.LoadTotalTimes(db.DefaultContext))
|
2019-12-28 02:00:58 +05:30
|
|
|
assert.Equal(t, int64(3682), ms.TotalTrackedTime)
|
2018-04-29 11:28:47 +05:30
|
|
|
}
|
2019-02-21 10:31:28 +05:30
|
|
|
|
2020-02-29 12:22:05 +05:30
|
|
|
func TestGetRepoIDsForIssuesOptions(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
2020-02-29 12:22:05 +05:30
|
|
|
for _, test := range []struct {
|
2022-06-13 15:07:59 +05:30
|
|
|
Opts issues_model.IssuesOptions
|
2020-02-29 12:22:05 +05:30
|
|
|
ExpectedRepoIDs []int64
|
|
|
|
}{
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2020-02-29 12:22:05 +05:30
|
|
|
AssigneeID: 2,
|
|
|
|
},
|
2022-05-16 15:19:17 +05:30
|
|
|
[]int64{3, 32},
|
2020-02-29 12:22:05 +05:30
|
|
|
},
|
|
|
|
{
|
2022-06-13 15:07:59 +05:30
|
|
|
issues_model.IssuesOptions{
|
2022-04-25 19:36:24 +05:30
|
|
|
RepoCond: builder.In("repo_id", 1, 2),
|
2020-02-29 12:22:05 +05:30
|
|
|
},
|
|
|
|
[]int64{1, 2},
|
|
|
|
},
|
|
|
|
} {
|
2022-06-13 15:07:59 +05:30
|
|
|
repoIDs, err := issues_model.GetRepoIDsForIssuesOptions(&test.Opts, user)
|
2020-02-29 12:22:05 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
if assert.Len(t, repoIDs, len(test.ExpectedRepoIDs)) {
|
|
|
|
for i, repoID := range repoIDs {
|
|
|
|
assert.EqualValues(t, test.ExpectedRepoIDs[i], repoID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
func testInsertIssue(t *testing.T, title, content string, expectIndex int64) *issues_model.Issue {
|
|
|
|
var newIssue issues_model.Issue
|
2021-06-14 07:52:55 +05:30
|
|
|
t.Run(title, func(t *testing.T) {
|
2022-08-16 07:52:25 +05:30
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
2021-06-14 07:52:55 +05:30
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
issue := issues_model.Issue{
|
2021-06-14 07:52:55 +05:30
|
|
|
RepoID: repo.ID,
|
|
|
|
PosterID: user.ID,
|
2021-10-23 20:17:38 +05:30
|
|
|
Poster: user,
|
2021-06-14 07:52:55 +05:30
|
|
|
Title: title,
|
|
|
|
Content: content,
|
|
|
|
}
|
2022-06-13 15:07:59 +05:30
|
|
|
err := issues_model.NewIssue(repo, &issue, nil, nil)
|
2021-06-14 07:52:55 +05:30
|
|
|
assert.NoError(t, err)
|
2019-09-29 18:22:39 +05:30
|
|
|
|
2021-09-23 21:15:36 +05:30
|
|
|
has, err := db.GetEngine(db.DefaultContext).ID(issue.ID).Get(&newIssue)
|
2021-06-14 07:52:55 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.True(t, has)
|
|
|
|
assert.EqualValues(t, issue.Title, newIssue.Title)
|
|
|
|
assert.EqualValues(t, issue.Content, newIssue.Content)
|
|
|
|
if expectIndex > 0 {
|
|
|
|
assert.EqualValues(t, expectIndex, newIssue.Index)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return &newIssue
|
2019-09-29 18:22:39 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
func TestIssue_InsertIssue(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2019-09-29 18:22:39 +05:30
|
|
|
|
2021-06-14 07:52:55 +05:30
|
|
|
// there are 5 issues and max index is 5 on repository 1, so this one should 6
|
|
|
|
issue := testInsertIssue(t, "my issue1", "special issue's comments?", 6)
|
2022-06-13 15:07:59 +05:30
|
|
|
_, err := db.GetEngine(db.DefaultContext).ID(issue.ID).Delete(new(issues_model.Issue))
|
2021-06-14 07:52:55 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
issue = testInsertIssue(t, `my issue2, this is my son's love \n \r \ `, "special issue's '' comments?", 7)
|
2022-06-13 15:07:59 +05:30
|
|
|
_, err = db.GetEngine(db.DefaultContext).ID(issue.ID).Delete(new(issues_model.Issue))
|
2021-06-14 07:52:55 +05:30
|
|
|
assert.NoError(t, err)
|
2019-09-29 18:22:39 +05:30
|
|
|
}
|
2019-10-10 22:15:11 +05:30
|
|
|
|
|
|
|
func TestIssue_ResolveMentions(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2019-10-10 22:15:11 +05:30
|
|
|
|
|
|
|
testSuccess := func(owner, repo, doer string, mentions []string, expected []int64) {
|
2022-08-16 07:52:25 +05:30
|
|
|
o := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: owner})
|
|
|
|
r := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: o.ID, LowerName: repo})
|
2022-06-13 15:07:59 +05:30
|
|
|
issue := &issues_model.Issue{RepoID: r.ID}
|
2022-08-16 07:52:25 +05:30
|
|
|
d := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: doer})
|
2022-06-13 15:07:59 +05:30
|
|
|
resolved, err := issues_model.ResolveIssueMentionsByVisibility(db.DefaultContext, issue, d, mentions)
|
2019-10-10 22:15:11 +05:30
|
|
|
assert.NoError(t, err)
|
|
|
|
ids := make([]int64, len(resolved))
|
|
|
|
for i, user := range resolved {
|
|
|
|
ids[i] = user.ID
|
|
|
|
}
|
|
|
|
sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] })
|
|
|
|
assert.EqualValues(t, expected, ids)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Public repo, existing user
|
|
|
|
testSuccess("user2", "repo1", "user1", []string{"user5"}, []int64{5})
|
|
|
|
// Public repo, non-existing user
|
|
|
|
testSuccess("user2", "repo1", "user1", []string{"nonexisting"}, []int64{})
|
|
|
|
// Public repo, doer
|
|
|
|
testSuccess("user2", "repo1", "user1", []string{"user1"}, []int64{})
|
|
|
|
// Private repo, team member
|
2023-09-14 08:29:53 +05:30
|
|
|
testSuccess("org17", "big_test_private_4", "user20", []string{"user2"}, []int64{2})
|
2019-10-10 22:15:11 +05:30
|
|
|
// Private repo, not a team member
|
2023-09-14 08:29:53 +05:30
|
|
|
testSuccess("org17", "big_test_private_4", "user20", []string{"user5"}, []int64{})
|
2019-10-10 22:15:11 +05:30
|
|
|
// Private repo, whole team
|
2023-09-14 08:29:53 +05:30
|
|
|
testSuccess("org17", "big_test_private_4", "user15", []string{"org17/owners"}, []int64{18})
|
2019-10-10 22:15:11 +05:30
|
|
|
}
|
2021-09-19 17:19:59 +05:30
|
|
|
|
|
|
|
func TestResourceIndex(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2021-09-19 17:19:59 +05:30
|
|
|
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
for i := 0; i < 100; i++ {
|
|
|
|
wg.Add(1)
|
|
|
|
go func(i int) {
|
|
|
|
testInsertIssue(t, fmt.Sprintf("issue %d", i+1), "my issue", 0)
|
|
|
|
wg.Done()
|
|
|
|
}(i)
|
|
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
}
|
2021-11-09 02:44:46 +05:30
|
|
|
|
|
|
|
func TestCorrectIssueStats(t *testing.T) {
|
2021-11-12 20:06:47 +05:30
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2021-11-09 02:44:46 +05:30
|
|
|
|
|
|
|
// Because the condition is to have chunked database look-ups,
|
|
|
|
// We have to more issues than `maxQueryParameters`, we will insert.
|
|
|
|
// maxQueryParameters + 10 issues into the testDatabase.
|
|
|
|
// Each new issues will have a constant description "Bugs are nasty"
|
|
|
|
// Which will be used later on.
|
|
|
|
|
2022-06-13 15:07:59 +05:30
|
|
|
issueAmount := issues_model.MaxQueryParameters + 10
|
2021-11-09 02:44:46 +05:30
|
|
|
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
for i := 0; i < issueAmount; i++ {
|
|
|
|
wg.Add(1)
|
|
|
|
go func(i int) {
|
|
|
|
testInsertIssue(t, fmt.Sprintf("Issue %d", i+1), "Bugs are nasty", 0)
|
|
|
|
wg.Done()
|
|
|
|
}(i)
|
|
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
|
|
|
|
// Now we will get all issueID's that match the "Bugs are nasty" query.
|
Refactor and enhance issue indexer to support both searching, filtering and paging (#26012)
Fix #24662.
Replace #24822 and #25708 (although it has been merged)
## Background
In the past, Gitea supported issue searching with a keyword and
conditions in a less efficient way. It worked by searching for issues
with the keyword and obtaining limited IDs (as it is heavy to get all)
on the indexer (bleve/elasticsearch/meilisearch), and then querying with
conditions on the database to find a subset of the found IDs. This is
why the results could be incomplete.
To solve this issue, we need to store all fields that could be used as
conditions in the indexer and support both keyword and additional
conditions when searching with the indexer.
## Major changes
- Redefine `IndexerData` to include all fields that could be used as
filter conditions.
- Refactor `Search(ctx context.Context, kw string, repoIDs []int64,
limit, start int, state string)` to `Search(ctx context.Context, options
*SearchOptions)`, so it supports more conditions now.
- Change the data type stored in `issueIndexerQueue`. Use
`IndexerMetadata` instead of `IndexerData` in case the data has been
updated while it is in the queue. This also reduces the storage size of
the queue.
- Enhance searching with Bleve/Elasticsearch/Meilisearch, make them
fully support `SearchOptions`. Also, update the data versions.
- Keep most logic of database indexer, but remove
`issues.SearchIssueIDsByKeyword` in `models` to avoid confusion where is
the entry point to search issues.
- Start a Meilisearch instance to test it in unit tests.
- Add unit tests with almost full coverage to test
Bleve/Elasticsearch/Meilisearch indexer.
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2023-07-31 11:58:53 +05:30
|
|
|
issues, err := issues_model.Issues(context.TODO(), &issues_model.IssuesOptions{
|
|
|
|
Paginator: &db.ListOptions{
|
|
|
|
PageSize: issueAmount,
|
|
|
|
},
|
|
|
|
RepoIDs: []int64{1},
|
|
|
|
})
|
|
|
|
total := int64(len(issues))
|
|
|
|
var ids []int64
|
|
|
|
for _, issue := range issues {
|
|
|
|
if issue.Content == "Bugs are nasty" {
|
|
|
|
ids = append(ids, issue.ID)
|
|
|
|
}
|
|
|
|
}
|
2021-11-09 02:44:46 +05:30
|
|
|
|
|
|
|
// Just to be sure.
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, issueAmount, total)
|
|
|
|
|
|
|
|
// Now we will call the GetIssueStats with these IDs and if working,
|
|
|
|
// get the correct stats back.
|
2023-05-18 16:15:25 +05:30
|
|
|
issueStats, err := issues_model.GetIssueStats(&issues_model.IssuesOptions{
|
2023-05-19 19:47:48 +05:30
|
|
|
RepoIDs: []int64{1},
|
2021-11-09 02:44:46 +05:30
|
|
|
IssueIDs: ids,
|
|
|
|
})
|
|
|
|
|
|
|
|
// Now check the values.
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, issueStats.OpenCount, issueAmount)
|
|
|
|
}
|
Store the foreign ID of issues during migration (#18446)
Storing the foreign identifier of an imported issue in the database is a prerequisite to implement idempotent migrations or mirror for issues. It is a baby step towards mirroring that introduces a new table.
At the moment when an issue is created by the Gitea uploader, it fails if the issue already exists. The Gitea uploader could be modified so that, instead of failing, it looks up the database to find an existing issue. And if it does it would update the issue instead of creating a new one. However this is not currently possible because an information is missing from the database: the foreign identifier that uniquely represents the issue being migrated is not persisted. With this change, the foreign identifier is stored in the database and the Gitea uploader will then be able to run a query to figure out if a given issue being imported already exists.
The implementation of mirroring for issues, pull requests, releases, etc. can be done in three steps:
1. Store an identifier for the element being mirrored (issue, pull request...) in the database (this is the purpose of these changes)
2. Modify the Gitea uploader to be able to update an existing repository with all it contains (issues, pull request...) instead of failing if it exists
3. Optimize the Gitea uploader to speed up the updates, when possible.
The second step creates code that does not yet exist to enable idempotent migrations with the Gitea uploader. When a migration is done for the first time, the behavior is not changed. But when a migration is done for a repository that already exists, this new code is used to update it.
The third step can use the code created in the second step to optimize and speed up migrations. For instance, when a migration is resumed, an issue that has an update time that is not more recent can be skipped and only newly created issues or updated ones will be updated. Another example of optimization could be that a webhook notifies Gitea when an issue is updated. The code triggered by the webhook would download only this issue and call the code created in the second step to update the issue, as if it was in the process of an idempotent migration.
The ForeignReferences table is added to contain local and foreign ID pairs relative to a given repository. It can later be used for pull requests and other artifacts that can be mirrored. Although the foreign id could be added as a single field in issues or pull requests, it would need to be added to all tables that represent something that can be mirrored. Creating a new table makes for a simpler and more generic design. The drawback is that it requires an extra lookup to obtain the information. However, this extra information is only required during migration or mirroring and does not impact the way Gitea currently works.
The foreign identifier of an issue or pull request is similar to the identifier of an external user, which is stored in reactions, issues, etc. as OriginalPosterID and so on. The representation of a user is however different and the ability of users to link their account to an external user at a later time is also a logic that is different from what is involved in mirroring or migrations. For these reasons, despite some commonalities, it is unclear at this time how the two tables (foreign reference and external user) could be merged together.
The ForeignID field is extracted from the issue migration context so that it can be dumped in files with dump-repo and later restored via restore-repo.
The GetAllComments downloader method is introduced to simplify the implementation and not overload the Context for the purpose of pagination. It also clarifies in which context the comments are paginated and in which context they are not.
The Context interface is no longer useful for the purpose of retrieving the LocalID and ForeignID since they are now both available from the PullRequest and Issue struct. The Reviewable and Commentable interfaces replace and serve the same purpose.
The Context data member of PullRequest and Issue becomes a DownloaderContext to clarify that its purpose is not to support in memory operations while the current downloader is acting but is not otherwise persisted. It is, for instance, used by the GitLab downloader to store the IsMergeRequest boolean and sort out issues.
---
[source](https://lab.forgefriends.org/forgefriends/forgefriends/-/merge_requests/36)
Signed-off-by: Loïc Dachary <loic@dachary.org>
Co-authored-by: Loïc Dachary <loic@dachary.org>
2022-03-17 22:38:35 +05:30
|
|
|
|
2022-04-08 14:41:15 +05:30
|
|
|
func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
miles := issues_model.MilestoneList{
|
2022-08-16 07:52:25 +05:30
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1}),
|
2022-04-08 14:41:15 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
assert.NoError(t, miles.LoadTotalTrackedTimes())
|
|
|
|
|
|
|
|
assert.Equal(t, int64(3682), miles[0].TotalTrackedTime)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestLoadTotalTrackedTime(t *testing.T) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 07:52:25 +05:30
|
|
|
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
|
2022-04-08 14:41:15 +05:30
|
|
|
|
|
|
|
assert.NoError(t, milestone.LoadTotalTrackedTime())
|
|
|
|
|
|
|
|
assert.Equal(t, int64(3682), milestone.TotalTrackedTime)
|
|
|
|
}
|
2022-05-02 19:05:45 +05:30
|
|
|
|
|
|
|
func TestCountIssues(t *testing.T) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
2022-11-19 13:42:33 +05:30
|
|
|
count, err := issues_model.CountIssues(db.DefaultContext, &issues_model.IssuesOptions{})
|
2022-05-02 19:05:45 +05:30
|
|
|
assert.NoError(t, err)
|
2023-07-29 00:48:12 +05:30
|
|
|
assert.EqualValues(t, 19, count)
|
2022-05-02 19:05:45 +05:30
|
|
|
}
|
2023-07-12 19:40:35 +05:30
|
|
|
|
|
|
|
func TestIssueLoadAttributes(t *testing.T) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
setting.Service.EnableTimetracking = true
|
|
|
|
|
|
|
|
issueList := issues_model.IssueList{
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1}),
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 4}),
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, issue := range issueList {
|
|
|
|
assert.NoError(t, issue.LoadAttributes(db.DefaultContext))
|
|
|
|
assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
|
|
|
|
for _, label := range issue.Labels {
|
|
|
|
assert.EqualValues(t, issue.RepoID, label.RepoID)
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
|
|
|
|
}
|
|
|
|
if issue.PosterID > 0 {
|
|
|
|
assert.EqualValues(t, issue.PosterID, issue.Poster.ID)
|
|
|
|
}
|
|
|
|
if issue.AssigneeID > 0 {
|
|
|
|
assert.EqualValues(t, issue.AssigneeID, issue.Assignee.ID)
|
|
|
|
}
|
|
|
|
if issue.MilestoneID > 0 {
|
|
|
|
assert.EqualValues(t, issue.MilestoneID, issue.Milestone.ID)
|
|
|
|
}
|
|
|
|
if issue.IsPull {
|
|
|
|
assert.EqualValues(t, issue.ID, issue.PullRequest.IssueID)
|
|
|
|
}
|
|
|
|
for _, attachment := range issue.Attachments {
|
|
|
|
assert.EqualValues(t, issue.ID, attachment.IssueID)
|
|
|
|
}
|
|
|
|
for _, comment := range issue.Comments {
|
|
|
|
assert.EqualValues(t, issue.ID, comment.IssueID)
|
|
|
|
}
|
|
|
|
if issue.ID == int64(1) {
|
|
|
|
assert.Equal(t, int64(400), issue.TotalTrackedTime)
|
|
|
|
assert.NotNil(t, issue.Project)
|
|
|
|
assert.Equal(t, int64(1), issue.Project.ID)
|
|
|
|
} else {
|
|
|
|
assert.Nil(t, issue.Project)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-09-09 02:39:23 +05:30
|
|
|
|
|
|
|
func assertCreateIssues(t *testing.T, isPull bool) {
|
|
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
reponame := "repo1"
|
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: reponame})
|
|
|
|
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
|
|
|
|
label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
|
|
|
|
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
|
|
|
|
assert.EqualValues(t, milestone.ID, 1)
|
|
|
|
reaction := &issues_model.Reaction{
|
|
|
|
Type: "heart",
|
|
|
|
UserID: owner.ID,
|
|
|
|
}
|
|
|
|
|
|
|
|
title := "issuetitle1"
|
|
|
|
is := &issues_model.Issue{
|
|
|
|
RepoID: repo.ID,
|
|
|
|
MilestoneID: milestone.ID,
|
|
|
|
Repo: repo,
|
|
|
|
Title: title,
|
|
|
|
Content: "issuecontent1",
|
|
|
|
IsPull: isPull,
|
|
|
|
PosterID: owner.ID,
|
|
|
|
Poster: owner,
|
|
|
|
IsClosed: true,
|
|
|
|
Labels: []*issues_model.Label{label},
|
|
|
|
Reactions: []*issues_model.Reaction{reaction},
|
|
|
|
}
|
|
|
|
err := issues_model.InsertIssues(is)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
i := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: title})
|
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Reaction{Type: "heart", UserID: owner.ID, IssueID: i.ID})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMigrate_CreateIssuesIsPullFalse(t *testing.T) {
|
|
|
|
assertCreateIssues(t, false)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMigrate_CreateIssuesIsPullTrue(t *testing.T) {
|
|
|
|
assertCreateIssues(t, true)
|
|
|
|
}
|