mumuki-domain 9.11.0 → 9.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641d60f1b417f2fa2a9d05fbdd0357b3415a42a222b8a38ab989c63baf5b064b
-  data.tar.gz: db353f1f369e0ae15f0349c2448d476e302921ef36479236408d74bada703f29
+  metadata.gz: 91e234afff822bf8ff746f174c941942d6a5d90d2b285e1613f4a739f13e7df6
+  data.tar.gz: d14adec7ec240db3d6aeff97d2ea7c05cf6dd72134a0118a5a2141c8d97e8215
 SHA512:
-  metadata.gz: b8d1d6c40137d84dd7bf3d4c12c406ce88914efb9cce0a231a4ec1758e9b30ac61c881d940c0890a58dfaec3f69eefad432c67de3c88bef11950be1953f71ded
-  data.tar.gz: 6e784be9dc46359358a831aae422ebadca1840cc9516d664aaa2d16b3100350dd8887a6dba2b1fa064a697b7a2443848cba238f5692caec72113c45a01ffd035
+  metadata.gz: 916afc62518c9ad05a8bd182f56f13b926584652bdc45ee11d267114cf1207b35bd267cccab98d3dffe0df8da200f44937732d8173677869794fb0ea3fa7aaf4
+  data.tar.gz: a0c2e513345ace615a0532c0f9443cc236f33ec1a17aa5177212162a1b1387353d5167f48641ecd2051e5e1f71b651bd454125976615882127a2ba6dd876d4bf

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

@@ -123,7 +123,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if exercise.solvable?
+    if content.present? && exercise.solvable?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end

data/app/models/concerns/organization/status/base.rb

@@ -0,0 +1,22 @@
+class Organization::Status::Base
+
+  attr_reader :organization
+
+  implements :teacher_access_mode, :student_access_mode, :ex_student_access_mode, :outsider_access_mode, :validate!
+
+  def initialize(organization)
+    @organization = organization
+  end
+
+  def access_mode(user)
+    if user&.teacher_of? organization
+      teacher_access_mode(user)
+    elsif user&.student_of? organization
+      student_access_mode(user)
+    elsif user&.ex_student_of? organization
+      ex_student_access_mode(user)
+    else
+      outsider_access_mode(user)
+    end
+  end
+end

data/app/models/concerns/organization/status/disabled.rb

@@ -0,0 +1,28 @@
+class Organization::Status::Disabled < Organization::Status::Base
+
+  def teacher_access_mode(user)
+    OrganizationAccessMode::Full.new user, organization
+  end
+
+  def student_access_mode(user)
+    OrganizationAccessMode::ReadOnly.new user, organization, :faqs, :profile, :exercises, :discussions
+  end
+
+  def ex_student_access_mode(user)
+    OrganizationAccessMode::ReadOnly.new user, organization, :faqs, :profile
+  end
+
+  def outsider_access_mode(user)
+    if organization.public?
+      OrganizationAccessMode::Gone.new user, organization
+    else
+      OrganizationAccessMode::Forbidden.new user, organization
+    end
+  end
+
+  def validate!(user = nil)
+    raise Mumuki::Domain::DisabledOrganizationError unless user
+  end
+
+end
+

data/app/models/concerns/organization/status/enabled.rb

@@ -0,0 +1,26 @@
+class Organization::Status::Enabled < Organization::Status::Base
+
+  def teacher_access_mode(user)
+    OrganizationAccessMode::Full.new user, organization
+  end
+
+  def student_access_mode(user)
+    OrganizationAccessMode::Full.new user, organization
+  end
+
+  def ex_student_access_mode(user)
+    OrganizationAccessMode::ReadOnly.new user, organization, :faqs, :profile, :discussions, exercises: :submitted
+  end
+
+  def outsider_access_mode(user)
+    if organization.public?
+      OrganizationAccessMode::Full.new user, organization
+    else
+      OrganizationAccessMode::Forbidden.new user, organization
+    end
+  end
+
+  def validate!(_user = nil)
+  end
+
+end

data/app/models/concerns/organization/status/in_preparation.rb

@@ -0,0 +1,27 @@
+class Organization::Status::InPreparation < Organization::Status::Base
+
+  def teacher_access_mode(user)
+    OrganizationAccessMode::Full.new user, organization
+  end
+
+  def student_access_mode(user)
+    OrganizationAccessMode::ComingSoon.new user, organization
+  end
+
+  def ex_student_access_mode(user)
+    OrganizationAccessMode::Forbidden.new user, organization
+  end
+
+  def outsider_access_mode(user)
+    if organization.public?
+      OrganizationAccessMode::ComingSoon.new user, organization
+    else
+      OrganizationAccessMode::Forbidden.new user, organization
+    end
+  end
+
+  def validate!(user = nil)
+    raise Mumuki::Domain::UnpreparedOrganizationError unless user
+  end
+
+end

data/app/models/concerns/with_assignments.rb

@@ -30,4 +30,10 @@ module WithAssignments
   def assignment_for(user, organization=Organization.current)
     find_assignment_for(user, organization) || user.build_assignment(self, organization)
   end
+
+  def has_progress_for?(user, organization)
+    user.present? && find_assignment_for(user, organization).present?
+  end
+
+
 end

data/app/models/concerns/with_notifications.rb

@@ -7,7 +7,7 @@ module WithNotifications
 
   def unread_notifications
     # TODO: message and discussion should trigger a notification instead of being one
-    all = notifications.where(read: false) + unread_messages + unread_discussions
+    all = notifications_in_organization.where(read: false) + unread_messages + unread_discussions
     all.sort_by(&:created_at).reverse
   end
 

data/app/models/concerns/with_organization_status.rb

@@ -0,0 +1,32 @@
+module WithOrganizationStatus
+
+  def status
+    @status ||= _status
+  end
+
+  def access_mode(user)
+    status.access_mode(user)
+  end
+
+  def validate_active!
+    status.validate!
+  end
+
+  def validate_active_for!(user)
+    status.validate!(user)
+    access_mode(user).validate_active!
+  end
+
+  private
+
+  def _status
+    if disabled?
+      Organization::Status::Disabled.new self
+    elsif in_preparation?
+      Organization::Status::InPreparation.new self
+    else
+      Organization::Status::Enabled.new self
+    end
+  end
+
+end

data/app/models/concerns/with_progress.rb

@@ -7,6 +7,10 @@ module WithProgress
     progress_for(user, organization).completion_percentage
   end
 
+  def has_progress_for?(user, organization)
+    progress_for(user, organization).persisted?
+  end
+
   def dirty_progresses!
     Indicator.dirty_by_content_change! self
   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
@@ -10,7 +9,7 @@ module WithReminders
   end
 
   def remind!
-    build_reminder.deliver_now
+    build_reminder.post!
     update! last_reminded_date: Time.current
   end
 

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

@@ -6,6 +6,7 @@ class Organization < ApplicationRecord
   include Mumukit::Login::OrganizationHelpers
 
   include WithTargetAudience
+  include WithOrganizationStatus
 
   serialize :profile, Mumuki::Domain::Organization::Profile
   serialize :settings, Mumuki::Domain::Organization::Settings

data/app/models/organization_access_mode/base.rb

@@ -0,0 +1,53 @@
+class OrganizationAccessMode::Base
+  attr_reader :user, :organization
+
+  def initialize(user, organization)
+    @user = user
+    @organization = organization
+  end
+
+  def validate_active!
+  end
+
+  def faqs_here?
+    organization.faqs.present?
+  end
+
+  def submit_solutions_here?
+    false
+  end
+
+  def resolve_discussions_here?
+    false
+  end
+
+  def discuss_here?
+    organization.forum_enabled? && user.discusser_of?(organization) &&
+      user.trusted_as_discusser_in?(organization) && !user.banned_from_forum?
+  end
+
+  def show_discussion_element?
+    false
+  end
+
+  def show_content_element?
+    false
+  end
+
+  def restore_indicators?(_content)
+    false
+  end
+
+  def read_only?
+    false
+  end
+
+  def validate_discuss_here!(_discussion)
+    raise Mumuki::Domain::ForbiddenError
+  end
+
+  def validate_content_here!(content)
+    raise Mumuki::Domain::ForbiddenError unless show_content?(content)
+  end
+end
+

data/app/models/organization_access_mode/coming_soon.rb

@@ -0,0 +1,5 @@
+class OrganizationAccessMode::ComingSoon < OrganizationAccessMode::Forbidden
+  def validate_active!
+    raise Mumuki::Domain::UnpreparedOrganizationError
+  end
+end

data/app/models/organization_access_mode/forbidden.rb

@@ -0,0 +1,22 @@
+class OrganizationAccessMode::Forbidden < OrganizationAccessMode::Base
+  def validate_active!
+    raise Mumuki::Domain::ForbiddenError if organization.private? && user.present?
+  end
+
+  def faqs_here?
+    false
+  end
+
+  def profile_here?
+    false
+  end
+
+  def discuss_here?
+    false
+  end
+
+  def show_content?(_content)
+    false
+  end
+
+end

data/app/models/organization_access_mode/full.rb

@@ -0,0 +1,28 @@
+class OrganizationAccessMode::Full < OrganizationAccessMode::Base
+  def profile_here?
+    true
+  end
+
+  def submit_solutions_here?
+    true
+  end
+
+  def show_discussion_element?
+    true
+  end
+
+  def resolve_discussions_here?
+    discuss_here?
+  end
+
+  def validate_discuss_here!(_discussion)
+  end
+
+  def show_content?(_content)
+    true
+  end
+
+  def show_content_element?
+    true
+  end
+end

data/app/models/organization_access_mode/gone.rb

@@ -0,0 +1,5 @@
+class OrganizationAccessMode::Gone < OrganizationAccessMode::Forbidden
+  def validate_active!
+    raise Mumuki::Domain::DisabledOrganizationError
+  end
+end

data/app/models/organization_access_mode/read_only.rb

@@ -0,0 +1,41 @@
+class OrganizationAccessMode::ReadOnly < OrganizationAccessMode::Base
+  def initialize(user, organization, *global_scopes, **specific_scopes)
+    super user, organization
+    @scopes = global_scopes.map { |scope| [scope, :all] }.to_h.merge specific_scopes
+  end
+
+  def faqs_here?
+    has_scope(:faqs) && super
+  end
+
+  def profile_here?
+    has_scope(:profile)
+  end
+
+  def discuss_here?
+    has_scope(:discussions) && super
+  end
+
+  def validate_discuss_here!(discussion)
+    super(discussion) unless discussion&.initiator == user
+  end
+
+  def show_content?(content)
+    has_scope(:exercises) ||
+      (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)
+    @scopes[key] == value
+  end
+end

data/app/models/organization_access_mode.rb

@@ -0,0 +1,2 @@
+module OrganizationAccessMode
+end

data/app/models/user.rb

@@ -54,6 +54,8 @@ 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, :assignments
+
   def last_lesson
     last_guide.try(:lesson)
   end
@@ -105,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
@@ -195,7 +207,7 @@ class User < ApplicationRecord
   # This is true only when this organization has the forum enabled and the user
   # has the discusser pseudo-permission and the discusser is trusted
   def can_discuss_in?(organization)
-    organization.forum_enabled? && discusser_of?(organization) && trusted_as_discusser_in?(organization) && !banned_from_forum?
+    organization.access_mode(self).discuss_here?
   end
 
   def trusted_as_discusser_in?(organization)
@@ -277,6 +289,10 @@ class User < ApplicationRecord
     }
   end
 
+  def solved_any_exercises?(organization = Organization.current)
+    Assignment.exists?(organization: organization, submitter: self)
+  end
+
   def save_and_notify!
     save!
     notify_permissions_changed!
@@ -300,7 +316,7 @@ class User < ApplicationRecord
   def certificate_in(certificate_program, certificate_h)
     return if certificated_in?(certificate_program)
     certificate = certificates.create certificate_h.merge(certificate_program: certificate_program)
-    UserMailer.certificate(certificate).deliver_later
+    UserMailer.certificate(certificate).post!
   end
 
   def clear_progress_for!(organization)
@@ -316,7 +332,7 @@ class User < ApplicationRecord
   end
 
   def notify_via_email!(notification)
-    UserMailer.notification(notification).deliver_later unless ignores_notification? notification
+    UserMailer.notification(notification).post! unless ignores_notification? notification
   end
 
   def ignores_notification?(notification)
@@ -327,7 +343,7 @@ class User < ApplicationRecord
 
   def welcome_to_new_organizations!
     new_accessible_organizations.each do |organization|
-      UserMailer.welcome_email(self, organization).deliver_now rescue nil if organization.greet_new_users?
+      UserMailer.welcome_email(self, organization).post! rescue nil if organization.greet_new_users?
     end
   end
 

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

@@ -52,11 +52,6 @@ module Mumuki::Domain::Helpers::Organization
     Mumukit::Platform.application.organic_domain(name)
   end
 
-  def validate_active!
-    raise Mumuki::Domain::DisabledOrganizationError if disabled?
-    raise Mumuki::Domain::UnpreparedOrganizationError if in_preparation?
-  end
-
   ## API Exposure
 
   def to_param

data/lib/mumuki/domain/incognito.rb

@@ -16,6 +16,22 @@ module Mumuki::Domain
       false
     end
 
+    def ex_student_of?(*)
+      false
+    end
+
+    def ex_student_here?
+      false
+    end
+
+    def student_of?(*)
+      false
+    end
+
+    def student_here?
+      false
+    end
+
     def teacher_here?
       false
     end

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

@@ -28,7 +28,7 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   end
 
   def forum_discussions_minimal_role
-    (@forum_discussions_minimal_role || 'student').to_sym
+    (@forum_discussions_minimal_role || 'ex_student').to_sym
   end
 
   def disabled_from=(disabled_from)

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.11.0'
+    VERSION = '9.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.11.0
+  version: 9.14.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.9'
+        version: '7.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.9'
+        version: '7.11'
 - !ruby/object:Gem::Dependency
   name: mumukit-assistant
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,10 @@ files:
 - app/models/concerns/navigation/siblings_navigation.rb
 - app/models/concerns/navigation/terminal_navigation.rb
 - app/models/concerns/onomastic.rb
+- app/models/concerns/organization/status/base.rb
+- app/models/concerns/organization/status/disabled.rb
+- app/models/concerns/organization/status/enabled.rb
+- app/models/concerns/organization/status/in_preparation.rb
 - app/models/concerns/submittable/confirmable.rb
 - app/models/concerns/submittable/queriable.rb
 - app/models/concerns/submittable/questionable.rb
@@ -292,6 +296,7 @@ files:
 - app/models/concerns/with_name.rb
 - app/models/concerns/with_notifications.rb
 - app/models/concerns/with_number.rb
+- app/models/concerns/with_organization_status.rb
 - app/models/concerns/with_pg_lock.rb
 - app/models/concerns/with_preferences.rb
 - app/models/concerns/with_profile.rb
@@ -336,6 +341,13 @@ files:
 - app/models/message.rb
 - app/models/notification.rb
 - app/models/organization.rb
+- app/models/organization_access_mode.rb
+- app/models/organization_access_mode/base.rb
+- app/models/organization_access_mode/coming_soon.rb
+- app/models/organization_access_mode/forbidden.rb
+- app/models/organization_access_mode/full.rb
+- app/models/organization_access_mode/gone.rb
+- app/models/organization_access_mode/read_only.rb
 - app/models/preferences.rb
 - app/models/progress.rb
 - app/models/stats.rb