mumuki-domain 9.19.0 → 9.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb85dd95292fca604bdfd6f77560b37650766ede8bfbf1b7afe9caf4a105efd
-  data.tar.gz: ed1292935f907bde74fe777fd48de3d61ef87c5f62e6db4c3c7c0ae50c5ce3de
+  metadata.gz: 138e6386f4e43861b313756d9ee01943ab84d4beef60faf7936f587ac4e40f82
+  data.tar.gz: 54afa2c2e250eec1de884cdf64568ec6d6c113508119884a6e96bfb7d91376f0
 SHA512:
-  metadata.gz: fcc442e31b9f5b510c8a5a99d78bcbd98b8a0f36b828badeb64e25e8eaeecb3d910c7348da4b263047f52e5c6bd9ad6ee8412cfcfdf932cee5418a2ee48cfb7c
-  data.tar.gz: 6f888100f4dc2b1f9c332c3f8b9ebc257c1eb3aa2534c7db85bd0b4f4328f9fc2cd24f8da23ecbd04bb1dab8edd56ad236dac2dd6505ea8451ee5c5b6212c570
+  metadata.gz: f52a72a3f090f95962572aa1cc17697ce4c1cec4608cb25dfbebf74db8f394349750868027865ef9f3cba9fd9564a8598875e4e17231e41b38bae06ed0abbec3
+  data.tar.gz: 2b4e6faed9348156829d672cc4ab98a093348f33831a14aec6ed5b197ba44277ad1a8bdbf4bd2667a6b95e6b1c274fd798eadf92979cb7876a0092108a28e6b2

data/app/models/assignment.rb

@@ -186,8 +186,8 @@ class Assignment < Progress
                     language: {only: [:name]}},
                 },
                 exercise: {only: [:name, :number]},
-                submitter: {only: [:email, :social_id, :uid], methods: [:name, :profile_picture]}}).
-      deep_merge(
+                submitter: {only: [:email, :social_id, :uid], methods: [:name, :profile_picture]}})
+      .deep_merge(
         'organization' => Organization.current.name,
         'sid' => submission_id,
         'created_at' => submitted_at || updated_at,
@@ -202,6 +202,7 @@ class Assignment < Progress
           'position' => navigable_parent.try(:number),
           'chapter' => guide.chapter.as_json(only: [:id], methods: [:name])
         }})
+      .merge({'randomized_values' => randomized_values.presence}.compact)
   end
 
   def tips

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_messages.rb

@@ -4,7 +4,7 @@ module WithMessages
   end
 
   def send_question!(question)
-    message = build_message question.merge(sender: submitter.uid, read: true)
+    message = build_message question.merge(sender: submitter, read: true)
     message.save_and_notify!
   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
@@ -101,7 +103,7 @@ class Discussion < ApplicationRecord
   end
 
   def submit_message!(message, user)
-    message.merge!(sender: user.uid)
+    message.merge!(sender: user)
     messages.create(message)
     user.subscribe_to! self
     mark_subscriptions_as_unread!(user)
@@ -140,7 +142,7 @@ class Discussion < ApplicationRecord
   end
 
   def responses_count
-    visible_messages.where.not(sender: initiator.uid).count
+    visible_messages.where('sender <> ? OR sender_id <> ?', initiator.uid, initiator.id).count
   end
 
   def has_responses?

data/app/models/message.rb

@@ -4,18 +4,20 @@ class Message < ApplicationRecord
   belongs_to :discussion, optional: true
   belongs_to :assignment, optional: true
   belongs_to :approved_by, class_name: 'User', optional: true
+  belongs_to :sender, class_name: 'User'
 
   has_one :exercise, through: :assignment
 
-  validates_presence_of :content, :sender
+  validates_presence_of :content
   validate :ensure_contextualized
 
+  before_create :mark_from_moderator!
   after_save :update_counters_cache!
 
   markdown_on :content
 
   # Visible messages are those that can be publicly seen
-  # in forums. non-direct messages are never visible.
+  # in forums. Direct messages are never visible.
   scope :visible, -> () do
     where.not(deletion_motive: :self_deleted)
       .or(where(deletion_motive: nil))
@@ -49,19 +51,15 @@ class Message < ApplicationRecord
   end
 
   def from_initiator?
-    sender_user == discussion&.initiator
+    sender == discussion&.initiator
   end
 
   def from_moderator?
-    sender_user.moderator_here?
+    from_moderator || sender.moderator_here?
   end
 
   def from_user?(user)
-    sender_user == user
-  end
-
-  def sender_user
-    User.find_by(uid: sender)
+    sender == user
   end
 
   def authorized?(user)
@@ -74,9 +72,10 @@ 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, :sender_id],
             include: {exercise: {only: [:bibliotheca_id]}})
-        .merge(organization: Organization.current.name)
+        .merge(organization: Organization.current.name, sender: sender.uid)
   end
 
   def read!
@@ -103,6 +102,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
@@ -122,7 +125,7 @@ class Message < ApplicationRecord
   def self.import_from_resource_h!(resource_h)
     if resource_h['submission_id'].present?
       assignment = Assignment.find_by(submission_id: resource_h['submission_id'])
-      assignment&.receive_answer! sender: resource_h['message']['sender'],
+      assignment&.receive_answer! sender: User.locate!(resource_h['message']['sender']),
                                   content: resource_h['message']['content']
     end
   end
@@ -132,6 +135,10 @@ class Message < ApplicationRecord
     'message'
   end
 
+  def sender
+    super || User.locate!(self[:sender])
+  end
+
   private
 
   def approve!(user)

data/app/models/user.rb

@@ -19,7 +19,7 @@ class User < ApplicationRecord
   has_many :assignments, foreign_key: :submitter_id
   has_many :indicators
   has_many :user_stats, class_name: 'UserStats'
-  has_many :messages, -> { order(created_at: :desc) }, through: :assignments
+  has_many :direct_messages, -> { order(created_at: :desc) }, class_name: 'Message', source: :messages, through: :assignments
 
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
 
@@ -61,7 +61,7 @@ class User < ApplicationRecord
   end
 
   def messages_in_organization(organization = Organization.current)
-    messages.where('assignments.organization': organization)
+    direct_messages.where('assignments.organization': organization)
   end
 
   def passed_submissions_count_in(organization)
@@ -141,9 +141,14 @@ class User < ApplicationRecord
     super.merge(image_url: profile_picture)
   end
 
-  def verify_name!
-    self.verified_first_name ||= first_name
-    self.verified_last_name ||= last_name
+  def verify_name!(force: false)
+    if force
+      self.verified_first_name = first_name
+      self.verified_last_name = last_name
+    else
+      self.verified_first_name ||= first_name
+      self.verified_last_name ||= last_name
+    end
     save!
   end
 
@@ -321,7 +326,7 @@ class User < ApplicationRecord
 
     target_assignments = assignments.where(location)
 
-    messages.where(assignment: target_assignments).delete_all
+    direct_messages.where(assignment: target_assignments).delete_all
 
     target_assignments.delete_all
     indicators.where(location).delete_all
@@ -336,6 +341,10 @@ class User < ApplicationRecord
     ignored_notifications.include? notification.subject
   end
 
+  def forum_messages
+    Message.where(sender: self).or(Message.where('sender = ?', uid)).where.not(discussion_id: nil)
+  end
+
   private
 
   def welcome_to_new_organizations!

data/app/models/user_stats.rb

@@ -32,8 +32,8 @@ class UserStats < ApplicationRecord
 
   def messages_in_discussions_count(date_range = nil)
     date_filter = { created_at: date_range }.compact
-    result = Message.joins(:discussion)
-        .where({sender: user.uid, deletion_motive: nil, discussions: { organization: organization }}.merge(date_filter))
+    result = user.forum_messages.joins(:discussion)
+        .where({deletion_motive: nil, discussions: { organization: organization }}.merge(date_filter))
         .group(:approved)
         .count
     unapproved = result[false] || 0

data/db/migrate/20211004062332_reference_sender_via_id_in_messages.rb

@@ -0,0 +1,5 @@
+class ReferenceSenderViaIdInMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :messages, :sender, index: true
+  end
+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) }
   end
 end

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

@@ -33,8 +33,4 @@ module Mumuki::Domain::Status::Discussion
       reachable_statuses_for_initiator(discussion)
     end
   end
-
-  def as_json(_options={})
-    to_s
-  end
 end

data/lib/mumuki/domain/status/submission/submission.rb

@@ -31,10 +31,6 @@ module Mumuki::Domain::Status::Submission
     group.iconize
   end
 
-  def as_json(_options={})
-    to_s
-  end
-
   def completed?
     solved?
   end
@@ -50,8 +46,4 @@ module Mumuki::Domain::Status::Submission
   def exp_given
     0
   end
-
-  def dup
-    self
-  end
 end

data/lib/mumuki/domain/status.rb

@@ -25,6 +25,14 @@ module Mumuki::Domain::Status
     self.equal? parent.to_mumuki_status(other) rescue false
   end
 
+  def as_json(_options={})
+    to_s
+  end
+
+  def dup
+    self
+  end
+
   class_methods do
     def load(i)
       cast(i)

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.19.0'
+    VERSION = '9.22.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.19.0
+  version: 9.22.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-11-04 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,8 @@ 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/20211004062332_reference_sender_via_id_in_messages.rb
+- db/migrate/20211020224011_add_from_moderator_to_messages.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb