mumuki-domain 9.22.1 → 9.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138e6386f4e43861b313756d9ee01943ab84d4beef60faf7936f587ac4e40f82
-  data.tar.gz: 54afa2c2e250eec1de884cdf64568ec6d6c113508119884a6e96bfb7d91376f0
+  metadata.gz: 91e7710d2d997039351f464c293d25fea0b8de59208431647e209dfaa67dad9c
+  data.tar.gz: eb4e1571ef6795874fda3a4871692af496fd322ad00009190cce5d3ee92c4fd2
 SHA512:
-  metadata.gz: f52a72a3f090f95962572aa1cc17697ce4c1cec4608cb25dfbebf74db8f394349750868027865ef9f3cba9fd9564a8598875e4e17231e41b38bae06ed0abbec3
-  data.tar.gz: 2b4e6faed9348156829d672cc4ab98a093348f33831a14aec6ed5b197ba44277ad1a8bdbf4bd2667a6b95e6b1c274fd798eadf92979cb7876a0092108a28e6b2
+  metadata.gz: 037fbb869e63fa550782f8fbb5c46993b3b901ca1c529d235f98982d86a450afcb7dcc47b1fd5cf39b2a3349c9993be9adc6c52d0a45cd95729a9b45a5d315ce
+  data.tar.gz: e2f2997b8479047321fcad632dabb65d0a4f2e24dabbe820da1150dcf38fc922add4a68666faed106930fb7e2dfe4a4c2cec26d3653cfe7c19bd3fda9ef7e16b

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

@@ -142,7 +142,7 @@ class Discussion < ApplicationRecord
   end
 
   def responses_count
-    visible_messages.where('sender <> ? OR sender_id <> ?', initiator.uid, initiator.id).count
+    visible_messages.where.not(sender: initiator).count
   end
 
   def has_responses?

data/app/models/message.rb

@@ -135,10 +135,6 @@ class Message < ApplicationRecord
     'message'
   end
 
-  def sender
-    super || User.locate!(self[:sender])
-  end
-
   private
 
   def approve!(user)

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 :direct_messages, -> { order(created_at: :desc) }, class_name: 'Message', source: :messages, 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
 
@@ -156,7 +162,6 @@ class User < ApplicationRecord
     update! accepts_reminders: false
   end
 
-
   def attach!(role, course)
     add_permission! role, course.slug
     save_and_notify!
@@ -341,8 +346,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)
+  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
@@ -380,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/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/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.22.1'
+    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.22.1
+  version: 9.23.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 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
@@ -690,6 +705,7 @@ files:
 - 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