Merge pull request #3191 from fjordllc/feature/change-practices-progress

プラクティスの進捗を % でなく、完了プラクティスの個数 / プラクティス全体の個数 として表示する

app/assets/stylesheets/blocks/user/_completed-practices-progress.sass

@@ -23,6 +23,6 @@ $bar-height: .75rem
   +position(relative, top $bar-height * -1)
   box-shadow: rgba(black, .2) 0 .0625rem .0625rem
 
-.completed-practices-progress__percentage-number
+.completed-practices-progress__number
   +text-block(.875rem 1rem, right)
   +size(2.5rem 1rem)

app/javascript/user-practice-progress.vue

@@ -9,8 +9,8 @@
       role='progressbar',
       :style='`width: ${roundedPercentage}`'
     )
-  .completed-practices-progress__percentage-number
-    | {{ roundedPercentage }}
+  .completed-practices-progress__number
+    | {{ fraction }}
 </template>
 <script>
 export default {
@@ -19,7 +19,8 @@ export default {
   },
   data() {
     return {
-      percentage: this.user.cached_completed_percentage
+      percentage: this.user.cached_completed_percentage,
+      fraction: this.user.completed_fraction
     }
   },
   computed: {

app/models/user.rb

@@ -335,15 +335,13 @@ def away?
   end
 
   def completed_percentage
-    practices_include_progress = course.practices.where(include_progress: true)
-
-    completed_practices_include_progress =
-      practices_include_progress.joins(:learnings)
-                                .merge(Learning.complete.where(user_id: id))
-
     completed_practices_include_progress.size.to_f / practices_include_progress.size * MAX_PERCENTAGE
   end
 
+  def completed_fraction
+    "#{completed_practices_include_progress.size}/#{practices_include_progress.size}"
+  end
+
   def completed_practices_size(category)
     Practice
       .joins({ categories: :categories_practices }, :learnings)
@@ -547,4 +545,13 @@ def update_mentor_memo(new_memo)
   def password_required?
     new_record? || password.present?
   end
+
+  def practices_include_progress
+    course.practices.where(include_progress: true)
+  end
+
+  def completed_practices_include_progress
+    practices_include_progress.joins(:learnings)
+                              .merge(Learning.complete.where(user_id: id))
+  end
 end

app/views/api/users/_list_user.json.jbuilder

@@ -1,4 +1,4 @@
-json.(user, :id, :login_name, :name, :discord_account, :description, :github_account, :twitter_account, :facebook_url, :blog_url, :times_url, :job_seeker, :free, :job, :os, :experience, :email, :role, :icon_title,:cached_completed_percentage)
+json.(user, :id, :login_name, :name, :discord_account, :description, :github_account, :twitter_account, :facebook_url, :blog_url, :times_url, :job_seeker, :free, :job, :os, :experience, :email, :role, :icon_title, :cached_completed_percentage, :completed_fraction)
 json.tag_list user.tags.pluck(:name)
 json.url user_url(user)
 json.updated_at l(user.updated_at)

app/views/users/practices/_completed_practices_progress.html.slim

@@ -1,7 +1,8 @@
 - percentage = user.cached_completed_percentage
+- fraction = user.completed_fraction
 .completed-practices-progress
   .completed-practices-progress__bar-container
     .completed-practices-progress__bar
     .completed-practices-progress__percentage-bar(aria-valuemax='100' aria-valuemin='0' aria-valuenow="#{percentage}" role='progressbar' style="width: #{number_to_percentage percentage, precision: 0};")
-  .completed-practices-progress__percentage-number
-    = number_to_percentage percentage, precision: 0
+  .completed-practices-progress__number
+    = fraction

test/models/user_test.rb

@@ -86,11 +86,37 @@ class UserTest < ActiveSupport::TestCase
     assert_not_equal old_percentage, user.completed_percentage
 
     old_percentage = user.completed_percentage
-    user.completed_practices << practices(:practice52)
+    user.completed_practices << practices(:practice55)
 
     assert_equal old_percentage, user.completed_percentage
   end
 
+  test '#completed_fraction don\'t calculate practice that include_progress: false' do
+    user = users(:komagata)
+    old_fraction = user.completed_fraction
+    user.completed_practices << practices(:practice5)
+
+    assert_not_equal old_fraction, user.completed_fraction
+
+    old_fraction = user.completed_fraction
+    user.completed_practices << practices(:practice53)
+
+    assert_equal old_fraction, user.completed_fraction
+  end
+
+  test '#completed_fraction don\'t calculate practice unrelated cource' do
+    user = users(:komagata)
+    old_fraction = user.completed_fraction
+    user.completed_practices << practices(:practice5)
+
+    assert_not_equal old_fraction, user.completed_fraction
+
+    old_fraction = user.completed_fraction
+    user.completed_practices << practices(:practice55)
+
+    assert_equal old_fraction, user.completed_fraction
+  end
+
   test '#depressed?' do
     user = users(:kimura)
     2.times do |i|