feat: 获取提案详情 (#54)

Author: Caspiiwww

api/handler/proposal.go

@@ -67,8 +67,22 @@ func ListProposals(c *gin.Context) {
 
 // GetProposal 获取提案详情
 // @router /api/proposal/:id [GET]
+// @Summary 获取提案详情
+// @Description 根据提案ID查询提案完整信息
+// @Tags proposal
+// @Produce json
+// @Param id path string true "提案ID"
+// @Success 200 {object} dto.GetProposalDetailResp
 func GetProposal(c *gin.Context) {
-	// TODO: not implemented
+	var req dto.GetProposalReq
+	var resp *dto.GetProposalResp
+	var err error
+
+	req.TargetID = c.Param(consts.CtxProposalID)
+	c.Set(consts.CtxUserID, token.GetUserID(c))
+
+	resp, err = provider.Get().ProposalService.GetProposal(c, &req)
+	PostProcess(c, &req, resp, err)
 }
 
 // ApproveProposal 审批提案

application/dto/proposal.go

@@ -31,13 +31,13 @@ type CreateProposalResp struct {
 }
 
 type ProposalVO struct {
-	ID      string `json:"id"`
-	UserID  string `json:"userId"`
-	Title   string `json:"title"`
-	Content string `json:"content"`
-	Status  string `json:"status"` // pending / approved / rejected
-	Deleted bool   `json:"deleted"`
-	Course *CourseVO `json:"course"`
+	ID        string    `json:"id"`
+	UserID    string    `json:"userId"`
+	Title     string    `json:"title"`
+	Content   string    `json:"content"`
+	Status    string    `json:"status"` // pending / approved / rejected
+	Deleted   bool      `json:"deleted"`
+	Course    *CourseVO `json:"course"`
 	CreatedAt time.Time `json:"createdAt"`
 	UpdatedAt time.Time `json:"updatedAt"`
 }
@@ -51,6 +51,10 @@ type ToggleProposalReq struct {
 	TargetID string `json:"targetId"`
 }
 
+type GetProposalReq struct {
+	TargetID string `json:"proposalId"`
+}
+
 // ListProposalResp 对应 /api/proposal/list 的响应体
 type ListProposalResp struct {
 	*Resp
@@ -63,3 +67,8 @@ type ToggleProposalResp struct {
 	ProposalCnt int64 `json:"proposalCnt"`
 	*Resp
 }
+
+type GetProposalResp struct {
+	*Resp
+	Proposal *ProposalVO `json:"proposal"`
+}

application/service/proposal.go

@@ -39,6 +39,7 @@ type IProposalService interface {
 	CreateProposal(ctx context.Context, req *dto.CreateProposalReq) (*dto.CreateProposalResp, error)
 	ToggleProposal(ctx context.Context, req *dto.ToggleProposalReq) (resp *dto.ToggleProposalResp, err error)
 	ListProposals(ctx context.Context, req *dto.ListProposalReq) (*dto.ListProposalResp, error)
+	GetProposal(ctx context.Context, req *dto.GetProposalReq) (resp *dto.GetProposalResp, err error)
 }
 
 type ProposalService struct {
@@ -167,7 +168,7 @@ func (s *ProposalService) ToggleProposal(ctx context.Context, req *dto.TogglePro
 	}
 
 	// 获取新的总投票数
-	proposalCount, err := s.ProposalRepo.CountProposalByTarget(ctx, req.TargetID, consts.ProposalType)
+	proposalCount, err := s.ProposalRepo.CountByTarget(ctx, req.TargetID, consts.ProposalType)
 	if err != nil {
 		logs.CtxWarnf(ctx, "[ProposalRepo] [CountByTarget] error: %v", err)
 		return nil, errorx.WrapByCode(err, errno.ErrProposalCountFailed,
@@ -211,3 +212,36 @@ func (s *ProposalService) ListProposals(ctx context.Context, req *dto.ListPropos
 		Proposals: vos,
 	}, nil
 }
+
+// GetProposalDetail 获取提案详情
+func (s *ProposalService) GetProposal(ctx context.Context, req *dto.GetProposalReq) (resp *dto.GetProposalResp, err error) {
+	// 鉴权
+	userId, ok := ctx.Value(consts.CtxUserID).(string)
+	if !ok || userId == "" {
+		return nil, errorx.New(errno.ErrUserNotLogin)
+	}
+
+	// 查询提案详情
+	proposalId := req.ProposalID
+	proposal, err := s.ProposalRepo.FindByID(ctx, proposalId)
+	if err != nil {
+		logs.CtxErrorf(ctx, "[ProposalRepo] [FindProposalByID] error: %v, proposalId: %s", err, proposalId)
+		return nil, errorx.WrapByCode(err, errno.ErrProposalFindFailed, errorx.KV("proposalId", proposalId))
+	}
+	if proposal == nil {
+		return nil, errorx.WrapByCode(err, errno.ErrProposalFindFailed, errorx.KV("proposalId", proposalId))
+	}
+
+	// 转换为VO
+	vo, err := s.ProposalAssembler.ToProposalVO(ctx, proposal)
+	if err != nil {
+		logs.CtxErrorf(ctx, "[ProposalAssembler] [ToProposalVO] error: %v, proposalId: %s", err, proposalId)
+		return nil, errorx.WrapByCode(err, errno.ErrProposalCvtFailed, errorx.KV("proposalId", proposalId))
+	}
+
+	// 构造响应
+	return &dto.GetProposalResp{
+		Resp:     dto.Success(),
+		Proposal: vo,
+	}, nil
+}

infra/repo/proposal.go

@@ -43,7 +43,8 @@ type IProposalRepo interface {
 	FindMany(ctx context.Context, param *dto.PageParam) ([]*model.Proposal, int64, error)
 	Toggle(ctx context.Context, userId, targetId string, targetType int32) (bool, error)
 	IsProposal(ctx context.Context, userId, targetId string, targetType int32) (bool, error)
-	CountProposalByTarget(ctx context.Context, targetId string, targetType int32) (int64, error)
+	CountByTarget(ctx context.Context, targetId string, targetType int32) (int64, error)
+	FindByID(ctx context.Context, proposalID string) (*model.Proposal, error) // 修改方法名
 }
 
 type ProposalRepo struct {
@@ -150,9 +151,28 @@ func (r *ProposalRepo) IsProposal(ctx context.Context, userId, targetId string,
 }
 
 // CountProposalByTarget 获得目标的总投票数
-func (r *ProposalRepo) CountProposalByTarget(ctx context.Context, targetId string, targetType int32) (int64, error) {
+func (r *ProposalRepo) CountByTarget(ctx context.Context, targetId string, targetType int32) (int64, error) {
 	return r.conn.CountDocuments(ctx, bson.M{
 		consts.TargetID: targetId,
 		consts.Active:   bson.M{"$ne": false},
 	})
 }
+
+// FindProposalByID 根据提案ID查询单个未删除的提案
+func (r *ProposalRepo) FindByID(ctx context.Context, proposalID string) (*model.Proposal, error) {
+	var proposal model.Proposal
+
+	filter := bson.M{
+		consts.ID:      proposalID,
+		consts.Deleted: bson.M{"$ne": true},
+	}
+
+	err := r.conn.FindOneNoCache(ctx, &proposal, filter, nil)
+	if err != nil {
+		if err == monc.ErrNotFound {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return &proposal, nil
+}