mumuki-laboratory 9.10.0 → 9.11.0

data/lib/mumuki/laboratory/version.rb

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

data/spec/controllers/users_controller_spec.rb

@@ -19,4 +19,52 @@ describe UsersController, type: :controller, organization_workspace: :test do
     it { expect(User.last.verified_first_name).to be_nil }
   end
 
+  context 'notifications' do
+    context 'get' do
+      context 'when logged in' do
+        before { set_current_user! user }
+        before { get :notifications }
+
+        it { expect(response.status).to eq 200 }
+      end
+
+      context 'when not logged in' do
+        before { get :notifications }
+
+        it { expect(response.status).to eq 302 }
+      end
+    end
+
+    context 'toggle_read' do
+      before { set_current_user! user }
+      before { post :toggle_read, params: { id: notification.id } }
+
+      context 'on toggling own notification read' do
+        let(:notification) { create :notification, user: user }
+
+        it { expect(response.status).to eq 302 }
+        it { expect(notification.reload.read?).to be true }
+      end
+
+      context 'on toggling someone else\'s notification read' do
+        let(:notification) { create :notification, user: create(:user) }
+
+        it { expect(response.status).to eq 404 }
+        it { expect(notification.reload.read?).to be false }
+      end
+    end
+
+    context 'notifications/manage' do
+      context 'post' do
+        let(:user) { create :user, ignored_notifications: [] }
+
+        before { set_current_user! user }
+        before { post :manage_notifications, params: { notifications: {'custom' => 1, 'exam_registrations' => 0 } } }
+
+        it { expect(response.status).to eq 302 }
+        it { expect(flash.notice).to eq 'Preferences updated successfully' }
+        it { expect(user.reload.ignored_notifications).to eq ['exam_registrations'] }
+      end
+    end
+  end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210707143002) do
+ActiveRecord::Schema.define(version: 20210803175124) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -193,6 +193,7 @@ ActiveRecord::Schema.define(version: 20210707143002) do
     t.bigint "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "processed", default: false
     t.index ["organization_id"], name: "index_exam_registrations_on_organization_id"
   end
 
@@ -399,6 +400,10 @@ ActiveRecord::Schema.define(version: 20210707143002) do
     t.bigint "organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "subject"
+    t.text "custom_title"
+    t.text "custom_content_plain_text"
+    t.text "custom_content_html"
     t.index ["organization_id"], name: "index_notifications_on_organization_id"
     t.index ["target_type", "target_id"], name: "index_notifications_on_target_type_and_target_id"
     t.index ["user_id"], name: "index_notifications_on_user_id"
@@ -529,6 +534,7 @@ ActiveRecord::Schema.define(version: 20210707143002) do
     t.boolean "uppercase_mode"
     t.string "delete_account_token"
     t.datetime "delete_account_token_expiration_date"
+    t.text "ignored_notifications"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

data/spec/features/notifications_flow_spec.rb

@@ -22,7 +22,8 @@ feature 'Notifications Flow', organization_workspace: :test do
     let(:exam_authorization_request) { create(:exam_authorization_request, exam_registration: exam_registration, user: user) }
 
     let!(:notifications) do
-      [exam_registration, exam_authorization_request].map { |target| create(:notification, user: user, target: target ) }
+      create(:notification, user: user, target: exam_registration, subject: :exam_registration )
+      create(:notification, user: user, target: exam_authorization_request, subject: :exam_authorization_request_updated )
     end
 
     before { visit '/' }

data/spec/mailers/previews/user_mailer_preview.rb

@@ -3,7 +3,51 @@ class UserMailerPreview < ActionMailer::Preview
 
   # Preview this email at http://localhost:3000/rails/mailers/user_mailer/we_miss_you_notification
   def we_miss_you_reminder
-    UserMailer.we_miss_you_reminder(User.new, 1)
+    UserMailer.we_miss_you_reminder user, 1
   end
 
+  def custom_content_plain_text_notification
+    UserMailer.notification notification
+  end
+
+  def custom_content_html_notification
+    UserMailer.notification notification(custom_content_html: 'This is <em>the text</em> of the mail. <strong>Awesome!</strong>')
+  end
+
+  def certificate_preview
+    UserMailer.certificate certificate
+  end
+
+  private
+
+  def user
+    User.new uid: 'some_user@gmail.com',
+             first_name: 'Some',
+             last_name: 'User',
+             verified_first_name: 'Jane',
+             verified_last_name: 'Doe',
+             last_organization: organization
+  end
+
+  def organization
+    Organization.central
+  end
+
+  def certificate
+    certificate_program = CertificateProgram.find_or_create_by!(title: 'Mumuki Certificate',
+                                                                description: 'Functional Programming',
+                                                                organization: organization,
+                                                                start_date: 1.minute.ago,
+                                                                end_date: 1.hour.since)
+
+    Certificate.new user: user, certificate_program:  certificate_program
+  end
+
+  def notification(**hash)
+    Notification.new({user: user,
+                     organization: organization,
+                     subject: :custom,
+                     custom_content_plain_text: 'This is the text of the mail. Awesome!',
+                     custom_title: 'This is the title!'}.merge hash)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.10.0
+  version: 9.11.0
 platform: ruby
 authors:
 - Franco 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
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 9.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.10.0
+        version: 9.11.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: muvment
   requirement: !ruby/object:Gem::Requirement
@@ -564,6 +564,7 @@ files:
 - app/helpers/menu_bar_helper.rb
 - app/helpers/messages_helper.rb
 - app/helpers/multiple_file_editor_helper.rb
+- app/helpers/notifications_helper.rb
 - app/helpers/open_graph_helper.rb
 - app/helpers/organization_breadcrumbs_helper.rb
 - app/helpers/overlapped_buttons_helper.rb
@@ -694,21 +695,33 @@ files:
 - app/views/layouts/modals/_level_up.html.erb
 - app/views/layouts/modals/_new_message.html.erb
 - app/views/lessons/show.html.erb
-- app/views/notifications/_discussion.html.erb
+- app/views/notifications/_custom.html.erb
 - app/views/notifications/_dropdown.html.erb
-- app/views/notifications/_exam_authorization_request.html.erb
+- app/views/notifications/_exam_authorization_request_updated.html.erb
 - app/views/notifications/_exam_registration.html.erb
-- app/views/notifications/_message.html.erb
+- app/views/notifications/previews/_custom.html.erb
+- app/views/notifications/previews/_discussion.html.erb
+- app/views/notifications/previews/_exam_authorization_request_updated.html.erb
+- app/views/notifications/previews/_exam_registration.html.erb
+- app/views/notifications/previews/_message.html.erb
 - app/views/user_mailer/1st_reminder.html.erb
 - app/views/user_mailer/1st_reminder.text.erb
 - app/views/user_mailer/2nd_reminder.html.erb
 - app/views/user_mailer/2nd_reminder.text.erb
 - app/views/user_mailer/3rd_reminder.html.erb
 - app/views/user_mailer/3rd_reminder.text.erb
+- app/views/user_mailer/_mail_template.erb
 - app/views/user_mailer/certificate.html.erb
 - app/views/user_mailer/certificate.text.erb
 - app/views/user_mailer/no_submissions_reminder.html.erb
 - app/views/user_mailer/no_submissions_reminder.text.erb
+- app/views/user_mailer/notification.html.erb
+- app/views/user_mailer/notification.text.erb
+- app/views/user_mailer/notifications/_custom.html.erb
+- app/views/user_mailer/notifications/_exam_authorization_request_updated.html.erb
+- app/views/user_mailer/notifications/_exam_registration.html.erb
+- app/views/user_mailer/notifications/exam_authorization_request_updated/_approved.html.erb
+- app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb
 - app/views/users/_activity_indicator.html.erb
 - app/views/users/_avatar_list.html.erb
 - app/views/users/_basic_profile_fields.html.erb
@@ -721,7 +734,9 @@ files:
 - app/views/users/discussions.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/exam_authorizations.html.erb
+- app/views/users/manage_notifications.html.erb
 - app/views/users/messages.html.erb
+- app/views/users/notifications.html.erb
 - app/views/users/show.html.erb
 - app/views/users/terms.html.erb
 - config/i18n-tasks.yml

data/app/views/notifications/_discussion.html.erb

@@ -1 +0,0 @@
-<%= menu_item :comments, :new_discussion_message, url_for([target.item, target]), { title: target.item.name.truncate_words(3) } %>

data/app/views/notifications/_exam_authorization_request.html.erb

@@ -1 +0,0 @@
-<%= menu_item :book_open, :exam_authorization_request_updated, exam_authorizations_user_path, { description: target.exam_registration.description } %>

data/app/views/notifications/_message.html.erb

@@ -1 +0,0 @@
-<%= menu_item :envelope, :new_message_received, url_for(target.exercise), { sender: target.sender } %>