2017-02-28 04:35:55 +03:00
|
|
|
// Copyright 2017 The Gitea Authors. All rights reserved.
|
2022-11-27 21:20:29 +03:00
|
|
|
// SPDX-License-Identifier: MIT
|
2017-02-28 04:35:55 +03:00
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
package issues_test
|
2017-02-28 04:35:55 +03:00
|
|
|
|
|
|
|
import (
|
2022-01-27 11:30:51 +03:00
|
|
|
"context"
|
2021-09-19 14:49:59 +03:00
|
|
|
"fmt"
|
2017-03-16 04:34:24 +03:00
|
|
|
"sort"
|
2021-09-19 14:49:59 +03:00
|
|
|
"sync"
|
2017-02-28 04:35:55 +03:00
|
|
|
"testing"
|
2017-07-27 04:20:38 +03:00
|
|
|
"time"
|
2017-02-28 04:35:55 +03:00
|
|
|
|
2021-09-19 14:49:59 +03:00
|
|
|
"code.gitea.io/gitea/models/db"
|
2022-04-08 12:11:15 +03:00
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
2021-12-10 04:27:50 +03:00
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
2021-11-12 17:36:47 +03:00
|
|
|
"code.gitea.io/gitea/models/unittest"
|
2021-11-24 12:49:20 +03:00
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
2023-07-12 17:10:35 +03:00
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2021-11-17 15:34:35 +03:00
|
|
|
|
2017-02-28 04:35:55 +03:00
|
|
|
"github.com/stretchr/testify/assert"
|
2024-07-30 22:41:10 +03:00
|
|
|
"github.com/stretchr/testify/require"
|
2022-04-25 17:06:24 +03:00
|
|
|
"xorm.io/builder"
|
2017-02-28 04:35:55 +03:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestIssue_ReplaceLabels(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2017-02-28 04:35:55 +03:00
|
|
|
|
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-18 22:17:39 +03:00
|
|
|
testSuccess := func(issueID int64, labelIDs, expectedLabelIDs []int64) {
|
2022-08-16 05:22:25 +03:00
|
|
|
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 04:35:55 +03:00
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
labels := make([]*issues_model.Label, len(labelIDs))
|
2017-02-28 04:35:55 +03:00
|
|
|
for i, labelID := range labelIDs {
|
2022-08-16 05:22:25 +03:00
|
|
|
labels[i] = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: labelID, RepoID: repo.ID})
|
2017-02-28 04:35:55 +03:00
|
|
|
}
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, issues_model.ReplaceIssueLabels(db.DefaultContext, 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-18 22:17:39 +03:00
|
|
|
unittest.AssertCount(t, &issues_model.IssueLabel{IssueID: issueID}, len(expectedLabelIDs))
|
|
|
|
for _, labelID := range expectedLabelIDs {
|
2022-06-13 12:37:59 +03:00
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issueID, LabelID: labelID})
|
2017-02-28 04:35:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-18 22:17:39 +03:00
|
|
|
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 04:35:55 +03:00
|
|
|
}
|
2017-03-03 17:35:42 +03:00
|
|
|
|
2021-06-10 03:08:19 +03:00
|
|
|
func Test_GetIssueIDsByRepoID(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2021-06-10 03:08:19 +03:00
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
ids, err := issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2021-06-10 03:08:19 +03:00
|
|
|
assert.Len(t, ids, 5)
|
|
|
|
}
|
|
|
|
|
2017-03-03 17:35:42 +03:00
|
|
|
func TestIssueAPIURL(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 05:22:25 +03:00
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
|
2022-06-13 12:37:59 +03:00
|
|
|
err := issue.LoadAttributes(db.DefaultContext)
|
2017-03-03 17:35:42 +03:00
|
|
|
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2023-10-03 13:30:41 +03:00
|
|
|
assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/issues/1", issue.APIURL(db.DefaultContext))
|
2017-03-03 17:35:42 +03:00
|
|
|
}
|
2017-03-15 04:10:35 +03:00
|
|
|
|
|
|
|
func TestGetIssuesByIDs(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2021-03-14 21:52:12 +03:00
|
|
|
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 09:28:53 +03:00
|
|
|
issues, err := issues_model.GetIssuesByIDs(db.DefaultContext, append(expectedIssueIDs, nonExistentIssueIDs...), true)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2017-03-15 04:10:35 +03:00
|
|
|
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 11:53:21 +03:00
|
|
|
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 09:28:53 +03:00
|
|
|
testSuccess([]int64{3, 2, 1}, []int64{})
|
2017-03-15 04:10:35 +03:00
|
|
|
}
|
2017-03-16 04:34:24 +03:00
|
|
|
|
2020-02-28 11:16:41 +03:00
|
|
|
func TestGetParticipantIDsByIssue(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2017-03-16 04:34:24 +03:00
|
|
|
|
2017-06-04 20:39:08 +03:00
|
|
|
checkParticipants := func(issueID int64, userIDs []int) {
|
2022-06-13 12:37:59 +03:00
|
|
|
issue, err := issues_model.GetIssueByID(db.DefaultContext, issueID)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
participants, err := issue.GetParticipantIDsByIssue(db.DefaultContext)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
participantsIDs := make([]int, len(participants))
|
|
|
|
for i, uid := range participants {
|
|
|
|
participantsIDs[i] = int(uid)
|
2017-03-16 04:34:24 +03:00
|
|
|
}
|
2024-07-30 22:41:10 +03:00
|
|
|
sort.Ints(participantsIDs)
|
|
|
|
sort.Ints(userIDs)
|
|
|
|
assert.Equal(t, userIDs, participantsIDs)
|
2017-03-16 04:34:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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 03:18:25 +03:00
|
|
|
// User 3 is inactive, thus not active participant
|
2020-02-28 11:16:41 +03:00
|
|
|
checkParticipants(1, []int{1, 5})
|
2017-03-16 04:34:24 +03:00
|
|
|
}
|
2017-07-26 10:16:45 +03:00
|
|
|
|
|
|
|
func TestIssue_ClearLabels(t *testing.T) {
|
2021-03-14 21:52:12 +03:00
|
|
|
tests := []struct {
|
2017-07-26 10:16:45 +03:00
|
|
|
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 {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 05:22:25 +03:00
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: test.issueID})
|
|
|
|
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: test.doerID})
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, issues_model.ClearIssueLabels(db.DefaultContext, issue, doer))
|
2022-06-13 12:37:59 +03:00
|
|
|
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: test.issueID})
|
2017-07-26 10:16:45 +03:00
|
|
|
}
|
|
|
|
}
|
2017-07-27 04:20:38 +03:00
|
|
|
|
|
|
|
func TestUpdateIssueCols(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 05:22:25 +03:00
|
|
|
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{})
|
2017-07-27 04:20:38 +03:00
|
|
|
|
|
|
|
const newTitle = "New Title for unit test"
|
|
|
|
issue.Title = newTitle
|
|
|
|
|
|
|
|
prevContent := issue.Content
|
|
|
|
issue.Content = "This should have no effect"
|
|
|
|
|
|
|
|
now := time.Now().Unix()
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, issues_model.UpdateIssueCols(db.DefaultContext, issue, "name"))
|
2017-07-27 04:20:38 +03:00
|
|
|
then := time.Now().Unix()
|
|
|
|
|
2022-08-16 05:22:25 +03:00
|
|
|
updatedIssue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
|
2017-07-27 04:20:38 +03:00
|
|
|
assert.EqualValues(t, newTitle, updatedIssue.Title)
|
|
|
|
assert.EqualValues(t, prevContent, updatedIssue.Content)
|
2021-11-16 11:53:21 +03:00
|
|
|
unittest.AssertInt64InRange(t, now, then, int64(updatedIssue.UpdatedUnix))
|
2017-07-27 04:20:38 +03:00
|
|
|
}
|
2017-12-26 02:25:16 +03:00
|
|
|
|
|
|
|
func TestIssues(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2017-12-26 02:25:16 +03:00
|
|
|
for _, test := range []struct {
|
2022-06-13 12:37:59 +03:00
|
|
|
Opts issues_model.IssuesOptions
|
2017-12-26 02:25:16 +03:00
|
|
|
ExpectedIssueIDs []int64
|
|
|
|
}{
|
|
|
|
{
|
2022-06-13 12:37:59 +03:00
|
|
|
issues_model.IssuesOptions{
|
2017-12-26 02:25:16 +03:00
|
|
|
AssigneeID: 1,
|
|
|
|
SortType: "oldest",
|
|
|
|
},
|
|
|
|
[]int64{1, 6},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 12:37:59 +03:00
|
|
|
issues_model.IssuesOptions{
|
2022-04-25 17:06:24 +03:00
|
|
|
RepoCond: builder.In("repo_id", 1, 3),
|
2017-12-26 02:25:16 +03:00
|
|
|
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 09:28:53 +03:00
|
|
|
Paginator: &db.ListOptions{
|
2020-01-24 22:00:29 +03:00
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2017-12-26 02:25:16 +03:00
|
|
|
},
|
|
|
|
[]int64{1, 2, 3, 5},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 12:37:59 +03:00
|
|
|
issues_model.IssuesOptions{
|
2019-01-23 07:10:38 +03:00
|
|
|
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 09:28:53 +03:00
|
|
|
Paginator: &db.ListOptions{
|
2020-01-24 22:00:29 +03:00
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2017-12-26 02:25:16 +03:00
|
|
|
},
|
2019-01-23 07:10:38 +03:00
|
|
|
[]int64{2, 1},
|
|
|
|
},
|
|
|
|
{
|
2022-06-13 12:37:59 +03:00
|
|
|
issues_model.IssuesOptions{
|
2019-01-23 07:10:38 +03:00
|
|
|
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 09:28:53 +03:00
|
|
|
Paginator: &db.ListOptions{
|
2020-01-24 22:00:29 +03:00
|
|
|
Page: 1,
|
|
|
|
PageSize: 4,
|
|
|
|
},
|
2019-01-23 07:10:38 +03:00
|
|
|
},
|
|
|
|
[]int64{}, // issues with **both** label 1 and 2, none of these issues matches, TODO: add more tests
|
2017-12-26 02:25:16 +03:00
|
|
|
},
|
Optimization of labels handling in issue_search (#4228)
This PR optimizes the SQL query and de-duplicate the labels' ids when generating the query string, on the issue page.
<hr/>
### Background
Some time ago, BingBot and some other crawlers have been putting my instance on its knees with requests containing a lot of label ids, like this one :
```
[07/Aug/2023:11:28:37 +0200] "GET /Dolibarr/sendrecurringinvoicebymail/issues?q=&type=all&sort=&state=closed&labels=1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c2%2c10%2c2%2c1%2c1%2c10%2c10%2c7%2c6%2c10%2c10%2c3%2c2%2c1%2c5%2c10%2c1%2c6%2c2%2c7%2c3%2c7%2c6%2c10%2c1%2c10%2c1%2c1%2c7%2c7%2c1%2c1%2c1%2c1%2c10%2c10%2c1%2c2%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c1%2c2%2c1%2c12%2c6%2c6%2c10&milestone=0&project=-1&poster=0 HTTP/1.1" 499 0 "-" "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm) Chrome/103.0.5060.134 Safari/537.36"
```
Since each of the label ids implies a join, it grows exponentially expensive for the database engine (at least on PostgreSQL but SQLite suffers a little too).
Thus, this PR proposes two enhancements:
* rewrite the database query to use only one squashed condition,
* deduplicate the label ids when generating the URL.
### Performance comparison
Here are some timings on Postgresql-backed, Forgejo 7.0.4 instances :
```sh
$ time curl -s -o /dev/null "http://localhost:3000/toto/tata/issues?q=&type=all&sort=&labels=19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25&state=open&milestone=0&project=0&assignee=0&poster=0"
real 0m10,491s
user 0m0,017s
sys 0m0,008s
```
...and with the patch:
```sh
$ time curl -s -o /dev/null "http://localhost:3000/toto/tata/issues?q=&type=all&sort=&labels=19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25%2c19%2c25&state=open&milestone=0&project=0&assignee=0&poster=0"
real 0m0,094s
user 0m0,012s
sys 0m0,013s
```
### Annex
This issue was originally proposed to [Gitea](https://github.com/go-gitea/gitea/pull/26460) but didn't get much attention, and I switched to Forgejo in the meantime :)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4228
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Chl <chl@xlii.si>
Co-committed-by: Chl <chl@xlii.si>
2024-06-28 08:11:57 +03:00
|
|
|
{
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
LabelIDs: []int64{-1, 2},
|
|
|
|
},
|
|
|
|
[]int64{5}, // issue without label 1 but with label 2.
|
|
|
|
},
|
|
|
|
{
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
RepoCond: builder.In("repo_id", 1),
|
|
|
|
LabelIDs: []int64{0},
|
|
|
|
},
|
|
|
|
[]int64{11, 3}, // issues without any label (ordered by creation date desc.)(note: 11 is a pull request)
|
|
|
|
},
|
2023-10-19 17:08:31 +03:00
|
|
|
{
|
|
|
|
issues_model.IssuesOptions{
|
|
|
|
MilestoneIDs: []int64{1},
|
|
|
|
},
|
|
|
|
[]int64{2},
|
|
|
|
},
|
2017-12-26 02:25:16 +03:00
|
|
|
} {
|
2022-11-19 11:12:33 +03:00
|
|
|
issues, err := issues_model.Issues(db.DefaultContext, &test.Opts)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2017-12-26 02:25:16 +03:00
|
|
|
if assert.Len(t, issues, len(test.ExpectedIssueIDs)) {
|
|
|
|
for i, issue := range issues {
|
|
|
|
assert.EqualValues(t, test.ExpectedIssueIDs[i], issue.ID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-29 08:58:47 +03:00
|
|
|
func TestIssue_loadTotalTimes(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-06-13 12:37:59 +03:00
|
|
|
ms, err := issues_model.GetIssueByID(db.DefaultContext, 2)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
|
|
|
require.NoError(t, ms.LoadTotalTimes(db.DefaultContext))
|
2019-12-27 23:30:58 +03:00
|
|
|
assert.Equal(t, int64(3682), ms.TotalTrackedTime)
|
2018-04-29 08:58:47 +03:00
|
|
|
}
|
2019-02-21 08:01:28 +03:00
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
func testInsertIssue(t *testing.T, title, content string, expectIndex int64) *issues_model.Issue {
|
|
|
|
var newIssue issues_model.Issue
|
2021-06-14 05:22:55 +03:00
|
|
|
t.Run(title, func(t *testing.T) {
|
2022-08-16 05:22:25 +03:00
|
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
2021-06-14 05:22:55 +03:00
|
|
|
|
2022-06-13 12:37:59 +03:00
|
|
|
issue := issues_model.Issue{
|
2021-06-14 05:22:55 +03:00
|
|
|
RepoID: repo.ID,
|
|
|
|
PosterID: user.ID,
|
2021-10-23 17:47:38 +03:00
|
|
|
Poster: user,
|
2021-06-14 05:22:55 +03:00
|
|
|
Title: title,
|
|
|
|
Content: content,
|
|
|
|
}
|
2023-09-29 15:12:54 +03:00
|
|
|
err := issues_model.NewIssue(db.DefaultContext, repo, &issue, nil, nil)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2019-09-29 15:52:39 +03:00
|
|
|
|
2021-09-23 18:45:36 +03:00
|
|
|
has, err := db.GetEngine(db.DefaultContext).ID(issue.ID).Get(&newIssue)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2021-06-14 05:22:55 +03:00
|
|
|
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 15:52:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestIssue_InsertIssue(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2019-09-29 15:52:39 +03:00
|
|
|
|
2021-06-14 05:22:55 +03:00
|
|
|
// 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)
|
2023-12-25 23:25:29 +03:00
|
|
|
_, err := db.DeleteByID[issues_model.Issue](db.DefaultContext, issue.ID)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2021-06-14 05:22:55 +03:00
|
|
|
|
|
|
|
issue = testInsertIssue(t, `my issue2, this is my son's love \n \r \ `, "special issue's '' comments?", 7)
|
2023-12-25 23:25:29 +03:00
|
|
|
_, err = db.DeleteByID[issues_model.Issue](db.DefaultContext, issue.ID)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2019-09-29 15:52:39 +03:00
|
|
|
}
|
2019-10-10 19:45:11 +03:00
|
|
|
|
|
|
|
func TestIssue_ResolveMentions(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2019-10-10 19:45:11 +03:00
|
|
|
|
|
|
|
testSuccess := func(owner, repo, doer string, mentions []string, expected []int64) {
|
2022-08-16 05:22:25 +03:00
|
|
|
o := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: owner})
|
|
|
|
r := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: o.ID, LowerName: repo})
|
2022-06-13 12:37:59 +03:00
|
|
|
issue := &issues_model.Issue{RepoID: r.ID}
|
2022-08-16 05:22:25 +03:00
|
|
|
d := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: doer})
|
2022-06-13 12:37:59 +03:00
|
|
|
resolved, err := issues_model.ResolveIssueMentionsByVisibility(db.DefaultContext, issue, d, mentions)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2019-10-10 19:45:11 +03:00
|
|
|
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{})
|
[MODERATION] User blocking
- Add the ability to block a user via their profile page.
- This will unstar their repositories and visa versa.
- Blocked users cannot create issues or pull requests on your the doer's repositories (mind that this is not the case for organizations).
- Blocked users cannot comment on the doer's opened issues or pull requests.
- Blocked users cannot add reactions to doer's comments.
- Blocked users cannot cause a notification trough mentioning the doer.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/540
(cherry picked from commit 687d852480388897db4d7b0cb397cf7135ab97b1)
(cherry picked from commit 0c32a4fde531018f74e01d9db6520895fcfa10cc)
(cherry picked from commit 1791130e3cb8470b9b39742e0004d5e4c7d1e64d)
(cherry picked from commit 37858b7e8fb6ba6c6ea0ac2562285b3b144efa19)
(cherry picked from commit a3e2bfd7e9eab82cc2c17061f6bb4e386a108c46)
(cherry picked from commit 7009b9fe87696b6182fab65ae82bf5a25cd39971)
Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014
routers/web/user/profile.go
templates/user/profile.tmpl
(cherry picked from commit b2aec3479177e725cfc7cbbb9d94753226928d1c)
(cherry picked from commit e2f1b73752f6bd3f830297d8f4ac438837471226)
[MODERATION] organization blocking a user (#802)
- Resolves #476
- Follow up for: #540
- Ensure that the doer and blocked person cannot follow each other.
- Ensure that the block person cannot watch doer's repositories.
- Add unblock button to the blocked user list.
- Add blocked since information to the blocked user list.
- Add extra testing to moderation code.
- Blocked user will unwatch doer's owned repository upon blocking.
- Add flash messages to let the user know the block/unblock action was successful.
- Add "You haven't blocked any users" message.
- Add organization blocking a user.
Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802
(cherry picked from commit 0505a1042197bd9136b58bc70ec7400a23471585)
(cherry picked from commit 37b4e6ef9b85e97d651cf350c9f3ea272ee8d76a)
(cherry picked from commit c17c121f2cf1f00e2a8d6fd6847705df47d0771e)
[MODERATION] organization blocking a user (#802) (squash)
Changes to adapt to:
6bbccdd177 Improve AJAX link and modal confirm dialog (#25210)
Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962
Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561
(cherry picked from commit 523635f83cb2a1a4386769b79326088c5c4bbec7)
(cherry picked from commit 4743eaa6a0be0ef47de5b17c211dfe8bad1b7af9)
(cherry picked from commit eff5b43d2e843d5d537756d4fa58a8a010b6b527)
Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014
routers/web/user/profile.go
(cherry picked from commit 9d359be5ed11237088ccf6328571939af814984e)
(cherry picked from commit b1f3069a22a03734cffbfcd503ce004ba47561b7)
[MODERATION] add user blocking API
- Follow up for: #540, #802
- Add API routes for user blocking from user and organization
perspective.
- The new routes have integration testing.
- The new model functions have unit tests.
- Actually quite boring to write and to read this pull request.
(cherry picked from commit f3afaf15c7e34038363c9ce8e1ef957ec1e22b06)
(cherry picked from commit 6d754db3e5faff93a58fab2867737f81f40f6599)
(cherry picked from commit 2a89ddc0acffa9aea0f02b721934ef9e2b496a88)
(cherry picked from commit 4a147bff7e963ab9dffcfaefa5c2c01c59b4c732)
Conflicts:
routers/api/v1/api.go
templates/swagger/v1_json.tmpl
(cherry picked from commit bb8c33918569f65f25b014f0d7fe6ac20f9036fc)
(cherry picked from commit 5a11569a011b7d0a14391e2b5c07d0af825d7b0e)
(cherry picked from commit 2373c801ee6b84c368b498b16e6ad18650b38f42)
[MODERATION] restore redirect on unblock
ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.ContextUser.HomeLink())
was replaced by
ctx.JSONOK()
in 128d77a3a Following up fixes for "Fix inconsistent user profile layout across tabs" (#25739)
thus changing the behavior (nicely spotted by the tests). This
restores it.
(cherry picked from commit 597c243707c3c86e7256faf1e6ba727224554de3)
(cherry picked from commit cfa539e590127b4b953b010fba3dea21c82a1714)
[MODERATION] Add test case (squash)
- Add an test case, to test an property of the function.
(cherry picked from commit 70dadb1916bfef8ba8cbc4e9b042cc8740f45e28)
[MODERATION] Block adding collaborators
- Ensure that the doer and blocked user cannot add each other as
collaborators to repositories.
- The Web UI gets an detailed message of the specific situation, the API
gets an generic Forbidden code.
- Unit tests has been added.
- Integration testing for Web and API has been added.
- This commit doesn't introduce removing each other as collaborators on
the block action, due to the complexity of database calls that needs to
be figured out. That deserves its own commit and test code.
(cherry picked from commit 747be949a1b3cd06f6586512f1af4630e55d7ad4)
[MODERATION] move locale_en-US.ini strings to avoid conflicts
Conflicts:
web_src/css/org.css
web_src/css/user.css
https://codeberg.org/forgejo/forgejo/pulls/1180
(cherry picked from commit e53f955c888ebaafc863a6e463da87f70f5605da)
Conflicts:
services/issue/comments.go
https://codeberg.org/forgejo/forgejo/pulls/1212
(cherry picked from commit b4a454b576eee0c7738b2f7df1acaf5bf7810d12)
Conflicts:
models/forgejo_migrations/migrate.go
options/locale/locale_en-US.ini
services/pull/pull.go
https://codeberg.org/forgejo/forgejo/pulls/1264
[MODERATION] Remove blocked user collaborations with doer
- When the doer blocks an user, who is also an collaborator on an
repository that the doer owns, remove that collaboration.
- Added unit tests.
- Refactor the unit test to be more organized.
(cherry picked from commit ec8701617830152680d69d50d64cb43cc2054a89)
(cherry picked from commit 313e6174d832501c57724ae7a6285194b7b81aab)
[MODERATION] QoL improvements (squash)
- Ensure that organisations cannot be blocked. It currently has no
effect, as all blocked operations cannot be executed from an
organisation standpoint.
- Refactored the API route to make use of the `UserAssignmentAPI`
middleware.
- Make more use of `t.Run` so that the test code is more clear about
which block of code belongs to which test case.
- Added more integration testing (to ensure the organisations cannot be
blocked and some authorization/permission checks).
(cherry picked from commit e9d638d0756ee20b6bf1eb999c988533a5066a68)
[MODERATION] s/{{avatar/{{ctx.AvatarUtils.Avatar/
(cherry picked from commit ce8b30be1327ab98df2ba061dd7e2a278b278c5b)
(cherry picked from commit f911dc402508b04cd5d5fb2f3332c2d640e4556e)
Conflicts:
options/locale/locale_en-US.ini
https://codeberg.org/forgejo/forgejo/pulls/1354
(cherry picked from commit c1b37b7fdaf06ee60da341dff76d703990c08082)
(cherry picked from commit 856a2e09036adf56d987c6eee364c431bc37fb2e)
[MODERATION] Show graceful error on comment creation
- When someone is blocked by the repository owner or issue poster and
try to comment on that issue, they get shown a graceful error.
- Adds integration test.
(cherry picked from commit 490646302e1e3dc3c59c9d75938b4647b6873ce7)
(cherry picked from commit d3d88667cbb928a6ff80658eba8ef0c6c508c9e0)
(cherry picked from commit 6818de13a921753e082b7c3d64c23917cc884e4b)
[MODERATION] Show graceful error on comment creation (squash) typo
(cherry picked from commit 1588d4834a37a744f092f2aeea6c9ef4795d7356)
(cherry picked from commit d510ea52d091503e841d66f2f604348add8b4535)
(cherry picked from commit 8249e93a14f628bb0e89fe3be678e4966539944e)
[MODERATION] Refactor integration testing (squash)
- Motivation for this PR is that I'd noticed that a lot of repeated
calls are happening between the test functions and that certain tests
weren't using helper functions like `GetCSRF`, therefor this refactor of
the integration tests to keep it: clean, small and hopefully more
maintainable and understandable.
- There are now three integration tests: `TestBlockUser`,
`TestBlockUserFromOrganization` and `TestBlockActions` (and has been
moved in that order in the source code).
- `TestBlockUser` is for doing blocking related actions as an user and
`TestBlockUserFromOrganization` as an organisation, even though they
execute the same kind of tests they do not share any database calls or
logic and therefor it currently doesn't make sense to merge them
together (hopefully such oppurtinutiy might be presented in the future).
- `TestBlockActions` now contain all tests for actions that should be
blocked after blocking has happened, most tests now share the same doer
and blocked users and a extra fixture has been added to make this
possible for the comment test.
- Less code, more comments and more re-use between tests.
(cherry picked from commit ffb393213d2f1269aad3c019d039cf60d0fe4b10)
(cherry picked from commit 85505e0f815fede589c272d301c95204f9596985)
(cherry picked from commit 0f3cf17761f6caedb17550f69de96990c2090af1)
[MODERATION] Fix network error (squash)
- Fix network error toast messages on user actions such as follow and
unfollow. This happened because the javascript code now expects an JSON
to be returned, but this wasn't the case due to
cfa539e590127b4953b010fba3dea21c82a1714.
- The integration testing has been adjusted to instead test for the
returned flash cookie.
(cherry picked from commit 112bc25e548d317a4ee00f9efa9068794a733e3b)
(cherry picked from commit 1194fe4899eb39dcb9a2410032ad0cc67a62b92b)
(cherry picked from commit 9abb95a8441e227874fe156095349a3173cc5a81)
[MODERATION] Modernize frontend (squash)
- Unify blocked users list.
- Use the new flex list classes for blocked users list to avoid using
the CSS helper classes and thereby be consistent in the design.
- Fix the modal by using the new modal class.
- Remove the icon in the modal as looks too big in the new design.
- Fix avatar not displaying as it was passing the context where the user
should've been passed.
- Don't use italics for 'Blocked since' text.
- Use namelink template to display the user's name and homelink.
(cherry picked from commit ec935a16a319b14e819ead828d1d9875280d9259)
(cherry picked from commit 67f37c83461aa393c53a799918e9708cb9b89b30)
Conflicts:
models/user/follow.go
models/user/user_test.go
routers/api/v1/user/follower.go
routers/web/shared/user/header.go
routers/web/user/profile.go
templates/swagger/v1_json.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1468
(cherry picked from commit 6a9626839c6342cd2767ea12757ee2f78eaf443b)
Conflicts:
tests/integration/api_nodeinfo_test.go
https://codeberg.org/forgejo/forgejo/pulls/1508#issuecomment-1242385
(cherry picked from commit 7378b251b481ed1e60e816caf8f649e8397ee5fc)
Conflicts:
models/fixtures/watch.yml
models/issues/reaction.go
models/issues/reaction_test.go
routers/api/v1/repo/issue_reaction.go
routers/web/repo/issue.go
services/issue/issue.go
https://codeberg.org/forgejo/forgejo/pulls/1547
(cherry picked from commit c2028930c101223820de0bbafc318e9394c347b8)
(cherry picked from commit d3f9134aeeef784586e8412e8dbba0a8fceb0cd4)
(cherry picked from commit 7afe154c5c40bcc65accdf51c9224b2f7627a684)
(cherry picked from commit 99ac7353eb1e834a77fe42aa89208791cc2364ff)
(cherry picked from commit a9cde00c5c25ea8c427967cb7ab57abb618e44cb)
Conflicts:
services/user/delete.go
https://codeberg.org/forgejo/forgejo/pulls/1736
(cherry picked from commit 008c0cc63d1a3b8eb694bffbf77a7b25c56afd57)
[DEADCODE] add exceptions
(cherry picked from commit 12ddd2b10e3309f6430b0af42855c6af832832ee)
[MODERATION] Remove deadcode (squash)
- Remove deadcode that's no longer used by Forgejo.
(cherry picked from commit 0faeab4fa9b0aa59f86760b24ecbc07815026c82)
[MODERATION] Add repo transfers to blocked functionality (squash)
- When someone gets blocked, remove all pending repository transfers
from the blocked user to the doer.
- Do not allow to start transferring repositories to the doer as blocked user.
- Added unit testing.
- Added integration testing.
(cherry picked from commit 8a3caac33013482ddbee2fa51510c6918ba54466)
(cherry picked from commit a92b4cfeb63b90eb2d90d0feb51cec62e0502d84)
(cherry picked from commit acaaaf07d999974dbe5f9c5e792621c597bfb542)
(cherry picked from commit 735818863c1793aa6f6983afedc4bd3b36026ca5)
(cherry picked from commit f50fa43b32160d0d88eca1dbdca09b5f575fb62b)
(cherry picked from commit e16683643388fb3c60ea478f1419a6af4f4aa283)
(cherry picked from commit 82a0e4a3814a66ce44be6a031bdf08484586c61b)
(cherry picked from commit ff233c19c4a5edcc2b99a6f41a2d19dbe8c08b3b)
(cherry picked from commit 8ad87d215f2b6adb978de77e53ba2bf7ea571430)
[MODERATION] Fix unblock action (squash)
- Pass the whole context instead of only giving pieces.
- This fixes CSRF not correctly being inserted into the unblock buttons.
(cherry picked from commit 2aa51922ba6a0ea2f8644277baa74fc8f34ab95a)
(cherry picked from commit 7ee8db0f018340bc97f125415503e3e5db5f5082)
(cherry picked from commit e4f8b999bcd3b68b3ef7f54f5b17c3ada0308121)
(cherry picked from commit 05aea60b1302bbd3ea574a9c6c34e1005a5d73bf)
(cherry picked from commit dc0d61b012cfaf2385f71e97cda5f220b58b9fa4)
(cherry picked from commit f53fa583de671ff60a0a1d0f3ab8c260e1ba4e1f)
(cherry picked from commit c65b89a58d11b32009c710c2f5e75f0cd3539395)
(cherry picked from commit 69e50b9969db3ab71cefaed520757876a9629a5c)
(cherry picked from commit ec127440b86cb5fcf51799d8bd76a9fd6b9cebcc)
[MODERATION] cope with shared fixtures
* There is one more issue in the fixtures and this breaks some tests
* The users in the shared fixtures were renamed for clarity and that
breaks some tests
(cherry picked from commit 707a4edbdf67d0eb168d7bb430cf85dd8cd63c52)
Conflicts:
modules/indexer/issues/indexer_test.go
https://codeberg.org/forgejo/forgejo/pulls/1508
(cherry picked from commit 82cc044366c749df80ffad44eed2988b8e64211e)
(cherry picked from commit 2776aec7e85850f1d7f01a090a72491550fb9d29)
(cherry picked from commit 1fbde36dc784b5b2cc6193f02ff0d436b0f2a629)
(cherry picked from commit 1293db3c4e5df218501f5add9f9d41101ffcb8aa)
(cherry picked from commit 6476802175bac3ef78dd8f24ff6bebc16f398a78)
(cherry picked from commit 5740f2fc830356acb7929a02fe304008b94a0ca5)
(cherry picked from commit afc12d7b6e9b773fa89718aa79cd95c0e0ce4406)
[MODERATION] Fix transfer confirmation (squash)
- Fix problem caused by the clearer confirmation for dangerous actions commit.
(cherry picked from commit 3488f4a9cb1f7f73103ae0017d644f13ca3ab798)
(cherry picked from commit ed7de91f6ace23a1459bc6552edf719d62c7c941)
(cherry picked from commit 2d97929b9b7b8d979eb12bf0994d3f169d41f7fd)
(cherry picked from commit 50d035a7b058b9c4486c38cd4be0b02a4e1bf4d9)
(cherry picked from commit 0a0c07d78a1dee3489b97ab359bb957e3f7fb94b)
(cherry picked from commit 85e55c4dbc2f513f3d5254dac20915e8c3c22886)
(cherry picked from commit d8282122ad6e8b497de35d1ed89e3093a2cd5ee2)
(cherry picked from commit 3f0b3b6cc582c3d672d371dd9fe1203a56cb88c0)
[MODERATION] Purge issues on user deletion (squash)
(cherry picked from commit 4f529d9596ffbfc4e754c28830ba028f6344dc5b)
(cherry picked from commit f0e3acadd321fcb99e8ea3e3ce1c69df25c4ca4d)
(cherry picked from commit 682c4effe69dc0d4ed304fa7ce6259d9ce573629)
(cherry picked from commit e43c2d84fd4b6fd31e2370cec1034262d12e5c34)
(cherry picked from commit 9c8e53ccc78053026e4f667889959c23c8d95934)
(cherry picked from commit a9eb7ac783b2c16ee3702a88203bf857cb4147fc)
[MODERATION] Purge issues on user deletion (squash) revert shared fixtures workarounds
(cherry picked from commit 7224653a40e32186892e89bfedd49edecf5b8f81)
(cherry picked from commit aa6e8672f9473a9100e7575051dec9eda37709a0)
(cherry picked from commit 58c7947e95648f50237ddcd46b6bd025b224a70f)
(cherry picked from commit f1aacb1851b232082febcd7870a40a56de3855a6)
(cherry picked from commit 0bf174af87f7de9a8d869304f709e2bf41f3dde9)
(cherry picked from commit f9706f4335df3b7688ed60853d917efa72fb464a)
[MODERATION] Prepare moderation for context locale changes (squash)
- Resolves https://codeberg.org/forgejo/forgejo/issues/1711
(cherry picked from commit 2e289baea943dcece88f02d110b03d344308a261)
(cherry picked from commit 97b16bc19ae680db62608d6020b00fe5ac451c60)
[MODERATION] User blocking (squash) do not use shared fixture
It conflicts with a fixtured added in the commit
Fix comment permissions (#28213) (#28216)
(cherry picked from commit ab40799dcab24e9f495d765268b791931da81684)
(cherry picked from commit 996c92cafdb5b33a6d2d05d94038e950d97eb7de)
(cherry picked from commit 259912e3a69071c5ad57871464d0b79f69a8e72c)
Conflicts:
options/locale/locale_en-US.ini
https://codeberg.org/forgejo/forgejo/pulls/1921
(cherry picked from commit 1e82abc032c18015b92c93a7617a5dd06d50bd2d)
(cherry picked from commit a176fee1607d571b25b345184f1c50d403029610)
(cherry picked from commit 0480b76dfeda968849e900da9454a3efd82590fa)
(cherry picked from commit 4bc06b7b3841c74e3d790b1ef635c2b382ca7123)
(cherry picked from commit 073094cf722a927a623408d66537c758d7d64e4c)
(cherry picked from commit ac6201c647a4d3a2cfb2b0303b851a8fe7a29444)
(cherry picked from commit 7e0812674da3fbd1e96bdda820962edad6826fbd)
(cherry picked from commit 068c741e5696957710b3d1c2e18c00be2ffaa278)
Conflicts:
models/repo_transfer.go
models/repo_transfer_test.go
routers/web/user/profile.go
https://codeberg.org/forgejo/forgejo/pulls/2298
2023-08-15 02:07:38 +03:00
|
|
|
// Public repo, blocked user
|
|
|
|
testSuccess("user2", "repo1", "user1", []string{"user4"}, []int64{})
|
2019-10-10 19:45:11 +03:00
|
|
|
// Private repo, team member
|
2023-09-14 05:59:53 +03:00
|
|
|
testSuccess("org17", "big_test_private_4", "user20", []string{"user2"}, []int64{2})
|
2019-10-10 19:45:11 +03:00
|
|
|
// Private repo, not a team member
|
2023-09-14 05:59:53 +03:00
|
|
|
testSuccess("org17", "big_test_private_4", "user20", []string{"user5"}, []int64{})
|
2019-10-10 19:45:11 +03:00
|
|
|
// Private repo, whole team
|
2023-09-14 05:59:53 +03:00
|
|
|
testSuccess("org17", "big_test_private_4", "user15", []string{"org17/owners"}, []int64{18})
|
2019-10-10 19:45:11 +03:00
|
|
|
}
|
2021-09-19 14:49:59 +03:00
|
|
|
|
|
|
|
func TestResourceIndex(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
|
|
|
|
beforeCount, err := issues_model.CountIssues(context.Background(), &issues_model.IssuesOptions{})
|
|
|
|
require.NoError(t, err)
|
2021-09-19 14:49:59 +03:00
|
|
|
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
for i := 0; i < 100; i++ {
|
|
|
|
wg.Add(1)
|
2024-07-30 22:41:10 +03:00
|
|
|
t.Run(fmt.Sprintf("issue %d", i+1), func(t *testing.T) {
|
|
|
|
t.Parallel()
|
2021-09-19 14:49:59 +03:00
|
|
|
testInsertIssue(t, fmt.Sprintf("issue %d", i+1), "my issue", 0)
|
|
|
|
wg.Done()
|
2024-07-30 22:41:10 +03:00
|
|
|
})
|
2021-09-19 14:49:59 +03:00
|
|
|
}
|
2024-07-30 22:41:10 +03:00
|
|
|
|
|
|
|
t.Run("Check the count", func(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
wg.Wait()
|
|
|
|
afterCount, err := issues_model.CountIssues(context.Background(), &issues_model.IssuesOptions{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
assert.EqualValues(t, 100, afterCount-beforeCount)
|
|
|
|
})
|
2021-09-19 14:49:59 +03:00
|
|
|
}
|
2021-11-09 00:14:46 +03:00
|
|
|
|
|
|
|
func TestCorrectIssueStats(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2021-11-09 00:14:46 +03:00
|
|
|
|
|
|
|
// 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 12:37:59 +03:00
|
|
|
issueAmount := issues_model.MaxQueryParameters + 10
|
2021-11-09 00:14:46 +03:00
|
|
|
|
|
|
|
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 09:28:53 +03:00
|
|
|
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 00:14:46 +03:00
|
|
|
|
|
|
|
// Just to be sure.
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2021-11-09 00:14:46 +03:00
|
|
|
assert.EqualValues(t, issueAmount, total)
|
|
|
|
|
|
|
|
// Now we will call the GetIssueStats with these IDs and if working,
|
|
|
|
// get the correct stats back.
|
2023-09-25 16:17:37 +03:00
|
|
|
issueStats, err := issues_model.GetIssueStats(db.DefaultContext, &issues_model.IssuesOptions{
|
2023-05-19 17:17:48 +03:00
|
|
|
RepoIDs: []int64{1},
|
2021-11-09 00:14:46 +03:00
|
|
|
IssueIDs: ids,
|
|
|
|
})
|
|
|
|
|
|
|
|
// Now check the values.
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2021-11-09 00:14:46 +03:00
|
|
|
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 20:08:35 +03:00
|
|
|
|
2022-04-08 12:11:15 +03:00
|
|
|
func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-04-08 12:11:15 +03:00
|
|
|
miles := issues_model.MilestoneList{
|
2022-08-16 05:22:25 +03:00
|
|
|
unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1}),
|
2022-04-08 12:11:15 +03:00
|
|
|
}
|
|
|
|
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, miles.LoadTotalTrackedTimes(db.DefaultContext))
|
2022-04-08 12:11:15 +03:00
|
|
|
|
|
|
|
assert.Equal(t, int64(3682), miles[0].TotalTrackedTime)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestLoadTotalTrackedTime(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-08-16 05:22:25 +03:00
|
|
|
milestone := unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
|
2022-04-08 12:11:15 +03:00
|
|
|
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, milestone.LoadTotalTrackedTime(db.DefaultContext))
|
2022-04-08 12:11:15 +03:00
|
|
|
|
|
|
|
assert.Equal(t, int64(3682), milestone.TotalTrackedTime)
|
|
|
|
}
|
2022-05-02 16:35:45 +03:00
|
|
|
|
|
|
|
func TestCountIssues(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2022-11-19 11:12:33 +03:00
|
|
|
count, err := issues_model.CountIssues(db.DefaultContext, &issues_model.IssuesOptions{})
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2024-02-24 15:38:43 +03:00
|
|
|
assert.EqualValues(t, 22, count)
|
2022-05-02 16:35:45 +03:00
|
|
|
}
|
2023-07-12 17:10:35 +03:00
|
|
|
|
|
|
|
func TestIssueLoadAttributes(t *testing.T) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2023-07-12 17:10:35 +03:00
|
|
|
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 {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, issue.LoadAttributes(db.DefaultContext))
|
2023-07-12 17:10:35 +03:00
|
|
|
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 00:09:23 +03:00
|
|
|
|
|
|
|
func assertCreateIssues(t *testing.T, isPull bool) {
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
2023-09-09 00:09:23 +03:00
|
|
|
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})
|
2024-07-30 22:41:10 +03:00
|
|
|
assert.EqualValues(t, 1, milestone.ID)
|
2023-09-09 00:09:23 +03:00
|
|
|
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},
|
|
|
|
}
|
2023-10-03 13:30:41 +03:00
|
|
|
err := issues_model.InsertIssues(db.DefaultContext, is)
|
2024-07-30 22:41:10 +03:00
|
|
|
require.NoError(t, err)
|
2023-09-09 00:09:23 +03:00
|
|
|
|
|
|
|
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)
|
|
|
|
}
|