mumuki-domain 9.21.0 → 9.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95912abc73b50f774b4e87873ea35afa3ce9016d4cf90ce9af6cfb9c88ea9c56
-  data.tar.gz: 3d2cbbf7c128f280edb477d38ad3a37770943ba9a0e6809d54936c62efb54186
+  metadata.gz: 3822b6222097cb19717c7d6a76c97988f3993ef342b7e238a38ffbba6dbd7bb7
+  data.tar.gz: 2d6a733e2f9daf5d7c4fe6694f59ce1f5f7887067121d2af0a772be73e785b3a
 SHA512:
-  metadata.gz: 54c74640cdef38c3aeec166b5fded89c82f4f867b37f83a2d0b3e24ef0bb4e0f0b707de265aaae9b56decfe6bdfadc6aa0448fb16506af72119ab3dca0e860c8
-  data.tar.gz: 75949f754f836b0315f5e717532e02de38a8222819d2ae4441df4b524e7fda2c55f45a12696d034060f3a1754120c6707f1cc6d3b9682d591d6c9edd8521fa58
+  metadata.gz: d0c4b744c65d518051715f839920c3adc7991bd747d26c6d75507335e8b26ce17842226cb3b2e5bac3acec3970f299b2f7b01b18271254f94aff286f62de8640
+  data.tar.gz: 26e47f01673258854896ca35468e7b5932514748c066f53c076cd06cfe06a2e92dc87ddd523eef97644e4e2e9d3e1e2fd2bde616c62dc0b06b3f63c884489427

data/app/models/concerns/with_discussion_status.rb

@@ -4,7 +4,6 @@ module WithDiscussionStatus
   included do
     serialize :status, Mumuki::Domain::Status::Discussion
     validates_presence_of :status
-    scope :by_status, -> (status) { where(status: status) }
   end
 
   delegate :closed?, :opened?, :solved?, :pending_review?, :reachable_statuses, to: :status

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/discussion.rb

@@ -103,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)
@@ -142,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,10 +4,11 @@ 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!
@@ -16,7 +17,7 @@ class Message < ApplicationRecord
   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))
@@ -50,19 +51,15 @@ class Message < ApplicationRecord
   end
 
   def from_initiator?
-    sender_user == discussion&.initiator
+    sender == discussion&.initiator
   end
 
   def from_moderator?
-    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)
@@ -75,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, :from_moderator],
+                     :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!
@@ -127,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
@@ -137,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/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 }
+    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.21.0'
+    VERSION = '9.22.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.21.0
+  version: 9.22.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -688,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/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