From dae1a57ddca410701d39977e9cd3ad87d87205c7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 27 Aug 2019 09:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/subjects_helper.rb | 5 -----
 app/models/subject.rb          | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/helpers/subjects_helper.rb b/app/helpers/subjects_helper.rb
index b03baf825..75ae9f041 100644
--- a/app/helpers/subjects_helper.rb
+++ b/app/helpers/subjects_helper.rb
@@ -13,13 +13,8 @@ module SubjectsHelper
 
   # 实训路径的所有用户获得的标签
   def user_shixun_tags challenge_ids, user_id
-    logger.info("#####################")
     ChallengeTag.joins("join games on challenge_tags.challenge_id = games.challenge_id").
       where(challenge_id: challenge_ids, games: {status: 2, user_id: user_id}).pluck("challenge_tags.name").uniq
-    logger.info("#####################")
-    pass_challenge_ids = Game.where(status: 2, user_id: user_id, challenge_id: challenge_ids).pluck(:challenge_id)
-    ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name).uniq
-    logger.info("#####################")
   end
 
   # 金课的课堂状态 0：未开课，1：进行中，2：已结束
diff --git a/app/models/subject.rb b/app/models/subject.rb
index 7aa0bc063..f35a8aad4 100644
--- a/app/models/subject.rb
+++ b/app/models/subject.rb
@@ -82,14 +82,9 @@ class Subject < ApplicationRecord
   end
 
   def my_subject_progress
-    logger.info("#-----------")
-    my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
-      pluck(:challenge_id).uniq.size
-    logger.info("#-----------")
-    new_challenge_count = Challenge.left_joins(:games)
+    my_challenge_count = Challenge.left_joins(:games)
                               .where(games: {user_id: User.current.id, status: 2}, shixun_id: shixuns.published_closed)
-                              .uniq.count
-    logger.info("#-----------")
+                              .pluck(:challenge_id).uniq.size
     subject_challenge_count = shixuns.sum(:challenges_count)
     subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / subject_challenge_count).round(2) * 100).to_i
   end