Fix bug

Author: lunny

models/repo/fork.go

@@ -76,7 +76,7 @@ func GetForksByUserAndOrgs(ctx context.Context, user *user_model.User, repo *Rep
 	if user == nil {
 		return repoList, nil
 	}
-	forkedRepo, err := GetForkedRepo(ctx, repo.ID, user.ID)
+	forkedRepo, err := GetForkedRepo(ctx, user.ID, repo.ID)
 	if err != nil && !IsErrRepoNotExist(err) {
 		return repoList, err
 	}

models/repo/fork_test.go

@@ -13,21 +13,21 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetUserFork(t *testing.T) {
+func Test_GetForkedRepo(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	// User13 has repo 11 forked from repo10
 	repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 10)
 	assert.NoError(t, err)
 	assert.NotNil(t, repo)
-	repo, err = repo_model.GetForkedRepo(db.DefaultContext, repo.ID, 13)
+	repo, err = repo_model.GetForkedRepo(db.DefaultContext, 13, repo.ID)
 	assert.NoError(t, err)
 	assert.NotNil(t, repo)
 
 	repo, err = repo_model.GetRepositoryByID(db.DefaultContext, 9)
 	assert.NoError(t, err)
 	assert.NotNil(t, repo)
-	repo, err = repo_model.GetForkedRepo(db.DefaultContext, repo.ID, 13)
+	repo, err = repo_model.GetForkedRepo(db.DefaultContext, 13, repo.ID)
 	assert.NoError(t, err)
 	assert.Nil(t, repo)
 }

services/repository/fork.go

@@ -71,7 +71,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 		}
 	}
 
-	forkedRepo, err := repo_model.GetForkedRepo(ctx, opts.BaseRepo.ID, owner.ID)
+	forkedRepo, err := repo_model.GetForkedRepo(ctx, owner.ID, opts.BaseRepo.ID)
 	if err != nil && !repo_model.IsErrRepoNotExist(err) {
 		return nil, err
 	}