From 5e571debbd0ade656e24e6946ca7b3139083807c Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Wed, 25 Aug 2021 21:30:16 +0900
Subject: [PATCH 1/6] =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=AF=E3=83=86?=
 =?UTF-8?q?=E3=82=A3=E3=82=B9=E3=81=AE=E9=80=B2=E6=8D=97=E3=82=92=20%=20?=
 =?UTF-8?q?=E3=81=A7=E3=81=AA=E3=81=8F=E5=AE=8C=E4=BA=86=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=AF=E3=83=86=E3=82=A3=E3=82=B9=E3=81=AE?=
 =?UTF-8?q?=E5=80=8B=E6=95=B0=E3=81=B8=E3=81=AE=E8=A1=A8=E7=A4=BA=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/decorators/user_decorator.rb              |  6 ++++++
 app/javascript/user-practice-progress.vue     |  5 +++--
 app/models/user.rb                            | 19 +++++++++++++------
 app/views/api/users/_list_user.json.jbuilder  |  2 +-
 .../_completed_practices_progress.html.slim   |  3 ++-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
index 411fa3d8eba..76057208113 100644
--- a/app/decorators/user_decorator.rb
+++ b/app/decorators/user_decorator.rb
@@ -50,6 +50,12 @@ def cached_completed_percentage
     end
   end
 
+  def cached_completed_fraction
+    Rails.cache.fetch "/model/user/#{id}/completed_fraction" do
+      completed_fraction
+    end
+  end
+
   def customer_url
     "https://dashboard.stripe.com/customers/#{customer_id}"
   end
diff --git a/app/javascript/user-practice-progress.vue b/app/javascript/user-practice-progress.vue
index b15e1f52602..b04a24ef902 100644
--- a/app/javascript/user-practice-progress.vue
+++ b/app/javascript/user-practice-progress.vue
@@ -10,7 +10,7 @@
       :style='`width: ${roundedPercentage}`'
     )
   .completed-practices-progress__percentage-number
-    | {{ roundedPercentage }}
+    | {{ 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.cached_completed_fraction
     }
   },
   computed: {
diff --git a/app/models/user.rb b/app/models/user.rb
index 74cfb75ac50..0098e137bfc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -339,15 +339,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)
@@ -565,4 +563,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
diff --git a/app/views/api/users/_list_user.json.jbuilder b/app/views/api/users/_list_user.json.jbuilder
index 76c554232f9..579dd189fca 100644
--- a/app/views/api/users/_list_user.json.jbuilder
+++ b/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, :cached_completed_fraction)
 json.tag_list user.tags.pluck(:name)
 json.url user_url(user)
 json.updated_at l(user.updated_at)
diff --git a/app/views/users/practices/_completed_practices_progress.html.slim b/app/views/users/practices/_completed_practices_progress.html.slim
index 26a04f7f7b2..56f3eae8f60 100644
--- a/app/views/users/practices/_completed_practices_progress.html.slim
+++ b/app/views/users/practices/_completed_practices_progress.html.slim
@@ -1,7 +1,8 @@
 - percentage = user.cached_completed_percentage
+- fraction = user.cached_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
+    = fraction

From 7384935e9ed839341462e67df5d1d556dc286955 Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Sun, 29 Aug 2021 10:26:24 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=AF=E3=83=86?=
 =?UTF-8?q?=E3=82=A3=E3=82=B9=E3=81=AE=E9=80=B2=E6=8D=97=E3=82=92=20%=20?=
 =?UTF-8?q?=E3=81=A7=E3=81=AA=E3=81=8F=E5=AE=8C=E4=BA=86=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=AF=E3=83=86=E3=82=A3=E3=82=B9=E3=81=AE?=
 =?UTF-8?q?=E5=80=8B=E6=95=B0=E3=81=B8=E3=81=AE=E8=A1=A8=E7=A4=BA=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=AE=E3=81=9F=E3=82=81CSS=E3=81=AE=E3=82=AF?=
 =?UTF-8?q?=E3=83=A9=E3=82=B9=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stylesheets/blocks/user/_completed-practices-progress.sass  | 2 +-
 app/javascript/user-practice-progress.vue                       | 2 +-
 .../users/practices/_completed_practices_progress.html.slim     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/blocks/user/_completed-practices-progress.sass b/app/assets/stylesheets/blocks/user/_completed-practices-progress.sass
index 8087a39843e..d562f597b71 100644
--- a/app/assets/stylesheets/blocks/user/_completed-practices-progress.sass
+++ b/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)
diff --git a/app/javascript/user-practice-progress.vue b/app/javascript/user-practice-progress.vue
index b04a24ef902..0064a22935e 100644
--- a/app/javascript/user-practice-progress.vue
+++ b/app/javascript/user-practice-progress.vue
@@ -9,7 +9,7 @@
       role='progressbar',
       :style='`width: ${roundedPercentage}`'
     )
-  .completed-practices-progress__percentage-number
+  .completed-practices-progress__number
     | {{ fraction }}
 </template>
 <script>
diff --git a/app/views/users/practices/_completed_practices_progress.html.slim b/app/views/users/practices/_completed_practices_progress.html.slim
index 56f3eae8f60..c86e8811623 100644
--- a/app/views/users/practices/_completed_practices_progress.html.slim
+++ b/app/views/users/practices/_completed_practices_progress.html.slim
@@ -4,5 +4,5 @@
   .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
+  .completed-practices-progress__number
     = fraction

From 128574a12d012531e6a50112882fc5f800492cb3 Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Sun, 29 Aug 2021 11:36:38 +0900
Subject: [PATCH 3/6] =?UTF-8?q?completed=5Ffraction=E3=83=A1=E3=82=BD?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/models/user_test.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 329d4afc798..a24dccebc27 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -91,6 +91,32 @@ class UserTest < ActiveSupport::TestCase
     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(:practice52)
+
+    assert_equal old_fraction, user.completed_fraction
+  end
+
   test '#depressed?' do
     user = users(:kimura)
     2.times do |i|

From c364e9253d86253ed4d3c177c74ee12bc8bd9c23 Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Tue, 31 Aug 2021 13:57:17 +0900
Subject: [PATCH 4/6] =?UTF-8?q?user=5Fdecorator.rb=E3=81=AE=E3=83=A1?=
 =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E5=89=8A=E9=99=A4=E3=81=AE=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=80=81=E4=BD=BF=E7=94=A8=E3=83=A1=E3=82=BD=E3=83=83?=
 =?UTF-8?q?=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/decorators/user_decorator.rb                            | 6 ------
 app/javascript/user-practice-progress.vue                   | 2 +-
 app/views/api/users/_list_user.json.jbuilder                | 2 +-
 .../users/practices/_completed_practices_progress.html.slim | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
index 76057208113..411fa3d8eba 100644
--- a/app/decorators/user_decorator.rb
+++ b/app/decorators/user_decorator.rb
@@ -50,12 +50,6 @@ def cached_completed_percentage
     end
   end
 
-  def cached_completed_fraction
-    Rails.cache.fetch "/model/user/#{id}/completed_fraction" do
-      completed_fraction
-    end
-  end
-
   def customer_url
     "https://dashboard.stripe.com/customers/#{customer_id}"
   end
diff --git a/app/javascript/user-practice-progress.vue b/app/javascript/user-practice-progress.vue
index 0064a22935e..dd6d18038b4 100644
--- a/app/javascript/user-practice-progress.vue
+++ b/app/javascript/user-practice-progress.vue
@@ -20,7 +20,7 @@ export default {
   data() {
     return {
       percentage: this.user.cached_completed_percentage,
-      fraction: this.user.cached_completed_fraction
+      fraction: this.user.completed_fraction
     }
   },
   computed: {
diff --git a/app/views/api/users/_list_user.json.jbuilder b/app/views/api/users/_list_user.json.jbuilder
index 579dd189fca..bfb1ee5798f 100644
--- a/app/views/api/users/_list_user.json.jbuilder
+++ b/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, :cached_completed_fraction)
+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)
diff --git a/app/views/users/practices/_completed_practices_progress.html.slim b/app/views/users/practices/_completed_practices_progress.html.slim
index c86e8811623..297945a7546 100644
--- a/app/views/users/practices/_completed_practices_progress.html.slim
+++ b/app/views/users/practices/_completed_practices_progress.html.slim
@@ -1,5 +1,5 @@
 - percentage = user.cached_completed_percentage
-- fraction = user.cached_completed_fraction
+- fraction = user.completed_fraction
 .completed-practices-progress
   .completed-practices-progress__bar-container
     .completed-practices-progress__bar

From d28a6a1c067dac77a14aae210c27a0916b85f2a3 Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Tue, 31 Aug 2021 21:33:21 +0900
Subject: [PATCH 5/6] =?UTF-8?q?practice=E3=81=AEfixture=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/fixtures/practices.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/fixtures/practices.yml b/test/fixtures/practices.yml
index f9f30d79f55..2f504e75500 100644
--- a/test/fixtures/practices.yml
+++ b/test/fixtures/practices.yml
@@ -330,7 +330,6 @@ practice52:
   description: "description..."
   goal: "goal..."
   memo: "memo for mentors..."
-  include_progress: false
 
 practice53:
   title: "C#の基本"

From 9272fd02f807af277cbc43310105e3001dcd045a Mon Sep 17 00:00:00 2001
From: rjtt17 <rjtt17@gmail.com>
Date: Wed, 1 Sep 2021 23:19:58 +0900
Subject: [PATCH 6/6] =?UTF-8?q?fixture=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=AB=E4=BC=B4=E3=81=84=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=A7=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8Bfixture?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/fixtures/practices.yml | 1 +
 test/models/user_test.rb    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/practices.yml b/test/fixtures/practices.yml
index 2f504e75500..f9f30d79f55 100644
--- a/test/fixtures/practices.yml
+++ b/test/fixtures/practices.yml
@@ -330,6 +330,7 @@ practice52:
   description: "description..."
   goal: "goal..."
   memo: "memo for mentors..."
+  include_progress: false
 
 practice53:
   title: "C#の基本"
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index a24dccebc27..f2d7a6bddd6 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -86,7 +86,7 @@ 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
@@ -112,7 +112,7 @@ class UserTest < ActiveSupport::TestCase
     assert_not_equal old_fraction, user.completed_fraction
 
     old_fraction = user.completed_fraction
-    user.completed_practices << practices(:practice52)
+    user.completed_practices << practices(:practice55)
 
     assert_equal old_fraction, user.completed_fraction
   end