feat(api): 完善网关层

Author: Eksin-4eva

api/handler/api/course_service.go

@@ -17,7 +17,9 @@ limitations under the License.
 package pack
 
 import (
+	api "github.com/west2-online/fzuhelper-server/api/model/api"
 	courseModel "github.com/west2-online/fzuhelper-server/api/model/model"
+	courseKitex "github.com/west2-online/fzuhelper-server/kitex_gen/course"
 	"github.com/west2-online/fzuhelper-server/kitex_gen/model"
 )
 
@@ -117,3 +119,58 @@ func BuildAdjustCourseList(res []*model.AdjustCourse) []*courseModel.AdjustCours
 	}
 	return list
 }
+
+// 自定义课程：kitex 模型 -> 网关模型
+func BuildCustomCourseItem(res *courseKitex.CustomCourseItem) *api.CustomCourseItem {
+	if res == nil {
+		return nil
+	}
+	return &api.CustomCourseItem{
+		Id:         res.Id,
+		Name:       res.Name,
+		Teacher:    res.Teacher,
+		Location:   res.Location,
+		StartClass: res.StartClass,
+		EndClass:   res.EndClass,
+		StartWeek:  res.StartWeek,
+		EndWeek:    res.EndWeek,
+		Weekday:    res.Weekday,
+		Single:     res.Single,
+		Double_:    res.Double_,
+		Color:      res.Color,
+		Remark:     res.Remark,
+	}
+}
+
+func BuildCustomCourseItemList(res []*courseKitex.CustomCourseItem) []*api.CustomCourseItem {
+	list := make([]*api.CustomCourseItem, 0, len(res))
+	for _, v := range res {
+		c := BuildCustomCourseItem(v)
+		if c != nil {
+			list = append(list, c)
+		}
+	}
+	return list
+}
+
+// 自定义课程：网关模型 -> kitex 模型（发给 RPC）
+func BuildCustomCourseItemForRPC(res *api.CustomCourseItem) *courseKitex.CustomCourseItem {
+	if res == nil {
+		return nil
+	}
+	return &courseKitex.CustomCourseItem{
+		Id:         res.Id,
+		Name:       res.Name,
+		Teacher:    res.Teacher,
+		Location:   res.Location,
+		StartClass: res.StartClass,
+		EndClass:   res.EndClass,
+		StartWeek:  res.StartWeek,
+		EndWeek:    res.EndWeek,
+		Weekday:    res.Weekday,
+		Single:     res.Single,
+		Double_:    res.Double_,
+		Color:      res.Color,
+		Remark:     res.Remark,
+	}
+}

api/model/api/api.go

@@ -35,7 +35,7 @@ func InitCourseRPC() {
 	courseClient = *c
 }
 
-func GetCourseListRPC(ctx context.Context, req *course.CourseListRequest) (courses []*model.Course, err error) {
+func GetCourseListRPC(ctx context.Context, req *course.CourseListRequest) (*course.CourseListResponse, error) {
 	resp, err := courseClient.GetCourseList(ctx, req)
 	if err != nil {
 		logger.WithCtx(ctx).Errorf("GetCourseListRPC: RPC called failed: %v", err.Error())
@@ -45,7 +45,7 @@ func GetCourseListRPC(ctx context.Context, req *course.CourseListRequest) (cours
 		return nil, err
 	}
 
-	return resp.Data, nil
+	return resp, nil
 }
 
 func GetCourseTermsListRPC(ctx context.Context, req *course.TermListRequest) (*course.TermListResponse, error) {
@@ -121,3 +121,27 @@ func UpdateAutoAdjustCourseRPC(ctx context.Context, req *course.UpdateAdjustCour
 	}
 	return nil
 }
+
+func UpsertCustomCourseRPC(ctx context.Context, req *course.UpsertCustomCourseRequest) (*course.UpsertCustomCourseResponse, error) {
+	resp, err := courseClient.UpsertCustomCourse(ctx, req)
+	if err != nil {
+		logger.WithCtx(ctx).Errorf("UpsertCustomCourseRPC: RPC called failed: %v", err.Error())
+		return nil, errno.InternalServiceError.WithMessage(err.Error())
+	}
+	if err = utils.HandleBaseRespWithCookie(resp.Base); err != nil {
+		return nil, errno.BizError.WithMessage("保存自定义课程失败: " + resp.Base.Msg)
+	}
+	return resp, nil
+}
+
+func DeleteCustomCourseRPC(ctx context.Context, req *course.DeleteCustomCourseRequest) error {
+	resp, err := courseClient.DeleteCustomCourse(ctx, req)
+	if err != nil {
+		logger.WithCtx(ctx).Errorf("DeleteCustomCourseRPC: RPC called failed: %v", err.Error())
+		return errno.InternalServiceError.WithMessage(err.Error())
+	}
+	if err = utils.HandleBaseRespWithCookie(resp.Base); err != nil {
+		return errno.BizError.WithMessage("删除自定义课程失败: " + resp.Base.Msg)
+	}
+	return nil
+}