feat: rename lists to projects
This commit is contained in:
parent
01bd4ccf7a
commit
8d052687f2
|
@ -26,12 +26,12 @@ import (
|
|||
|
||||
func TestUserProject(t *testing.T) {
|
||||
t.Run("Normal test", func(t *testing.T) {
|
||||
rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", nil, nil)
|
||||
rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserProject, &testuser1, "", nil, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, "null\n", rec.Body.String())
|
||||
})
|
||||
t.Run("Search for user3", func(t *testing.T) {
|
||||
rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", map[string][]string{"s": {"user3"}}, nil)
|
||||
rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserProject, &testuser1, "", map[string][]string{"s": {"user3"}}, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Contains(t, rec.Body.String(), `user3`)
|
||||
assert.NotContains(t, rec.Body.String(), `user1`)
|
||||
|
|
|
@ -44,7 +44,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
Name: "TestBoard",
|
||||
Desc: "This is a description",
|
||||
Closed: false,
|
||||
Lists: []*trello.List{
|
||||
Projects: []*trello.Project{
|
||||
{
|
||||
Name: "Test Project 1",
|
||||
Cards: []*trello.Card{
|
||||
|
@ -77,7 +77,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
{
|
||||
Name: "Test Card 2",
|
||||
Pos: 124,
|
||||
Checklists: []*trello.Checklist{
|
||||
Checkprojects: []*trello.Checkproject{
|
||||
{
|
||||
Name: "Checkproject 1",
|
||||
CheckItems: []trello.CheckItem{
|
||||
|
@ -157,7 +157,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
{
|
||||
Name: "TestBoard 2",
|
||||
Closed: false,
|
||||
Lists: []*trello.List{
|
||||
Projects: []*trello.Project{
|
||||
{
|
||||
Name: "Test Project 4",
|
||||
Cards: []*trello.Card{
|
||||
|
@ -172,7 +172,7 @@ func TestConvertTrelloToVikunja(t *testing.T) {
|
|||
{
|
||||
Name: "TestBoard Archived",
|
||||
Closed: true,
|
||||
Lists: []*trello.List{
|
||||
Projects: []*trello.Project{
|
||||
{
|
||||
Name: "Test Project 5",
|
||||
Cards: []*trello.Card{
|
||||
|
|
|
@ -41,13 +41,13 @@ import (
|
|||
// @Failure 400 {object} web.HTTPError "Something's invalid."
|
||||
// @Failure 500 {object} models.Message "Internal server error."
|
||||
// @Router /users [get]
|
||||
func UserList(c echo.Context) error {
|
||||
func UserProject(c echo.Context) error {
|
||||
search := c.QueryParam("s")
|
||||
|
||||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
users, err := user.ListUsers(s, search, nil)
|
||||
users, err := user.ProjectUsers(s, search, nil)
|
||||
if err != nil {
|
||||
_ = s.Rollback()
|
||||
return handler.HandleHTTPError(err, c)
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
package routes
|
||||
|
||||
import (
|
||||
"code.vikunja.io/api/pkg/modules/migration/wunderlist"
|
||||
"errors"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
@ -287,7 +288,7 @@ func registerAPIRoutes(a *echo.Group) {
|
|||
|
||||
u.GET("", apiv1.UserShow)
|
||||
u.POST("/password", apiv1.UserChangePassword)
|
||||
u.GET("s", apiv1.UserList)
|
||||
u.GET("s", apiv1.UserProject)
|
||||
u.POST("/token", apiv1.RenewToken)
|
||||
u.POST("/settings/email", apiv1.UpdateUserEmail)
|
||||
u.GET("/settings/avatar", apiv1.GetUserAvatarProvider)
|
||||
|
|
|
@ -364,7 +364,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "user1", nil)
|
||||
all, err := ProjectUsers(s, "user1", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.True(t, len(all) > 0)
|
||||
assert.Equal(t, all[0].Username, "user1")
|
||||
|
@ -374,7 +374,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "uSEr1", nil)
|
||||
all, err := ProjectUsers(s, "uSEr1", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.True(t, len(all) > 0)
|
||||
assert.Equal(t, all[0].Username, "user1")
|
||||
|
@ -393,7 +393,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "", nil)
|
||||
all, err := ProjectUsers(s, "", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 0)
|
||||
})
|
||||
|
@ -402,7 +402,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "user1@example.com", nil)
|
||||
all, err := ProjectUsers(s, "user1@example.com", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 0)
|
||||
db.AssertExists(t, "users", map[string]interface{}{
|
||||
|
@ -415,7 +415,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "one else", nil)
|
||||
all, err := ProjectUsers(s, "one else", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 0)
|
||||
db.AssertExists(t, "users", map[string]interface{}{
|
||||
|
@ -428,7 +428,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "user7@example.com", nil)
|
||||
all, err := ProjectUsers(s, "user7@example.com", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 1)
|
||||
assert.Equal(t, int64(7), all[0].ID)
|
||||
|
@ -442,7 +442,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "with space", nil)
|
||||
all, err := ProjectUsers(s, "with space", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 1)
|
||||
assert.Equal(t, int64(12), all[0].ID)
|
||||
|
@ -470,7 +470,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "user7", nil)
|
||||
all, err := ProjectUsers(s, "user7", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 1)
|
||||
assert.Equal(t, int64(7), all[0].ID)
|
||||
|
@ -483,7 +483,7 @@ func TestProjectUsers(t *testing.T) {
|
|||
s := db.NewSession()
|
||||
defer s.Close()
|
||||
|
||||
all, err := ListUsers(s, "user", nil)
|
||||
all, err := ProjectUsers(s, "user", nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, all, 0)
|
||||
db.AssertExists(t, "users", map[string]interface{}{
|
||||
|
|
|
@ -31,7 +31,7 @@ type ProjectUserOpts struct {
|
|||
ReturnAllIfNoSearchProvided bool
|
||||
}
|
||||
|
||||
// ListUsers returns a project with all users, filtered by an optional search string
|
||||
// ProjectUsers returns a project with all users, filtered by an optional search string
|
||||
func ListUsers(s *xorm.Session, search string, opts *ProjectUserOpts) (users []*User, err error) {
|
||||
if opts == nil {
|
||||
opts = &ProjectUserOpts{}
|
||||
|
|
Loading…
Reference in New Issue
Block a user