mumuki-domain 9.1.2 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cee0ac6003bfa5540350ced96322774553ba6999f9c37d90aa48cb08d7af787d
-  data.tar.gz: 69f2c3b8f4025cd5eee0b1b3dcfa155a2f278719bd220c34910bdf04ad1bf019
+  metadata.gz: 85f8e4d573ce0f6681d4e1924eecdf84e2967a033e3090c4a649f585e7587081
+  data.tar.gz: c0cc95b03d98873b09c462b34cc69c741b638f04f8fce6f184c28472853449b2
 SHA512:
-  metadata.gz: 5e9421f3b18be2279b97185b622dd3079588e2843e9e217d610749f458433ed37c9cba47d551da49c0623aa5b891a746980c510b893423526ce665eb1f615b50
-  data.tar.gz: 2fcca6401cf692bd457b6273ca39aaa3f16864e6cc7da2f62f1c468409e3f11e8b99ad292f58d52e35c02e1428ce2c050cfc302bdde5e5aa1e223aaecd4f8829
+  metadata.gz: f92c8f47f514d0d5a38e5ce78dd93745591ce7344758c679439ee60388b5863e64e80b1061572b03c7842792dce189554fe7d986f49130940ad83faf8968bb8d
+  data.tar.gz: 6fb9c49eb8232748fb02fdb45866583a913c17416071af6de67cdf9cca2013a886d01c1df25035a17c54f09b7158d152312e3526c10355743659145aa9ac8208

data/app/models/application_record.rb

@@ -29,7 +29,7 @@ class ApplicationRecord < ActiveRecord::Base
   def self.serialize_symbolized_hash_array(*keys)
     keys.each do |field|
       serialize field
-      define_method(field) { self[field]&.map { |it| it.symbolize_keys } }
+      define_method(field) { self[field]&.map { |it| it.deep_symbolize_keys } }
     end
   end
 

data/app/models/concerns/with_pg_lock.rb

@@ -0,0 +1,19 @@
+module WithPgLock
+  ##
+  # Lock PG table, reload model and execute callback if
+  # criterion is met
+  #
+  def with_pg_lock(callback, criterion = proc { true })
+    # Some notes:
+    #
+    # * nowait is a postgre specific option and may not work with other databases
+    # * nowait will raise an exception if the lock can not be acquired
+    # * we are using a double check lock pattern to reduce lock acquisition
+    with_lock('for update nowait') do
+      reload
+      callback.call if criterion.call
+    end if criterion.call
+  rescue
+    nil
+  end
+end

data/app/models/concerns/with_reminders.rb

@@ -1,5 +1,6 @@
 module WithReminders
   extend ActiveSupport::Concern
+  include WithPgLock
 
   def build_reminder
     mailer = UserMailer.new
@@ -18,23 +19,13 @@ module WithReminders
   end
 
   # Try to send a reminder, by acquiring a database lock for update
-  # the aproppriate record. This object can't be updated as long as
+  # the appropriate record. This object can't be updated as long as
   # the reminder is being sent.
   #
   # This method is aimed to be sent across multiple servers or processed concurrently
   # and still not send duplicate mails
   def try_remind_with_lock!
-    # Some notes:
-    #
-    # * nowait is a postgre specific option and may not work with other databases
-    # * nowait will raise an exception if the lock can not be acquired
-    # * we are using a double check lock pattern to reduce lock acquisition
-    with_lock('for update nowait') do
-      reload
-      remind! if should_remind?
-    end if should_remind?
-  rescue
-    nil
+    with_pg_lock proc { remind! }, proc { should_remind? }
   end
 
   private

data/app/models/concerns/with_responsible_moderator.rb

@@ -0,0 +1,51 @@
+module WithResponsibleModerator
+  extend ActiveSupport::Concern
+
+  MODERATOR_MAX_RESPONSIBLE_TIME = 45.minutes
+
+  def toggle_responsible!(moderator)
+    if responsible?(moderator)
+      no_responsible!
+    elsif no_current_responsible?
+      responsible! moderator
+    end
+  end
+
+  def any_responsible?
+    responsible_moderator_at.present? && (responsible_moderator_at + MODERATOR_MAX_RESPONSIBLE_TIME).future?
+  end
+
+  def no_current_responsible?
+    !any_responsible?
+  end
+
+  def responsible?(moderator)
+    any_responsible? && responsible_moderator_by == moderator
+  end
+
+  def current_responsible_visible_for?(user)
+    user&.moderator_here? && any_responsible?
+  end
+
+  def can_toggle_responsible?(user)
+    can_have_responsible? && user_can_be_responsible?(user)
+  end
+
+  private
+
+  def responsible!(moderator)
+    update! responsible_moderator_at: Time.now, responsible_moderator_by: moderator
+  end
+
+  def no_responsible!
+    update! responsible_moderator_at: nil, responsible_moderator_by: nil
+  end
+
+  def user_can_be_responsible?(user)
+    user&.moderator_here? && (no_current_responsible? || responsible?(user))
+  end
+
+  def can_have_responsible?
+    opened? || pending_review?
+  end
+end

data/app/models/discussion.rb

@@ -1,11 +1,11 @@
 class Discussion < ApplicationRecord
-  include WithDiscussionStatus, WithScopedQueries, Contextualization
+  include WithDiscussionStatus, WithScopedQueries, Contextualization, WithResponsibleModerator
 
   belongs_to :item, polymorphic: true
   has_many :messages, -> { order(:created_at) }, dependent: :destroy
   belongs_to :initiator, class_name: 'User'
 
-  belongs_to :last_moderator_access_by, class_name: 'User', optional: true
+  belongs_to :responsible_moderator_by, class_name: 'User', optional: true
   belongs_to :status_updated_by, class_name: 'User', optional: true
 
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
@@ -28,8 +28,6 @@ class Discussion < ApplicationRecord
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status
 
-  MODERATOR_REVIEW_AVERAGE_TIME = 10.minutes
-
   scope :for_user, -> (user) do
     if user.try(:moderator_here?)
       all
@@ -81,7 +79,7 @@ class Discussion < ApplicationRecord
   end
 
   def friendly
-    initiator.name
+    initiator.abbreviated_name
   end
 
   def subscription_for(user)
@@ -101,6 +99,7 @@ class Discussion < ApplicationRecord
     messages.create(message)
     user.subscribe_to! self
     unread_subscriptions(user)
+    no_responsible! if responsible?(user)
   end
 
   def authorized?(user)
@@ -125,6 +124,8 @@ class Discussion < ApplicationRecord
       update! status: status,
               status_updated_by: user,
               status_updated_at: Time.now
+
+      no_responsible! if responsible?(user)
     end
   end
 
@@ -163,25 +164,6 @@ class Discussion < ApplicationRecord
             requires_moderator_response: !has_moderator_response
   end
 
-  def update_last_moderator_access!(user)
-    if user&.moderator_here? && !last_moderator_access_visible_for?(user)
-      update! last_moderator_access_at: Time.now,
-              last_moderator_access_by: user
-    end
-  end
-
-  def being_accessed_by_moderator?
-    last_moderator_access_at.present? && (last_moderator_access_at + MODERATOR_REVIEW_AVERAGE_TIME).future?
-  end
-
-  def last_moderator_access_visible_for?(user)
-    show_last_moderator_access_for?(user) && being_accessed_by_moderator?
-  end
-
-  def show_last_moderator_access_for?(user)
-    user&.moderator_here? && last_moderator_access_by != user
-  end
-
   def self.debatable_for(klazz, params)
     debatable_id = params[:"#{klazz.underscore}_id"]
     klazz.constantize.find(debatable_id)

data/app/models/exam_authorization_request.rb

@@ -21,7 +21,7 @@ class ExamAuthorizationRequest < ApplicationRecord
   def icon
     case status.to_sym
     when :pending
-      { class: 'info-circle', type: 'info' }
+      { class: 'hourglass', type: 'info' }
     when :approved
       { class: 'check-circle', type: 'success' }
     when :rejected

data/app/models/exam_registration.rb

@@ -1,4 +1,5 @@
 class ExamRegistration < ApplicationRecord
+  include WithPgLock
   include WithTimedEnablement
   include TerminalNavigation
 
@@ -16,6 +17,8 @@ class ExamRegistration < ApplicationRecord
 
   alias_attribute :name, :description
 
+  scope :should_process, -> { where(processed: false).where(arel_table[:end_time].lt(Time.now)) }
+
   def authorization_criterion
     @authorization_criterion ||= ExamRegistration::AuthorizationCriterion.parse(authorization_criterion_type, authorization_criterion_value)
   end
@@ -40,11 +43,21 @@ class ExamRegistration < ApplicationRecord
     registrees.where.not(id: Notification.notified_users_ids_for(self, self.organization))
   end
 
+  # Try to process authorization request, by acquiring a database lock for update
+  # the appropriate record.
+  #
+  # This method is aimed to be sent across multiple servers or processed concurrently
+  # and still not send duplicate mails
   def process_requests!
+    with_pg_lock proc { process_authorization_requests! }, proc { !processed? }
+  end
+
+  def process_authorization_requests!
     authorization_requests.each do |it|
       process_request! it
       it.try_authorize!
     end
+    update! processed: true
   end
 
   def authorization_request_for(user)

data/app/models/exercise.rb

@@ -29,7 +29,7 @@ class Exercise < ApplicationRecord
   defaults { self.submissions_count = 0 }
 
   def self.default_scope
-    where(manual_evaluation: false) if Organization.safe_current&.prevent_manual_evaluation_content
+    where(manual_evaluation: false) if hide_manual_evaluation?
   end
 
   alias_method :progress_for, :assignment_for
@@ -256,6 +256,10 @@ class Exercise < ApplicationRecord
     layouts.keys[0]
   end
 
+  def self.hide_manual_evaluation?
+    Organization.safe_current&.prevent_manual_evaluation_content
+  end
+
   def self.with_pending_assignments_for(user, relation)
     relation.
         joins("left join assignments assignments
@@ -266,6 +270,7 @@ class Exercise < ApplicationRecord
                   #{Mumuki::Domain::Status::Submission::Passed.to_i},
                   #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
                 )").
-        where('assignments.id is null')
+        where('assignments.id is null').
+        where(('exercises.manual_evaluation = false' if hide_manual_evaluation?))
   end
 end

data/app/models/user.rb

@@ -16,6 +16,8 @@ class User < ApplicationRecord
 
   has_many :notifications
   has_many :assignments, foreign_key: :submitter_id
+  has_many :indicators
+  has_many :user_stats, class_name: 'UserStats'
   has_many :messages, -> { order(created_at: :desc) }, through: :assignments
 
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
@@ -312,6 +314,18 @@ class User < ApplicationRecord
     UserMailer.certificate(certificate).deliver_later
   end
 
+  def clear_progress_for!(organization)
+    location = { organization: organization }.compact
+
+    target_assignments = assignments.where(location)
+
+    messages.where(assignment: target_assignments).delete_all
+
+    target_assignments.delete_all
+    indicators.where(location).delete_all
+    user_stats.where(location).delete_all
+  end
+
   private
 
   def welcome_to_new_organizations!

data/app/models/user_stats.rb

@@ -31,9 +31,9 @@ class UserStats < ApplicationRecord
   private
 
   def messages_in_discussions_count(date_range = nil)
-    date_filter = { date: date_range }.compact
+    date_filter = { created_at: date_range }.compact
     result = Message.joins(:discussion)
-        .where({sender: user.uid, discussions: { organization: organization }}.merge(date_filter))
+        .where({sender: user.uid, deletion_motive: nil, discussions: { organization: organization }}.merge(date_filter))
         .group(:approved)
         .count
     unapproved = result[false] || 0

data/db/migrate/20210512200453_add_processed_flag_to_exam_registration.rb

@@ -0,0 +1,5 @@
+class AddProcessedFlagToExamRegistration < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exam_registrations, :processed, :boolean, default: false
+  end
+end

data/db/migrate/20210518100153_rename_last_moderator_access.rb

@@ -0,0 +1,6 @@
+class RenameLastModeratorAccess < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :discussions, :last_moderator_access_by_id, :responsible_moderator_by_id
+    rename_column :discussions, :last_moderator_access_at, :responsible_moderator_at
+  end
+end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.1.2'
+    VERSION = '9.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.1.2
+  version: 9.5.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,11 +291,13 @@ files:
 - app/models/concerns/with_name.rb
 - app/models/concerns/with_notifications.rb
 - app/models/concerns/with_number.rb
+- app/models/concerns/with_pg_lock.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
 - app/models/concerns/with_reminders.rb
+- app/models/concerns/with_responsible_moderator.rb
 - app/models/concerns/with_scoped_queries.rb
 - app/models/concerns/with_scoped_queries/filter.rb
 - app/models/concerns/with_scoped_queries/page.rb
@@ -666,6 +668,8 @@ files:
 - db/migrate/20210318194559_add_dates_to_certificate_program.rb
 - db/migrate/20210318195238_rename_certificate_dates.rb
 - db/migrate/20210330175706_create_exam_registration_user_join_table.rb
+- db/migrate/20210512200453_add_processed_flag_to_exam_registration.rb
+- db/migrate/20210518100153_rename_last_moderator_access.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb