mumuki-domain 8.5.0 → 8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de3b061fa4456ea064c8a2d782b6e78f4f4685c022b58b21942095f7fbbf838
-  data.tar.gz: 34c7fc5d21ebb806bda2b59faf5a54c2389545fbc4b5ad66bc89bc7c3a3dd8f8
+  metadata.gz: 0fc67d5d416345806e5d570dae375114d9bd32e3be5af26485a926c9957d10f2
+  data.tar.gz: cb223b383c8f176ac852091b8cf79ed2f496404bc75d1d7dcc3ccfbde70e49f2
 SHA512:
-  metadata.gz: 9de9ccc06eeb08ad7fc4eb18b0bad4b93d095343135900e0199587efdba3a10182fe902653c828baed7ef16f1adf52913c3747d844aa19a636946b3a9d05cc44
-  data.tar.gz: 17d913971689eceb1aeb165dbc8c6eec0e8ea4b314097c1ea9a5d8da2e9ed1c9cb46bb5c347db11d8f74b516cc2feb72b38ff79b67eade1510d4b20498617d71
+  metadata.gz: 3a891889e37c9fd9a55c383f2ffe6aa2f9368193bb7550ba34d9253fb8fbab3534be85ac6acc8a162f02907059acc57da14658ee6df7ad19ad93523ee1ef998d
+  data.tar.gz: e830934dd132b0bada6f45348249f06d170438c98fbb07528fa1e608397b40945485adeb4a79e732d701371e4196a9fae22c5e4ba68ef983a71dc7ae40236704

data/app/models/application_record.rb

@@ -129,6 +129,12 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.enum_prefixed_translations_for(selector)
+    send(selector.to_s.pluralize).map do |key, _|
+      [I18n.t("#{selector}_#{key}", default: key.to_sym), key]
+    end
+  end
+
   private
 
   def raise_foreign_key_error!

data/app/models/concerns/with_notifications.rb

@@ -0,0 +1,17 @@
+module WithNotifications
+  extend ActiveSupport::Concern
+
+  def unread_messages
+    messages.where read: false
+  end
+
+  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.sort_by(&:created_at).reverse
+  end
+
+  def read_notification!(target)
+    notifications.find_by(target: target)&.mark_as_read!
+  end
+end

data/app/models/discussion.rb

@@ -48,6 +48,10 @@ class Discussion < ApplicationRecord
     nil
   end
   
+  def target
+    self
+  end
+
   def used_in?(organization)
     organization == self.organization
   end

data/app/models/exam_authorization_request.rb

@@ -1,7 +1,10 @@
 class ExamAuthorizationRequest < ApplicationRecord
+  include TerminalNavigation
+
   belongs_to :exam
   belongs_to :user
   belongs_to :organization
+  belongs_to :exam_registration
 
   enum status: %i(pending approved rejected)
 
@@ -11,6 +14,10 @@ class ExamAuthorizationRequest < ApplicationRecord
     exam.authorize! user if approved?
   end
 
+  def name
+    exam_registration.description
+  end
+
   private
 
   def notify_user!

data/app/models/exam_registration.rb

@@ -1,9 +1,10 @@
 class ExamRegistration < ApplicationRecord
   include WithTimedEnablement
+  include TerminalNavigation
 
   belongs_to :organization
   has_and_belongs_to_many :exams
-  has_many :authorization_requests, class_name: 'ExamAuthorizationRequest', through: :exams
+  has_many :authorization_requests, class_name: 'ExamAuthorizationRequest'
 
   enum authorization_criterion_type: %i(none passed_exercises), _prefix: :authorization_criterion
 
@@ -11,6 +12,8 @@ class ExamRegistration < ApplicationRecord
 
   delegate :meets_authorization_criteria?, :process_request!, to: :authorization_criterion
 
+  alias_attribute :name, :description
+
   def authorization_criterion
     @authorization_criterion ||= ExamRegistration::AuthorizationCriterion.parse(authorization_criterion_type, authorization_criterion_value)
   end
@@ -30,6 +33,11 @@ class ExamRegistration < ApplicationRecord
     end
   end
 
+  def authorization_request_for(user)
+    authorization_requests.find_by(user: user) ||
+      ExamAuthorizationRequest.new(exam_registration: self, organization: organization)
+  end
+
   private
 
   def notify_user!(user)

data/app/models/message.rb

@@ -70,6 +70,10 @@ class Message < ApplicationRecord
     from_initiator? && !not_actually_a_question?
   end
 
+  def target
+    self
+  end
+
   def self.parse_json(json)
     message = json.delete 'message'
     json

data/app/models/notification.rb

@@ -2,4 +2,8 @@ class Notification < ApplicationRecord
   belongs_to :user
   belongs_to :organization
   belongs_to :target, polymorphic: true
+
+  def mark_as_read!
+    update read: true
+  end
 end

data/app/models/user.rb

@@ -3,6 +3,7 @@ class User < ApplicationRecord
   include WithProfile,
           WithUserNavigation,
           WithReminders,
+          WithNotifications,
           WithDiscussionCreation,
           Awardee,
           Disabling,
@@ -75,10 +76,6 @@ class User < ApplicationRecord
     assignments.where(status: Mumuki::Domain::Status::Submission::Passed.to_i)
   end
 
-  def unread_messages
-    messages.where read: false
-  end
-
   def visit!(organization)
     update!(last_organization: organization) if organization != last_organization
   end

data/lib/mumuki/domain/factories.rb

@@ -16,6 +16,7 @@ require_relative './factories/lesson_factory'
 require_relative './factories/login_settings_factory'
 require_relative './factories/medal_factory'
 require_relative './factories/message_factory'
+require_relative './factories/notification_factory'
 require_relative './factories/organization_factory'
 require_relative './factories/term_factory'
 require_relative './factories/topic_factory'

data/lib/mumuki/domain/factories/notification_factory.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :notification do
+    organization { Organization.current }
+  end
+end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.5.0'
+    VERSION = '8.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -286,6 +286,7 @@ files:
 - app/models/concerns/with_medal.rb
 - app/models/concerns/with_messages.rb
 - app/models/concerns/with_name.rb
+- app/models/concerns/with_notifications.rb
 - app/models/concerns/with_number.rb
 - app/models/concerns/with_preferences.rb
 - app/models/concerns/with_profile.rb
@@ -693,6 +694,7 @@ files:
 - lib/mumuki/domain/factories/login_settings_factory.rb
 - lib/mumuki/domain/factories/medal_factory.rb
 - lib/mumuki/domain/factories/message_factory.rb
+- lib/mumuki/domain/factories/notification_factory.rb
 - lib/mumuki/domain/factories/organization_factory.rb
 - lib/mumuki/domain/factories/term_factory.rb
 - lib/mumuki/domain/factories/topic_factory.rb