A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
update short id
aichy126c7d616c991f8
diff --git a/internal/controller/collection_controller.go b/internal/controller/collection_controller.goindex c405acaa..2564f02a 100644--- a/internal/controller/collection_controller.go+++ b/internal/controller/collection_controller.go@@ -7,6 +7,7 @@ import ("github.com/answerdev/answer/internal/schema""github.com/answerdev/answer/internal/service""github.com/answerdev/answer/pkg/converter"+ "github.com/answerdev/answer/pkg/uid""github.com/gin-gonic/gin""github.com/jinzhu/copier""github.com/segmentfault/pacman/errors"@@ -37,6 +38,7 @@ func (cc *CollectionController) CollectionSwitch(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}+ req.ObjectID = uid.DeShortID(req.ObjectID)dto := &schema.CollectionSwitchDTO{}_ = copier.Copy(dto, req)diff --git a/internal/controller/follow_controller.go b/internal/controller/follow_controller.goindex 1ccc1220..0cf5ad6f 100644--- a/internal/controller/follow_controller.go+++ b/internal/controller/follow_controller.go@@ -5,6 +5,7 @@ import ("github.com/answerdev/answer/internal/base/middleware""github.com/answerdev/answer/internal/schema""github.com/answerdev/answer/internal/service/follow"+ "github.com/answerdev/answer/pkg/uid""github.com/gin-gonic/gin""github.com/jinzhu/copier")@@ -34,7 +35,7 @@ func (fc *FollowController) Follow(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}-+ req.ObjectID = uid.DeShortID(req.ObjectID)dto := &schema.FollowDTO{}_ = copier.Copy(dto, req)dto.UserID = middleware.GetLoginUserIDFromContext(ctx)diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.goindex 85987e84..20ecd325 100644--- a/internal/controller/report_controller.go+++ b/internal/controller/report_controller.go@@ -8,6 +8,7 @@ import ("github.com/answerdev/answer/internal/service/permission""github.com/answerdev/answer/internal/service/rank""github.com/answerdev/answer/internal/service/report"+ "github.com/answerdev/answer/pkg/uid""github.com/gin-gonic/gin""github.com/segmentfault/pacman/errors")@@ -39,7 +40,7 @@ func (rc *ReportController) AddReport(ctx *gin.Context) {if handler.BindAndCheck(ctx, req) {return}-+ req.ObjectID = uid.DeShortID(req.ObjectID)req.UserID = middleware.GetLoginUserIDFromContext(ctx)can, err := rc.rankService.CheckOperationPermission(ctx, req.UserID, permission.ReportAdd, "")if err != nil {diff --git a/internal/repo/collection/collection_repo.go b/internal/repo/collection/collection_repo.goindex 396398c5..7fcf9335 100644--- a/internal/repo/collection/collection_repo.go+++ b/internal/repo/collection/collection_repo.go@@ -30,6 +30,7 @@ func NewCollectionRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo) collec// AddCollection add collectionfunc (cr *collectionRepo) AddCollection(ctx context.Context, collection *entity.Collection) (err error) {+ needAdd := false_, err = cr.data.DB.Transaction(func(session *xorm.Session) (result any, err error) {var has booldbcollection := &entity.Collection{}@@ -41,16 +42,23 @@ func (cr *collectionRepo) AddCollection(ctx context.Context, collection *entity.if has {return}+ needAdd = true+ return+ })+ if err != nil {+ return+ }+ if needAdd {id, err := cr.uniqueIDRepo.GenUniqueIDStr(ctx, collection.TableName())if err == nil {collection.ID = id- _, err = session.Insert(collection)+ _, err = cr.data.DB.Insert(collection)if err != nil {- return result, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}}- return- })+ }+return err}