fix 视频统计

app/controllers/courses_controller.rb

@@ -1533,14 +1533,14 @@ class CoursesController < ApplicationController
       JOIN videos ON course_videos.course_id = #{@course.id} AND videos.id = course_videos.video_id
       JOIN watch_course_videos ON course_videos.id = watch_course_videos.course_video_id AND watch_course_videos.user_id = #{current_user.id}
       JOIN (
-        SELECT watch_course_videos.course_video_id, COUNT(watch_video_histories.watch_course_video_id) AS num
+        SELECT watch_course_videos.id,  COUNT(watch_video_histories.watch_course_video_id) AS num
         FROM watch_course_videos
         JOIN course_videos ON course_videos.id = watch_course_videos.course_video_id
-        JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id} AND role = 4
+        JOIN course_members ON course_members.user_id = watch_course_videos.user_id AND course_members.course_id = #{@course.id}  AND role = 4
         JOIN watch_video_histories ON watch_course_videos.id = watch_video_histories.watch_course_video_id AND watch_video_histories.end_at IS NOT NULL
         WHERE course_videos.course_id = #{@course.id} AND watch_course_videos.user_id = #{current_user.id} AND watch_course_videos.end_at IS NOT NULL
-        GROUP BY watch_course_videos.course_video_id
+        GROUP BY watch_course_videos.id
-      ) AS hisotries ON hisotries.course_video_id = course_videos.id").select("course_videos.id")
+      ) AS hisotries ON hisotries.id = watch_course_videos.id ").select("course_videos.id")
 
     @count = @videos.count
 
@@ -1553,7 +1553,7 @@ class CoursesController < ApplicationController
       end
     end
 
-    @videos = @videos.select("course_videos.id, course_videos.video_id, watch_course_videos.start_at, watch_course_videos.total_duration, watch_course_videos.end_at, watch_course_videos.is_finished, videos.title, IFNULL(hisotries.num,0) AS freq")
+    @videos = @videos.select("course_videos.id, watch_course_videos.id AS watch_course_video_id, course_videos.video_id, watch_course_videos.start_at, watch_course_videos.total_duration, watch_course_videos.end_at, watch_course_videos.is_finished, videos.title, IFNULL(hisotries.num,0) AS freq")
     
     @videos = paginate @videos
   end

app/views/courses/own_watch_histories.json.jbuilder

@@ -1,5 +1,6 @@
 json.data do
   json.array! @videos.each do |d|
+    json.watch_course_video_id d['watch_course_video_id']
     json.title d.title
     json.user_name d.video.user&.real_name
     json.is_finished d.is_finished ? true : false