mumuki-domain 9.20.0 → 9.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444b1f0d9b9045b65edc00adfa94535e351fb2d0c906e1f5f4ddce6a8ae7da8c
-  data.tar.gz: 9363d9f7b2f7db38f13913a4396417af31583e8d8f45443d3e3792f8add84f8c
+  metadata.gz: 91e7710d2d997039351f464c293d25fea0b8de59208431647e209dfaa67dad9c
+  data.tar.gz: eb4e1571ef6795874fda3a4871692af496fd322ad00009190cce5d3ee92c4fd2
 SHA512:
-  metadata.gz: 1e214a051c3d7ea39244492a5a6ce85e9e96089f0ba7ae880f6a051cb75222bfbf40a643de40b950d7555bff1fe71c3c119561212751626489804eda3c0f7157
-  data.tar.gz: 8262781e1b3e394c222085f7730a869a37b1b8b7145520c429d02f5fba7997cc719aaa3fc1db54d04fc928ecf47dc612a0cd4b670de8b905fc21bedfecda2416
+  metadata.gz: 037fbb869e63fa550782f8fbb5c46993b3b901ca1c529d235f98982d86a450afcb7dcc47b1fd5cf39b2a3349c9993be9adc6c52d0a45cd95729a9b45a5d315ce
+  data.tar.gz: e2f2997b8479047321fcad632dabb65d0a4f2e24dabbe820da1150dcf38fc922add4a68666faed106930fb7e2dfe4a4c2cec26d3653cfe7c19bd3fda9ef7e16b

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

@@ -0,0 +1,29 @@
+module WithDeletedUser
+  def self.prepended(base)
+    super
+    base.before_destroy :forbid_destroy!, if: :deleted_user?
+    base.extend ClassMethods
+  end
+
+  def deleted_user?
+    self == User.deleted_user
+  end
+
+  def abbreviated_name
+    return super unless deleted_user?
+
+    I18n.t(:deleted_user, locale: (Organization.current.locale rescue 'en'))
+  end
+
+  module ClassMethods
+    def deleted_user
+      @deleted_user ||= User.create_with(@buried_profile).find_or_create_by(uid: 'deleted:shibi')
+    end
+  end
+
+  private
+
+  def forbid_destroy!
+    raise '"Deleted User" shibi cannot be destroyed'
+  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.not(sender: initiator).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

data/app/models/user.rb

@@ -6,20 +6,30 @@ class User < ApplicationRecord
           WithNotifications,
           WithDiscussionCreation,
           Awardee,
-          Disabling,
           WithTermsAcceptance,
           WithPreferences,
           Onomastic,
           Mumuki::Domain::Helpers::User
 
+  prepend WithDeletedUser
+
   serialize :permissions, Mumukit::Auth::Permissions
   serialize :ignored_notifications, Array
 
-  has_many :notifications
-  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
+  before_destroy :clean_belongings!
+
+  has_many :api_clients,                             dependent: :delete_all
+  has_many :assignments, foreign_key: :submitter_id, dependent: :delete_all
+  has_many :certificates,                            dependent: :delete_all
+  has_many :exam_authorizations,                     dependent: :delete_all
+  has_many :exam_authorization_requests,             dependent: :delete_all
+  has_many :notifications,                           dependent: :delete_all
+  has_many :indicators,                              dependent: :delete_all
+  has_many :user_stats, class_name: 'UserStats',     dependent: :delete_all
+
+  has_many :discussions, foreign_key: :initiator_id
+  has_many :forum_messages, -> { where.not(discussion_id: nil)  }, class_name: 'Message', foreign_key: :sender_id
+  has_many :direct_messages, -> { order(created_at: :desc) }, through: :assignments, source: :messages
 
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
 
@@ -34,12 +44,8 @@ class User < ApplicationRecord
 
   has_one :last_guide, through: :last_exercise, source: :guide
 
-  has_many :exam_authorizations
-
   has_many :exams, through: :exam_authorizations
 
-  has_many :certificates
-
   enum gender: %i(female male other unspecified)
   belongs_to :avatar, polymorphic: true, optional: true
 
@@ -61,7 +67,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 +147,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
 
@@ -151,7 +162,6 @@ class User < ApplicationRecord
     update! accepts_reminders: false
   end
 
-
   def attach!(role, course)
     add_permission! role, course.slug
     save_and_notify!
@@ -321,7 +331,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 +346,12 @@ class User < ApplicationRecord
     ignored_notifications.include? notification.subject
   end
 
+  def clean_belongings!
+    discussions.update_all initiator_id: User.deleted_user.id
+    forum_messages.update_all sender_id: User.deleted_user.id
+    direct_messages.where(sender: self).delete_all
+  end
+
   private
 
   def welcome_to_new_organizations!
@@ -371,10 +387,6 @@ class User < ApplicationRecord
     :uid
   end
 
-  def self.unsubscription_verifier
-    Rails.application.message_verifier(:unsubscribe)
-  end
-
   def self.create_if_necessary(user)
     user[:uid] ||= user[:email]
     where(uid: user[:uid]).first_or_create(user)

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/db/migrate/20211104182009_remove_sender_uid_from_messages.rb

@@ -0,0 +1,5 @@
+class RemoveSenderUidFromMessages < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :messages, :sender, :string
+  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.20.0'
+    VERSION = '9.23.0'
   end
 end

data/lib/mumuki/domain.rb

@@ -1,4 +1,5 @@
-require "mumuki/domain/engine"
+require 'email_validator/strict'
+require 'mumuki/domain/engine'
 
 require 'mumukit/core'
 require 'mumukit/core/activemodel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.20.0
+  version: 9.23.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.6
+- !ruby/object:Gem::Dependency
+  name: email_validator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mumukit-auth
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - app/models/concerns/with_assignments.rb
 - app/models/concerns/with_assignments_batch.rb
 - app/models/concerns/with_case_insensitive_search.rb
+- app/models/concerns/with_deleted_user.rb
 - app/models/concerns/with_description.rb
 - app/models/concerns/with_discussion_creation.rb
 - app/models/concerns/with_discussion_creation/subscription.rb
@@ -306,6 +321,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 +703,9 @@ 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
+- db/migrate/20211104182009_remove_sender_uid_from_messages.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb