Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss into dev

yangfu
README.md
cmd/discuss/api/internal/logic/article/mini_get_article_logic.go
cmd/discuss/api/internal/logic/article/mini_set_user_like_logic.go
cmd/discuss/api/internal/logic/comment/mini_get_article_comment_logic.go
cmd/discuss/api/internal/logic/comment/mini_list_article_comment_logic.go
--- a/README.md
查看文件 @9fe24aa
+++ b/README.md
查看文件 @9fe24aa
@@ -5,7 +5,7 @@
   服务端域名 http://sumifcc-discuss-test.sumifcc.com/  
   日志地址 https://sumifcc-discuss-test.sumifcc.com/v1/log/access  
   管理后台“易数家“前端入口：https://digital-front-platform-dev.fjmaimaimai.com/  
-  跳转后的实际管理后台地址：  
+  跳转后的实际管理后台地址： https://sumifcc-x-front-test.sumifcc.com
 ### 可设置环境变量
 - DataSource  
--- a/cmd/discuss/api/internal/logic/article/mini_get_article_logic.go
查看文件 @9fe24aa
+++ b/cmd/discuss/api/internal/logic/article/mini_get_article_logic.go
查看文件 @9fe24aa
@@ -30,7 +30,10 @@ func NewMiniGetArticleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Mi
 func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (resp *types.MiniArticleGetResponse, err error) {
 	// 获取文章内容
 	var conn = l.svcCtx.DefaultDBConn()
-
+	companyInfo, err := l.svcCtx.CompanyRepository.FindOne(l.ctx, conn, req.CompanyId)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("读取公司数据失败", err)
+	}
 	articleInfo, err := l.svcCtx.ArticleRepository.FindOne(l.ctx, conn, req.Id)
 	if err != nil {
 		return nil, xerr.NewErrMsgErr("读取文章内容失败", err)
@@ -66,6 +69,7 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 		}
 		return resp, nil
 	}
+
 	queryOption := domain.NewQueryOptions().
 		WithFindOnly().
 		MustWithKV("articleId", articleInfo.Id)
@@ -74,6 +78,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 	if err != nil {
 		return nil, xerr.NewErrMsgErr("读取文章内容失败", err)
 	}
+
+	//获取作者信息
+	author, _ := l.svcCtx.UserRepository.FindOne(l.ctx, conn, int64(req.UserId))
+
 	var meLoveFlag int
 	if req.UserId > 0 {
 		// 获取我对文章的点赞标识
@@ -120,10 +128,10 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 		AuthorId: articleInfo.AuthorId,
 		Author: types.ArticleAuthor{
 			Id:       articleInfo.Author.Id,
-			Name:     articleInfo.Author.Name,
-			Avatar:   articleInfo.Author.Avatar,
-			Position: articleInfo.Author.Position,
-			Company:  articleInfo.Author.Company,
+			Name:     "",
+			Avatar:   "",
+			Position: "",
+			Company:  companyInfo.Name,
 		},
 		CreatedAt: articleInfo.CreatedAt,
 		Section:   articleSection,
@@ -148,7 +156,15 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 	if len(backupList) > 0 {
 		resp.Edit = 1
 	}
-
+	if author != nil {
+		resp.Author = types.ArticleAuthor{
+			Id:       articleInfo.Author.Id,
+			Name:     author.Name,
+			Avatar:   author.Avatar,
+			Position: author.Position,
+			Company:  companyInfo.Name,
+		}
+	}
 	for k, v := range articleInfo.MatchUrl {
 		resp.MatchUrl[k] = v
 	}
@@ -158,5 +174,9 @@ func (l *MiniGetArticleLogic) MiniGetArticle(req *types.MiniArticleGetRequest) (
 	if follow != nil {
 		resp.MeFollowFlag = 1
 	}
+	if resp.AuthorId == int64(req.UserId) {
+		// 作者本人在查看
+		resp.MeFollowFlag = 1
+	}
 	return
 }
--- a/cmd/discuss/api/internal/logic/article/mini_set_user_like_logic.go
查看文件 @9fe24aa
+++ b/cmd/discuss/api/internal/logic/article/mini_set_user_like_logic.go
查看文件 @9fe24aa
@@ -113,7 +113,7 @@ func (l *MiniSetUserLikeLogic) cancelSetUserLikeArticle(req *types.MiniSetUserLi
 		return nil, xerr.NewErrMsgErr("取消点赞标识失败", err)
 	}
 	articleInfo, err = l.svcCtx.ArticleRepository.FindOne(l.ctx, conn, req.ArticleId)
-	if err == nil {
+	if err != nil {
 		return nil, xerr.NewErrMsgErr("获取点赞数量失败", err)
 	}
 	resp = &types.MiniSetUserLikeResponse{
--- a/cmd/discuss/api/internal/logic/comment/mini_get_article_comment_logic.go
查看文件 @9fe24aa
+++ b/cmd/discuss/api/internal/logic/comment/mini_get_article_comment_logic.go
查看文件 @9fe24aa
@@ -5,6 +5,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
@@ -15,6 +16,7 @@ type MiniGetArticleCommentLogic struct {
 	logx.Logger
 	ctx       context.Context
 	svcCtx    *svc.ServiceContext
+	userCache map[int64]types.CommentAuthor
 }
 func NewMiniGetArticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniGetArticleCommentLogic {
@@ -22,12 +24,17 @@ func NewMiniGetArticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceConte
 		Logger:    logx.WithContext(ctx),
 		ctx:       ctx,
 		svcCtx:    svcCtx,
+		userCache: make(map[int64]types.CommentAuthor),
 	}
 }
 // 获取单条评论详情
 func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArticleCommentRequest) (resp *types.MiniGetArticleCommentResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
+	companyInfo, err := l.svcCtx.CompanyRepository.FindOne(l.ctx, conn, req.CompanyId)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("读取公司数据失败", err)
+	}
 	//获取主评论
 	commentInfo, err := l.svcCtx.ArticleCommentRepository.FindOne(l.ctx, conn, req.CommentId)
 	if err != nil {
@@ -38,10 +45,14 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 	}
 	if commentInfo.Show == domain.CommentShowDisable {
-		return nil, xerr.NewErrMsg("没有查看权限")
+		return nil, xerr.NewErrMsg("具体评论已被关闭")
 	}
-	queryOption := domain.NewQueryOptions().WithFindOnly().MustWithKV("topId", commentInfo.Id).MustWithKV("show", domain.CommentShowEnable)
-	//获取回复的评论
+
+	queryOption := domain.NewQueryOptions().
+		WithFindOnly().
+		MustWithKV("topId", commentInfo.Id).
+		MustWithKV("show", domain.CommentShowEnable)
+	// 获取回复的评论
 	_, replyCommenList, err := l.svcCtx.ArticleCommentRepository.Find(l.ctx, conn, queryOption)
 	if err != nil {
@@ -60,7 +71,6 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 	for _, val := range userFlagList {
 		flagMap[val.CommentId] = struct{}{}
 	}
-
 	//混合数据
 	commentResp := types.ArticleCommentItem{
 		Id:             commentInfo.Id,
@@ -69,21 +79,9 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 		ArtitcleId:     commentInfo.ArticleId,
 		SectionId:      commentInfo.ArticleId,
 		FromUserId:     commentInfo.FromUserId,
-		FromUser: types.CommentAuthor{
-			Id:       commentInfo.FromUser.Id,
-			Name:     commentInfo.FromUser.Name,
-			Avatar:   commentInfo.FromUser.Avatar,
-			Position: commentInfo.FromUser.Position,
-			Company:  commentInfo.FromUser.Company,
-		},
+		FromUser:       l.getCommentAuthor(conn, commentInfo.FromUserId, companyInfo.Name),
 		ToUserId:       commentInfo.ToUserId,
-		ToUser: types.CommentAuthor{
-			Id:       commentInfo.ToUser.Id,
-			Name:     commentInfo.ToUser.Name,
-			Avatar:   commentInfo.ToUser.Avatar,
-			Position: commentInfo.ToUser.Position,
-			Company:  commentInfo.ToUser.Company,
-		},
+		ToUser:         l.getCommentAuthor(conn, commentInfo.ToUserId, companyInfo.Name),
 		SectionContent: commentInfo.SectionContent,
 		CountReply:     commentInfo.CountReply,
 		CountUserLove:  commentInfo.CountUserLove,
@@ -116,22 +114,10 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 			ArtitcleId:     val.ArticleId,
 			SectionId:      val.SectionId,
 			FromUserId:     val.FromUserId,
-			FromUser: types.CommentAuthor{
-				Id:       val.FromUser.Id,
-				Name:     val.FromUser.Name,
-				Avatar:   val.FromUser.Avatar,
-				Position: val.FromUser.Position,
-				Company:  val.FromUser.Company,
-			},
+			FromUser:       l.getCommentAuthor(conn, val.FromUserId, companyInfo.Name),
 			ToUserId:       val.ToUserId,
-			ToUser: types.CommentAuthor{
-				Id:       val.ToUser.Id,
-				Name:     val.ToUser.Name,
-				Avatar:   val.ToUser.Avatar,
-				Position: val.ToUser.Position,
-				Company:  val.ToUser.Company,
-			},
-			SectionContent: val.SectionContent,
+			ToUser:         l.getCommentAuthor(conn, val.ToUserId, companyInfo.Name),
+			SectionContent: "",
 			CountReply:     val.CountReply,
 			CountUserLove:  val.CountUserLove,
 			CountAdminLove: val.CountAdminLove,
@@ -139,7 +125,9 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 			MatchUrl:       map[string]string{},
 			CreatedAt:      val.CreatedAt,
 			MeLoveFlag:     0,
+			Content:        val.Content,
 		}
+
 		if _, ok := flagMap[val.Id]; ok {
 			reply.MeLoveFlag = 1
 		}
@@ -163,3 +151,22 @@ func (l *MiniGetArticleCommentLogic) MiniGetArticleComment(req *types.MiniGetArt
 	}
 	return
 }
+
+func (l *MiniGetArticleCommentLogic) getCommentAuthor(conn transaction.Conn, userid int64, companyName string) types.CommentAuthor {
+	if u, ok := l.userCache[userid]; ok {
+		return u
+	}
+	toUser, err := l.svcCtx.UserRepository.FindOne(l.ctx, conn, userid)
+	if err == nil {
+		commentToUser := types.CommentAuthor{
+			Id:       toUser.Id,
+			Name:     toUser.Name,
+			Avatar:   toUser.Avatar,
+			Position: toUser.Position,
+			Company:  companyName,
+		}
+		l.userCache[toUser.Id] = commentToUser
+		return commentToUser
+	}
+	return types.CommentAuthor{}
+}
--- a/cmd/discuss/api/internal/logic/comment/mini_list_article_comment_logic.go
查看文件 @9fe24aa
+++ b/cmd/discuss/api/internal/logic/comment/mini_list_article_comment_logic.go
查看文件 @9fe24aa
@@ -5,6 +5,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
@@ -15,6 +16,7 @@ type MiniListArticleCommentLogic struct {
 	logx.Logger
 	ctx       context.Context
 	svcCtx    *svc.ServiceContext
+	userCache map[int64]types.CommentAuthor
 }
 func NewMiniListArticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniListArticleCommentLogic {
@@ -22,6 +24,7 @@ func NewMiniListArticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceCont
 		Logger:    logx.WithContext(ctx),
 		ctx:       ctx,
 		svcCtx:    svcCtx,
+		userCache: make(map[int64]types.CommentAuthor),
 	}
 }
@@ -29,6 +32,10 @@ func NewMiniListArticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceCont
 func (l *MiniListArticleCommentLogic) MiniListArticleComment(req *types.MiniListArticleCommentRequest) (resp *types.MiniListArticleCommentResponse, err error) {
 	// 先获取最顶层的评论
 	var conn = l.svcCtx.DefaultDBConn()
+	companyInfo, err := l.svcCtx.CompanyRepository.FindOne(l.ctx, conn, req.CompanyId)
+	if err != nil {
+		return nil, xerr.NewErrMsgErr("获取评论信息失败", err)
+	}
 	if req.Size > 40 {
 		req.Size = 40
 	}
@@ -54,7 +61,6 @@ func (l *MiniListArticleCommentLogic) MiniListArticleComment(req *types.MiniList
 		}
 		return
 	}
-
 	queryOption = domain.NewQueryOptions().WithFindOnly().
 		MustWithKV("articleId", req.ArticleId).
 		MustWithKV("userId", req.UserId)
@@ -82,21 +88,9 @@ func (l *MiniListArticleCommentLogic) MiniListArticleComment(req *types.MiniList
 				ArtitcleId:     val.ArticleId,
 				SectionId:      val.SectionId,
 				FromUserId:     val.FromUserId,
-				FromUser: types.CommentAuthor{
-					Id:       val.FromUser.Id,
-					Name:     val.FromUser.Name,
-					Avatar:   val.FromUser.Avatar,
-					Position: val.FromUser.Position,
-					Company:  val.FromUser.Company,
-				},
+				FromUser:       l.getCommentAuthor(conn, val.FromUserId, companyInfo.Name),
 				ToUserId:       val.ToUserId,
-				ToUser: types.CommentAuthor{
-					Id:       val.ToUser.Id,
-					Name:     val.ToUser.Name,
-					Avatar:   val.ToUser.Avatar,
-					Position: val.ToUser.Position,
-					Company:  val.ToUser.Company,
-				},
+				ToUser:         l.getCommentAuthor(conn, val.ToUserId, companyInfo.Name),
 				SectionContent: val.SectionContent,
 				CountReply:     val.CountReply,
 				CountUserLove:  val.CountUserLove,
@@ -126,7 +120,6 @@ func (l *MiniListArticleCommentLogic) MiniListArticleComment(req *types.MiniList
 		//获取回复的评论
 		cntReply, reply := l.listCommentReply(item.Comment.Id, flagMap)
-
 		resp.List[i] = item
 		resp.List[i].Reply = reply
 		resp.List[i].TotalReply = cntReply
@@ -137,6 +130,10 @@ func (l *MiniListArticleCommentLogic) MiniListArticleComment(req *types.MiniList
 // listCommentReply
 func (l *MiniListArticleCommentLogic) listCommentReply(commentId int64, loveFlagMap map[int64]struct{}) (cnt int64, replyList []types.ArticleCommentItem) {
 	var conn = l.svcCtx.DefaultDBConn()
+	companyInfo, err := l.svcCtx.CompanyRepository.FindOne(l.ctx, conn, commentId)
+	if err != nil {
+		return 0, []types.ArticleCommentItem{}
+	}
 	queryOption := domain.NewQueryOptions().
 		WithOffsetLimit(1, 2).
 		MustWithKV("topId", commentId).
@@ -159,22 +156,10 @@ func (l *MiniListArticleCommentLogic) listCommentReply(commentId int64, loveFlag
 			ArtitcleId:     val.ArticleId,
 			SectionId:      val.SectionId,
 			FromUserId:     val.FromUserId,
-			FromUser: types.CommentAuthor{
-				Id:       val.FromUser.Id,
-				Name:     val.FromUser.Name,
-				Avatar:   val.FromUser.Avatar,
-				Position: val.FromUser.Position,
-				Company:  val.FromUser.Company,
-			},
+			FromUser:       l.getCommentAuthor(conn, val.FromUserId, companyInfo.Name),
 			ToUserId:       val.ToUserId,
-			ToUser: types.CommentAuthor{
-				Id:       val.ToUser.Id,
-				Name:     val.ToUser.Name,
-				Avatar:   val.ToUser.Avatar,
-				Position: val.ToUser.Position,
-				Company:  val.ToUser.Company,
-			},
-			SectionContent: val.SectionContent,
+			ToUser:         l.getCommentAuthor(conn, val.ToUserId, companyInfo.Name),
+			SectionContent: "", //不设置值
 			CountReply:     val.CountReply,
 			CountUserLove:  val.CountUserLove,
 			CountAdminLove: val.CountAdminLove,
@@ -184,7 +169,6 @@ func (l *MiniListArticleCommentLogic) listCommentReply(commentId int64, loveFlag
 			MeLoveFlag:     0,
 			Content:        val.Content,
 		}
-
 		if _, ok := loveFlagMap[val.Id]; ok {
 			item.MeLoveFlag = 1
 		}
@@ -201,3 +185,22 @@ func (l *MiniListArticleCommentLogic) listCommentReply(commentId int64, loveFlag
 	}
 	return cnt, replyList
 }
+
+func (l *MiniListArticleCommentLogic) getCommentAuthor(conn transaction.Conn, userid int64, companyName string) types.CommentAuthor {
+	if u, ok := l.userCache[userid]; ok {
+		return u
+	}
+	toUser, err := l.svcCtx.UserRepository.FindOne(l.ctx, conn, userid)
+	if err == nil {
+		commentToUser := types.CommentAuthor{
+			Id:       toUser.Id,
+			Name:     toUser.Name,
+			Avatar:   toUser.Avatar,
+			Position: toUser.Position,
+			Company:  companyName,
+		}
+		l.userCache[toUser.Id] = commentToUser
+		return commentToUser
+	}
+	return types.CommentAuthor{}
+}