mumuki-domain 8.2.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea9b10953e5031cfcfa680763efb0eac02e63b91219c3dbf71b0d30b5dd3250
-  data.tar.gz: 8fda448216e9d80cb4de41a7f43825882e043895705c66c1c6b9b4bc68c5bfec
+  metadata.gz: 05e92b25906e2bdad81e9af37f88d03423ce78e18e60e911883e1fd9933056d4
+  data.tar.gz: 3fc2d20e7199cd604ba3462a5755084ed1ed9bbcf4b434d71bd3ed340677d650
 SHA512:
-  metadata.gz: f2f8f341502367fa4a7ba037eb086f0506c19fede8290aba4921430fb22e33cc338faf01bc85d23d9df89fca006dba97705e377f48c3eae789170291644562e5
-  data.tar.gz: e5044aa8475aba10ea9d1140eceefccd9fc36de384cf215007f4f239568aebf9f06583074249af630fff81db9da8d429604fa428db0c509a55c4f9092b25965d
+  metadata.gz: 8b75c52aeec6f2403888816619740882acf061c684d09f71fd52094c9cc2b13561203433b13eaca1499a4d7c6f7046e596d3e01d95ac0e02e983bf1107fc2923
+  data.tar.gz: 56ed033125bb4eea0d39ba693dca8e142532846159dea3e68329f3b79984ac201a3852ec6019c9428f2696d1e900583c09cd55f8b80c38215fe02ebefd014ed0

data/Rakefile

@@ -1,3 +1,5 @@
+ENV['RAILS_ENV'] = 'test'
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/app/models/chapter.rb

@@ -13,6 +13,9 @@ class Chapter < ApplicationRecord
 
   has_many :exercises, through: :topic
 
+  delegate :monolesson?, :monolesson, :first_lesson, to: :topic
+
+  delegate :next_exercise, :stats_for, to: :monolesson, allow_nil: true
 
   def used_in?(organization)
     organization.book == self.book

data/app/models/concerns/with_timed_enablement.rb

@@ -0,0 +1,11 @@
+module WithTimedEnablement
+  extend ActiveSupport::Concern
+
+  def enabled?
+    enabled_range.cover? DateTime.current
+  end
+
+  def enabled_range
+    start_time..end_time
+  end
+end

data/app/models/exam.rb

@@ -3,13 +3,17 @@ class Exam < ApplicationRecord
   include GuideContainer
   include FriendlyName
   include TerminalNavigation
+  include WithTimedEnablement
 
   belongs_to :organization
   belongs_to :course
 
   has_many :authorizations, class_name: 'ExamAuthorization', dependent: :destroy
+  has_many :authorization_requests, class_name: 'ExamAuthorizationRequest', dependent: :destroy
   has_many :users, through: :authorizations
 
+  has_and_belongs_to_many :exam_registrations
+
   enum passing_criterion_type: [:none, :percentage, :passed_exercises], _prefix: :passing_criterion
 
   validates_presence_of :start_time, :end_time
@@ -27,14 +31,6 @@ class Exam < ApplicationRecord
     organization == self.organization
   end
 
-  def enabled?
-    enabled_range.cover? DateTime.current
-  end
-
-  def enabled_range
-    start_time..end_time
-  end
-
   def enabled_for?(user)
     enabled_range_for(user).cover? DateTime.current
   end

data/app/models/exam_authorization_request.rb

@@ -0,0 +1,19 @@
+class ExamAuthorizationRequest < ApplicationRecord
+  belongs_to :exam
+  belongs_to :user
+  belongs_to :organization
+
+  enum status: %i(pending approved rejected)
+
+  after_update :notify_user!
+
+  def try_authorize!
+    exam.authorize! user if approved?
+  end
+
+  private
+
+  def notify_user!
+    Notification.create! organization: organization, user: user, target: self if saved_change_to_status?
+  end
+end

data/app/models/exam_registration.rb

@@ -0,0 +1,38 @@
+class ExamRegistration < ApplicationRecord
+  include WithTimedEnablement
+
+  belongs_to :organization
+  has_and_belongs_to_many :exams
+  has_many :authorization_requests, class_name: 'ExamAuthorizationRequest', through: :exams
+
+  enum authorization_criterion_type: %i(none passed_exercises), _prefix: :authorization_criterion
+
+  before_save :ensure_valid_authorization_criterion!
+
+  delegate :meets_authorization_criteria?, :process_request!, to: :authorization_criterion
+
+  def authorization_criterion
+    @authorization_criterion ||= ExamRegistration::AuthorizationCriterion.parse(authorization_criterion_type, authorization_criterion_value)
+  end
+
+  def ensure_valid_authorization_criterion!
+    authorization_criterion.ensure_valid!
+  end
+
+  def start!(users)
+    users.each &method(:notify_user!)
+  end
+
+  def process_requests!
+    authorization_requests.each do |it|
+      process_request! it
+      it.try_authorize!
+    end
+  end
+
+  private
+
+  def notify_user!(user)
+    Notification.create! organization: organization, user: user, target: self
+  end
+end

data/app/models/exam_registration/authorization_criterion.rb

@@ -0,0 +1,61 @@
+class ExamRegistration::AuthorizationCriterion
+  attr_reader :value
+
+  def initialize(value)
+    @value = value
+  end
+
+  def type
+    self.class.name.demodulize.underscore
+  end
+
+  def as_json
+    { type: type, value: value }
+  end
+
+  def ensure_valid!
+    raise "Invalid criterion value #{value} for #{type}" unless valid?
+  end
+
+  def process_request!(authorization_request)
+    authorization_request.update! status: authorization_status_for(authorization_request)
+  end
+
+  def authorization_status_for(authorization_request)
+    meets_authorization_criteria?(authorization_request) ? :approved : :rejected
+  end
+
+  def self.parse(type, value)
+    parse_criterion_type(type, value)
+  end
+
+  def self.parse_criterion_type(type, value)
+    "ExamRegistration::AuthorizationCriterion::#{type.camelize}".constantize.new(value)
+  rescue
+    raise "Invalid criterion type #{type}"
+  end
+end
+
+class ExamRegistration::AuthorizationCriterion::None < ExamRegistration::AuthorizationCriterion
+  def initialize(_)
+    @value = nil
+  end
+
+  def valid?
+    !value
+  end
+
+  def meets_authorization_criteria?(_authorization_request)
+    true
+  end
+end
+
+class ExamRegistration::AuthorizationCriterion::PassedExercises < ExamRegistration::AuthorizationCriterion
+  def valid?
+    value.positive?
+  end
+
+  def meets_authorization_criteria?(authorization_request)
+    authorization_request.user.passed_submissions_count_in(authorization_request.organization) >= value
+  end
+end

data/app/models/exercise.rb

@@ -28,6 +28,10 @@ class Exercise < ApplicationRecord
 
   defaults { self.submissions_count = 0 }
 
+  def self.default_scope
+    where(manual_evaluation: false) if Organization.safe_current&.prevent_manual_evaluation_content
+  end
+
   alias_method :progress_for, :assignment_for
 
   serialize :choices, Array
@@ -38,6 +42,7 @@ class Exercise < ApplicationRecord
 
   randomize(*RANDOMIZED_FIELDS)
   delegate :timed?, to: :navigable_parent
+  delegate :stats_for, to: :guide
 
   def console?
     queriable?

data/app/models/guide.rb

@@ -42,7 +42,11 @@ class Guide < Content
   end
 
   def next_exercise(user)
-    user.next_exercise_at(self)
+    if user.present?
+      user.next_exercise_at(self)
+    else
+      first_exercise
+    end
   end
 
   # TODO: Make use of pending_siblings logic

data/app/models/notification.rb

@@ -0,0 +1,5 @@
+class Notification < ApplicationRecord
+  belongs_to :user
+  belongs_to :organization
+  belongs_to :target, polymorphic: true
+end

data/app/models/organization.rb

@@ -207,7 +207,7 @@ class Organization < ApplicationRecord
     end
 
     def silenced?
-      !Mumukit::Platform::Organization.current? || current.silent?
+      !current? || current.silent?
     end
 
     def sync_key_id_field

data/app/models/topic.rb

@@ -35,6 +35,14 @@ class Topic < Content
     Chapter.where(topic: self).map(&:book).each(&:reindex_usages!)
   end
 
+  def monolesson
+    @monolesson ||= lessons.to_a.single
+  end
+
+  def monolesson?
+    monolesson.present?
+  end
+
   ## Forking
 
   def fork_children_into!(dup, organization, syncer)

data/app/models/user.rb

@@ -12,6 +12,7 @@ class User < ApplicationRecord
   serialize :permissions, Mumukit::Auth::Permissions
 
 
+  has_many :notifications
   has_many :assignments, foreign_key: :submitter_id
   has_many :messages, -> { order(created_at: :desc) }, through: :assignments
 
@@ -49,6 +50,10 @@ class User < ApplicationRecord
     last_guide.try(:lesson)
   end
 
+  def passed_submissions_count_in(organization)
+    assignments.where(top_submission_status: Mumuki::Domain::Status::Submission::Passed.to_i, organization: organization).count
+  end
+
   def submissions_count
     assignments.pluck(:submissions_count).sum
   end

data/app/models/with_stats.rb

@@ -1,5 +1,6 @@
 module WithStats
   def stats_for(user)
+    return unless user.present?
     Stats.from_statuses exercises.map { |it| it.status_for(user) }
   end
 

data/db/migrate/20210114200545_create_exam_registrations.rb

@@ -0,0 +1,14 @@
+class CreateExamRegistrations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :exam_registrations do |t|
+      t.string :description
+      t.datetime :start_time, null: false
+      t.datetime :end_time, null: false
+      t.integer :authorization_criterion_type, default: 0
+      t.integer :authorization_criterion_value
+      t.references :organization, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210118180941_create_exam_authorization_request.rb

@@ -0,0 +1,13 @@
+class CreateExamAuthorizationRequest < ActiveRecord::Migration[5.1]
+  def change
+    create_table :exam_authorization_requests do |t|
+      t.integer :status, default: 0
+      t.references :exam, index: true
+      t.references :exam_registration, index: true
+      t.references :user, index: true
+      t.references :organization, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210118194904_create_notification.rb

@@ -0,0 +1,13 @@
+class CreateNotification < ActiveRecord::Migration[5.1]
+  def change
+    create_table :notifications do |t|
+      t.integer :priority, default: 100
+      t.boolean :read, default: false
+      t.references :target, polymorphic: true
+      t.references :user, index: true
+      t.references :organization, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210119160440_add_prevent_manual_evaluation_content_to_organizations.rb

@@ -0,0 +1,5 @@
+class AddPreventManualEvaluationContentToOrganizations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :prevent_manual_evaluation_content, :boolean
+  end
+end

data/db/migrate/20210119190204_create_exam_registration_exam_join_table.rb

@@ -0,0 +1,8 @@
+class CreateExamRegistrationExamJoinTable < ActiveRecord::Migration[5.1]
+  def change
+    create_join_table :exams, :exam_registrations do |t|
+      t.index :exam_id
+      t.index :exam_registration_id
+    end
+  end
+end

data/lib/mumuki/domain/factories.rb

@@ -7,6 +7,8 @@ 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_request_factory'
+require_relative './factories/exam_registration_factory'
 require_relative './factories/exercise_factory'
 require_relative './factories/guide_factory'
 require_relative './factories/invitation_factory'

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :exam_authorization_request do
+    organization { Organization.current }
+    exam { create(:exam) }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :exam_registration do
+    description { Faker::Lorem.sentence(word_count: 5) }
+    organization { Organization.current }
+    start_time { 5.minutes.ago }
+    end_time { 10.minutes.since }
+  end
+end

data/lib/mumuki/domain/helpers/organization.rb

@@ -74,6 +74,10 @@ module Mumuki::Domain::Helpers::Organization
       Mumukit::Platform::Organization.current?
     end
 
+    def safe_current
+      current if current?
+    end
+
     def parse(json)
       json
         .slice(:name)

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.2.0'
+    VERSION = '8.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -297,6 +297,7 @@ files:
 - app/models/concerns/with_slug.rb
 - app/models/concerns/with_target_audience.rb
 - app/models/concerns/with_terms_acceptance.rb
+- app/models/concerns/with_timed_enablement.rb
 - app/models/concerns/with_usages.rb
 - app/models/concerns/with_user_navigation.rb
 - app/models/content.rb
@@ -306,6 +307,9 @@ files:
 - app/models/exam.rb
 - app/models/exam/passing_criterion.rb
 - app/models/exam_authorization.rb
+- app/models/exam_authorization_request.rb
+- app/models/exam_registration.rb
+- app/models/exam_registration/authorization_criterion.rb
 - app/models/exercise.rb
 - app/models/exercise/challenge.rb
 - app/models/exercise/interactive.rb
@@ -320,6 +324,7 @@ files:
 - app/models/lesson.rb
 - app/models/medal.rb
 - app/models/message.rb
+- app/models/notification.rb
 - app/models/organization.rb
 - app/models/progress.rb
 - app/models/stats.rb
@@ -637,6 +642,11 @@ files:
 - db/migrate/20201027134205_add_immersible_to_organization.rb
 - db/migrate/20201027152806_create_terms.rb
 - db/migrate/20201130163114_add_banned_from_forum_to_users.rb
+- db/migrate/20210114200545_create_exam_registrations.rb
+- db/migrate/20210118180941_create_exam_authorization_request.rb
+- db/migrate/20210118194904_create_notification.rb
+- db/migrate/20210119160440_add_prevent_manual_evaluation_content_to_organizations.rb
+- db/migrate/20210119190204_create_exam_registration_exam_join_table.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -669,7 +679,9 @@ 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_request_factory.rb
 - lib/mumuki/domain/factories/exam_factory.rb
+- lib/mumuki/domain/factories/exam_registration_factory.rb
 - lib/mumuki/domain/factories/exercise_factory.rb
 - lib/mumuki/domain/factories/guide_factory.rb
 - lib/mumuki/domain/factories/invitation_factory.rb