mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-26 12:27:06 +00:00 
			
		
		
		
	Move organization related structs into sub package (#18518)
* Move organization related structs into sub package * Fix test * Fix lint * Move more functions into sub packages * Fix bug * Fix test * Update models/organization/team_repo.go Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Apply suggestions from code review Co-authored-by: KN4CK3R <admin@oldschoolhack.me> * Fix fmt * Follow suggestion from @Gusted * Fix test * Fix test * Fix bug * Use ctx but db.DefaultContext on routers * Fix bug * Fix bug * fix bug * Update models/organization/team_user.go * Fix bug Co-authored-by: KN4CK3R <admin@oldschoolhack.me> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -5,7 +5,6 @@ | ||||
| package models | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"testing" | ||||
|  | ||||
| 	"code.gitea.io/gitea/models/unittest" | ||||
| @@ -42,59 +41,3 @@ func TestUnfollowUser(t *testing.T) { | ||||
|  | ||||
| 	unittest.CheckConsistencyFor(t, &user_model.User{}) | ||||
| } | ||||
|  | ||||
| func TestUserIsPublicMember(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	tt := []struct { | ||||
| 		uid      int64 | ||||
| 		orgid    int64 | ||||
| 		expected bool | ||||
| 	}{ | ||||
| 		{2, 3, true}, | ||||
| 		{4, 3, false}, | ||||
| 		{5, 6, true}, | ||||
| 		{5, 7, false}, | ||||
| 	} | ||||
| 	for _, v := range tt { | ||||
| 		t.Run(fmt.Sprintf("UserId%dIsPublicMemberOf%d", v.uid, v.orgid), func(t *testing.T) { | ||||
| 			testUserIsPublicMember(t, v.uid, v.orgid, v.expected) | ||||
| 		}) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func testUserIsPublicMember(t *testing.T, uid, orgID int64, expected bool) { | ||||
| 	user, err := user_model.GetUserByID(uid) | ||||
| 	assert.NoError(t, err) | ||||
| 	is, err := IsPublicMembership(orgID, user.ID) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.Equal(t, expected, is) | ||||
| } | ||||
|  | ||||
| func TestIsUserOrgOwner(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
|  | ||||
| 	tt := []struct { | ||||
| 		uid      int64 | ||||
| 		orgid    int64 | ||||
| 		expected bool | ||||
| 	}{ | ||||
| 		{2, 3, true}, | ||||
| 		{4, 3, false}, | ||||
| 		{5, 6, true}, | ||||
| 		{5, 7, true}, | ||||
| 	} | ||||
| 	for _, v := range tt { | ||||
| 		t.Run(fmt.Sprintf("UserId%dIsOrgOwnerOf%d", v.uid, v.orgid), func(t *testing.T) { | ||||
| 			testIsUserOrgOwner(t, v.uid, v.orgid, v.expected) | ||||
| 		}) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func testIsUserOrgOwner(t *testing.T, uid, orgID int64, expected bool) { | ||||
| 	user, err := user_model.GetUserByID(uid) | ||||
| 	assert.NoError(t, err) | ||||
| 	is, err := IsOrganizationOwner(orgID, user.ID) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.Equal(t, expected, is) | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Lunny Xiao
					Lunny Xiao