mumuki-domain 8.3.1 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e92b25906e2bdad81e9af37f88d03423ce78e18e60e911883e1fd9933056d4
-  data.tar.gz: 3fc2d20e7199cd604ba3462a5755084ed1ed9bbcf4b434d71bd3ed340677d650
+  metadata.gz: 945a8212dc38bd06d9ce3a7ba70f58fd5ea3fc2ae7076c81727ef2bdfee05979
+  data.tar.gz: 79dbe9e02af53932d78b403777c3d03f92dff40844047ce40052a43dbbb361c4
 SHA512:
-  metadata.gz: 8b75c52aeec6f2403888816619740882acf061c684d09f71fd52094c9cc2b13561203433b13eaca1499a4d7c6f7046e596d3e01d95ac0e02e983bf1107fc2923
-  data.tar.gz: 56ed033125bb4eea0d39ba693dca8e142532846159dea3e68329f3b79984ac201a3852ec6019c9428f2696d1e900583c09cd55f8b80c38215fe02ebefd014ed0
+  metadata.gz: a59255b4f0dcf4bb464dea4d0c1efb86cd28b3ce85b7e3f0ba2d74ad735505d82d795425bc704dd7b8e2e0bcb45a4a6ebd6e26d6f942971b4149ee0b09dd21c2
+  data.tar.gz: a904b0a41d0c04b09f3dc5afbc4abaf4a228112f57d4f7279798be91a9405b2a9a5bf4d7f0962c55773f3be0add354fecd5ba0e5cc0d5c2e3c91c2b3cea3a38f

data/app/models/assignment.rb

@@ -263,6 +263,10 @@ class Assignment < Progress
     update! misplaced: value if value != misplaced?
   end
 
+  def self.build_for(user, exercise, organization)
+    Assignment.new submitter: user, exercise: exercise, organization: organization
+  end
+
   private
 
   def duplicates_key

data/app/models/concerns/guide_container.rb

@@ -13,7 +13,8 @@ module GuideContainer
              :first_exercise,
              :next_exercise,
              :stats_for,
-             :exercises_count, to: :guide
+             :exercises_count,
+             :assignments_for, to: :guide
   end
 
   def index_usage!(organization = Organization.current)

data/app/models/concerns/with_assignments.rb

@@ -19,6 +19,7 @@ module WithAssignments
   end
 
   # TODO: When the organization is used in this one, please change guide.pending_exercises
+  # TODO: Please do the same on WithAssignmentsBatch
   def find_assignment_for(user, _organization)
     assignments.find_by(submitter: user)
   end

data/app/models/concerns/with_assignments_batch.rb

@@ -0,0 +1,31 @@
+# WithAssignmentsBatch mirrors the WithAssignment mixin
+# but implements operations in batches, so that they outperform
+# their counterparts
+module WithAssignmentsBatch
+  extend ActiveSupport::Concern
+
+  def find_assignments_for(user, _organization = Organization.current, &block)
+    block = block_given? ? block : lambda { |it, _e| it }
+
+    return exercises.map { |it| block.call nil, it  } unless user
+
+    pairs = exercises.map { |it| [it.id, [nil, it]] }.to_h
+    Assignment.where(submitter: user, exercise: exercises).each do |it|
+      pairs[it.exercise_id][0] = it
+    end
+
+    pairs.values.map { |assignment, exercise| block.call assignment, exercise }
+  end
+
+  def statuses_for(user, organization = Organization.current)
+    find_assignments_for user, organization do |it|
+      it&.status || Mumuki::Domain::Status::Submission::Pending
+    end
+  end
+
+  def assignments_for(user, organization = Organization.current)
+    find_assignments_for user, organization do |it, exercise|
+      it || Assignment.build_for(user, exercise, organization)
+    end
+  end
+end

data/app/models/concerns/with_preferences.rb

@@ -0,0 +1,7 @@
+module WithPreferences
+  extend ActiveSupport::Concern
+
+  included do
+    composed_of :preferences, mapping: %w(uppercase_mode uppercase_mode), constructor: :from_attributes
+  end
+end

data/app/models/guide.rb

@@ -6,7 +6,8 @@ class Guide < Content
 
   include WithStats,
           WithExpectations,
-          WithLanguage
+          WithLanguage,
+          WithAssignmentsBatch
 
   markdown_on :corollary, :sources, :learn_more, :teacher_info
 

data/app/models/preferences.rb

@@ -0,0 +1,17 @@
+class Preferences
+  include ActiveModel::Model
+
+  def self.attributes
+    [:uppercase_mode]
+  end
+
+  attr_accessor *self.attributes
+
+  def self.from_attributes(*args)
+    new self.attributes.zip(args).to_h
+  end
+
+  def uppercase?
+    uppercase_mode
+  end
+end

data/app/models/stats.rb

@@ -11,6 +11,10 @@ class Stats
     failed + pending == 0
   end
 
+  def almost_done?
+    failed + pending <= 1
+  end
+
   def started?
     submitted > 0
   end

data/app/models/topic.rb

@@ -50,18 +50,19 @@ class Topic < Content
   end
 
   def pending_lessons(user)
-    guides.
-      joins('left join public.exercises exercises
-                on exercises.guide_id = guides.id').
-      joins("left join public.assignments assignments
+    lessons
+      .includes(:guide)
+      .references(:guide)
+      .joins('left join exercises exercises on exercises.guide_id = guides.id')
+      .joins("left join assignments assignments
                 on assignments.exercise_id = exercises.id
                 and assignments.submitter_id = #{user.id}
                 and assignments.submission_status in (
                   #{Mumuki::Domain::Status::Submission::Passed.to_i},
                   #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
-                )").
-      where('assignments.id is null').
-      group('public.guides.id', 'lessons.number').map(&:lesson)
+                )")
+      .where('assignments.id is null')
+      .group('guides.id', 'lessons.number', 'lessons.id')
   end
 
   private

data/app/models/user.rb

@@ -7,6 +7,7 @@ class User < ApplicationRecord
           Awardee,
           Disabling,
           WithTermsAcceptance,
+          WithPreferences,
           Mumuki::Domain::Helpers::User
 
   serialize :permissions, Mumukit::Auth::Permissions
@@ -211,7 +212,7 @@ class User < ApplicationRecord
   end
 
   def build_assignment(exercise, organization)
-    assignments.build(exercise: exercise, organization: organization)
+    Assignment.build_for(self, exercise, organization)
   end
 
   def pending_siblings_at(content)

data/app/models/with_stats.rb

@@ -1,7 +1,7 @@
 module WithStats
   def stats_for(user)
     return unless user.present?
-    Stats.from_statuses exercises.map { |it| it.status_for(user) }
+    Stats.from_statuses statuses_for(user)
   end
 
   def started?(user)

data/db/migrate/20210111125810_add_uppercase_mode_to_user.rb

@@ -0,0 +1,5 @@
+class AddUppercaseModeToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :uppercase_mode, :boolean
+  end
+end

data/lib/mumuki/domain/incognito.rb

@@ -107,7 +107,7 @@ module Mumuki::Domain
     end
 
     def build_assignment(exercise, organization)
-      Assignment.new exercise: exercise, organization: organization, submitter: self
+      Assignment.build_for(self, exercise, organization)
     end
 
     def pending_siblings_at(content)

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.3.1'
+    VERSION = '8.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.3.1
+  version: 8.4.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,6 +270,7 @@ files:
 - app/models/concerns/submittable/triable.rb
 - app/models/concerns/topic_container.rb
 - app/models/concerns/with_assignments.rb
+- app/models/concerns/with_assignments_batch.rb
 - app/models/concerns/with_case_insensitive_search.rb
 - app/models/concerns/with_description.rb
 - app/models/concerns/with_discussion_creation.rb
@@ -286,6 +287,7 @@ files:
 - app/models/concerns/with_messages.rb
 - app/models/concerns/with_name.rb
 - app/models/concerns/with_number.rb
+- app/models/concerns/with_preferences.rb
 - app/models/concerns/with_profile.rb
 - app/models/concerns/with_progress.rb
 - app/models/concerns/with_randomizations.rb
@@ -326,6 +328,7 @@ files:
 - app/models/message.rb
 - app/models/notification.rb
 - app/models/organization.rb
+- app/models/preferences.rb
 - app/models/progress.rb
 - app/models/stats.rb
 - app/models/subscription.rb
@@ -642,6 +645,7 @@ files:
 - db/migrate/20201027134205_add_immersible_to_organization.rb
 - db/migrate/20201027152806_create_terms.rb
 - db/migrate/20201130163114_add_banned_from_forum_to_users.rb
+- db/migrate/20210111125810_add_uppercase_mode_to_user.rb
 - db/migrate/20210114200545_create_exam_registrations.rb
 - db/migrate/20210118180941_create_exam_authorization_request.rb
 - db/migrate/20210118194904_create_notification.rb