mumuki-domain 9.14.0 → 9.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e234afff822bf8ff746f174c941942d6a5d90d2b285e1613f4a739f13e7df6
-  data.tar.gz: d14adec7ec240db3d6aeff97d2ea7c05cf6dd72134a0118a5a2141c8d97e8215
+  metadata.gz: 6ddb5479d7f8ddd0c1c452f6a27f67ed5423a3d0aadca123e9aebddfed06d062
+  data.tar.gz: e135a47bc3062fd705d316fd2eb7922dc45bec56620c35ac0ada0c77eac2ebd0
 SHA512:
-  metadata.gz: 916afc62518c9ad05a8bd182f56f13b926584652bdc45ee11d267114cf1207b35bd267cccab98d3dffe0df8da200f44937732d8173677869794fb0ea3fa7aaf4
-  data.tar.gz: a0c2e513345ace615a0532c0f9443cc236f33ec1a17aa5177212162a1b1387353d5167f48641ecd2051e5e1f71b651bd454125976615882127a2ba6dd876d4bf
+  metadata.gz: 4a1061815ce251506c410550ee976f552e5266da914845f2ae197a89a11d0f7713a4cbcc5e8ee8fcbef92668860bfda60de3d9fb14245c378d5a74096f849e5b
+  data.tar.gz: d20d53b94de4eda7c28b90bbb0ff095f005c60ee0631a15eb1970d8b853010e4e7f3762662c127b3c674cca0aa1f939c5c9808dfa4ce946cbdd8b973e0419e86

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/concerns/organization/status/base.rb

@@ -19,4 +19,8 @@ class Organization::Status::Base
       outsider_access_mode(user)
     end
   end
+
+  def validate!(user = nil)
+    validate_enabled! unless user
+  end
 end

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

@@ -20,9 +20,8 @@ class Organization::Status::Disabled < Organization::Status::Base
     end
   end
 
-  def validate!(user = nil)
-    raise Mumuki::Domain::DisabledOrganizationError unless user
+  def validate_enabled!
+    raise Mumuki::Domain::DisabledOrganizationError
   end
-
 end
 

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

@@ -20,7 +20,6 @@ class Organization::Status::Enabled < Organization::Status::Base
     end
   end
 
-  def validate!(_user = nil)
+  def validate_enabled!
   end
-
 end

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

@@ -20,8 +20,7 @@ class Organization::Status::InPreparation < Organization::Status::Base
     end
   end
 
-  def validate!(user = nil)
-    raise Mumuki::Domain::UnpreparedOrganizationError unless user
+  def validate_enabled!
+    raise Mumuki::Domain::UnpreparedOrganizationError
   end
-
 end

data/app/models/concerns/with_organization_status.rb

@@ -1,13 +1,11 @@
 module WithOrganizationStatus
 
+  delegate :validate_enabled!, :access_mode, to: :status
+
   def status
     @status ||= _status
   end
 
-  def access_mode(user)
-    status.access_mode(user)
-  end
-
   def validate_active!
     status.validate!
   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_here?
   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
 

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/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.0'
+    VERSION = '9.17.0'
   end
 end

metadata

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