mumuki-domain 9.9.0 → 9.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae661db3a1a6f210ac27b6d998846fde5a4968acdbcec182db4cca7d9dd4245
-  data.tar.gz: 8ed2e95b7d1b21768062735e1fe8c5fbb55fe50e0c17821ae6e3baf8a9d50b5c
+  metadata.gz: cce9f2ab048f758a4122c66f8a3da650a28c3a2ef10aefd8887a89091ba7a2af
+  data.tar.gz: c55a063f04e3ae7d32750db8b7f520a2bd3f8d37f4411201011fec953ee99079
 SHA512:
-  metadata.gz: b0f931e47808ff51e1cabe419e31a3d59ad9a3d3cf61f6ef66ff9b3e2026bc3db6441f5352002fad29d047ad23fa5030bede82b0d6a7b8e07b58875a236a1827
-  data.tar.gz: 2da409d2e2c0e606457e6f78e72d97ec7ac8ba9ca0c20b12cffc3d48e9d4d72e131e7379ff2ceb60c1aa124f4ec5db30e653fca12812b0bb4ef4db3398d72d32
+  metadata.gz: d203713ba3bcb38b7d36971a77718ff3887e82d51199e9423635f62a5a244d75433f5aefb7fbfe9c0994971b178dafc655eae03a4b8c9d48bcd0ccc655785441
+  data.tar.gz: c3b3db4bc2faac6b2ec976aa380fdd5ad203ee248f6fc96a7dccee55c58a794d7c7f11944be3ef75f311bd5f791e87590c676192194c3c4247e4dc53a51f67cf

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_discussion_creation/subscription.rb

@@ -8,7 +8,7 @@ module WithDiscussionCreation::Subscription
   end
 
   def subscriptions_in_organization
-    subscriptions.joins(:discussion).where(discussion: discussions_in_organization)
+    subscriptions.where(discussion: Organization.current.discussions)
   end
 
   def subscribed_to?(discussion)

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

@@ -10,7 +10,7 @@ module WithReminders
   end
 
   def remind!
-    build_reminder.deliver_now
+    build_reminder.post!
     update! last_reminded_date: Time.current
   end
 

data/app/models/discussion.rb

@@ -21,6 +21,7 @@ class Discussion < ApplicationRecord
   scope :no_responsible_moderator, -> { where('responsible_moderator_at < ?', Time.now - MODERATOR_MAX_RESPONSIBLE_TIME)
                                           .or(where(responsible_moderator_at: nil)) }
   scope :pending_review, -> { where(status: :pending_review) }
+  scope :unread_first, -> { includes(:subscriptions).reorder('subscriptions.read', created_at: :desc) }
 
   after_create :subscribe_initiator!
 
@@ -95,15 +96,15 @@ class Discussion < ApplicationRecord
     upvotes.find_by(user: user)
   end
 
-  def unread_subscriptions(user)
-    subscriptions.where.not(user: user).map(&:unread!)
+  def mark_subscriptions_as_unread!(user)
+    subscriptions.where.not(user: user).each(&:unread!)
   end
 
   def submit_message!(message, user)
     message.merge!(sender: user.uid)
     messages.create(message)
     user.subscribe_to! self
-    unread_subscriptions(user)
+    mark_subscriptions_as_unread!(user)
     no_responsible! if responsible?(user)
   end
 
@@ -182,6 +183,11 @@ class Discussion < ApplicationRecord
     klazz.constantize.find(debatable_id)
   end
 
+  # TODO remove this once discussions generate notifications
+  def subject
+    'discussion'
+  end
+
   private
 
   def messages_by_updated_at(direction = :desc)

data/app/models/exam_authorization_request.rb

@@ -32,6 +32,6 @@ class ExamAuthorizationRequest < ApplicationRecord
   private
 
   def notify_user!
-    Notification.create! organization: organization, user: user, target: self if saved_change_to_status?
+    Notification.create_and_notify_via_email! organization: organization, user: user, target: self, subject: 'exam_authorization_request_updated' if saved_change_to_status?
   end
 end

data/app/models/exam_registration.rb

@@ -73,9 +73,13 @@ class ExamRegistration < ApplicationRecord
     registrees.include? user
   end
 
+  def meets_criterion?(user)
+    authorization_criterion.meets_criterion?(user, organization)
+  end
+
   private
 
   def notify_registree!(registree)
-    Notification.create! organization: organization, user: registree, target: self
+    Notification.create_and_notify_via_email! organization: organization, user: registree, subject: :exam_registration, target: self
   end
 end

data/app/models/exam_registration/authorization_criterion.rb

@@ -34,6 +34,10 @@ class ExamRegistration::AuthorizationCriterion
   rescue
     raise "Invalid criterion type #{type}"
   end
+
+  def meets_authorization_criteria?(authorization_request)
+    meets_criterion? authorization_request.user, authorization_request.organization
+  end
 end
 
 class ExamRegistration::AuthorizationCriterion::None < ExamRegistration::AuthorizationCriterion
@@ -45,7 +49,7 @@ class ExamRegistration::AuthorizationCriterion::None < ExamRegistration::Authori
     !value
   end
 
-  def meets_authorization_criteria?(_authorization_request)
+  def meets_criterion?(_user, _organization)
     true
   end
 end
@@ -55,7 +59,7 @@ class ExamRegistration::AuthorizationCriterion::PassedExercises < ExamRegistrati
     value.positive?
   end
 
-  def meets_authorization_criteria?(authorization_request)
-    authorization_request.user.passed_submissions_count_in(authorization_request.organization) >= value
+  def meets_criterion?(user, organization)
+    user.passed_submissions_count_in(organization) >= value
   end
 end

data/app/models/message.rb

@@ -127,6 +127,11 @@ class Message < ApplicationRecord
     end
   end
 
+  # TODO remove this once messages generate notifications
+  def subject
+    'message'
+  end
+
   private
 
   def approve!(user)

data/app/models/notification.rb

@@ -1,8 +1,12 @@
 class Notification < ApplicationRecord
   belongs_to :user
   belongs_to :organization
-  belongs_to :target, polymorphic: true
+  belongs_to :target, polymorphic: true, optional: true
 
+  enum subject: %i(
+    custom
+    exam_authorization_request_updated
+    exam_registration)
 
   scope :notified_users_ids_for, ->(target, organization=Organization.current) do
     where(target: target, organization: organization).pluck(:user_id)
@@ -11,4 +15,12 @@ class Notification < ApplicationRecord
   def mark_as_read!
     update read: true
   end
+
+  def self.create_and_notify_via_email!(args)
+    create!(args).tap(&:notify_via_email!)
+  end
+
+  def notify_via_email!
+    user.notify_via_email! self
+  end
 end

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
@@ -148,6 +149,10 @@ class Organization < ApplicationRecord
     [default_date, in_preparation_until&.to_date].compact.max
   end
 
+  def discussions
+    book.discussions_in_organization(self)
+  end
+
   # ==============
   # Display fields
   # ==============

data/app/models/organization_access_mode.rb

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

data/app/models/organization_access_mode/base.rb

@@ -0,0 +1,45 @@
+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 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,33 @@
+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
+
+  private
+
+  def has_scope(key, value = :all)
+    @scopes[key] == value
+  end
+end

data/app/models/user.rb

@@ -13,7 +13,7 @@ class User < ApplicationRecord
           Mumuki::Domain::Helpers::User
 
   serialize :permissions, Mumukit::Auth::Permissions
-
+  serialize :ignored_notifications, Array
 
   has_many :notifications
   has_many :assignments, foreign_key: :submitter_id
@@ -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
+
   def last_lesson
     last_guide.try(:lesson)
   end
@@ -62,6 +64,10 @@ 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
@@ -195,7 +201,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 +283,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 +310,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)
@@ -315,11 +325,19 @@ class User < ApplicationRecord
     user_stats.where(location).delete_all
   end
 
+  def notify_via_email!(notification)
+    UserMailer.notification(notification).post! unless ignores_notification? notification
+  end
+
+  def ignores_notification?(notification)
+    ignored_notifications.include? notification.subject
+  end
+
   private
 
   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/app/models/user_stats.rb

@@ -11,7 +11,7 @@ class UserStats < ApplicationRecord
   end
 
   def activity(date_range = nil)
-    date_filter = { updated_at: date_range }.compact
+    date_filter = { submitted_at: date_range }.compact
     {
         exercises: {
             solved_count: organization_exercises

data/db/migrate/20210719145706_add_new_fields_to_notifications.rb

@@ -0,0 +1,8 @@
+class AddNewFieldsToNotifications < ActiveRecord::Migration[5.1]
+  def change
+    add_column :notifications, :subject, :integer
+    add_column :notifications, :custom_title, :text
+    add_column :notifications, :custom_content_plain_text, :text
+    add_column :notifications, :custom_content_html, :text
+  end
+end

data/db/migrate/20210803175124_add_ignored_notifications_to_users.rb

@@ -0,0 +1,5 @@
+class AddIgnoredNotificationsToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :ignored_notifications, :text
+  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.9.0'
+    VERSION = '9.13.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.9.0
+  version: 9.13.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-19 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
@@ -672,6 +684,8 @@ files:
 - db/migrate/20210512200453_add_processed_flag_to_exam_registration.rb
 - db/migrate/20210518100153_rename_last_moderator_access.rb
 - 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
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb