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.
Merge branch 'feat/1.1.0/report' into feat/1.1.0/context
LinkinStarsf16207e30fab
diff --cc internal/repo/rank/user_rank_repo.goindex f25bf819,fc97c6de..beac7ec6--- a/internal/repo/rank/user_rank_repo.go+++ b/internal/repo/rank/user_rank_repo.go@@@ -138,7 -138,7 +138,7 @@@ func (ur *UserRankRepo) UserRankPage(ct) {rankPage = make([]*entity.Activity, 0)- session := ur.data.DB.Context(ctx).Where(builder.Eq{"has_rank": 1}.And(builder.Eq{"cancelled": 0}))- session := ur.data.DB.Where(builder.Eq{"has_rank": 1}.And(builder.Eq{"cancelled": 0})).And(builder.Gt{"rank": 0})++ session := ur.data.DB.Context(ctx).Where(builder.Eq{"has_rank": 1}.And(builder.Eq{"cancelled": 0})).And(builder.Gt{"rank": 0})session.Desc("created_at")cond := &entity.Activity{UserID: userID}diff --cc internal/repo/tag/tag_rel_repo.goindex a015dee8,38cf353b..62b3fe7a--- a/internal/repo/tag/tag_rel_repo.go+++ b/internal/repo/tag/tag_rel_repo.go@@@ -52,9 -53,29 +52,27 @@@ func (tr *tagRelRepo) RemoveTagRelListBreturn}+ func (tr *tagRelRepo) HideTagRelListByObjectID(ctx context.Context, objectID string) (err error) {- spew.Dump("====== HideTagRelListByObjectID")+ objectID = uid.DeShortID(objectID)+ _, err = tr.data.DB.Where("object_id = ?", objectID).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusHide})+ if err != nil {+ err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ }+ return+ }++ func (tr *tagRelRepo) ShowTagRelListByObjectID(ctx context.Context, objectID string) (err error) {- spew.Dump("====== ShowTagRelListByObjectID")+ objectID = uid.DeShortID(objectID)+ _, err = tr.data.DB.Where("object_id = ?", objectID).Cols("status").Update(&entity.TagRel{Status: entity.TagRelStatusAvailable})+ if err != nil {+ err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ }+ return+ }+// RemoveTagRelListByIDs delete tag listfunc (tr *tagRelRepo) RemoveTagRelListByIDs(ctx context.Context, ids []int64) (err error) {- _, err = tr.data.DB.In("id", ids).Update(&entity.TagRel{Status: entity.TagRelStatusDeleted})+ _, err = tr.data.DB.Context(ctx).In("id", ids).Update(&entity.TagRel{Status: entity.TagRelStatusDeleted})if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}@@@ -89,8 -110,8 +107,8 @@@ func (tr *tagRelRepo) EnableTagRelByIDsfunc (tr *tagRelRepo) GetObjectTagRelList(ctx context.Context, objectID string) (tagListList []*entity.TagRel, err error) {objectID = uid.DeShortID(objectID)tagListList = make([]*entity.TagRel, 0)- session := tr.data.DB.Where("object_id = ?", objectID)+ session := tr.data.DB.Context(ctx).Where("object_id = ?", objectID)- session.Where("status = ?", entity.TagRelStatusAvailable)+ session.In("status", []int{entity.TagRelStatusAvailable, entity.TagRelStatusHide})err = session.Find(&tagListList)if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()diff --cc internal/service/report_admin/report_backyard.goindex c3822ebc,cc0479c3..f651e8e3--- a/internal/service/report_admin/report_backyard.go+++ b/internal/service/report_admin/report_backyard.go@@@ -3,8 -3,9 +3,10 @@@ package report_admiimport ("context"+ "github.com/answerdev/answer/internal/base/handler"- "github.com/answerdev/answer/internal/repo/config"- configrepo "github.com/answerdev/answer/internal/service/config"++ configrepo "github.com/answerdev/answer/internal/repo/config"+ "github.com/answerdev/answer/internal/service/config"+ "github.com/answerdev/answer/internal/service/object_info""github.com/answerdev/answer/pkg/htmltext""github.com/segmentfault/pacman/log"@@@ -138,31 -139,102 +138,34 @@@ func (rs *ReportAdminService) HandleRepreturn}-func (rs *ReportAdminService) parseObject(ctx context.Context, resp *[]*schema.GetReportListPageResp) {+func (rs *ReportAdminService) decorateReportResp(ctx context.Context, resp *schema.GetReportListPageResp) {+ lang := handler.GetLangByCtx(ctx)- var (- res = *resp- )+ objectInfo, err := rs.objectInfoService.GetInfo(ctx, resp.ObjectID)+ if err != nil {+ log.Error(err)+ return+ }- for i, r := range res {- var (- objIds map[string]string- exists,- ok bool- err error- questionId,- answerId,- commentId string- question *entity.Question- answer *entity.Answer- cmt *entity.Comment- )-- objIds, err = rs.commonRepo.GetObjectIDMap(r.ObjectID)+ resp.QuestionID = objectInfo.QuestionID+ resp.AnswerID = objectInfo.AnswerID+ resp.CommentID = objectInfo.CommentID+ resp.Title = objectInfo.Title+ resp.Excerpt = htmltext.FetchExcerpt(objectInfo.Content, "...", 240)++ resp.Reason.Translate(configrepo.ID2KeyMapping[resp.ReportType], lang)++ if resp.ReportType > 0 {+ resp.Reason = &schema.ReasonItem{ReasonType: resp.ReportType}+ err = rs.configRepo.GetJsonConfigByIDAndSetToObject(resp.ReportType, resp.Reason)if err != nil {log.Error(err)- continue- }-- questionId, ok = objIds["question"]- if !ok {- continue}-- question, exists, err = rs.questionRepo.GetQuestion(ctx, questionId)- if err != nil || !exists {- continue- }-- answerId, ok = objIds["answer"]- if ok {- answer, _, err = rs.answerRepo.GetAnswer(ctx, answerId)- if err != nil {- log.Error(err)- continue- }- }-- commentId, ok = objIds["comment"]- if ok {- cmt, _, err = rs.commentCommonRepo.GetComment(ctx, commentId)- if err != nil {- log.Error(err)- continue- }- }-- switch r.OType {- case "question":- r.QuestionID = questionId- r.Title = question.Title- r.Excerpt = htmltext.FetchExcerpt(question.ParsedText, "...", 240)-- case "answer":- r.QuestionID = questionId- r.AnswerID = answerId- r.Title = question.Title- r.Excerpt = htmltext.FetchExcerpt(answer.ParsedText, "...", 240)-- case "comment":- r.QuestionID = questionId- r.AnswerID = answerId- r.CommentID = commentId- r.Title = question.Title- r.Excerpt = htmltext.FetchExcerpt(cmt.ParsedText, "...", 240)- }-- // parse reason- if r.ReportType > 0 {- r.Reason = &schema.ReasonItem{- ReasonType: r.ReportType,- }- err = rs.configRepo.GetJsonConfigByIDAndSetToObject(r.ReportType, r.Reason)- if err != nil {- log.Error(err)- }- r.Reason.Translate(config.ID2KeyMapping[r.ReportType], lang)- }- if r.FlaggedType > 0 {- r.FlaggedReason = &schema.ReasonItem{- ReasonType: r.FlaggedType,- }- err = rs.configRepo.GetJsonConfigByIDAndSetToObject(r.FlaggedType, r.FlaggedReason)- if err != nil {- log.Error(err)- }- r.Reason.Translate(config.ID2KeyMapping[r.ReportType], lang)+ }+ if resp.FlaggedType > 0 {+ resp.FlaggedReason = &schema.ReasonItem{ReasonType: resp.FlaggedType}+ err = rs.configRepo.GetJsonConfigByIDAndSetToObject(resp.FlaggedType, resp.FlaggedReason)+ if err != nil {+ log.Error(err)}-- res[i] = r++ resp.Reason.Translate(configrepo.ID2KeyMapping[resp.ReportType], lang)}}