fix(models): use client/orm instead of adapter/orm

- using new orm api, change some related logics
- newer orm api has the concept of TxOrmer, for purpose of transaction
handling. A transaction ormer in v2 is a stateful object, it should be
dropped after using. A Ormer object is stateless and thread(routine)
    safe, and should not be used for transaction handling. More details
    count be found at official doc:
    https://beego.me/docs/mvc/model/orm.md, and pr note: https://github.com/mindoc-org/mindoc/pull/662#issuecomment-807040262

commands/command.go

@@ -16,11 +16,11 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter"
-	"github.com/beego/beego/v2/adapter/orm"
 	beegoCache "github.com/beego/beego/v2/client/cache"
 	_ "github.com/beego/beego/v2/client/cache/memcache"
 	"github.com/beego/beego/v2/client/cache/redis"
 	_ "github.com/beego/beego/v2/client/cache/redis"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/howeyc/fsnotify"

commands/migrate/migrate_v03.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/models"
 )
 

controllers/BlogController.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/mindoc-org/mindoc/conf"

controllers/BookController.go

@@ -18,7 +18,7 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/graphics"
 	"github.com/mindoc-org/mindoc/models"

controllers/BookMemberController.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/models"
 )

controllers/DocumentController.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/boombuler/barcode"

controllers/ItemsetsController.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/models"
 	"github.com/mindoc-org/mindoc/utils/pagination"

controllers/LabelController.go

@@ -4,7 +4,7 @@ import (
 	"math"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/models"
 	"github.com/mindoc-org/mindoc/utils/pagination"

controllers/ManagerController.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/beego/beego/v2/adapter"
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/models"
 	"github.com/mindoc-org/mindoc/utils"

controllers/TemplateController.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/models"
 )

models/AttachmentModel.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/utils/filetil"
 )

models/AttachmentResult.go

@@ -3,7 +3,7 @@ package models
 import (
 	"strings"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/utils/filetil"
 )
 

models/Blog.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/mindoc-org/mindoc/cache"

models/BookModel.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"context"
 	"crypto/md5"
 	"errors"
 	"fmt"
@@ -17,7 +18,7 @@ import (
 	"encoding/json"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/utils"
 	"github.com/mindoc-org/mindoc/utils/cryptil"
@@ -196,7 +197,7 @@ func (book *Book) Copy(identify string) error {
 		logs.Error("查询项目时出错 -> ", err)
 		return err
 	}
-	if err := o.Begin(); err != nil {
+	if _, err := o.Begin(); err != nil {
 		logs.Error("开启事物时出错 -> ", err)
 		return err
 	}
@@ -209,49 +210,87 @@ func (book *Book) Copy(identify string) error {
 	book.CommentCount = 0
 	book.HistoryCount = 0
 
-	if _, err := o.Insert(book); err != nil {
+	/* v2 version of beego remove the o.Rollback api for transaction operation.
-		logs.Error("复制项目时出错 -> ", err)
+	 * typically, in v1, you can write code like this:
-		o.Rollback()
+	 *
+	 *		o := orm.NewOrm()
+	 *		if err := o.Operateion(); err != nil {
+	 *			o.Rollback()
+	 *			...
+	 *		}
+	 *
+	 * however, in v2, this is not available. beego will handles the transaction in new way using
+	 * cluster. the new code is like below:
+	 *
+	 * 		o := orm.NewOrm()
+	 * 		if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error{
+	 *			err := o.Operations()
+	 *			if err != nil {
+	 *				return err
+	 * 			}
+	 *			...
+	 * 		}); err != nil {
+	 *			...
+	 * 		}
+	 *
+	 * 	when operation failed, it will automatically calls o.Rollback() for TxOrmer.
+	 *  more details see https://beego.me/docs/mvc/model/transaction.md
+	 */
+	if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error {
+		_, err := txo.Insert(book)
+		return err
+
+	}); err != nil {
+		logs.Error("复制项目时出错： %s", err)
 		return err
 	}
+
 	var rels []*Relationship
 
-	if _, err := o.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("book_id", bookId).All(&rels); err != nil {
+	if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error {
+		_, err := txo.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("book_id", bookId).All(&rels)
+		return err
+	}); err != nil {
 		logs.Error("复制项目关系时出错 -> ", err)
-		o.Rollback()
 		return err
 	}
 
 	for _, rel := range rels {
 		rel.BookId = book.BookId
 		rel.RelationshipId = 0
-		if _, err := o.Insert(rel); err != nil {
+		if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error {
+			_, err := txo.Insert(rel)
+			return err
+		}); err != nil {
 			logs.Error("复制项目关系时出错 -> ", err)
-			o.Rollback()
 			return err
 		}
 	}
 
 	var docs []*Document
 
-	if _, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Filter("parent_id", 0).All(&docs); err != nil && err != orm.ErrNoRows {
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
+		_, err := txOrm.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Filter("parent_id", 0).All(&docs)
+		return err
+	}); err != nil && err != orm.ErrNoRows {
 		logs.Error("读取项目文档时出错 -> ", err)
-		o.Rollback()
 		return err
 	}
+
 	if len(docs) > 0 {
-		if err := recursiveInsertDocument(docs, o, book.BookId, 0); err != nil {
+		if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
+			return recursiveInsertDocument(docs, txOrm, book.BookId, 0)
+		}); err != nil {
 			logs.Error("复制项目时出错 -> ", err)
-			o.Rollback()
 			return err
 		}
 	}
 
-	return o.Commit()
+	return nil
 }
 
 //递归的复制文档
-func recursiveInsertDocument(docs []*Document, o orm.Ormer, bookId int, parentId int) error {
+func recursiveInsertDocument(docs []*Document, o orm.TxOrmer, bookId int, parentId int) error {
 	for _, doc := range docs {
 
 		docId := doc.DocumentId
@@ -418,42 +457,49 @@ func (book *Book) ThoroughDeleteBook(id int) error {
 	o.Begin()
 
 	//删除附件,这里没有删除实际物理文件
-	_, err = o.Raw("DELETE FROM "+NewAttachment().TableNameWithPrefix()+" WHERE book_id=?", book.BookId).Exec()
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-	if err != nil {
+		_, err = txOrm.Raw("DELETE FROM "+NewAttachment().TableNameWithPrefix()+" WHERE book_id=?", book.BookId).Exec()
-		o.Rollback()
+		return err
+	}); err != nil {
 		return err
 	}
 
 	//删除文档
-	_, err = o.Raw("DELETE FROM "+NewDocument().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-
+		_, err = txOrm.Raw("DELETE FROM "+NewDocument().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
-	if err != nil {
+		return err
-		o.Rollback()
+	}); err != nil {
 		return err
 	}
 	//删除项目
-	_, err = o.Raw("DELETE FROM "+book.TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-
+		_, err = txOrm.Raw("DELETE FROM "+book.TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
-	if err != nil {
+		return err
-		o.Rollback()
+	}); err != nil {
 		return err
 	}
 
 	//删除关系
-	_, err = o.Raw("DELETE FROM "+NewRelationship().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+
-	if err != nil {
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-		o.Rollback()
+		_, err = txOrm.Raw("DELETE FROM "+NewRelationship().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+		return err
+	}); err != nil {
 		return err
 	}
-	_, err = o.Raw(fmt.Sprintf("DELETE FROM %s WHERE book_id=?", NewTeamRelationship().TableNameWithPrefix()), book.BookId).Exec()
+
-	if err != nil {
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-		o.Rollback()
+		_, err = txOrm.Raw(fmt.Sprintf("DELETE FROM %s WHERE book_id=?", NewTeamRelationship().TableNameWithPrefix()), book.BookId).Exec()
+		return err
+	}); err != nil {
 		return err
 	}
 	//删除模板
-	_, err = o.Raw("DELETE FROM "+NewTemplate().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+
-	if err != nil {
+	if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error {
-		o.Rollback()
+		_, err = txOrm.Raw("DELETE FROM "+NewTemplate().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec()
+		return err
+	}); err != nil {
 		return err
 	}
 
@@ -470,7 +516,7 @@ func (book *Book) ThoroughDeleteBook(id int) error {
 		logs.Error("删除项目附件和图片失败 ->", err)
 	}
 
-	return o.Commit()
+	return nil
 
 }
 

models/BookResult.go

@@ -16,7 +16,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/beego/beego/v2/adapter"
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/converter"

models/Dashboard.go

@@ -1,6 +1,6 @@
 package models
 
-import "github.com/beego/beego/v2/adapter/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type Dashboard struct {
 	BookNumber       int64 `json:"book_number"`

models/DocumentHistory.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 )

models/DocumentSearchResult.go

@@ -5,7 +5,7 @@ import (
 
 	"strings"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 )
 

models/DocumentTree.go

@@ -6,7 +6,7 @@ import (
 	"html/template"
 	"math"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/Itemsets.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 	"github.com/mindoc-org/mindoc/utils"
@@ -112,8 +112,9 @@ func (item *Itemsets) Delete(itemId int) (err error) {
 	if !item.Exist(itemId) {
 		return errors.New("项目空间不存在")
 	}
-	o := orm.NewOrm()
+	ormer := orm.NewOrm()
-	if err := o.Begin(); err != nil {
+	o, err := ormer.Begin()
+	if err != nil {
 		logs.Error("开启事物失败 ->", err)
 		return err
 	}

models/LabelModel.go

@@ -3,7 +3,7 @@ package models
 import (
 	"strings"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 )

models/Logs.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/Member.go

@@ -19,7 +19,7 @@ import (
 
 	"math"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/mindoc-org/mindoc/conf"
@@ -462,9 +462,9 @@ func (m *Member) Valid(is_hash_password bool) error {
 
 //删除一个用户.
 func (m *Member) Delete(oldId int, newId int) error {
-	o := orm.NewOrm()
+	ormer := orm.NewOrm()
 
-	err := o.Begin()
+	o, err := ormer.Begin()
 
 	if err != nil {
 		return err

models/MemberResult.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/MemberToken.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/Migrations.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/Options.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/Relationship.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/beego/beego/v2/adapter/logs"
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 
@@ -122,11 +122,11 @@ func (m *Relationship) Insert() error {
 	return err
 }
 
-func (m *Relationship) Update() error {
+func (m *Relationship) Update(txOrm orm.TxOrmer) error {
-	o := orm.NewOrm()
+	_, err := txOrm.Update(m)
-
+	if err != nil {
-	_, err := o.Update(m)
+		txOrm.Rollback()
-
+	}
 	return err
 }
 
@@ -152,11 +152,11 @@ func (m *Relationship) DeleteByBookIdAndMemberId(book_id, member_id int) error {
 }
 
 func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error {
-	o := orm.NewOrm()
+	ormer := orm.NewOrm()
 
 	founder := NewRelationship()
 
-	err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", founder_id).One(founder)
+	err := ormer.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", founder_id).One(founder)
 
 	if err != nil {
 		return err
@@ -166,12 +166,12 @@ func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error {
 	}
 	receive := NewRelationship()
 
-	err = o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", receive_id).One(receive)
+	err = ormer.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", receive_id).One(receive)
 
 	if err != orm.ErrNoRows && err != nil {
 		return err
 	}
-	o.Begin()
+	o, _ := ormer.Begin()
 
 	founder.RoleId = conf.BookAdmin
 
@@ -179,8 +179,7 @@ func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error {
 	receive.RoleId = conf.BookFounder
 	receive.BookId = book_id
 
-	if err := founder.Update(); err != nil {
+	if err := founder.Update(o); err != nil {
-		o.Rollback()
 		return err
 	}
 	if receive.RelationshipId > 0 {

models/Team.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 )
@@ -59,9 +59,9 @@ func (t *Team) Delete(id int) (err error) {
 	if id <= 0 {
 		return ErrInvalidParameter
 	}
-	o := orm.NewOrm()
+	ormer := orm.NewOrm()
 
-	err = o.Begin()
+	o, err := ormer.Begin()
 
 	if err != nil {
 		logs.Error("开启事物时出错 ->", err)

models/TeamMember.go

@@ -3,7 +3,7 @@ package models
 import (
 	"errors"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 )

models/TeamRelationship.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/mindoc-org/mindoc/conf"
 )

models/comment.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )
 

models/comment_result.go

@@ -1,6 +1,6 @@
 package models
 
-import "github.com/beego/beego/v2/adapter/orm"
+import "github.com/beego/beego/v2/client/orm"
 
 type CommentResult struct {
 	Comment

models/comment_vote.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/beego/beego/v2/adapter/orm"
+	"github.com/beego/beego/v2/client/orm"
 	"github.com/mindoc-org/mindoc/conf"
 )