mumuki-domain 9.15.0 → 9.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304bef838324905dba928e6099d897752778b1781ce9c445448f8e9a6601c76d
-  data.tar.gz: 28b4571ce4c641fec10223786b7e9ddd367d85e8b45fda84e315ef990efe35a7
+  metadata.gz: d6ca5bebdea5c189193c066336fc00f63aadee23e7a3d898fc90f9801eb118da
+  data.tar.gz: 4f6320243a816ca7be058072d587ee53765afb1eb5e5d25df5d5c774c4e79fc6
 SHA512:
-  metadata.gz: 1727cf0e4115b793e472529251ed7754a2ec4adee510910f0a4d09ebd5c5aa04c2c59dc7b2459b8ab316391e4b0b26422d9c38c4321988b14ca5a27bfc965bcc
-  data.tar.gz: e30036eb0b135ebdd26f8ec9fbb782b445955bc2c24695d6ec298f6b7229f26e54360fe7093a1640540081254f0e0e9f6ad469aa56fdf4af1e000b2c48ffde65
+  metadata.gz: 2cc91011652076858bef72e4e6bded616ab09ae49bc04f88161898546fe4ed5855ec7164d1f8b6999d270caefddb6f7965c16f641b417e6ddffa33716e4fe7a1
+  data.tar.gz: ce626e9a3577946dfbe671924bc1e444292cf5947bce1811739d8ad94b02f3c09c0f3a8fba825aa77967f123ede918ca1cfa19edd625c2709f41ddb1a6706bb5

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
 

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/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.16.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.16.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -721,6 +721,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