Use XXXBean instead of XXXExample

go-gitea · Nov 21, 2021 · 33f6a18 · 33f6a18
1 parent ebccf6c
commit 33f6a18
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/models/db/context.go b/models/db/context.go
@@ -133,18 +133,18 @@ func Exec(ctx context.Context, sqlAndArgs ...interface{}) (sql.Result, error) {
 	return GetEngine(ctx).Exec(sqlAndArgs...)
 }
 
-// GetByExample filled empty fields of the bean according non-empty fields to query in database.
-func GetByExample(ctx context.Context, bean interface{}) (bool, error) {
+// GetByBean filled empty fields of the bean according non-empty fields to query in database.
+func GetByBean(ctx context.Context, bean interface{}) (bool, error) {
 	return GetEngine(ctx).Get(bean)
 }
 
-// DeleteByExample deletes all records according non-empty fields of the bean as conditions.
-func DeleteByExample(ctx context.Context, bean interface{}) (int64, error) {
+// DeleteByBean deletes all records according non-empty fields of the bean as conditions.
+func DeleteByBean(ctx context.Context, bean interface{}) (int64, error) {
 	return GetEngine(ctx).Delete(bean)
 }
 
-// CountByExample counts the number of database records according non-empty fields of the bean as conditions.
-func CountByExample(ctx context.Context, bean interface{}) (int64, error) {
+// CountByBean counts the number of database records according non-empty fields of the bean as conditions.
+func CountByBean(ctx context.Context, bean interface{}) (int64, error) {
 	return GetEngine(ctx).Count(bean)
 }
 

diff --git a/models/lfs.go b/models/lfs.go
@@ -50,7 +50,7 @@ func NewLFSMetaObject(m *LFSMetaObject) (*LFSMetaObject, error) {
 	}
 	defer committer.Close()
 
-	has, err := db.GetByExample(ctx, m)
+	has, err := db.GetByBean(ctx, m)
 	if err != nil {
 		return nil, err
 	}
@@ -99,11 +99,11 @@ func (repo *Repository) RemoveLFSMetaObjectByOid(oid string) (int64, error) {
 	defer committer.Close()
 
 	m := &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}, RepositoryID: repo.ID}
-	if _, err := db.DeleteByExample(ctx, m); err != nil {
+	if _, err := db.DeleteByBean(ctx, m); err != nil {
 		return -1, err
 	}
 
-	count, err := db.CountByExample(ctx, &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}})
+	count, err := db.CountByBean(ctx, &LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}})
 	if err != nil {
 		return count, err
 	}

diff --git a/models/login/session.go b/models/login/session.go
@@ -43,7 +43,7 @@ func ReadSession(key string) (*Session, error) {
 	}
 	defer committer.Close()
 
-	if has, err := db.GetByExample(ctx, &session); err != nil {
+	if has, err := db.GetByBean(ctx, &session); err != nil {
 		return nil, err
 	} else if !has {
 		session.Expiry = timeutil.TimeStampNow()
@@ -79,15 +79,15 @@ func RegenerateSession(oldKey, newKey string) (*Session, error) {
 	}
 	defer committer.Close()
 
-	if has, err := db.GetByExample(ctx, &Session{
+	if has, err := db.GetByBean(ctx, &Session{
 		Key: newKey,
 	}); err != nil {
 		return nil, err
 	} else if has {
 		return nil, fmt.Errorf("session Key: %s already exists", newKey)
 	}
 
-	if has, err := db.GetByExample(ctx, &Session{
+	if has, err := db.GetByBean(ctx, &Session{
 		Key: oldKey,
 	}); err != nil {
 		return nil, err
@@ -107,7 +107,7 @@ func RegenerateSession(oldKey, newKey string) (*Session, error) {
 	s := Session{
 		Key: newKey,
 	}
-	if _, err := db.GetByExample(ctx, &s); err != nil {
+	if _, err := db.GetByBean(ctx, &s); err != nil {
 		return nil, err
 	}
 

diff --git a/models/star.go b/models/star.go
@@ -49,7 +49,7 @@ func StarRepo(userID, repoID int64, star bool) error {
 			return nil
 		}
 
-		if _, err := db.DeleteByExample(ctx, &Star{UID: userID, RepoID: repoID}); err != nil {
+		if _, err := db.DeleteByBean(ctx, &Star{UID: userID, RepoID: repoID}); err != nil {
 			return err
 		}
 		if _, err := db.Exec(ctx, "UPDATE `repository` SET num_stars = num_stars - 1 WHERE id = ?", repoID); err != nil {

diff --git a/models/user/follow.go b/models/user/follow.go
@@ -65,7 +65,7 @@ func UnfollowUser(userID, followID int64) (err error) {
 	}
 	defer committer.Close()
 
-	if _, err = db.DeleteByExample(ctx, &Follow{UserID: userID, FollowID: followID}); err != nil {
+	if _, err = db.DeleteByBean(ctx, &Follow{UserID: userID, FollowID: followID}); err != nil {
 		return err
 	}
 

diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go
@@ -513,11 +513,11 @@ func deleteWebhook(bean *Webhook) (err error) {
 	}
 	defer committer.Close()
 
-	if count, err := db.DeleteByExample(ctx, bean); err != nil {
+	if count, err := db.DeleteByBean(ctx, bean); err != nil {
 		return err
 	} else if count == 0 {
 		return ErrWebhookNotExist{ID: bean.ID}
-	} else if _, err = db.DeleteByExample(ctx, &HookTask{HookID: bean.ID}); err != nil {
+	} else if _, err = db.DeleteByBean(ctx, &HookTask{HookID: bean.ID}); err != nil {
 		return err
 	}
 
@@ -557,7 +557,7 @@ func DeleteDefaultSystemWebhook(id int64) error {
 		return ErrWebhookNotExist{ID: id}
 	}
 
-	if _, err := db.DeleteByExample(ctx, &HookTask{HookID: id}); err != nil {
+	if _, err := db.DeleteByBean(ctx, &HookTask{HookID: id}); err != nil {
 		return err
 	}