mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 02:46:04 +01:00 
			
		
		
		
	Reimplement GetUserOrgsList to make it simple and clear (#32486)
Reimplement GetUserOrgsList and also move some functions and test to org_list file. --------- Co-authored-by: Zettat123 <zettat123@gmail.com>
This commit is contained in:
		| @@ -129,15 +129,6 @@ func TestGetOrgByName(t *testing.T) { | ||||
| 	assert.True(t, organization.IsErrOrgNotExist(err)) | ||||
| } | ||||
|  | ||||
| func TestCountOrganizations(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 	expected, err := db.GetEngine(db.DefaultContext).Where("type=?", user_model.UserTypeOrganization).Count(&organization.Organization{}) | ||||
| 	assert.NoError(t, err) | ||||
| 	cnt, err := db.Count[organization.Organization](db.DefaultContext, organization.FindOrgOptions{IncludePrivate: true}) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.Equal(t, expected, cnt) | ||||
| } | ||||
|  | ||||
| func TestIsOrganizationOwner(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 	test := func(orgID, userID int64, expected bool) { | ||||
| @@ -251,33 +242,6 @@ func TestRestrictedUserOrgMembers(t *testing.T) { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func TestFindOrgs(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	orgs, err := db.Find[organization.Organization](db.DefaultContext, organization.FindOrgOptions{ | ||||
| 		UserID:         4, | ||||
| 		IncludePrivate: true, | ||||
| 	}) | ||||
| 	assert.NoError(t, err) | ||||
| 	if assert.Len(t, orgs, 1) { | ||||
| 		assert.EqualValues(t, 3, orgs[0].ID) | ||||
| 	} | ||||
|  | ||||
| 	orgs, err = db.Find[organization.Organization](db.DefaultContext, organization.FindOrgOptions{ | ||||
| 		UserID:         4, | ||||
| 		IncludePrivate: false, | ||||
| 	}) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.Len(t, orgs, 0) | ||||
|  | ||||
| 	total, err := db.Count[organization.Organization](db.DefaultContext, organization.FindOrgOptions{ | ||||
| 		UserID:         4, | ||||
| 		IncludePrivate: true, | ||||
| 	}) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.EqualValues(t, 1, total) | ||||
| } | ||||
|  | ||||
| func TestGetOrgUsersByOrgID(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user