mumuki-domain 9.13.0 → 9.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce9f2ab048f758a4122c66f8a3da650a28c3a2ef10aefd8887a89091ba7a2af
-  data.tar.gz: c55a063f04e3ae7d32750db8b7f520a2bd3f8d37f4411201011fec953ee99079
+  metadata.gz: 304bef838324905dba928e6099d897752778b1781ce9c445448f8e9a6601c76d
+  data.tar.gz: 28b4571ce4c641fec10223786b7e9ddd367d85e8b45fda84e315ef990efe35a7
 SHA512:
-  metadata.gz: d203713ba3bcb38b7d36971a77718ff3887e82d51199e9423635f62a5a244d75433f5aefb7fbfe9c0994971b178dafc655eae03a4b8c9d48bcd0ccc655785441
-  data.tar.gz: c3b3db4bc2faac6b2ec976aa380fdd5ad203ee248f6fc96a7dccee55c58a794d7c7f11944be3ef75f311bd5f791e87590c676192194c3c4247e4dc53a51f67cf
+  metadata.gz: 1727cf0e4115b793e472529251ed7754a2ec4adee510910f0a4d09ebd5c5aa04c2c59dc7b2459b8ab316391e4b0b26422d9c38c4321988b14ca5a27bfc965bcc
+  data.tar.gz: e30036eb0b135ebdd26f8ec9fbb782b445955bc2c24695d6ec298f6b7229f26e54360fe7093a1640540081254f0e0e9f6ad469aa56fdf4af1e000b2c48ffde65

data/app/models/application_record.rb

@@ -1,6 +1,8 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
+  include WithPgLock
+
   delegate :whitelist_attributes, to: :class
 
   def self.teaser_on(*args)

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

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

@@ -1,6 +1,5 @@
 module WithReminders
   extend ActiveSupport::Concern
-  include WithPgLock
 
   def build_reminder
     mailer = UserMailer.new

data/app/models/exam_registration.rb

@@ -1,5 +1,4 @@
 class ExamRegistration < ApplicationRecord
-  include WithPgLock
   include WithTimedEnablement
   include TerminalNavigation
 
@@ -77,6 +76,14 @@ class ExamRegistration < ApplicationRecord
     authorization_criterion.meets_criterion?(user, organization)
   end
 
+  def multiple_options?
+    exams.count > 1
+  end
+
+  def ended?
+    end_time.past?
+  end
+
   private
 
   def notify_registree!(registree)

data/app/models/organization_access_mode/base.rb

@@ -34,6 +34,14 @@ class OrganizationAccessMode::Base
     false
   end
 
+  def restore_indicators?(_content)
+    false
+  end
+
+  def read_only?
+    false
+  end
+
   def validate_discuss_here!(_discussion)
     raise Mumuki::Domain::ForbiddenError
   end

data/app/models/organization_access_mode/read_only.rb

@@ -25,6 +25,14 @@ class OrganizationAccessMode::ReadOnly < OrganizationAccessMode::Base
       (has_scope(:exercises, :submitted) && content.has_progress_for?(user, organization))
   end
 
+  def restore_indicators?(book)
+    !book.has_progress_for?(user, organization) && user.has_assignments_in_organization?(organization)
+  end
+
+  def read_only?
+    true
+  end
+
   private
 
   def has_scope(key, value = :all)

data/app/models/user.rb

@@ -54,7 +54,7 @@ class User < ApplicationRecord
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
   with_temporary_token :delete_account_token
 
-  organic_on :notifications
+  organic_on :notifications, :assignments
 
   def last_lesson
     last_guide.try(:lesson)
@@ -64,10 +64,6 @@ class User < ApplicationRecord
     messages.where('assignments.organization': organization)
   end
 
-  def notifications_in_organization(organization = Organization.current)
-    notifications.where(organization: organization)
-  end
-
   def passed_submissions_count_in(organization)
     assignments.where(top_submission_status: Mumuki::Domain::Status::Submission::Passed.to_i, organization: organization).count
   end
@@ -111,6 +107,16 @@ class User < ApplicationRecord
     end
   end
 
+  def restore_organization_progress!(organization)
+    assignments_in_organization(organization).each do |assignment|
+      assignment.tap(&:parent).save!
+    end
+  end
+
+  def has_assignments_in_organization?(organization)
+    assignments_in_organization(organization).exists?
+  end
+
   def accept_invitation!(invitation)
     make_student_of! invitation.course_slug
   end

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.13.0'
+    VERSION = '9.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.13.0
+  version: 9.15.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails