mumuki-domain 9.10.0 → 9.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a03f1d01bc567c0b91939577bd7fad54968380794122c8f93a6355b4d2fd87
-  data.tar.gz: e953f4fdca9d236bfef4e9ab6d9543fec286229b668cf071830d6c98f38bfa39
+  metadata.gz: 641d60f1b417f2fa2a9d05fbdd0357b3415a42a222b8a38ab989c63baf5b064b
+  data.tar.gz: db353f1f369e0ae15f0349c2448d476e302921ef36479236408d74bada703f29
 SHA512:
-  metadata.gz: 46ef5320c51569aab17dda636d81fcba3cc27cbbf7e9f22f78c96a67b97aa1f7f3d25127c9cd7bded347a5764a91b970c1ec5809c84bb904930d61212cd81cda
-  data.tar.gz: c3ffff05f15964f1bac7ea31adc0e5c78e09ce7ccc47dee8f95347205b692aa93be2c0f79ed9162fbf27a664eb60e205eeaf7f078e5456b5356a2e73b4db7f2f
+  metadata.gz: b8d1d6c40137d84dd7bf3d4c12c406ce88914efb9cce0a231a4ec1758e9b30ac61c881d940c0890a58dfaec3f69eefad432c67de3c88bef11950be1953f71ded
+  data.tar.gz: 6e784be9dc46359358a831aae422ebadca1840cc9516d664aaa2d16b3100350dd8887a6dba2b1fa064a697b7a2443848cba238f5692caec72113c45a01ffd035

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

@@ -21,7 +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')) }
+  scope :unread_first, -> { includes(:subscriptions).reorder('subscriptions.read', created_at: :desc) }
 
   after_create :subscribe_initiator!
 
@@ -96,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
 
@@ -183,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

@@ -148,6 +148,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/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
@@ -315,6 +315,14 @@ class User < ApplicationRecord
     user_stats.where(location).delete_all
   end
 
+  def notify_via_email!(notification)
+    UserMailer.notification(notification).deliver_later unless ignores_notification? notification
+  end
+
+  def ignores_notification?(notification)
+    ignored_notifications.include? notification.subject
+  end
+
   private
 
   def welcome_to_new_organizations!

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.10.0
+  version: 9.11.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -672,6 +672,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