mumuki-domain 9.17.0 → 9.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ddb5479d7f8ddd0c1c452f6a27f67ed5423a3d0aadca123e9aebddfed06d062
-  data.tar.gz: e135a47bc3062fd705d316fd2eb7922dc45bec56620c35ac0ada0c77eac2ebd0
+  metadata.gz: 95912abc73b50f774b4e87873ea35afa3ce9016d4cf90ce9af6cfb9c88ea9c56
+  data.tar.gz: 3d2cbbf7c128f280edb477d38ad3a37770943ba9a0e6809d54936c62efb54186
 SHA512:
-  metadata.gz: 4a1061815ce251506c410550ee976f552e5266da914845f2ae197a89a11d0f7713a4cbcc5e8ee8fcbef92668860bfda60de3d9fb14245c378d5a74096f849e5b
-  data.tar.gz: d20d53b94de4eda7c28b90bbb0ff095f005c60ee0631a15eb1970d8b853010e4e7f3762662c127b3c674cca0aa1f939c5c9808dfa4ce946cbdd8b973e0419e86
+  metadata.gz: 54c74640cdef38c3aeec166b5fded89c82f4f867b37f83a2d0b3e24ef0bb4e0f0b707de265aaae9b56decfe6bdfadc6aa0448fb16506af72119ab3dca0e860c8
+  data.tar.gz: 75949f754f836b0315f5e717532e02de38a8222819d2ae4441df4b524e7fda2c55f45a12696d034060f3a1754120c6707f1cc6d3b9682d591d6c9edd8521fa58

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

@@ -10,6 +10,6 @@ module Gamified
   end
 
   def net_experience
-    submission_status.exp_given - top_submission_status.exp_given
+    submitter.currently_in_exam? ? 0 : (submission_status.exp_given - top_submission_status.exp_given)
   end
 end

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/concerns/with_scoped_queries/limit.rb

@@ -0,0 +1,14 @@
+module WithScopedQueries::Limit
+  def self.query_by(params, current_scope, _)
+    if params[:limit].present?
+      max_limit = [params[:limit].to_i, 25].min
+      current_scope.limit(max_limit)
+    else
+      current_scope
+    end
+  end
+
+  def self.add_queriable_attributes_to(klass, _)
+    klass.queriable_attributes.merge!(limit: :limit)
+  end
+end

data/app/models/concerns/with_scoped_queries/page.rb

@@ -1,10 +1,14 @@
 module WithScopedQueries::Page
   def self.query_by(params, current_scope, _)
-    page_param = params[:page] || 1
-    current_scope.page(page_param).per(10)
+    if params[:limit].present?
+      current_scope
+    else
+      page_param = params[:page] || 1
+      current_scope.page(page_param).per(10)
+    end
   end
 
   def self.add_queriable_attributes_to(klass, _)
-    klass.queriable_attributes.merge!(page: :page)
+    klass.queriable_attributes.merge!(page: [:page, :limit])
   end
 end

data/app/models/concerns/with_scoped_queries.rb

@@ -1,7 +1,7 @@
 module WithScopedQueries
   extend ActiveSupport::Concern
 
-  SCOPING_METHODS = [Filter, Sort, Page]
+  SCOPING_METHODS = [Filter, Sort, Page, Limit]
 
   included do
     class_attribute :queriable_attributes, instance_writer: false

data/app/models/discussion.rb

@@ -22,14 +22,16 @@ class Discussion < ApplicationRecord
                                           .or(where(responsible_moderator_at: nil)) }
   scope :pending_review, -> { where(status: :pending_review) }
   scope :unread_first, -> { includes(:subscriptions).reorder('subscriptions.read', created_at: :desc) }
+  scope :by_recent, -> (_) { where('created_at > ?', Time.now - 6.months)}
 
   after_create :subscribe_initiator!
 
   markdown_on :description
 
   sortable :responses_count, :upvotes_count, :created_at, default: :created_at_desc
-  filterable :status, :language, :requires_attention
+  filterable :status, :language, :requires_attention, :recent
   pageable
+  limitable
 
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status

data/app/models/exam.rb

@@ -49,7 +49,7 @@ class Exam < ApplicationRecord
   end
 
   def accessible_for?(user)
-    (authorized?(user) && enabled_for?(user)) || user&.teacher_here?
+    (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/message.rb

@@ -10,6 +10,7 @@ class Message < ApplicationRecord
   validates_presence_of :content, :sender
   validate :ensure_contextualized
 
+  before_create :mark_from_moderator!
   after_save :update_counters_cache!
 
   markdown_on :content
@@ -53,7 +54,7 @@ class Message < ApplicationRecord
   end
 
   def from_moderator?
-    sender_user.moderator_here?
+    from_moderator || sender_user.moderator_here?
   end
 
   def from_user?(user)
@@ -74,7 +75,7 @@ class Message < ApplicationRecord
 
   def to_resource_h
     as_json(except: [:id, :type, :discussion_id, :approved, :approved_at, :approved_by_id,
-                     :not_actually_a_question, :deletion_motive, :deleted_at, :deleted_by_id],
+                     :not_actually_a_question, :deletion_motive, :deleted_at, :deleted_by_id, :from_moderator],
             include: {exercise: {only: [:bibliotheca_id]}})
         .merge(organization: Organization.current.name)
   end
@@ -103,6 +104,10 @@ class Message < ApplicationRecord
     approved? || from_moderator?
   end
 
+  def mark_from_moderator!
+    self.from_moderator = from_moderator?
+  end
+
   def update_counters_cache!
     discussion&.update_counters!
   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/db/migrate/20211020224011_add_from_moderator_to_messages.rb

@@ -0,0 +1,5 @@
+class AddFromModeratorToMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :from_moderator, :boolean
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
-
   factory :message do
     content { Faker::Lorem.sentence(word_count: 3) }
+    sender { create(:user).uid }
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.17.0'
+    VERSION = '9.21.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.17.0
+  version: 9.21.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-28 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
@@ -306,6 +306,7 @@ files:
 - app/models/concerns/with_responsible_moderator.rb
 - app/models/concerns/with_scoped_queries.rb
 - app/models/concerns/with_scoped_queries/filter.rb
+- app/models/concerns/with_scoped_queries/limit.rb
 - app/models/concerns/with_scoped_queries/page.rb
 - app/models/concerns/with_scoped_queries/sort.rb
 - app/models/concerns/with_slug.rb
@@ -686,6 +687,8 @@ 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
+- db/migrate/20211020224011_add_from_moderator_to_messages.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb