mumuki-domain 9.1.1 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469928d18be5b255deb12fc4bf34681d5be7c4fd8ce1d19943e5d931152f89b6
-  data.tar.gz: 36afde0edf8b67cdfb86fd3f6b4b31df496a4a8e33081ca2f8497e34395a64a4
+  metadata.gz: ddd0081f4ed25d268fe17c327be9b5b343a21b2491eb737db4ee837fb16eead8
+  data.tar.gz: 7e34398bd300598d749d628af5ae31a49985ff62f8dda2ce2598169197cacc2d
 SHA512:
-  metadata.gz: 4f803662c7ac490c3531cb7adba534d871efb9e4b54bde3eb9f294971da09794834842892fbbc420d9fc4d231bb51372a76b0b06f021ac70f2fd74f844933284
-  data.tar.gz: 3001b4fa192a0065ed973d70b066612af5b739d1d144a41b037c89136fa06d9289f5d1e1c922063bf045502cab6aa8c02a8c238987ad34563ef0db92712f517c
+  metadata.gz: 87e8fbb20f42949df631f2696c1d10a0c40744b7f84a1c7b705e525a8f2120a1e1ce5a58231a9bb9c2faa4987bd031eba01d3eb01a3e407f7202c4469eaeda72
+  data.tar.gz: 9196ae6c744c474853ffb027cf86f015546539ef994f83c62f27199123e54dbda3372fbd141a22f86c349270a0d14b1e6cdf3fdda47f3476bc6cd594ceb6e742

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/navigation/terminal_navigation.rb

@@ -18,4 +18,8 @@ module TerminalNavigation
   def siblings
     []
   end
+
+  def next_for(_user)
+    nil
+  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/discussion.rb

@@ -28,7 +28,7 @@ class Discussion < ApplicationRecord
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status
 
-  MODERATOR_REVIEW_AVERAGE_TIME = 10.minutes
+  MODERATOR_REVIEW_AVERAGE_TIME = 17.minutes
 
   scope :for_user, -> (user) do
     if user.try(:moderator_here?)

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/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.1.1'
+    VERSION = '9.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.4.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,6 +291,7 @@ 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
@@ -666,6 +667,7 @@ 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
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb