From dc8dd51d1eb5f0131862e4433d4cc91964cee730 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sat, 23 Jan 2021 22:18:57 -0300
Subject: [PATCH 01/13] 1st optimization: preload lesson's exercises

---
 app/views/chapters/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/chapters/show.html.erb b/app/views/chapters/show.html.erb
index d8ab2bf487..1fe8be2073 100644
--- a/app/views/chapters/show.html.erb
+++ b/app/views/chapters/show.html.erb
@@ -26,7 +26,7 @@
     <div>
       <h3><%= t(:lessons) %></h3>
 
-      <% @chapter.lessons.each do |lesson| %>
+      <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
         <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
         <%= render partial: 'layouts/progress_listing', locals: { exercises: lesson.exercises } %>
       <% end %>

From c66abf816e9394530986bd21a2bc31676bc6ce12 Mon Sep 17 00:00:00 2001
From: Franco Leonardo Bulgarelli <franco@mumuki.org>
Date: Tue, 26 Jan 2021 13:59:19 -0300
Subject: [PATCH 02/13] Point to domain branch

---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 7e379383cc..f38fc0840b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,3 +40,6 @@ group :development, :test do
   gem 'teaspoon-jasmine'
   gem 'selenium-webdriver'
 end
+
+
+gem "mumuki-domain", github: "mumuki/mumuki-domain", branch: "chore-database-optimization"
\ No newline at end of file

From 04c15142449c619e408c2d183788d95acf0e37f6 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sat, 23 Jan 2021 22:19:40 -0300
Subject: [PATCH 03/13] 2nd optimization: Use assignments_for & reuse them

---
 app/helpers/icons_helper.rb                  | 10 +++-------
 app/views/chapters/show.html.erb             |  2 +-
 app/views/layouts/_guide.html.erb            |  2 +-
 app/views/layouts/_progress_listing.html.erb | 10 +++++-----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 0c92b68c59..356aa88970 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -7,9 +7,9 @@ def fixed_fa_icon(name, options = {})
     fa_icon name, options.merge(class: 'fa-fw fixed-icon')
   end
 
-  def exercise_status_icon(exercise)
-    link_to exercise_status_fa_icon(exercise),
-            exercise_path(exercise) if current_user?
+  def assignment_status_icon(assignment)
+    link_to contextualization_fa_icon(assignment),
+            exercise_path(assignment.exercise) if current_user?
   end
 
   def language_icon(language)
@@ -22,10 +22,6 @@ def contextualization_fa_icon(contextualization)
     fa_icon(*icon_for(contextualization))
   end
 
-  def exercise_status_fa_icon(exercise)
-    contextualization_fa_icon(exercise.assignment_for(current_user))
-  end
-
   def discussion_status_fa_icon(discussion)
     contextualization_fa_icon(discussion)
   end
diff --git a/app/views/chapters/show.html.erb b/app/views/chapters/show.html.erb
index 1fe8be2073..4a3dfb5141 100644
--- a/app/views/chapters/show.html.erb
+++ b/app/views/chapters/show.html.erb
@@ -28,7 +28,7 @@
 
       <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
         <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
-        <%= render partial: 'layouts/progress_listing', locals: { exercises: lesson.exercises } %>
+        <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/layouts/_guide.html.erb b/app/views/layouts/_guide.html.erb
index 4726ac48e2..46822c0d68 100644
--- a/app/views/layouts/_guide.html.erb
+++ b/app/views/layouts/_guide.html.erb
@@ -13,7 +13,7 @@
   <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
 </h3>
 
-<%= render partial: 'layouts/progress_listing', locals: {exercises: @guide.exercises} %>
+<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
 
 <% if @stats&.done? %>
   <div class="text-box">
diff --git a/app/views/layouts/_progress_listing.html.erb b/app/views/layouts/_progress_listing.html.erb
index d0bace21b7..6cce14a771 100644
--- a/app/views/layouts/_progress_listing.html.erb
+++ b/app/views/layouts/_progress_listing.html.erb
@@ -1,9 +1,9 @@
 <ul class="progress-listing">
-  <% exercises.each do |exercise| %>
-      <% cache [exercise, exercise.status_for(current_user), Organization.current] do %>
-          <li <%= turbolinks_enable_for(exercise) %>>
-            <%= exercise_status_icon exercise %>
-            <%= link_to_path_element(exercise) %>
+  <% guide.assignments_for(current_user).each do |assignment| %>
+      <% cache [assignment.exercise, assignment.status, Organization.current] do %>
+          <li <%= turbolinks_enable_for(assignment.exercise) %>>
+            <%= assignment_status_icon assignment %>
+            <%= link_to_path_element(assignment.exercise) %>
           </li>
       <% end %>
   <% end %>

From f2e2d26e36eda2292726d7f604734f4cf93b854c Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sun, 24 Jan 2021 11:47:42 -0300
Subject: [PATCH 04/13] 3rd optimization: Avoid fetching stats twice

---
 app/views/layouts/_guide.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_guide.html.erb b/app/views/layouts/_guide.html.erb
index 46822c0d68..b58096287c 100644
--- a/app/views/layouts/_guide.html.erb
+++ b/app/views/layouts/_guide.html.erb
@@ -10,7 +10,7 @@
 
 <h3>
   <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
+  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
 </h3>
 
 <%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>

From 78cccbdd756760ee839bbff64fea6897dd93e430 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sun, 24 Jan 2021 14:42:14 -0300
Subject: [PATCH 05/13] 4th optimization: load progress bar assignments

Load them all at once, like in the listings
---
 app/helpers/icons_helper.rb              |  4 ----
 app/helpers/progress_bar_helper.rb       |  4 ++--
 app/views/layouts/_progress_bar.html.erb | 16 +++++++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 356aa88970..fe0523a14e 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -31,10 +31,6 @@ def icon_for(iconizable)
     [iconized[:type], class: "text-#{iconized[:class]} status-icon"]
   end
 
-  def class_for_exercise(exercise)
-    icon_class_for(exercise.assignment_for(current_user))
-  end
-
   def icon_class_for(iconizable)
     iconizable.iconize[:class].to_s
   end
diff --git a/app/helpers/progress_bar_helper.rb b/app/helpers/progress_bar_helper.rb
index 3346715f4b..3dc7be052d 100644
--- a/app/helpers/progress_bar_helper.rb
+++ b/app/helpers/progress_bar_helper.rb
@@ -1,8 +1,8 @@
 module ProgressBarHelper
   include IconsHelper
 
-  def class_for_progress_list_item(exercise, active)
-    "progress-list-item text-center #{class_for_exercise(exercise)} #{active ? 'active' : ''}"
+  def class_for_progress_list_item(assignment, active)
+    "progress-list-item text-center #{icon_class_for(assignment)} #{active ? 'active' : ''}"
   end
 
 end
diff --git a/app/views/layouts/_progress_bar.html.erb b/app/views/layouts/_progress_bar.html.erb
index 3e499cf4c8..498a89cd5b 100644
--- a/app/views/layouts/_progress_bar.html.erb
+++ b/app/views/layouts/_progress_bar.html.erb
@@ -1,12 +1,14 @@
 <div class="progress-list-flex">
-  <% guide.exercises.each do |e| %>
+  <% assignments = guide.assignments_for(current_user) %>
+  <% assignments.each do |assignment| %>
+    <% exercise = assignment.exercise %>
     <a
-      <%= turbolinks_enable_for e %>
-      href="<%= exercise_path(e)%>"
-      aria-label="<%= e.navigable_name %>"
-      title="<%= e.navigable_name %>"
-      data-mu-exercise-id="<%= e.id %>"
-      class="<%= class_for_progress_list_item(e, e == actual)%>">
+      <%= turbolinks_enable_for exercise %>
+      href="<%= exercise_path(exercise)%>"
+      aria-label="<%= exercise.navigable_name %>"
+      title="<%= exercise.navigable_name %>"
+      data-mu-exercise-id="<%= exercise.id %>"
+      class="<%= class_for_progress_list_item(assignment, exercise == actual)%>">
     </a>
   <% end %>
 </div>

From 5dd4345fdbff3f8d610aa1ced8461c7f23c773ed Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sun, 24 Jan 2021 14:44:34 -0300
Subject: [PATCH 06/13] 5th optimiztion: load stats just once @ exercise

---
 app/views/layouts/_guide.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_guide.html.erb b/app/views/layouts/_guide.html.erb
index b58096287c..925e665e01 100644
--- a/app/views/layouts/_guide.html.erb
+++ b/app/views/layouts/_guide.html.erb
@@ -2,7 +2,7 @@
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% if subject.timed? && subject.started?(current_user) && !current_user.teacher? %>
+<% if subject.timed? && @stats.started? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
 <% end %>
 

From 1de58d5d7ec330e53c2ad8032d610733041c2108 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Sun, 24 Jan 2021 23:23:19 -0300
Subject: [PATCH 07/13] 6th optimization: avoid preparing guide corollary

Unless it is about to finish, obviously
---
 app/views/exercises/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
index 9f7cf09e6c..b55958682e 100644
--- a/app/views/exercises/show.html.erb
+++ b/app/views/exercises/show.html.erb
@@ -65,6 +65,6 @@
     <%= render partial: 'layouts/modals/level_up' %>
   <% end %>
 
-  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
+  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} if @stats.almost_done? %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

From d235ff9cd47cdd5232b61c48c6497b0425979584 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Mon, 25 Jan 2021 10:36:09 -0300
Subject: [PATCH 08/13] 1st: Cache breadcrumb

---
 app/helpers/breadcrumbs_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb
index 56bbb86422..04e581c25e 100644
--- a/app/helpers/breadcrumbs_helper.rb
+++ b/app/helpers/breadcrumbs_helper.rb
@@ -2,7 +2,9 @@ module BreadcrumbsHelper
   include DiscussionsHelper
 
   def breadcrumbs(e, extra=nil)
-    breadcrumbs0(e.navigable_name, e, extra, 'last')
+    Rails.cache.fetch [:breadcrumb, e, extra, Organization.current] do
+      breadcrumbs0(e.navigable_name, e, extra, 'last')
+    end
   end
 
   def header_breadcrumbs(link_for_organization: true)

From 518fc14503144d9aead5015f9e7009a6e117d63c Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Mon, 25 Jan 2021 10:36:50 -0300
Subject: [PATCH 09/13] 2nd: Cache paths to elements

---
 app/helpers/links_helper.rb             | 17 ++++++-----------
 spec/helpers/application_helper_spec.rb |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/helpers/links_helper.rb b/app/helpers/links_helper.rb
index b8d2a1ee77..c24d36d048 100644
--- a/app/helpers/links_helper.rb
+++ b/app/helpers/links_helper.rb
@@ -1,8 +1,10 @@
 module LinksHelper
 
   def link_to_path_element(element, options={})
-    name = extract_name element, options
-    link_to name, element, options
+    mode = options[:mode]
+    Rails.cache.fetch [:link, element, mode, Organization.current] do
+      link_to extract_name(element, mode), element
+    end
   end
 
   def link_to_error_404
@@ -65,15 +67,8 @@ def turbolinks_enable_for(exercise)
 
   private
 
-  def extract_name(named, options)
-    case options.delete(:mode)
-      when :plain
-        named.name
-      when :friendly
-        named.friendly
-      else
-        named.navigable_name
-    end
+  def extract_name(named, mode )
+    mode == :plain ? named.name : named.navigable_name
   end
 
   def edit_link_to_bibliotheca
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index c67da7a59f..5411723eee 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -17,7 +17,6 @@
     before { reindex_current_organization! }
 
     it { expect(link_to_path_element(exercise, mode: :plain)).to eq '<a href="/exercises/30-c1-bar-foo3">foo3</a>' }
-    it { expect(link_to_path_element(exercise, mode: :friendly)).to eq '<a href="/exercises/30-c1-bar-foo3">C1: bar - foo3</a>' }
     it { expect(link_to_path_element(exercise)).to eq '<a href="/exercises/30-c1-bar-foo3">3. foo3</a>' }
   end
 

From d1ee4858482150b33815b831129305b8b45de1c6 Mon Sep 17 00:00:00 2001
From: Franco Bulgarelli <franco@mumuki.org>
Date: Mon, 25 Jan 2021 11:02:21 -0300
Subject: [PATCH 10/13] 3rd: Greedly cache progress listing

---
 app/views/layouts/_progress_listing.html.erb | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_progress_listing.html.erb b/app/views/layouts/_progress_listing.html.erb
index 6cce14a771..d7d32e2252 100644
--- a/app/views/layouts/_progress_listing.html.erb
+++ b/app/views/layouts/_progress_listing.html.erb
@@ -1,10 +1,17 @@
 <ul class="progress-listing">
-  <% guide.assignments_for(current_user).each do |assignment| %>
-      <% cache [assignment.exercise, assignment.status, Organization.current] do %>
-          <li <%= turbolinks_enable_for(assignment.exercise) %>>
-            <%= assignment_status_icon assignment %>
-            <%= link_to_path_element(assignment.exercise) %>
-          </li>
-      <% end %>
+  <%
+    assignments = guide.assignments_for(current_user)
+    statuses = assignments.map(&:status)
+  %>
+  <% cache_if statuses.chunk_while(&:==).count <= 2, [guide, statuses, Organization.current] do %>
+    <% assignments.each do |assignment| %>
+        <% cache [assignment.exercise, assignment.status, Organization.current] do %>
+            <li <%= turbolinks_enable_for(assignment.exercise) %>>
+              <%= assignment_status_icon assignment %>
+              <%= link_to_path_element(assignment.exercise) %>
+            </li>
+        <% end %>
+    <% end %>
   <% end %>
+
 </ul>

From 9f1fc6f5a6d042af231f2ce7a8fa225c523c7a49 Mon Sep 17 00:00:00 2001
From: Franco Leonardo Bulgarelli <franco@mumuki.org>
Date: Sat, 30 Jan 2021 19:29:49 -0300
Subject: [PATCH 11/13] Rename actual to current

---
 app/views/exercises/show.html.erb        | 2 +-
 app/views/layouts/_progress_bar.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/exercises/show.html.erb b/app/views/exercises/show.html.erb
index b55958682e..3bb077f1cc 100644
--- a/app/views/exercises/show.html.erb
+++ b/app/views/exercises/show.html.erb
@@ -30,7 +30,7 @@
 
 <div>
   <% if @stats && standalone_mode? %>
-      <%= render partial: 'layouts/progress_bar', locals: {actual: @exercise, guide: @exercise.guide, stats: @stats} %>
+      <%= render partial: 'layouts/progress_bar', locals: {current: @exercise, guide: @exercise.guide, stats: @stats} %>
   <% end %>
 </div>
 
diff --git a/app/views/layouts/_progress_bar.html.erb b/app/views/layouts/_progress_bar.html.erb
index 498a89cd5b..168707b110 100644
--- a/app/views/layouts/_progress_bar.html.erb
+++ b/app/views/layouts/_progress_bar.html.erb
@@ -8,7 +8,7 @@
       aria-label="<%= exercise.navigable_name %>"
       title="<%= exercise.navigable_name %>"
       data-mu-exercise-id="<%= exercise.id %>"
-      class="<%= class_for_progress_list_item(assignment, exercise == actual)%>">
+      class="<%= class_for_progress_list_item(assignment, exercise == current)%>">
     </a>
   <% end %>
 </div>

From b78a45a04f889942abd253786cc056d968d3342e Mon Sep 17 00:00:00 2001
From: Franco Leonardo Bulgarelli <franco@mumuki.org>
Date: Sat, 30 Jan 2021 19:39:42 -0300
Subject: [PATCH 12/13] Update domain

---
 Gemfile                   | 3 ---
 mumuki-laboratory.gemspec | 2 +-
 spec/dummy/db/schema.rb   | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f38fc0840b..7e379383cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,3 @@ group :development, :test do
   gem 'teaspoon-jasmine'
   gem 'selenium-webdriver'
 end
-
-
-gem "mumuki-domain", github: "mumuki/mumuki-domain", branch: "chore-database-optimization"
\ No newline at end of file
diff --git a/mumuki-laboratory.gemspec b/mumuki-laboratory.gemspec
index 4c7612867b..82246dad79 100644
--- a/mumuki-laboratory.gemspec
+++ b/mumuki-laboratory.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", "~> 5.1.6"
 
-  s.add_dependency 'mumuki-domain', '~> 8.3.0'
+  s.add_dependency 'mumuki-domain', '~> 8.4.0'
   s.add_dependency 'mumukit-bridge', '~> 4.1'
   s.add_dependency 'mumukit-login', '~> 7.3'
   s.add_dependency 'mumukit-nuntius', '~> 6.1'
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index 40f638bb85..df36d31055 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -482,6 +482,7 @@
     t.datetime "legal_terms_accepted_at"
     t.datetime "forum_terms_accepted_at"
     t.boolean "banned_from_forum"
+    t.boolean "uppercase_mode"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

From b2d471d1f63a393fbb997d8c5b993f737976e909 Mon Sep 17 00:00:00 2001
From: Franco Leonardo Bulgarelli <franco@mumuki.org>
Date: Sat, 30 Jan 2021 19:40:26 -0300
Subject: [PATCH 13/13] 4th optimization: cache progress items

---
 app/views/layouts/_progress_bar.html.erb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_progress_bar.html.erb b/app/views/layouts/_progress_bar.html.erb
index 168707b110..7f072d87a5 100644
--- a/app/views/layouts/_progress_bar.html.erb
+++ b/app/views/layouts/_progress_bar.html.erb
@@ -2,13 +2,15 @@
   <% assignments = guide.assignments_for(current_user) %>
   <% assignments.each do |assignment| %>
     <% exercise = assignment.exercise %>
-    <a
-      <%= turbolinks_enable_for exercise %>
-      href="<%= exercise_path(exercise)%>"
-      aria-label="<%= exercise.navigable_name %>"
-      title="<%= exercise.navigable_name %>"
-      data-mu-exercise-id="<%= exercise.id %>"
-      class="<%= class_for_progress_list_item(assignment, exercise == current)%>">
-    </a>
+    <% cache [:progress_list_item, exercise, assignment.status, Organization.current, exercise == current] do %>
+      <a
+        <%= turbolinks_enable_for exercise %>
+        href="<%= exercise_path(exercise)%>"
+        aria-label="<%= exercise.navigable_name %>"
+        title="<%= exercise.navigable_name %>"
+        data-mu-exercise-id="<%= exercise.id %>"
+        class="<%= class_for_progress_list_item(assignment, exercise == current)%>">
+      </a>
+    <% end %>
   <% end %>
-</div>
+</div>
\ No newline at end of file