feat: 完成新增提案功能 (#53)

* feat: 完成新增提案功能

* fix: 复用已有的 Assembler 函数

Author: junru-1

api/handler/proposal.go

@@ -25,7 +25,18 @@ import (
 // CreateProposal 新建一个提案
 // @router /api/proposal/add [POST]
 func CreateProposal(c *gin.Context) {
-	// TODO: not implemented
+	var req dto.CreateProposalReq
+	var resp *dto.CreateProposalResp
+	var err error
+
+	if err = c.ShouldBindJSON(&req); err != nil {
+		PostProcess(c, &req, nil, err)
+		return
+	}
+	c.Set(consts.CtxUserID, token.GetUserID(c))
+
+	resp, err = provider.Get().ProposalService.CreateProposal(c, &req)
+	PostProcess(c, req, resp, err)
 }
 
 // ListProposals godoc
@@ -52,7 +63,6 @@ func ListProposals(c *gin.Context) {
 
 	resp, err = provider.Get().ProposalService.ListProposals(c, &req)
 	PostProcess(c, &req, resp, err)
-
 }
 
 // GetProposal 获取提案详情

application/dto/proposal.go

@@ -16,12 +16,28 @@ package dto
 
 import "time"
 
+// CreateProposalReq 新增投票请求参数
+type CreateProposalReq struct {
+	Title   string    `json:"title" binding:"required"`
+	Content string    `json:"content" binding:"required"`
+	Status  string    `json:"status" binding:"required"`
+	Course  *CourseVO `json:"course" binding:"required"`
+}
+
+// CreateProposalResp 新增投票响应
+type CreateProposalResp struct {
+	*Resp
+	ProposalID string `json:"proposalId"` // 提案ID
+}
+
 type ProposalVO struct {
-	ID        string    `json:"id"`
-	UserID    string    `json:"userId"`
-	Title     string    `json:"title"`
-	Content   string    `json:"content"`
-	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"`
 }

application/service/proposal.go

@@ -16,27 +16,34 @@ package service
 
 import (
 	"context"
+	"time"
 
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/application/assembler"
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/application/dto"
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/infra/cache"
+	"github.com/Boyuan-IT-Club/Meowpick-Backend/infra/model"
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/infra/repo"
+	"github.com/Boyuan-IT-Club/Meowpick-Backend/infra/util/mapping"
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/types/consts"
 	"github.com/Boyuan-IT-Club/Meowpick-Backend/types/errno"
 
 	"github.com/Boyuan-IT-Club/go-kit/errorx"
 	"github.com/Boyuan-IT-Club/go-kit/logs"
 	"github.com/google/wire"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 var _ IProposalService = (*ProposalService)(nil)
 
 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)
 }
 
 type ProposalService struct {
+	CourseRepo        *repo.CourseRepo
+	CourseAssembler   *assembler.CourseAssembler
 	ProposalRepo      *repo.ProposalRepo
 	ProposalCache     *cache.ProposalCache
 	ProposalAssembler *assembler.ProposalAssembler
@@ -47,6 +54,96 @@ var ProposalServiceSet = wire.NewSet(
 	wire.Bind(new(IProposalService), new(*ProposalService)),
 )
 
+// CreateProposal 添加一个新的课程提案
+func (s *ProposalService) CreateProposal(ctx context.Context, req *dto.CreateProposalReq) (*dto.CreateProposalResp, error) {
+	// 鉴权
+	userId, ok := ctx.Value(consts.CtxUserID).(string)
+	if !ok || userId == "" {
+		return nil, errorx.New(errno.ErrUserNotLogin)
+	}
+
+	// 转换为 courseModel
+	courseDB, err := s.CourseAssembler.ToCourseDB(ctx, req.Course)
+	if err != nil {
+		return nil, errorx.WrapByCode(err, errno.ErrCourseCvtFailed,
+			errorx.KV("src", "database course"), errorx.KV("dst", "course vo"),
+		)
+	}
+
+	// 检查是否已经存在相同的提案（前端传回的和我已有的ProposalCourse）
+	existingProposal, err := s.ProposalRepo.IsCourseInExistingProposals(ctx, courseDB)
+	if err != nil {
+		return nil, errorx.WrapByCode(err, errno.ErrProposalCourseFindInProposalsFailed,
+			errorx.KV("key", consts.ReqCourse),
+			errorx.KV("value", req.Course.Name),
+		)
+	}
+
+	// 检查是否已经存在相同的课程（前端传回的的和我已有的course）
+	existingCourse, err := s.CourseRepo.IsCourseInExistingCourses(ctx, courseDB)
+	if err != nil {
+		return nil, errorx.WrapByCode(err, errno.ErrProposalCourseFindInCoursesFailed,
+			errorx.KV("key", consts.ReqCourse),
+			errorx.KV("value", req.Course.Name),
+		)
+	}
+
+	if existingProposal == true {
+		return nil, errorx.New(errno.ErrProposalCourseFoundInProposals,
+			errorx.KV("key", consts.ReqCourse),
+			errorx.KV("value", req.Course.Name),
+		)
+	}
+	if existingCourse == true {
+		return nil, errorx.New(errno.ErrProposalCourseFoundInCourses,
+			errorx.KV("key", consts.ReqCourse),
+			errorx.KV("value", req.Course.Name),
+		)
+	}
+	campuses := []int32{}
+	for _, campus := range req.Course.Campuses {
+		campuses = append(campuses, mapping.Data.GetCampusIDByName(campus))
+	}
+
+	// 构造课程信息
+	course := model.Course{
+		Name:       req.Course.Name,
+		Code:       req.Course.Code,
+		TeacherIDs: make([]string, 0),
+		Department: mapping.Data.GetDepartmentIDByName(req.Course.Department),
+		Category:   mapping.Data.GetCategoryIDByName(req.Course.Category),
+		Campuses:   campuses,
+		CreatedAt:  time.Now(),
+		UpdatedAt:  time.Now(),
+	}
+
+	// 创建提案对象
+	status := mapping.Data.GetProposalStatusIDByName(req.Status)
+	proposal := &model.Proposal{
+		ID:        primitive.NewObjectID().Hex(),
+		UserID:    userId,
+		Title:     req.Title,
+		Content:   req.Content,
+		Deleted:   false,
+		Course:    &course,
+		Status:    status,
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+	}
+
+	// 保存提案到数据库
+	if err = s.ProposalRepo.Insert(ctx, proposal); err != nil {
+		return nil, errorx.WrapByCode(err, errno.ErrProposalCreateFailed,
+			errorx.KV(consts.ReqTitle, req.Title),
+			errorx.KV(consts.CtxUserID, userId))
+	}
+
+	return &dto.CreateProposalResp{
+		Resp:       dto.Success(),
+		ProposalID: proposal.ID,
+	}, nil
+}
+
 // ToggleProposal 切换投票状态
 func (s *ProposalService) ToggleProposal(ctx context.Context, req *dto.ToggleProposalReq) (resp *dto.ToggleProposalResp, err error) {
 

infra/repo/course.go

@@ -46,6 +46,8 @@ type ICourseRepo interface {
 	GetCategoriesByName(ctx context.Context, name string) ([]int32, error)
 	GetCampusesByName(ctx context.Context, name string) ([]int32, error)
 	GetSuggestionsByName(ctx context.Context, name string, param *dto.PageParam) ([]*model.Course, error)
+
+	IsCourseInExistingCourses(ctx context.Context, vo *model.Course) (bool, error)
 }
 
 type CourseRepo struct {
@@ -211,3 +213,24 @@ func (r *CourseRepo) GetSuggestionsByName(ctx context.Context, name string, para
 	}
 	return courses, nil
 }
+
+// IsCourseInExistingCourses 检查课程是否已经存在于现有课程中
+// 比较的字段包括: Name, Code, Department, Category, Campuses, TeacherIDs
+func (r *CourseRepo) IsCourseInExistingCourses(ctx context.Context, vo *model.Course) (bool, error) {
+	filter := bson.M{
+		consts.Name:       vo.Name,
+		consts.Code:       vo.Code,
+		consts.Department: vo.Department,
+		consts.Categories: vo.Category,
+		consts.Campuses:   vo.Campuses,
+		consts.TeacherIDs: vo.TeacherIDs,
+		consts.Deleted:    false, // 只检查未删除的提案
+	}
+
+	count, err := r.conn.CountDocuments(ctx, filter)
+	if err != nil {
+		return false, err
+	}
+
+	return count > 0, nil
+}

infra/repo/proposal.go

@@ -38,6 +38,8 @@ const (
 )
 
 type IProposalRepo interface {
+	Insert(ctx context.Context, proposal *model.Proposal) error
+	IsCourseInExistingProposals(ctx context.Context, courseVO *model.Course) (bool, error)
 	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)
@@ -54,6 +56,34 @@ func NewProposalRepo(cfg *config.Config) *ProposalRepo {
 	return &ProposalRepo{conn: conn}
 }
 
+// Insert 插入一个新的提案
+func (r *ProposalRepo) Insert(ctx context.Context, proposal *model.Proposal) error {
+	_, err := r.conn.InsertOneNoCache(ctx, proposal)
+	return err
+}
+
+// IsCourseInExistingProposals 检查课程是否已经存在于现有提案中
+// 比较的字段包括: Name, Code, Department, Category, Campuses, TeacherIDs
+func (r *ProposalRepo) IsCourseInExistingProposals(ctx context.Context, courseDB *model.Course) (bool, error) {
+	filter := bson.M{
+		consts.Name:       courseDB.Name,
+		consts.Code:       courseDB.Code,
+		consts.Department: courseDB.Department,
+		consts.Categories: courseDB.Category,
+		consts.Campuses:   courseDB.Campuses,
+		consts.TeacherIDs: courseDB.TeacherIDs,
+		consts.Deleted:    false, // 只检查未删除的提案
+	}
+
+	// 查询提案中是否已存在该课程
+	count, err := r.conn.CountDocuments(ctx, filter)
+	if err != nil {
+		return false, err
+	}
+
+	return count > 0, nil
+}
+
 // FindMany 分页查询所有未删除的提案
 func (r *ProposalRepo) FindMany(ctx context.Context, param *dto.PageParam) ([]*model.Proposal, int64, error) {
 	proposals := []*model.Proposal{}

infra/util/mapping/mapping.go

@@ -24,21 +24,25 @@ import (
 
 // StaticData 存放所有静态映射数据
 type StaticData struct {
-	CampusNameByID     map[int32]string
-	DepartmentNameByID map[int32]string
-	CategoryNameByID   map[int32]string
-	CampusIDByName     map[string]int32
-	DepartmentIDByName map[string]int32
-	CategoryIDByName   map[string]int32
+	CampusNameByID         map[int32]string
+	DepartmentNameByID     map[int32]string
+	CategoryNameByID       map[int32]string
+	ProposalStatusNameByID map[int32]string
+	CampusIDByName         map[string]int32
+	DepartmentIDByName     map[string]int32
+	CategoryIDByName       map[string]int32
+	ProposalStatusIDByName map[string]int32
 }
 
 var Data = &StaticData{
-	CampusNameByID:     make(map[int32]string),
-	DepartmentNameByID: make(map[int32]string),
-	CategoryNameByID:   make(map[int32]string),
-	CampusIDByName:     make(map[string]int32),
-	DepartmentIDByName: make(map[string]int32),
-	CategoryIDByName:   make(map[string]int32),
+	CampusNameByID:         make(map[int32]string),
+	DepartmentNameByID:     make(map[int32]string),
+	CategoryNameByID:       make(map[int32]string),
+	ProposalStatusNameByID: make(map[int32]string),
+	CampusIDByName:         make(map[string]int32),
+	DepartmentIDByName:     make(map[string]int32),
+	CategoryIDByName:       make(map[string]int32),
+	ProposalStatusIDByName: make(map[string]int32),
 }
 
 func init() {
@@ -51,6 +55,9 @@ func init() {
 	for k, v := range mapping.CategoriesMap {
 		Data.CategoryNameByID[k] = v
 	}
+	for k, v := range mapping.ProposalStatusMap {
+		Data.ProposalStatusNameByID[k] = v
+	}
 
 	for id, name := range Data.CampusNameByID {
 		Data.CampusIDByName[name] = id
@@ -61,6 +68,9 @@ func init() {
 	for id, name := range Data.CategoryNameByID {
 		Data.CategoryIDByName[name] = id
 	}
+	for id, name := range Data.ProposalStatusNameByID {
+		Data.ProposalStatusIDByName[name] = id
+	}
 }
 
 func (d *StaticData) GetCampusNameByID(id int32) string {
@@ -84,6 +94,13 @@ func (d *StaticData) GetCategoryNameByID(id int32) string {
 	return "未知分类"
 }
 
+func (d *StaticData) GetProposalStatusNameByID(id int32) string {
+	if name, ok := d.ProposalStatusNameByID[id]; ok {
+		return name
+	}
+	return "未知状态"
+}
+
 func (d *StaticData) GetCampusIDByName(name string) int32 {
 	if id, ok := d.CampusIDByName[name]; ok {
 		return id
@@ -105,6 +122,13 @@ func (d *StaticData) GetCategoryIDByName(name string) int32 {
 	return 0
 }
 
+func (d *StaticData) GetProposalStatusIDByName(name string) int32 {
+	if id, ok := d.ProposalStatusIDByName[name]; ok {
+		return id
+	}
+	return 0
+}
+
 // --- 搜索方法（正则+包含匹配）---
 
 // GetBestCategoryIDByKeyword 根据关键词获取最匹配的单个分类ID

types/consts/consts.go

@@ -80,6 +80,7 @@ const (
 	ReqType       = "type"
 	ReqCourseID   = "courseId"
 	ReqTargetID   = "targetId"
+	ReqTitle      = "title"
 )
 
 // 限制相关