mumuki-domain 9.16.0 → 9.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ca5bebdea5c189193c066336fc00f63aadee23e7a3d898fc90f9801eb118da
-  data.tar.gz: 4f6320243a816ca7be058072d587ee53765afb1eb5e5d25df5d5c774c4e79fc6
+  metadata.gz: 444b1f0d9b9045b65edc00adfa94535e351fb2d0c906e1f5f4ddce6a8ae7da8c
+  data.tar.gz: 9363d9f7b2f7db38f13913a4396417af31583e8d8f45443d3e3792f8add84f8c
 SHA512:
-  metadata.gz: 2cc91011652076858bef72e4e6bded616ab09ae49bc04f88161898546fe4ed5855ec7164d1f8b6999d270caefddb6f7965c16f641b417e6ddffa33716e4fe7a1
-  data.tar.gz: ce626e9a3577946dfbe671924bc1e444292cf5947bce1811739d8ad94b02f3c09c0f3a8fba825aa77967f123ede918ca1cfa19edd625c2709f41ddb1a6706bb5
+  metadata.gz: 1e214a051c3d7ea39244492a5a6ce85e9e96089f0ba7ae880f6a051cb75222bfbf40a643de40b950d7555bff1fe71c3c119561212751626489804eda3c0f7157
+  data.tar.gz: 8262781e1b3e394c222085f7730a869a37b1b8b7145520c429d02f5fba7997cc719aaa3fc1db54d04fc928ecf47dc612a0cd4b670de8b905fc21bedfecda2416

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
@@ -182,8 +186,8 @@ class Assignment < Progress
                     language: {only: [:name]}},
                 },
                 exercise: {only: [:name, :number]},
-                submitter: {only: [:email, :social_id, :uid], methods: [:name, :profile_picture]}}).
-      deep_merge(
+                submitter: {only: [:email, :social_id, :uid], methods: [:name, :profile_picture]}})
+      .deep_merge(
         'organization' => Organization.current.name,
         'sid' => submission_id,
         'created_at' => submitted_at || updated_at,
@@ -198,6 +202,7 @@ class Assignment < Progress
           'position' => navigable_parent.try(:number),
           'chapter' => guide.chapter.as_json(only: [:id], methods: [:name])
         }})
+      .merge({'randomized_values' => randomized_values.presence}.compact)
   end
 
   def tips

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.rb

@@ -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_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,8 +157,8 @@ class User < ApplicationRecord
     save_and_notify!
   end
 
-  def detach!(role, course)
-    make_ex_student_of! course.slug if student_of?(course.slug) && solved_any_exercises?(course.organization)
+  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

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/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.16.0'
+    VERSION = '9.20.0'
   end
 end

metadata

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