Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refactor repository transfer #33211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jan 30, 2025
Merged

Refactor repository transfer #33211

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5acc289
refactor transfer related code
lunny Jan 11, 2025
237a09c
Fix bugs
lunny Jan 11, 2025
94caa39
Fix test
lunny Jan 11, 2025
07d1a37
Fix bugs
lunny Jan 12, 2025
45ffedd
Fix bug
lunny Jan 13, 2025
2f1fc75
Some improvements
lunny Jan 13, 2025
877b676
Merge branch 'main' into lunny/refactor_transfer
lunny Jan 13, 2025
6bd16bd
Follow reviews
lunny Jan 18, 2025
f286ace
Merge branch 'main' into lunny/refactor_transfer
lunny Jan 18, 2025
78b1cb9
Some improvements
lunny Jan 23, 2025
7edb840
Fix the permission check
lunny Jan 23, 2025
9e53ad7
Merge branch 'main' into lunny/refactor_transfer
lunny Jan 23, 2025
cb24f72
Follow @wxiaoguang's suggestion
lunny Jan 29, 2025
58d6d50
Merge branch 'main' into lunny/refactor_transfer
lunny Jan 29, 2025
0a51b67
Update repo.go
wxiaoguang Jan 30, 2025
515ee5f
Update repo.go
wxiaoguang Jan 30, 2025
b80f349
Update services/repository/transfer.go
wxiaoguang Jan 30, 2025
01ebb16
Merge branch 'main' into lunny/refactor_transfer
GiteaBot Jan 30, 2025
a7d4f35
Merge branch 'main' into lunny/refactor_transfer
GiteaBot Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix bugs
  • Loading branch information
@lunny
lunny committed Jan 13, 2025
commit 237a09c0ccdabc9ab2c9433dee15c8ceffe25c2d
4 changes: 2 additions & 2 deletions services/notify/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ func MigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo
}

// TransferRepository notifies create repository to notifiers
func TransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, newOwnerName string) {
func TransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldOwnerName string) {
for _, notifier := range notifiers {
notifier.TransferRepository(ctx, doer, repo, newOwnerName)
notifier.TransferRepository(ctx, doer, repo, oldOwnerName)
}
}

Expand Down
7 changes: 5 additions & 2 deletions services/repository/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ func AcceptTransferOwnership(ctx context.Context, repo *repo_model.Repository, d
return err
}

oldOwnerName := repo.OwnerName

if err := db.WithTx(ctx, func(ctx context.Context) error {
if err := repoTransfer.LoadAttributes(ctx); err != nil {
return err
Expand All @@ -65,7 +67,7 @@ func AcceptTransferOwnership(ctx context.Context, repo *repo_model.Repository, d
}
releaser()

notify_service.TransferRepository(ctx, doer, repo, repoTransfer.Recipient.Name)
notify_service.TransferRepository(ctx, doer, repo, oldOwnerName)

return nil
}
Expand Down Expand Up @@ -397,6 +399,7 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
}

var isTransfer bool
oldOwnerName := repo.OwnerName

if err := db.WithTx(ctx, func(ctx context.Context) error {
// Admin is always allowed to transfer || user transfer repo back to his account
Expand Down Expand Up @@ -440,7 +443,7 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
}

if isTransfer {
notify_service.TransferRepository(ctx, doer, repo, newOwner.Name)
notify_service.TransferRepository(ctx, doer, repo, oldOwnerName)
} else {
// notify users who are able to accept / reject transfer
notify_service.RepoPendingTransfer(ctx, doer, newOwner, repo)
Expand Down
13 changes: 8 additions & 5 deletions services/repository/transfer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,26 @@ func TestTransferOwnership(t *testing.T) {

assert.NoError(t, unittest.PrepareTestDatabase())

doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
repo.Owner = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
assert.NoError(t, repo.LoadOwner(db.DefaultContext))
repoTransfer := unittest.AssertExistsAndLoadBean(t, &repo_model.RepoTransfer{ID: 1})
assert.NoError(t, repoTransfer.LoadAttributes(db.DefaultContext))
assert.NoError(t, AcceptTransferOwnership(db.DefaultContext, repo, doer))

transferredRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3})
assert.EqualValues(t, 2, transferredRepo.OwnerID)
assert.EqualValues(t, 1, transferredRepo.OwnerID) // repo_transfer.yml id=1
unittest.AssertNotExistsBean(t, &repo_model.RepoTransfer{ID: 1})

exist, err := util.IsExist(repo_model.RepoPath("org3", "repo3"))
assert.NoError(t, err)
assert.False(t, exist)
exist, err = util.IsExist(repo_model.RepoPath("user2", "repo3"))
exist, err = util.IsExist(repo_model.RepoPath("user1", "repo3"))
assert.NoError(t, err)
assert.True(t, exist)
unittest.AssertExistsAndLoadBean(t, &activities_model.Action{
OpType: activities_model.ActionTransferRepo,
ActUserID: 2,
ActUserID: 1,
RepoID: 3,
Content: "org3/repo3",
})
Expand Down