Merge branch 'develop' into dev_aliyun

app/controllers/challenges_controller.rb

@@ -159,11 +159,12 @@ class ChallengesController < ApplicationController
                     challenges.shixun_id, games.identifier, games.status"
     join_sql = "LEFT JOIN games ON games.challenge_id = challenges.id AND games.user_id = #{current_user.id}"
     # 下面2个参数是为了解决列表获取通关人数与正在游玩人数的问题
-    @pass_games_map = @shixun.challenges.joins(:games).where(games: {status:2}).group(:challenge_id).reorder(nil).count
-    @play_games_map = @shixun.challenges.joins(:games).where(games: {status:[0,1]}).group(:challenge_id).reorder(nil).count
+    #@pass_games_map = @shixun.challenges.joins(:games).where(games: {status:2}).group(:challenge_id).reorder(nil).count
+    #@play_games_map = @shixun.challenges.joins(:games).where(games: {status:[0,1]}).group(:challenge_id).reorder(nil).count
 
     @challenges = @shixun.challenges.joins(join_sql).select(base_columns)
 
+    #@challenges = @shixun.challenges.fields_for_list
     @editable = @shixun.status == 0 # before_action：有判断权限，如果没发布，则肯定是管理人员
     @user = current_user
     @shixun.increment!(:visits)

app/models/challenge.rb

@@ -79,20 +79,34 @@ class Challenge < ApplicationRecord
     end
   end
 
-  # # 开启挑战
-  # def open_game(user_id, shixun)
-  #
-  #
-  #   game = self.games.select([:status, :identifier]).where(user_id: user_id).first
-  #   game = self.games.select{|game| game.user_id == user_id}
+  # def open_game shixun, user_id
+  #   game = self.games.map{|g| g.user_id == user_id}.first
   #   if game.present?
   #     shixun.task_pass || game.status != 3 ? "/tasks/#{game.identifier}" : ""
   #   else
-  #     "/api/shixuns/#{shixun.identifier}/shixun_exec"
+  #     self.position == 1 ? "/api/shixuns/#{shixun.identifier}/shixun_exec" : ""
   #   end
   # end
 
   ## 用户关卡状态 0: 不能开启实训; 1:直接开启; 2表示已完成
+  # def user_tpi_status shixun, user_id
+  #   # todo: 以前没加索引导致相同关卡,同一用户有多个games
+  #   # 允许跳关则直接开启
+  #   game = games.where(user_id: user_id).take
+  #   if game.blank?
+  #     position == 1 ? 1 : 0
+  #   else
+  #     if game.status == 3
+  #       shixun.task_pass ? 1 : 0
+  #     elsif game.status == 2
+  #       2
+  #     else
+  #       1
+  #     end
+  #   end
+  # end
+
+  # ## 用户关卡状态 0: 不能开启实训; 1:直接开启; 2表示已完成
   def user_tpi_status shixun
     # todo: 以前没加索引导致相同关卡,同一用户有多个games
     # 允许跳关则直接开启
@@ -128,12 +142,14 @@ class Challenge < ApplicationRecord
 
   # 关卡用户通关数
   def user_passed_count
-    games.where(status: 2).count
+    #games.map{|g| g.status == 2}.count
+    self.games.where(status: 1).count
   end
 
   # 关卡用户正在挑战的人数
   def playing_count
-    games.where(status: [0, 1]).count
+    #games.map{|g| g.status == 0 || g.status == 1}.count
+    self.games.where(status: [0,1]).count
   end
 
   def last_challenge

app/views/challenges/index.json.jbuilder

@@ -16,12 +16,14 @@ if @challenges.present?
     json.st challenge.st
     json.name challenge.subject
     json.score challenge.score
-    json.passed_count @pass_games_map.fetch(challenge.id, 0)
-    #json.passed_count challenge.user_passed_count
-    json.playing_count @play_games_map.fetch(challenge.id, 0)
-    #json.playing_count challenge.playing_count
+    #json.passed_count @pass_games_map.fetch(challenge.id, 0)
+    user_passed_count = challenge.user_passed_count
+    json.passed_count user_passed_count
+    #json.playing_count @play_games_map.fetch(challenge.id, 0)
+    json.playing_count (challenge.games.count - user_passed_count)
     json.name_url shixun_challenge_path(challenge, shixun_identifier: @shixun.identifier)
     json.open_game challenge.open_game(@shixun)
+    #json.open_game challenge.open_game(@shixun, @user.id)
     if @editable
       json.edit_url edit_shixun_challenge_path(challenge, shixun_identifier: @shixun.identifier)
       json.delete_url shixun_challenge_path(challenge, shixun_identifier: @shixun.identifier)
@@ -29,6 +31,7 @@ if @challenges.present?
       json.down_url index_down_shixun_challenge_path(challenge, :shixun_identifier =>  @shixun.identifier) if @shixun.challenges_count != challenge.position
     end
     #json.passed challenge.has_passed?(@user.id)
+    #json.status challenge.user_tpi_status(@shixun, @user.id)
     json.status challenge.user_tpi_status(@shixun)
   end
 end