mumuki-domain 9.14.1 → 9.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b312037c43def7204d8591702f2002340539b6f66df217e4bf8b35e5a0392785
-  data.tar.gz: f417d2c02346fcd6e2460c246d38f0a9c4eb1ac8a5162bf72bbe00f983326bec
+  metadata.gz: 58b906585eb037f9120720bf77a34555343051e1aa2c87636a86208604247c2d
+  data.tar.gz: ac72f7c3a8e36c388fe4cbf0c7e1e3a51620c9a2a6a333222a033dfa56ab3176
 SHA512:
-  metadata.gz: 5786a0b215fee7332099994a47e13b24d2f8a66647ede57aaa67bdcdd2e77433e471d8dc5f7ef48369bea06fb2636f900ed365d24b3b1549f0cef3c48d316f25
-  data.tar.gz: 282e425ad11463f7c0945b323327f17addc7997e60f191a034b07317907e0156918fcd667786f4905b89682abe9bb2090148fab392aebd9f99c6c0ab1320be2b
+  metadata.gz: 254fa485adb9816805590f4fc60877b8e1626f152d7e335e419ac5402079ec9bd4f30a5fd85cab712e694c10f8aeb0a9829d762bd1ec01323ccec9525981d930
+  data.tar.gz: 5ef6dd8ed07d02d17c9c6049371bcd50a1235e7958d9a68ea41940121ff72c2f81c17beb9b9a69b2b5d70fc4c811df0bd1181cd18ebc28efbd9676d922d8d1a1

data/app/models/assignment.rb

@@ -43,20 +43,6 @@ class Assignment < Progress
   after_initialize :set_default_top_submission_status
   before_save :award_experience_points!, :update_top_submission!, if: :submission_status_changed?
   after_save :dirty_parent_by_submission!, if: :completion_changed?
-  before_validation :set_current_organization!, unless: :organization
-
-  # TODO: Momentary as some assignments may not have an associated organization
-  def set_current_organization!
-    self.organization = Organization.current
-  end
-
-  def recontextualize!(new_organization = Organization.current)
-    if organization != new_organization
-      dirty_parent_by_submission! if organization.present? && exercise.used_in?(organization)
-      self.organization = new_organization
-      self.parent_id = nil
-    end
-  end
 
   def set_default_top_submission_status
     self.top_submission_status ||= 0
@@ -123,7 +109,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present? && exercise.solvable?
+    if exercise.solvable?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end

data/app/models/exam.rb

@@ -49,7 +49,7 @@ class Exam < ApplicationRecord
   end
 
   def accessible_for?(user)
-    authorized?(user) && enabled_for?(user)
+    (authorized?(user) && enabled_for?(user)) || user&.teacher_of?(course)
   end
 
   def timed?

data/app/models/exam_registration/authorization_criterion.rb

@@ -38,6 +38,10 @@ class ExamRegistration::AuthorizationCriterion
   def meets_authorization_criteria?(authorization_request)
     meets_criterion? authorization_request.user, authorization_request.organization
   end
+
+  def authorization_criteria_matcher
+    criterion_matcher
+  end
 end
 
 class ExamRegistration::AuthorizationCriterion::None < ExamRegistration::AuthorizationCriterion
@@ -52,6 +56,10 @@ class ExamRegistration::AuthorizationCriterion::None < ExamRegistration::Authori
   def meets_criterion?(_user, _organization)
     true
   end
+
+  def criterion_matcher
+    {}
+  end
 end
 
 class ExamRegistration::AuthorizationCriterion::PassedExercises < ExamRegistration::AuthorizationCriterion
@@ -62,4 +70,8 @@ class ExamRegistration::AuthorizationCriterion::PassedExercises < ExamRegistrati
   def meets_criterion?(user, organization)
     user.passed_submissions_count_in(organization) >= value
   end
+
+  def criterion_matcher
+    { 'stats.passed': { '$gte': value.to_f } }
+  end
 end

data/app/models/exam_registration.rb

@@ -12,7 +12,7 @@ class ExamRegistration < ApplicationRecord
 
   before_save :ensure_valid_authorization_criterion!
 
-  delegate :meets_authorization_criteria?, :process_request!, to: :authorization_criterion
+  delegate :meets_authorization_criteria?, :process_request!, :authorization_criteria_matcher, to: :authorization_criterion
 
   alias_attribute :name, :description
 
@@ -76,6 +76,18 @@ class ExamRegistration < ApplicationRecord
     authorization_criterion.meets_criterion?(user, organization)
   end
 
+  def available_exams
+    return exams unless limited_authorization_requests?
+    counts = authorization_request_ids_counts
+    exams.select do |it|
+      counts[it.id].to_i < authorization_requests_limit
+    end
+  end
+
+  def limited_authorization_requests?
+    authorization_requests_limit.present?
+  end
+
   def multiple_options?
     exams.count > 1
   end
@@ -84,9 +96,39 @@ class ExamRegistration < ApplicationRecord
     end_time.past?
   end
 
+  def request_authorization!(user, exam)
+    with_available_exam exam do
+      authorization_requests.find_or_create_by! user: user do |it|
+        it.assign_attributes organization: organization, exam: exam
+      end
+    end
+  end
+
+  def update_authorization_request_by_id!(request_id, exam)
+    with_available_exam exam do
+      authorization_requests.update request_id, exam: exam
+    end
+  end
+
+  def authorization_request_ids_counts
+    authorization_requests.group(:exam_id).count
+  end
+
+  def exam_available?(exam)
+    available_exams.include? exam
+  end
+
+  def with_available_exam(exam, &block)
+    transaction do
+      raise Mumuki::Domain::GoneError unless exam_available?(exam)
+      block.call
+    end
+  end
+
   private
 
   def notify_registree!(registree)
     Notification.create_and_notify_via_email! organization: organization, user: registree, subject: :exam_registration, target: self
   end
+
 end

data/app/models/organization.rb

@@ -21,7 +21,7 @@ class Organization < ApplicationRecord
 
   belongs_to :book
   has_many :usages
-
+  has_many :exam_registrations
   has_many :certificate_programs
 
   validates_presence_of :contact_email, :locale, :time_zone

data/app/models/organization_access_mode/base.rb

@@ -23,7 +23,8 @@ class OrganizationAccessMode::Base
 
   def discuss_here?
     organization.forum_enabled? && user.discusser_of?(organization) &&
-      user.trusted_as_discusser_in?(organization) && !user.banned_from_forum?
+      user.trusted_as_discusser_in?(organization) && !user.banned_from_forum? &&
+      !user.currently_in_exam?
   end
 
   def show_discussion_element?

data/app/models/user.rb

@@ -158,6 +158,7 @@ class User < ApplicationRecord
   end
 
   def detach!(role, course)
+    make_ex_student_of! course.slug if student_of?(course.slug) && solved_any_exercises?(course.organization)
     remove_permission! role, course.slug
     save_and_notify!
   end
@@ -202,10 +203,6 @@ class User < ApplicationRecord
     sequence[0..count + lookahead - 1]
   end
 
-  # Tells if the given user can discuss in an organization
-  #
-  # This is true only when this organization has the forum enabled and the user
-  # has the discusser pseudo-permission and the discusser is trusted
   def can_discuss_in?(organization)
     organization.access_mode(self).discuss_here?
   end

data/db/migrate/20210929223144_add_authorization_requests_limit_to_exam_registration.rb

@@ -0,0 +1,5 @@
+class AddAuthorizationRequestsLimitToExamRegistration < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exam_registrations, :authorization_requests_limit, :integer
+  end
+end

data/lib/mumuki/domain/factories/exam_authorization_factory.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :exam_authorization do
+    exam { create(:exam) }
+  end
+end

data/lib/mumuki/domain/factories.rb

@@ -9,6 +9,7 @@ require_relative './factories/complement_factory'
 require_relative './factories/course_factory'
 require_relative './factories/discussion_factory'
 require_relative './factories/exam_factory'
+require_relative './factories/exam_authorization_factory'
 require_relative './factories/exam_authorization_request_factory'
 require_relative './factories/exam_registration_factory'
 require_relative './factories/exercise_factory'

data/lib/mumuki/domain/submission/base.rb

@@ -52,8 +52,6 @@ class Mumuki::Domain::Submission::Base
   private
 
   def save_submission!(assignment)
-    assignment.content = content
-    assignment.recontextualize!
     assignment.save!
   end
 

data/lib/mumuki/domain/submission/persistent_submission.rb

@@ -1,5 +1,6 @@
 class Mumuki::Domain::Submission::PersistentSubmission < Mumuki::Domain::Submission::Base
   def save_submission!(assignment)
+    assignment.content = content
     assignment.running!
     super
     assignment.save_submission! self

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.14.1'
+    VERSION = '9.18.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.14.1
+  version: 9.18.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mumukit-platform
   requirement: !ruby/object:Gem::Requirement
@@ -686,6 +686,7 @@ files:
 - db/migrate/20210707143002_add_assignment_id_to_message.rb
 - db/migrate/20210719145706_add_new_fields_to_notifications.rb
 - db/migrate/20210803175124_add_ignored_notifications_to_users.rb
+- db/migrate/20210929223144_add_authorization_requests_limit_to_exam_registration.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -721,6 +722,7 @@ files:
 - lib/mumuki/domain/factories/complement_factory.rb
 - lib/mumuki/domain/factories/course_factory.rb
 - lib/mumuki/domain/factories/discussion_factory.rb
+- lib/mumuki/domain/factories/exam_authorization_factory.rb
 - lib/mumuki/domain/factories/exam_authorization_request_factory.rb
 - lib/mumuki/domain/factories/exam_factory.rb
 - lib/mumuki/domain/factories/exam_registration_factory.rb