fixup

gogs · unknwon · Aug 24, 2023 · Nov 2, 2023 · Nov 3, 2023 · Nov 3, 2023
commit 371c56e3063848dab049b636085062b68ba6a280
@@ -29,7 +29,7 @@ func ServeGoGet() macaron.Handler {
 
 		owner, err := db.Users.GetByUsername(c.Req.Context(), ownerName)
 		if err == nil {
-			repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, repoName)
+			repo, err := db.Repositories.GetByName(c.Req.Context(), owner.ID, repoName)
 			if err == nil && repo.DefaultBranch != "" {
 				branchName = repo.DefaultBranch
 			}

@@ -74,7 +74,7 @@ func HandleOrgAssignment(c *Context, args ...bool) {
 			c.Org.IsTeamMember = true
 			c.Org.IsTeamAdmin = true
 		} else {
-			c.Org.IsMember, _ = db.Orgs.HasMember(c.Req.Context(), org.ID, c.User.ID)
+			c.Org.IsMember, _ = db.Organizations.HasMember(c.Req.Context(), org.ID, c.User.ID)
 		}
 	} else {
 		// Fake data.

@@ -403,7 +403,7 @@ func RepoRef() macaron.Handler {
 		c.Data["IsViewCommit"] = c.Repo.IsViewCommit
 
 		// People who have push access or have forked repository can propose a new pull request.
-		if c.Repo.IsWriter() || (c.IsLogged && db.Repos.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID)) {
+		if c.Repo.IsWriter() || (c.IsLogged && db.Repositories.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID)) {
 			// Pull request is allowed if this is a fork repository
 			// and base repository accepts pull requests.
 			if c.Repo.Repository.BaseRepo != nil {

@@ -165,7 +165,7 @@ func (db *actions) ListByUser(ctx context.Context, userID, actorID, afterID int6
 
 // notifyWatchers creates rows in action table for watchers who are able to see the action.
 func (db *actions) notifyWatchers(ctx context.Context, act *Action) error {
-	watches, err := NewReposStore(db.DB).ListWatches(ctx, act.RepoID)
+	watches, err := NewRepositoriesStore(db.DB).ListWatches(ctx, act.RepoID)
 	if err != nil {
 		return errors.Wrap(err, "list watches")
 	}
@@ -489,7 +489,7 @@ type CommitRepoOptions struct {
 }
 
 func (db *actions) CommitRepo(ctx context.Context, opts CommitRepoOptions) error {
-	err := NewReposStore(db.DB).Touch(ctx, opts.Repo.ID)
+	err := NewRepositoriesStore(db.DB).Touch(ctx, opts.Repo.ID)
 	if err != nil {
 		return errors.Wrap(err, "touch repository")
 	}
@@ -633,7 +633,7 @@ type PushTagOptions struct {
 }
 
 func (db *actions) PushTag(ctx context.Context, opts PushTagOptions) error {
-	err := NewReposStore(db.DB).Touch(ctx, opts.Repo.ID)
+	err := NewRepositoriesStore(db.DB).Touch(ctx, opts.Repo.ID)
 	if err != nil {
 		return errors.Wrap(err, "touch repository")
 	}

@@ -137,7 +137,7 @@ func TestActions(t *testing.T) {
 func actionsCommitRepo(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -440,7 +440,7 @@ func actionsListByUser(t *testing.T, ctx context.Context, db *actions) {
 func actionsMergePullRequest(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -485,7 +485,7 @@ func actionsMergePullRequest(t *testing.T, ctx context.Context, db *actions) {
 func actionsMirrorSyncCreate(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -526,7 +526,7 @@ func actionsMirrorSyncCreate(t *testing.T, ctx context.Context, db *actions) {
 func actionsMirrorSyncDelete(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -567,7 +567,7 @@ func actionsMirrorSyncDelete(t *testing.T, ctx context.Context, db *actions) {
 func actionsMirrorSyncPush(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -632,7 +632,7 @@ func actionsMirrorSyncPush(t *testing.T, ctx context.Context, db *actions) {
 func actionsNewRepo(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -711,7 +711,7 @@ func actionsPushTag(t *testing.T, ctx context.Context, db *actions) {
 
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -803,7 +803,7 @@ func actionsPushTag(t *testing.T, ctx context.Context, db *actions) {
 func actionsRenameRepo(t *testing.T, ctx context.Context, db *actions) {
 	alice, err := NewUsersStore(db.DB).Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",
@@ -842,7 +842,7 @@ func actionsTransferRepo(t *testing.T, ctx context.Context, db *actions) {
 	require.NoError(t, err)
 	bob, err := NewUsersStore(db.DB).Create(ctx, "bob", "bob@example.com", CreateUserOptions{})
 	require.NoError(t, err)
-	repo, err := NewReposStore(db.DB).Create(ctx,
+	repo, err := NewRepositoriesStore(db.DB).Create(ctx,
 		alice.ID,
 		CreateRepoOptions{
 			Name: "example",

@@ -127,9 +127,9 @@ func Init(w logger.Writer) (*gorm.DB, error) {
 	LoginSources = &loginSources{DB: db, files: sourceFiles}
 	LFS = &lfs{DB: db}
 	Notices = NewNoticesStore(db)
-	Orgs = NewOrgsStore(db)
+	Organizations = NewOrganizationsStore(db)
 	Perms = NewPermsStore(db)
-	Repos = NewReposStore(db)
+	Repositories = NewRepositoriesStore(db)
 	TwoFactors = &twoFactors{DB: db}
 	Users = NewUsersStore(db)
 

@@ -48,11 +48,11 @@ func SetMockPermsStore(t *testing.T, mock PermsStore) {
 	})
 }
 
-func SetMockReposStore(t *testing.T, mock ReposStore) {
-	before := Repos
-	Repos = mock
+func SetMockReposStore(t *testing.T, mock RepositoriesStore) {
+	before := Repositories
+	Repositories = mock
 	t.Cleanup(func() {
-		Repos = before
+		Repositories = before
 	})
 }
 

@@ -211,7 +211,7 @@ type Statistic struct {
 
 func GetStatistic(ctx context.Context) (stats Statistic) {
 	stats.Counter.User = Users.Count(ctx)
-	stats.Counter.Org = Orgs.Count(ctx)
+	stats.Counter.Org = Organizations.Count(ctx)
 	stats.Counter.PublicKey, _ = x.Count(new(PublicKey))
 	stats.Counter.Repo = CountRepositories(true)
 	stats.Counter.Watch, _ = x.Count(new(Watch))

@@ -7,97 +7,11 @@ package db
 import (
 	"context"
 	"fmt"
-	"os"
-	"strings"
 
 	"xorm.io/builder"
 	"xorm.io/xorm"
-
-	"gogs.io/gogs/internal/errutil"
-	"gogs.io/gogs/internal/repoutil"
-	"gogs.io/gogs/internal/userutil"
 )
 
-// CreateOrganization creates record of a new organization.
-func CreateOrganization(org, owner *User) (err error) {
-	if err = isUsernameAllowed(org.Name); err != nil {
-		return err
-	}
-
-	if Users.IsUsernameUsed(context.TODO(), org.Name, 0) {
-		return ErrUserAlreadyExist{
-			args: errutil.Args{
-				"name": org.Name,
-			},
-		}
-	}
-
-	org.LowerName = strings.ToLower(org.Name)
-	if org.Rands, err = userutil.RandomSalt(); err != nil {
-		return err
-	}
-	if org.Salt, err = userutil.RandomSalt(); err != nil {
-		return err
-	}
-	org.UseCustomAvatar = true
-	org.MaxRepoCreation = -1
-	org.NumTeams = 1
-	org.NumMembers = 1
-
-	sess := x.NewSession()
-	defer sess.Close()
-	if err = sess.Begin(); err != nil {
-		return err
-	}
-
-	if _, err = sess.Insert(org); err != nil {
-		return fmt.Errorf("insert organization: %v", err)
-	}
-	_ = userutil.GenerateRandomAvatar(org.ID, org.Name, org.Email)
-
-	// Add initial creator to organization and owner team.
-	if _, err = sess.Insert(&OrgUser{
-		UserID:   owner.ID,
-		OrgID:    org.ID,
-		IsOwner:  true,
-		NumTeams: 1,
-	}); err != nil {
-		return fmt.Errorf("insert org-user relation: %v", err)
-	}
-
-	// Create default owner team.
-	t := &Team{
-		OrgID:      org.ID,
-		LowerName:  strings.ToLower(TeamNameOwners),
-		Name:       TeamNameOwners,
-		Authorize:  AccessModeOwner,
-		NumMembers: 1,
-	}
-	if _, err = sess.Insert(t); err != nil {
-		return fmt.Errorf("insert owner team: %v", err)
-	}
-
-	if _, err = sess.Insert(&TeamUser{
-		UID:    owner.ID,
-		OrgID:  org.ID,
-		TeamID: t.ID,
-	}); err != nil {
-		return fmt.Errorf("insert team-user relation: %v", err)
-	}
-
-	if err = os.MkdirAll(repoutil.UserPath(org.Name), os.ModePerm); err != nil {
-		return fmt.Errorf("create directory: %v", err)
-	}
-
-	return sess.Commit()
-}
-
-// Organizations returns number of organizations in given page.
-func Organizations(page, pageSize int) ([]*User, error) {
-	orgs := make([]*User, 0, pageSize)
-	return orgs, x.Limit(pageSize, (page-1)*pageSize).Where("type=1").Asc("id").Find(&orgs)
-}
-
 // deleteBeans deletes all given beans, beans should contain delete conditions.
 func deleteBeans(e Engine, beans ...any) (err error) {
 	for i := range beans {

@@ -486,7 +486,7 @@ func AddTeamMember(orgID, teamID, userID int64) error {
 		return nil
 	}
 
-	if err := Orgs.AddMember(context.TODO(), orgID, userID); err != nil {
+	if err := Organizations.AddMember(context.TODO(), orgID, userID); err != nil {
 		return err
 	}