mumuki-domain 9.11.0 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641d60f1b417f2fa2a9d05fbdd0357b3415a42a222b8a38ab989c63baf5b064b
-  data.tar.gz: db353f1f369e0ae15f0349c2448d476e302921ef36479236408d74bada703f29
+  metadata.gz: d20f0f5d9cfe938c4a33f561f9e4df1e5e84ab18296fda644038b87166d631fc
+  data.tar.gz: bf7adb112a37b84a8fb4f8fa7dc74db1c5df29dc0d8763005256e98e381b7951
 SHA512:
-  metadata.gz: b8d1d6c40137d84dd7bf3d4c12c406ce88914efb9cce0a231a4ec1758e9b30ac61c881d940c0890a58dfaec3f69eefad432c67de3c88bef11950be1953f71ded
-  data.tar.gz: 6e784be9dc46359358a831aae422ebadca1840cc9516d664aaa2d16b3100350dd8887a6dba2b1fa064a697b7a2443848cba238f5692caec72113c45a01ffd035
+  metadata.gz: fbcc0dcdd8fd5134d463f61f18da8dfc872b7142f221f16ea3d99dac828bdbcf628d47b924559ac40e3224597955ad575720dc318b385297509cc3364b5c9897
+  data.tar.gz: 4a2a358f2b888268d4193b0b9b50873702ac293430c26e5d64576f7c02b185fc4263cbc0b30c02758c611240e9646bb917277ed5ec37951521762db028f0fb52

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_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/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
+
   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
@@ -300,7 +306,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 +322,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 +333,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/version.rb

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