Fix issue (apache#661)

insistedMarin · Dec 17, 2023 · 66f2ef8 · 66f2ef8
1 parent a00f660
commit 66f2ef8
Show file tree

Hide file tree

Showing 19 changed files with 275 additions and 1,361 deletions.
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go
@@ -274,8 +274,7 @@ func (cc *CommentController) GetCommentPersonalWithPage(ctx *gin.Context) {
 		return
 	}
 
-	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-
+	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
 	resp, err := cc.commentService.GetCommentPersonalWithPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }

diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go
@@ -788,8 +788,9 @@ func (qc *QuestionController) GetSimilarQuestions(ctx *gin.Context) {
 // @Router /answer/api/v1/personal/qa/top [get]
 func (qc *QuestionController) UserTop(ctx *gin.Context) {
 	userName := ctx.Query("username")
+	loginUserRole := ctx.Query("login_user_role")
 	userID := middleware.GetLoginUserIDFromContext(ctx)
-	questionList, answerList, err := qc.questionService.SearchUserTopList(ctx, userName, userID)
+	questionList, answerList, err := qc.questionService.SearchUserTopList(ctx, userName, userID, loginUserRole)
 	handler.HandleResponse(ctx, err, gin.H{
 		"question": questionList,
 		"answer":   answerList,
@@ -814,7 +815,6 @@ func (qc *QuestionController) PersonalQuestionPage(ctx *gin.Context) {
 	if handler.BindAndCheck(ctx, req) {
 		return
 	}
-
 	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
 	resp, err := qc.questionService.PersonalQuestionPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
@@ -862,7 +862,6 @@ func (qc *QuestionController) PersonalCollectionPage(ctx *gin.Context) {
 	}
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
-
 	resp, err := qc.questionService.PersonalCollectionPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)
 }

diff --git a/internal/controller/rank_controller.go b/internal/controller/rank_controller.go
@@ -54,7 +54,7 @@ func (cc *RankController) GetRankPersonalWithPage(ctx *gin.Context) {
 		return
 	}
 
-	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	resp, err := cc.rankService.GetRankPersonalPage(ctx, req)
 	handler.HandleResponse(ctx, err, resp)

diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.go
@@ -179,7 +179,7 @@ func (vc *VoteController) UserVotes(ctx *gin.Context) {
 		return
 	}
 
-	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
+	req.LoginUserID = middleware.GetLoginUserIDFromContext(ctx)
 
 	resp, err := vc.VoteService.ListUserVotes(ctx, req)
 	handler.HandleResponse(ctx, err, resp)

diff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.go
@@ -211,6 +211,10 @@ type GetCommentPersonalWithPageReq struct {
 	PageSize int `validate:"omitempty,min=1" form:"page_size"`
 	// username
 	Username string `validate:"omitempty,gt=0,lte=100" form:"username"`
+	// login user role
+	LoginUserRole string `form:"login_user_role"`
+	// login user id
+	LoginUserID string `json:"-"`
 	// user id
 	UserID string `json:"-"`
 }

diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
@@ -464,23 +464,26 @@ type AdminUpdateQuestionStatusReq struct {
 }
 
 type PersonalQuestionPageReq struct {
-	Page        int    `validate:"omitempty,min=1" form:"page"`
-	PageSize    int    `validate:"omitempty,min=1" form:"page_size"`
-	OrderCond   string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
-	Username    string `validate:"omitempty,gt=0,lte=100" form:"username"`
-	LoginUserID string `json:"-"`
+	Page        	int    `validate:"omitempty,min=1" form:"page"`
+	PageSize    	int    `validate:"omitempty,min=1" form:"page_size"`
+	OrderCond   	string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
+	Username    	string `validate:"omitempty,gt=0,lte=100" form:"username"`
+	LoginUserID 	string `json:"-"`
+	LoginUserRole string `form:"login_user_role"`
 }
 
 type PersonalAnswerPageReq struct {
-	Page        int    `validate:"omitempty,min=1" form:"page"`
-	PageSize    int    `validate:"omitempty,min=1" form:"page_size"`
-	OrderCond   string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
-	Username    string `validate:"omitempty,gt=0,lte=100" form:"username"`
-	LoginUserID string `json:"-"`
+	Page        	int    `validate:"omitempty,min=1" form:"page"`
+	PageSize    	int    `validate:"omitempty,min=1" form:"page_size"`
+	OrderCond   	string `validate:"omitempty,oneof=newest active frequent score unanswered" form:"order"`
+	Username    	string `validate:"omitempty,gt=0,lte=100" form:"username"`
+	LoginUserID 	string `json:"-"`
+	LoginUserRole string `form:"login_user_role"`
 }
 
 type PersonalCollectionPageReq struct {
-	Page     int    `validate:"omitempty,min=1" form:"page"`
-	PageSize int    `validate:"omitempty,min=1" form:"page_size"`
-	UserID   string `json:"-"`
+	Page     			int    `validate:"omitempty,min=1" form:"page"`
+	PageSize 			int    `validate:"omitempty,min=1" form:"page_size"`
+	UserID   			string `json:"-"`
+	LoginUserRole string `form:"login_user_role"`
 }
diff --git a/internal/schema/rank_schema.go b/internal/schema/rank_schema.go
@@ -27,6 +27,10 @@ type GetRankPersonalWithPageReq struct {
 	PageSize int `validate:"omitempty,min=1" form:"page_size"`
 	// username
 	Username string `validate:"omitempty,gt=0,lte=100" form:"username"`
+
+	LoginUserRole string `form:"login_user_role"`
+
+	LoginUserID string `json:"-"`
 	// user id
 	UserID string `json:"-"`
 }

diff --git a/internal/schema/vote_schema.go b/internal/schema/vote_schema.go
@@ -72,6 +72,10 @@ type GetVoteWithPageReq struct {
 	Page int `validate:"omitempty,min=1" form:"page"`
 	// page size
 	PageSize int `validate:"omitempty,min=1" form:"page_size"`
+
+	LoginUserRole string `form:"login_user_role"`
+
+	LoginUserID string `json:"-"`
 	// user id
 	UserID string `json:"-"`
 }

diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go
@@ -29,9 +29,12 @@ import (
 	"github.com/apache/incubator-answer/internal/base/reason"
 	"github.com/apache/incubator-answer/internal/entity"
 	"github.com/apache/incubator-answer/internal/schema"
+// 	"github.com/apache/incubator-answer/internal/service"
+	answercommon "github.com/apache/incubator-answer/internal/service/answer_common"
 	"github.com/apache/incubator-answer/internal/service/activity_common"
 	"github.com/apache/incubator-answer/internal/service/activity_queue"
 	"github.com/apache/incubator-answer/internal/service/comment_common"
+	questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
 	"github.com/apache/incubator-answer/internal/service/export"
 	"github.com/apache/incubator-answer/internal/service/notice_queue"
 	"github.com/apache/incubator-answer/internal/service/object_info"
@@ -77,7 +80,9 @@ func (c *CommentQuery) GetOrderBy() string {
 // CommentService user service
 type CommentService struct {
 	commentRepo                      CommentRepo
-	commentCommonRepo                comment_common.CommentCommonRepo
+	commentCommonRepo								 comment_common.CommentCommonRepo
+	questionCommon                   *questioncommon.QuestionCommon
+	answerRepo                       answercommon.AnswerRepo
 	userCommon                       *usercommon.UserCommon
 	voteCommon                       activity_common.VoteRepo
 	objectInfoService                *object_info.ObjService
@@ -92,6 +97,8 @@ type CommentService struct {
 func NewCommentService(
 	commentRepo CommentRepo,
 	commentCommonRepo comment_common.CommentCommonRepo,
+	questionCommon *questioncommon.QuestionCommon,
+	answerRepo answercommon.AnswerRepo,
 	userCommon *usercommon.UserCommon,
 	objectInfoService *object_info.ObjService,
 	voteCommon activity_common.VoteRepo,
@@ -104,6 +111,8 @@ func NewCommentService(
 	return &CommentService{
 		commentRepo:                      commentRepo,
 		commentCommonRepo:                commentCommonRepo,
+		questionCommon: 	                questionCommon,
+		answerRepo:                       answerRepo,
 		userCommon:                       userCommon,
 		voteCommon:                       voteCommon,
 		objectInfoService:                objectInfoService,
@@ -447,17 +456,17 @@ func (cs *CommentService) GetCommentPersonalWithPage(ctx context.Context, req *s
 	if len(req.UserID) == 0 {
 		return nil, errors.BadRequest(reason.UserNotFound)
 	}
-
 	dto := &CommentQuery{
 		PageCond:  pager.PageCond{Page: req.Page, PageSize: req.PageSize},
 		UserID:    req.UserID,
 		QueryCond: "created_at",
 	}
-	commentList, total, err := cs.commentRepo.GetCommentPage(ctx, dto)
+	commentList, _, err := cs.commentRepo.GetCommentPage(ctx, dto)
 	if err != nil {
 		return nil, err
 	}
 	resp := make([]*schema.GetCommentPersonalWithPageResp, 0)
+	dbSearch := entity.AnswerSearch{}
 	for _, comment := range commentList {
 		commentResp := &schema.GetCommentPersonalWithPageResp{
 			CommentID: comment.ID,
@@ -470,6 +479,19 @@ func (cs *CommentService) GetCommentPersonalWithPage(ctx context.Context, req *s
 			if err != nil {
 				log.Error(err)
 			} else {
+				questionInfo, _, _ := cs.questionCommon.GetQuestionRepo().GetQuestion(ctx, objInfo.QuestionID)
+				isParticipant := questionInfo.UserID == req.LoginUserID
+				dbSearch.QuestionID = questionInfo.ID
+				answerOriginalList, _, _ := cs.answerRepo.SearchList(ctx, &dbSearch)
+				for _, answer := range answerOriginalList {
+					if answer.UserID == req.LoginUserID {
+						isParticipant = true
+						break
+					}
+				}
+				if req.LoginUserRole == "1" && questionInfo.Show == 2 && !isParticipant{
+        			continue
+        }
 				commentResp.ObjectType = objInfo.ObjectType
 				commentResp.Title = objInfo.Title
 				commentResp.UrlTitle = htmltext.UrlTitle(objInfo.Title)
@@ -482,7 +504,7 @@ func (cs *CommentService) GetCommentPersonalWithPage(ctx context.Context, req *s
 		}
 		resp = append(resp, commentResp)
 	}
-	return pager.NewPageModel(total, resp), nil
+	return pager.NewPageModel(int64(len(resp)), resp), nil
 }
 
 func (cs *CommentService) notificationQuestionComment(ctx context.Context, questionUserID,

diff --git a/internal/service/mock/siteinfo_repo_mock.go b/internal/service/mock/siteinfo_repo_mock.go
diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go
@@ -170,6 +170,7 @@ func (qs *QuestionCommon) UpdatePostSetTime(ctx context.Context, questionID stri
 func (qs *QuestionCommon) FindInfoByID(ctx context.Context, questionIDs []string, loginUserID string) (map[string]*schema.QuestionInfo, error) {
 	list := make(map[string]*schema.QuestionInfo)
 	questionList, err := qs.questionRepo.FindByID(ctx, questionIDs)
+
 	if err != nil {
 		return list, err
 	}
@@ -651,3 +652,7 @@ func (qs *QuestionCommon) ShowFormatWithTag(ctx context.Context, data *entity.Qu
 	info.Tags = Tags
 	return info
 }
+
+func (qc *QuestionCommon) GetQuestionRepo() QuestionRepo {
+    return qc.questionRepo
+}