diff --git a/app/controllers/api/v8/users_controller.rb b/app/controllers/api/v8/users_controller.rb index 880a10c2d..a0d4c3074 100644 --- a/app/controllers/api/v8/users_controller.rb +++ b/app/controllers/api/v8/users_controller.rb @@ -126,7 +126,7 @@ class UsersController < Api::V8::BaseController property :courses do key :type, :array items do - key :required, %i[id name title moocfi_id awarded_points submissions last_submission_at] + key :required, %i[id name title moocfi_id awarded_points submissions last_submission_at url] property :id, type: :integer, example: 1 property :name, type: :string, example: 'mooc-java-programming-i' property :title, type: :string, 'x-nullable': true, example: 'Java Programming I' @@ -134,6 +134,7 @@ class UsersController < Api::V8::BaseController property :awarded_points, type: :integer, example: 12 property :submissions, type: :integer, example: 34 property :last_submission_at, type: :string, format: 'date-time', 'x-nullable': true, example: '2026-10-01T12:00:00Z' + property :url, type: :string, 'x-nullable': true, description: 'The course page, when the user can open it', example: 'https://tmc.mooc.fi/org/mooc/courses/1' end end end @@ -286,7 +287,17 @@ def destroy def course_progress unauthorize_guest! only_admins! - render json: { courses: User.find_by!(id: params[:id]).course_progress } + user = User.find_by!(id: params[:id]) + ability = Ability.new(user) + progress = user.course_progress + courses_by_id = Course.includes(:organization).where(id: progress.pluck(:id)).index_by(&:id) + courses = progress.map do |entry| + course = courses_by_id.fetch(entry[:id]) + # A link the user cannot open, e.g. to a hidden or disabled course, is worse than none. + url = organization_course_url(course.organization, course) if ability.can?(:read, course) + entry.merge(url: url) + end + render json: { courses: courses } end sig { void } diff --git a/spec/controllers/api/v8/users_controller_spec.rb b/spec/controllers/api/v8/users_controller_spec.rb index ebc24908b..c4f7cd57e 100644 --- a/spec/controllers/api/v8/users_controller_spec.rb +++ b/spec/controllers/api/v8/users_controller_spec.rb @@ -337,7 +337,11 @@ def app_data_values describe 'GET course_progress' do let!(:token) { Doorkeeper::AccessToken.create!(resource_owner_id: admin.id, scopes: 'public') } - it 'lists each course the user has submissions or points in, latest submission first' do + def course_page(course) + "http://test.host/org/#{course.organization.slug}/courses/#{course.id}" + end + + it 'lists each course the user has submissions or points in, latest submission first, linking those they can open' do submitted_course = FactoryBot.create(:course, name: 'submitted', moocfi_id: SecureRandom.uuid, hidden: true) FactoryBot.create(:submission, user: user, course: submitted_course, created_at: Time.zone.parse('2026-10-01T12:00:00Z')) FactoryBot.create(:submission, user: user, course: submitted_course, created_at: Time.zone.parse('2026-09-01T12:00:00Z')) @@ -355,15 +359,17 @@ def app_data_values { 'id' => submitted_course.id, 'name' => 'submitted', 'title' => submitted_course.title, 'moocfi_id' => submitted_course.moocfi_id, 'awarded_points' => 0, 'submissions' => 2, - 'last_submission_at' => '2026-10-01T12:00:00Z' + 'last_submission_at' => '2026-10-01T12:00:00Z', 'url' => nil }, { 'id' => older_course.id, 'name' => 'older', 'title' => older_course.title, 'moocfi_id' => nil, - 'awarded_points' => 0, 'submissions' => 1, 'last_submission_at' => '2025-01-01T00:00:00Z' + 'awarded_points' => 0, 'submissions' => 1, 'last_submission_at' => '2025-01-01T00:00:00Z', + 'url' => nil }, { 'id' => points_only_course.id, 'name' => 'points-only', 'title' => points_only_course.title, - 'moocfi_id' => nil, 'awarded_points' => 2, 'submissions' => 0, 'last_submission_at' => nil + 'moocfi_id' => nil, 'awarded_points' => 2, 'submissions' => 0, 'last_submission_at' => nil, + 'url' => course_page(points_only_course) } ]) end