feat: cloud custom course

api/handler/api/course_service_test.go

@@ -55,7 +55,7 @@ func TestGetCourseList(t *testing.T) {
 	type testCase struct {
 		name           string
 		url            string
-		mockResp       []*model.Course
+		mockResp       *course.CourseListResponse
 		mockErr        error
 		expectContains string
 	}
@@ -64,7 +64,7 @@ func TestGetCourseList(t *testing.T) {
 		{
 			name:           "success",
 			url:            "/api/v1/jwch/course/list?term=202401",
-			mockResp:       []*model.Course{},
+			mockResp:       &course.CourseListResponse{Data: []*model.Course{}},
 			expectContains: `{"code":"10000","message":"ok","data":[]}`,
 		},
 		{
@@ -86,7 +86,7 @@ func TestGetCourseList(t *testing.T) {
 	defer mockey.UnPatchAll()
 	for _, tc := range testCases {
 		mockey.PatchConvey(tc.name, t, func() {
-			mockey.Mock(rpc.GetCourseListRPC).To(func(ctx context.Context, req *course.CourseListRequest) ([]*model.Course, error) {
+			mockey.Mock(rpc.GetCourseListRPC).To(func(ctx context.Context, req *course.CourseListRequest) (*course.CourseListResponse, error) {
 				return tc.mockResp, tc.mockErr
 			}).Build()
 
@@ -97,6 +97,216 @@ func TestGetCourseList(t *testing.T) {
 	}
 }
 
+func TestGetCourseListV2(t *testing.T) {
+	type testCase struct {
+		name           string
+		url            string
+		mockResp       *course.CourseListResponse
+		mockErr        error
+		expectContains string
+		expectAbsence  string
+	}
+
+	testCases := []testCase{
+		{
+			name:           "success",
+			url:            "/api/v2/course/list?term=202401",
+			mockResp:       &course.CourseListResponse{Data: []*model.Course{}},
+			expectContains: `{"code":"10000","message":"ok","data":{"base":null,"data":[],"custom_courses":[]}}`,
+		},
+		{
+			name: "success",
+			url:  "/api/v2/course/list?term=202401",
+			mockResp: &course.CourseListResponse{
+				Data: []*model.Course{},
+				CustomCourses: []*course.CustomCourseItem{
+					{Name: "x", Location: "y", StartClass: 1, EndClass: 2, StartWeek: 1, EndWeek: 2, Weekday: 1},
+				},
+			},
+			expectContains: `"custom_courses":[{"name":"x"`,
+		},
+		{
+			name:           "rpc error",
+			url:            "/api/v2/course/list?term=202401",
+			mockErr:        errno.InternalServiceError,
+			expectContains: `{"code":"50001","message":"内部服务错误"}`,
+		},
+		{
+			name:           "bind error",
+			url:            "/api/v2/course/list",
+			expectContains: `{"code":"20001","message":"参数错误,`,
+		},
+	}
+
+	router := route.NewEngine(&config.Options{})
+	router.GET("/api/v2/course/list", GetCourseListV2)
+
+	defer mockey.UnPatchAll()
+	for _, tc := range testCases {
+		mockey.PatchConvey(tc.name, t, func() {
+			mockey.Mock(rpc.GetCourseListRPC).To(func(ctx context.Context, req *course.CourseListRequest) (*course.CourseListResponse, error) {
+				return tc.mockResp, tc.mockErr
+			}).Build()
+
+			res := ut.PerformRequest(router, consts.MethodGet, tc.url, nil)
+			assert.Equal(t, consts.StatusOK, res.Result().StatusCode())
+			body := string(res.Result().Body())
+			assert.Contains(t, body, tc.expectContains)
+			if tc.expectAbsence != "" {
+				assert.NotContains(t, body, tc.expectAbsence)
+			}
+		})
+	}
+}
+
+func TestDeleteCustomCourse(t *testing.T) {
+	type testCase struct {
+		name           string
+		url            string
+		body           string
+		mockErr        error
+		expectContains string
+	}
+
+	testCases := []testCase{
+		{
+			name:           "success",
+			url:            "/api/v1/course/custom",
+			body:           `{"term":"202401","course_id":"114514"}`,
+			expectContains: `{"code":"10000","message":"ok"}`,
+		},
+		{
+			name:           "rpc error",
+			url:            "/api/v1/course/custom",
+			body:           `{"term":"202401","course_id":"114514"}`,
+			mockErr:        errno.InternalServiceError,
+			expectContains: `{"code":"50001","message":"内部服务错误"}`,
+		},
+		{
+			name:           "bind error",
+			url:            "/api/v1/course/custom",
+			body:           `{"course_id":"114514"}`,
+			expectContains: `{"code":"20001","message":"参数错误,`,
+		},
+	}
+
+	router := route.NewEngine(&config.Options{})
+	router.DELETE("/api/v1/course/custom", DeleteCustomCourse)
+
+	defer mockey.UnPatchAll()
+	for _, tc := range testCases {
+		mockey.PatchConvey(tc.name, t, func() {
+			mockey.Mock(rpc.DeleteCustomCourseRPC).To(func(ctx context.Context, req *course.DeleteCustomCourseRequest) error {
+				return tc.mockErr
+			}).Build()
+
+			body := &ut.Body{
+				Body: bytes.NewBufferString(tc.body),
+				Len:  len(tc.body),
+			}
+			res := ut.PerformRequest(router, consts.MethodDelete, tc.url, body, ut.Header{
+				Key:   "Content-Type",
+				Value: "application/json",
+			})
+			assert.Equal(t, consts.StatusOK, res.Result().StatusCode())
+			assert.Contains(t, string(res.Result().Body()), tc.expectContains)
+		})
+	}
+}
+
+func TestUpsertCustomCourse(t *testing.T) {
+	type testCase struct {
+		name           string
+		url            string
+		body           string
+		mockResp       *course.UpsertCustomCourseResponse
+		mockErr        error
+		expectContains string
+	}
+
+	testCases := []testCase{
+		{
+			name: "success",
+			url:  "/api/v1/course/custom",
+			body: `{"term":"202401","course":` +
+				`{"name":"x","location":"y","start_class":1,"end_class":2,` +
+				`"start_week":1,"end_week":2,"weekday":1,"single":false,"double_":false}}`,
+			mockResp:       &course.UpsertCustomCourseResponse{},
+			expectContains: `{"code":"10000","message":"ok","data":`,
+		},
+		{
+			name: "rpc error",
+			url:  "/api/v1/course/custom",
+			body: `{"term":"202401","course":` +
+				`{"name":"x","location":"y","start_class":1,"end_class":2,` +
+				`"start_week":1,"end_week":2,"weekday":1,"single":false,"double_":false}}`,
+			mockErr:        errno.InternalServiceError,
+			expectContains: `{"code":"50001","message":"内部服务错误"}`,
+		},
+		{
+			name:           "missing course rejected at bind",
+			url:            "/api/v1/course/custom",
+			body:           `{"term":"202401"}`,
+			expectContains: `{"code":"20001","message":"参数错误,`,
+		},
+		{
+			name:           "bind error",
+			url:            "/api/v1/course/custom",
+			body:           `{"term":"202401","course":{"name":"x"}}`,
+			expectContains: `{"code":"20001","message":"参数错误,`,
+		},
+	}
+
+	router := route.NewEngine(&config.Options{})
+	router.POST("/api/v1/course/custom", UpsertCustomCourse)
+
+	defer mockey.UnPatchAll()
+	for _, tc := range testCases {
+		mockey.PatchConvey(tc.name, t, func() {
+			mockey.Mock(rpc.UpsertCustomCourseRPC).To(func(ctx context.Context, req *course.UpsertCustomCourseRequest) (*course.UpsertCustomCourseResponse, error) {
+				return tc.mockResp, tc.mockErr
+			}).Build()
+
+			body := &ut.Body{
+				Body: bytes.NewBufferString(tc.body),
+				Len:  len(tc.body),
+			}
+			res := ut.PerformRequest(router, consts.MethodPost, tc.url, body, ut.Header{
+				Key:   "Content-Type",
+				Value: "application/json",
+			})
+			assert.Equal(t, consts.StatusOK, res.Result().StatusCode())
+			assert.Contains(t, string(res.Result().Body()), tc.expectContains)
+		})
+	}
+}
+
+func TestUpsertCustomCourseCourseNil(t *testing.T) {
+	router := route.NewEngine(&config.Options{})
+	router.POST("/api/v1/course/custom", UpsertCustomCourse)
+
+	defer mockey.UnPatchAll()
+	mockey.PatchConvey("course nil reaches nil check", t, func() {
+		// 绕过 hertz 的 required 校验，使 req.Course 保持 nil，覆盖 handler 中的防御性检查
+		mockey.Mock((*app.RequestContext).BindAndValidate).To(
+			func(c *app.RequestContext, req interface{}) error {
+				return nil
+			},
+		).Build()
+
+		body := &ut.Body{
+			Body: bytes.NewBufferString(`{"term":"202401"}`),
+			Len:  len(`{"term":"202401"}`),
+		}
+		res := ut.PerformRequest(router, consts.MethodPost, "/api/v1/course/custom", body, ut.Header{
+			Key:   "Content-Type",
+			Value: "application/json",
+		})
+		assert.Equal(t, consts.StatusOK, res.Result().StatusCode())
+		assert.Contains(t, string(res.Result().Body()), `{"code":"20001","message":"参数错误"}`)
+	})
+}
+
 func TestGetTermList(t *testing.T) {
 	type testCase struct {
 		name           string

api/mcp/course.go

@@ -118,7 +118,7 @@ func handleGetCourse(ctx context.Context, request mcp.CallToolRequest) (*mcp.Cal
 	// 包装成JSON，JSON数组直接返回时不合法的
 	resp := map[string]any{
 		"term":    term,
-		"courses": courseList,
+		"courses": courseList.Data,
 	}
 
 	return mcp.NewToolResultJSON(resp)