mumuki-domain 9.7.0 → 9.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0a85995ceefa3f9400d60e29b11c3907b1c42853c2d1517138bc7fa4532239
-  data.tar.gz: d468a495d0c21ee1139b4087c7ce5653936d7b9289a5a06d2e7c338f443fe128
+  metadata.gz: 801f11c820f31c39323edff06d235e0c48804b1454f5dbd118363a34f153808f
+  data.tar.gz: daaa6a61637d5d52412fee38276de7c2ebad10cb696f28b912cbe4ef3ca49247
 SHA512:
-  metadata.gz: f5ddf066cff9cf215e1ad83041b418cf615dcf3f5674b97cc569725d53f2107f2fc4c33b5d75fc3ae36e9a16694eeac90318062a65b3b1f1c003f97924359119
-  data.tar.gz: 0200b8bf90e1e7c08797fd2f3c417b744be4c455ff40cff1063fd7f8bf9a28f143f7d272a85e765ef02b663f10957b1ee5fa647b32331ea953bb6b7d8cbf4e0c
+  metadata.gz: 4b0370b955ddf9ae29c02dde36613b1bde7fcd3c3711e55f20744bcdcd283e711f461ad6ab2766b0b560fa7e845a401a2cf0172d4a04d7223eb93671ea85e95f
+  data.tar.gz: 1ea134ed3fe1ac847c524eff4479463f7a75c6d96ef2ecdcb6ef2c62162c38ab0effaae3e76da02c57666418747fd01753c3b369f5a0dae1058b794dac22c067

data/app/models/discussion.rb

@@ -15,14 +15,19 @@ 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
@@ -145,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

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/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.7.0'
+    VERSION = '9.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.7.0
+  version: 9.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails