mumuki-domain 9.13.0 → 9.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce9f2ab048f758a4122c66f8a3da650a28c3a2ef10aefd8887a89091ba7a2af
-  data.tar.gz: c55a063f04e3ae7d32750db8b7f520a2bd3f8d37f4411201011fec953ee99079
+  metadata.gz: 7d31db11eea83cf47119ccf9d3e59f9664d58fb855d8d07ba28c8a3a82e21f43
+  data.tar.gz: 58a403f7d731986fdcb6226b388a650c990a3ddbb38543a25a1edf6574389076
 SHA512:
-  metadata.gz: d203713ba3bcb38b7d36971a77718ff3887e82d51199e9423635f62a5a244d75433f5aefb7fbfe9c0994971b178dafc655eae03a4b8c9d48bcd0ccc655785441
-  data.tar.gz: c3b3db4bc2faac6b2ec976aa380fdd5ad203ee248f6fc96a7dccee55c58a794d7c7f11944be3ef75f311bd5f791e87590c676192194c3c4247e4dc53a51f67cf
+  metadata.gz: 4527364cb58249d910cc3d89452638bf4447a0fb538da1291abbd89df0b0621785d473a5e61d25a35bf2278271506ae1e8ced880ab73bd2a9c2fd232def15d7b
+  data.tar.gz: 21077fb1b6576f433ebce3e9d3b24ad6466498454dee37ece7bfa650625cea3ea3ee12e7796ed4e26f4c96beaa44ec7d7c3bf031f837940fea9637b4a5ec25ec

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/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
 

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

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.13.0'
+    VERSION = '9.13.1'
   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.13.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails