mumuki-domain 9.4.0 → 9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd0081f4ed25d268fe17c327be9b5b343a21b2491eb737db4ee837fb16eead8
-  data.tar.gz: 7e34398bd300598d749d628af5ae31a49985ff62f8dda2ce2598169197cacc2d
+  metadata.gz: 27f2a30ca00c41bffa5a3673fe92328ee1b0565d27a8e3e2ac34e40e791ac2ca
+  data.tar.gz: be141181663a286b037540f0a7b553a190d20b254429eff0e9f64263f60bbfc4
 SHA512:
-  metadata.gz: 87e8fbb20f42949df631f2696c1d10a0c40744b7f84a1c7b705e525a8f2120a1e1ce5a58231a9bb9c2faa4987bd031eba01d3eb01a3e407f7202c4469eaeda72
-  data.tar.gz: 9196ae6c744c474853ffb027cf86f015546539ef994f83c62f27199123e54dbda3372fbd141a22f86c349270a0d14b1e6cdf3fdda47f3476bc6cd594ceb6e742
+  metadata.gz: 9c5bb7a56c9fb93812146a45e21c74e438036812243c3566f01baf1916d0fce49c0be5a3153c0c973122d45e4b5556eddc64602f794fd2c838669470208b6032
+  data.tar.gz: 2eb10bc2416e79bb20e05bf4eea458ea834aa68fa5e14af7d4e45043e3c49827961de4d35eaf7a2b0fb34fb4360b2654a85fada4056bd7ba3f22f32c4aaf7703

data/app/models/application_record.rb

@@ -103,6 +103,21 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def self.with_pg_retry(&block)
+    retries ||= 0
+    transaction(&block)
+  rescue ActiveRecord::StatementInvalid => e
+    retries += 1
+
+    raise e if retries > 2
+    if %w(PG::ConnectionBad PG::UnableToSend).any? { |it| e.message.include? it }
+      warn "Postgres connection failed. Retrying in 5 seconds..."
+      sleep 5
+      ActiveRecord::Base.connection.verify!
+      retry
+    end
+  end
+
   def self.numbered(*associations)
     class_eval do
       associations.each do |it|

data/app/models/concerns/with_notifications.rb

@@ -7,7 +7,8 @@ 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
+    # include message notifications once they are properly implemented
+    all = notifications.where(read: false) + unread_discussions
     all.sort_by(&:created_at).reverse
   end
 

data/app/models/concerns/with_responsible_moderator.rb

@@ -0,0 +1,51 @@
+module WithResponsibleModerator
+  extend ActiveSupport::Concern
+
+  MODERATOR_MAX_RESPONSIBLE_TIME = 45.minutes
+
+  def toggle_responsible!(moderator)
+    if responsible?(moderator)
+      no_responsible!
+    elsif no_current_responsible?
+      responsible! moderator
+    end
+  end
+
+  def any_responsible?
+    responsible_moderator_at.present? && (responsible_moderator_at + MODERATOR_MAX_RESPONSIBLE_TIME).future?
+  end
+
+  def no_current_responsible?
+    !any_responsible?
+  end
+
+  def responsible?(moderator)
+    any_responsible? && responsible_moderator_by == moderator
+  end
+
+  def current_responsible_visible_for?(user)
+    user&.moderator_here? && any_responsible?
+  end
+
+  def can_toggle_responsible?(user)
+    can_have_responsible? && user_can_be_responsible?(user)
+  end
+
+  private
+
+  def responsible!(moderator)
+    update! responsible_moderator_at: Time.now, responsible_moderator_by: moderator
+  end
+
+  def no_responsible!
+    update! responsible_moderator_at: nil, responsible_moderator_by: nil
+  end
+
+  def user_can_be_responsible?(user)
+    user&.moderator_here? && (no_current_responsible? || responsible?(user))
+  end
+
+  def can_have_responsible?
+    opened? || pending_review?
+  end
+end

data/app/models/discussion.rb

@@ -1,11 +1,11 @@
 class Discussion < ApplicationRecord
-  include WithDiscussionStatus, WithScopedQueries, Contextualization
+  include WithDiscussionStatus, WithScopedQueries, Contextualization, WithResponsibleModerator
 
   belongs_to :item, polymorphic: true
   has_many :messages, -> { order(:created_at) }, dependent: :destroy
   belongs_to :initiator, class_name: 'User'
 
-  belongs_to :last_moderator_access_by, class_name: 'User', optional: true
+  belongs_to :responsible_moderator_by, class_name: 'User', optional: true
   belongs_to :status_updated_by, class_name: 'User', optional: true
 
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
@@ -15,21 +15,24 @@ class Discussion < ApplicationRecord
 
   scope :by_language, -> (language) { includes(:exercise).joins(exercise: :language).where(languages: {name: language}) }
   scope :order_by_responses_count, -> (direction) { reorder(validated_messages_count: direction, messages_count: opposite(direction)) }
-  scope :by_requires_moderator_response, -> (boolean) { where(requires_moderator_response: boolean.to_boolean) }
+  scope :by_requires_attention, -> (boolean) { opened_and_requires_moderator_response(boolean).or(pending_review).no_responsible_moderator }
+  scope :opened_and_requires_moderator_response, -> (boolean) { where(requires_moderator_response: boolean.to_boolean)
+                                                                  .where(status: :opened) }
+  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) }
 
   after_create :subscribe_initiator!
 
   markdown_on :description
 
   sortable :responses_count, :upvotes_count, :created_at, default: :created_at_desc
-  filterable :status, :language, :requires_moderator_response
+  filterable :status, :language, :requires_attention
   pageable
 
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status
 
-  MODERATOR_REVIEW_AVERAGE_TIME = 17.minutes
-
   scope :for_user, -> (user) do
     if user.try(:moderator_here?)
       all
@@ -81,7 +84,7 @@ class Discussion < ApplicationRecord
   end
 
   def friendly
-    initiator.name
+    initiator.abbreviated_name
   end
 
   def subscription_for(user)
@@ -101,6 +104,7 @@ class Discussion < ApplicationRecord
     messages.create(message)
     user.subscribe_to! self
     unread_subscriptions(user)
+    no_responsible! if responsible?(user)
   end
 
   def authorized?(user)
@@ -125,6 +129,8 @@ class Discussion < ApplicationRecord
       update! status: status,
               status_updated_by: user,
               status_updated_at: Time.now
+
+      no_responsible! if responsible?(user)
     end
   end
 
@@ -144,6 +150,14 @@ class Discussion < ApplicationRecord
     validated_messages_count > 0
   end
 
+  def requires_attention_for?(user)
+    user&.moderator_here? && requires_attention?
+  end
+
+  def requires_attention?
+    no_current_responsible? && status.requires_attention_for?(self)
+  end
+
   def subscribe_initiator!
     initiator.subscribe_to! self
   end
@@ -163,25 +177,6 @@ class Discussion < ApplicationRecord
             requires_moderator_response: !has_moderator_response
   end
 
-  def update_last_moderator_access!(user)
-    if user&.moderator_here? && !last_moderator_access_visible_for?(user)
-      update! last_moderator_access_at: Time.now,
-              last_moderator_access_by: user
-    end
-  end
-
-  def being_accessed_by_moderator?
-    last_moderator_access_at.present? && (last_moderator_access_at + MODERATOR_REVIEW_AVERAGE_TIME).future?
-  end
-
-  def last_moderator_access_visible_for?(user)
-    show_last_moderator_access_for?(user) && being_accessed_by_moderator?
-  end
-
-  def show_last_moderator_access_for?(user)
-    user&.moderator_here? && last_moderator_access_by != user
-  end
-
   def self.debatable_for(klazz, params)
     debatable_id = params[:"#{klazz.underscore}_id"]
     klazz.constantize.find(debatable_id)

data/app/models/user_stats.rb

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

data/db/migrate/20210518100153_rename_last_moderator_access.rb

@@ -0,0 +1,6 @@
+class RenameLastModeratorAccess < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :discussions, :last_moderator_access_by_id, :responsible_moderator_by_id
+    rename_column :discussions, :last_moderator_access_at, :responsible_moderator_at
+  end
+end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     locale { 'en' }
     settings {}
     name { 'an-organization' }
+    time_zone { 'UTC' }
     book
   end
 

data/lib/mumuki/domain/organization/profile.rb

@@ -13,7 +13,8 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
                       :community_link,
                       :errors_explanations,
                       :welcome_email_template,
-                      :welcome_email_sender
+                      :welcome_email_sender,
+                      :time_zone
 
   def locale_json
     locale_h.to_json
@@ -38,4 +39,9 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
   def open_graph_image_url
     @open_graph_image_url ||= Mumukit::Platform.laboratory.url_for("logo-alt.png")  # Best image size: 256x256
   end
+
+  def time_zone
+    @time_zone || 'Buenos Aires'
+  end
+
 end

data/lib/mumuki/domain/organization/settings.rb

@@ -46,4 +46,5 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   def in_preparation?
     in_preparation_until.present? && in_preparation_until.future?
   end
+
 end

data/lib/mumuki/domain/status/discussion/closed.rb

@@ -12,4 +12,8 @@ module Mumuki::Domain::Status::Discussion::Closed
   def self.iconize
     {class: :danger, type: 'times-circle'}
   end
+
+  def self.requires_attention_for?(_)
+    false
+  end
 end

data/lib/mumuki/domain/status/discussion/opened.rb

@@ -28,4 +28,8 @@ module Mumuki::Domain::Status::Discussion::Opened
   def self.should_be_shown?(*)
     true
   end
+
+  def self.requires_attention_for?(discussion)
+    discussion.requires_moderator_response?
+  end
 end

data/lib/mumuki/domain/status/discussion/pending_review.rb

@@ -12,4 +12,8 @@ module Mumuki::Domain::Status::Discussion::PendingReview
   def self.iconize
     {class: :info, type: 'hourglass'}
   end
+
+  def self.requires_attention_for?(_)
+    true
+  end
 end

data/lib/mumuki/domain/status/discussion/solved.rb

@@ -16,4 +16,8 @@ module Mumuki::Domain::Status::Discussion::Solved
   def self.should_be_shown?(*)
     true
   end
+
+  def self.requires_attention_for?(_)
+    false
+  end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.4.0'
+    VERSION = '9.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.8.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -297,6 +297,7 @@ files:
 - app/models/concerns/with_progress.rb
 - app/models/concerns/with_randomizations.rb
 - app/models/concerns/with_reminders.rb
+- app/models/concerns/with_responsible_moderator.rb
 - app/models/concerns/with_scoped_queries.rb
 - app/models/concerns/with_scoped_queries/filter.rb
 - app/models/concerns/with_scoped_queries/page.rb
@@ -668,6 +669,7 @@ files:
 - db/migrate/20210318195238_rename_certificate_dates.rb
 - db/migrate/20210330175706_create_exam_registration_user_join_table.rb
 - db/migrate/20210512200453_add_processed_flag_to_exam_registration.rb
+- db/migrate/20210518100153_rename_last_moderator_access.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb