mumuki-domain 9.20.0 → 9.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444b1f0d9b9045b65edc00adfa94535e351fb2d0c906e1f5f4ddce6a8ae7da8c
-  data.tar.gz: 9363d9f7b2f7db38f13913a4396417af31583e8d8f45443d3e3792f8add84f8c
+  metadata.gz: 95912abc73b50f774b4e87873ea35afa3ce9016d4cf90ce9af6cfb9c88ea9c56
+  data.tar.gz: 3d2cbbf7c128f280edb477d38ad3a37770943ba9a0e6809d54936c62efb54186
 SHA512:
-  metadata.gz: 1e214a051c3d7ea39244492a5a6ce85e9e96089f0ba7ae880f6a051cb75222bfbf40a643de40b950d7555bff1fe71c3c119561212751626489804eda3c0f7157
-  data.tar.gz: 8262781e1b3e394c222085f7730a869a37b1b8b7145520c429d02f5fba7997cc719aaa3fc1db54d04fc928ecf47dc612a0cd4b670de8b905fc21bedfecda2416
+  metadata.gz: 54c74640cdef38c3aeec166b5fded89c82f4f867b37f83a2d0b3e24ef0bb4e0f0b707de265aaae9b56decfe6bdfadc6aa0448fb16506af72119ab3dca0e860c8
+  data.tar.gz: 75949f754f836b0315f5e717532e02de38a8222819d2ae4441df4b524e7fda2c55f45a12696d034060f3a1754120c6707f1cc6d3b9682d591d6c9edd8521fa58

data/app/models/concerns/gamified.rb

@@ -10,6 +10,6 @@ module Gamified
   end
 
   def net_experience
-    submission_status.exp_given - top_submission_status.exp_given
+    submitter.currently_in_exam? ? 0 : (submission_status.exp_given - top_submission_status.exp_given)
   end
 end

data/app/models/concerns/with_scoped_queries/limit.rb

@@ -0,0 +1,14 @@
+module WithScopedQueries::Limit
+  def self.query_by(params, current_scope, _)
+    if params[:limit].present?
+      max_limit = [params[:limit].to_i, 25].min
+      current_scope.limit(max_limit)
+    else
+      current_scope
+    end
+  end
+
+  def self.add_queriable_attributes_to(klass, _)
+    klass.queriable_attributes.merge!(limit: :limit)
+  end
+end

data/app/models/concerns/with_scoped_queries/page.rb

@@ -1,10 +1,14 @@
 module WithScopedQueries::Page
   def self.query_by(params, current_scope, _)
-    page_param = params[:page] || 1
-    current_scope.page(page_param).per(10)
+    if params[:limit].present?
+      current_scope
+    else
+      page_param = params[:page] || 1
+      current_scope.page(page_param).per(10)
+    end
   end
 
   def self.add_queriable_attributes_to(klass, _)
-    klass.queriable_attributes.merge!(page: :page)
+    klass.queriable_attributes.merge!(page: [:page, :limit])
   end
 end

data/app/models/concerns/with_scoped_queries.rb

@@ -1,7 +1,7 @@
 module WithScopedQueries
   extend ActiveSupport::Concern
 
-  SCOPING_METHODS = [Filter, Sort, Page]
+  SCOPING_METHODS = [Filter, Sort, Page, Limit]
 
   included do
     class_attribute :queriable_attributes, instance_writer: false

data/app/models/discussion.rb

@@ -22,14 +22,16 @@ class Discussion < ApplicationRecord
                                           .or(where(responsible_moderator_at: nil)) }
   scope :pending_review, -> { where(status: :pending_review) }
   scope :unread_first, -> { includes(:subscriptions).reorder('subscriptions.read', created_at: :desc) }
+  scope :by_recent, -> (_) { where('created_at > ?', Time.now - 6.months)}
 
   after_create :subscribe_initiator!
 
   markdown_on :description
 
   sortable :responses_count, :upvotes_count, :created_at, default: :created_at_desc
-  filterable :status, :language, :requires_attention
+  filterable :status, :language, :requires_attention, :recent
   pageable
+  limitable
 
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status

data/app/models/message.rb

@@ -10,6 +10,7 @@ class Message < ApplicationRecord
   validates_presence_of :content, :sender
   validate :ensure_contextualized
 
+  before_create :mark_from_moderator!
   after_save :update_counters_cache!
 
   markdown_on :content
@@ -53,7 +54,7 @@ class Message < ApplicationRecord
   end
 
   def from_moderator?
-    sender_user.moderator_here?
+    from_moderator || sender_user.moderator_here?
   end
 
   def from_user?(user)
@@ -74,7 +75,7 @@ class Message < ApplicationRecord
 
   def to_resource_h
     as_json(except: [:id, :type, :discussion_id, :approved, :approved_at, :approved_by_id,
-                     :not_actually_a_question, :deletion_motive, :deleted_at, :deleted_by_id],
+                     :not_actually_a_question, :deletion_motive, :deleted_at, :deleted_by_id, :from_moderator],
             include: {exercise: {only: [:bibliotheca_id]}})
         .merge(organization: Organization.current.name)
   end
@@ -103,6 +104,10 @@ class Message < ApplicationRecord
     approved? || from_moderator?
   end
 
+  def mark_from_moderator!
+    self.from_moderator = from_moderator?
+  end
+
   def update_counters_cache!
     discussion&.update_counters!
   end

data/db/migrate/20211020224011_add_from_moderator_to_messages.rb

@@ -0,0 +1,5 @@
+class AddFromModeratorToMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :from_moderator, :boolean
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
-
   factory :message do
     content { Faker::Lorem.sentence(word_count: 3) }
+    sender { create(:user).uid }
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.20.0'
+    VERSION = '9.21.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.20.0
+  version: 9.21.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -306,6 +306,7 @@ files:
 - 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/limit.rb
 - app/models/concerns/with_scoped_queries/page.rb
 - app/models/concerns/with_scoped_queries/sort.rb
 - app/models/concerns/with_slug.rb
@@ -687,6 +688,7 @@ files:
 - db/migrate/20210719145706_add_new_fields_to_notifications.rb
 - db/migrate/20210803175124_add_ignored_notifications_to_users.rb
 - db/migrate/20210929223144_add_authorization_requests_limit_to_exam_registration.rb
+- db/migrate/20211020224011_add_from_moderator_to_messages.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb