mumuki-domain 9.15.0 → 9.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304bef838324905dba928e6099d897752778b1781ce9c445448f8e9a6601c76d
-  data.tar.gz: 28b4571ce4c641fec10223786b7e9ddd367d85e8b45fda84e315ef990efe35a7
+  metadata.gz: bcb85dd95292fca604bdfd6f77560b37650766ede8bfbf1b7afe9caf4a105efd
+  data.tar.gz: ed1292935f907bde74fe777fd48de3d61ef87c5f62e6db4c3c7c0ae50c5ce3de
 SHA512:
-  metadata.gz: 1727cf0e4115b793e472529251ed7754a2ec4adee510910f0a4d09ebd5c5aa04c2c59dc7b2459b8ab316391e4b0b26422d9c38c4321988b14ca5a27bfc965bcc
-  data.tar.gz: e30036eb0b135ebdd26f8ec9fbb782b445955bc2c24695d6ec298f6b7229f26e54360fe7093a1640540081254f0e0e9f6ad469aa56fdf4af1e000b2c48ffde65
+  metadata.gz: fcc442e31b9f5b510c8a5a99d78bcbd98b8a0f36b828badeb64e25e8eaeecb3d910c7348da4b263047f52e5c6bd9ad6ee8412cfcfdf932cee5418a2ee48cfb7c
+  data.tar.gz: 6f888100f4dc2b1f9c332c3f8b9ebc257c1eb3aa2534c7db85bd0b4f4328f9fc2cd24f8da23ecbd04bb1dab8edd56ad236dac2dd6505ea8451ee5c5b6212c570

data/app/models/assignment.rb

@@ -68,6 +68,10 @@ class Assignment < Progress
     end
   end
 
+  def randomized_values
+    exercise.randomizer.randomized_values(submitter.id)
+  end
+
   def save_submission!(submission)
     transaction do
       update! submission_id: submission.id

data/app/models/concerns/organization/status/in_preparation.rb

@@ -9,7 +9,7 @@ class Organization::Status::InPreparation < Organization::Status::Base
   end
 
   def ex_student_access_mode(user)
-    OrganizationAccessMode::Forbidden.new user, organization
+    OrganizationAccessMode::ReadOnly.new user, organization, :faqs, :profile
   end
 
   def outsider_access_mode(user)

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?
@@ -96,6 +96,10 @@ class Exam < ApplicationRecord
     end
   end
 
+  def time_left(user)
+    (real_end_time(user) - Time.current).round
+  end
+
   def started_at(user)
     authorization_for(user).started_at
   end

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/organization_access_mode/read_only.rb

@@ -17,7 +17,7 @@ class OrganizationAccessMode::ReadOnly < OrganizationAccessMode::Base
   end
 
   def validate_discuss_here!(discussion)
-    super(discussion) unless discussion&.initiator == user
+    super(discussion) unless discuss_here? && discussion&.initiator == user
   end
 
   def show_content?(content)

data/app/models/user.rb

@@ -157,7 +157,8 @@ class User < ApplicationRecord
     save_and_notify!
   end
 
-  def detach!(role, course)
+  def detach!(role, course, deep: false)
+    make_ex_student_of! course.slug if !deep && 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/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.15.0'
+    VERSION = '9.19.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.15.0
+  version: 9.19.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-10-19 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