mumuki-domain 9.1.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d165cf9f919009ff75f9b6287e01df473ff786089c553651d0841911afb7375
-  data.tar.gz: 6b746d09af5ab93422f9bd8091a0fb5d809f74422fb4ec6b6c4847af86896451
+  metadata.gz: b78b493d9f7e6314a746e22d17fe33c140dada6e77a9af84da850098180a1677
+  data.tar.gz: 9ed9017804d844c8a24540dcdf5c32d4ad78d8a28b186e3df1dbd83b845ff5cd
 SHA512:
-  metadata.gz: 396f0b0743fd5d44e4bc5bea7b8e8ffedd34932df9f98b29334cef334ff6361fbdc769e81deec7213aaa1ad684acb627ca52ddf68bc3e6b88019d1195470f278
-  data.tar.gz: 901f97fe4f6f6d1b8a6b916b9d90339d350d796d9c3e3f8b9a3c01bf9770a707a145370be8162eabcfa03490a2dff4cf77236de8ffc43ee2cc7d7414429f2743
+  metadata.gz: 84faddd371cc851bbb08155cddb140dd6a17eaa3920f73cf235950d3321f07be4dd4f44325708b582904ee4d1eac2b5c426be3afb7b82e566834d87686eec3b2
+  data.tar.gz: 93cf6080fba52bffbe3d7fafd4a3ed0121f55accaa8b1c7950e9512a4f409b9031288b51998ab7caff22ac161fd4c0d4c9fb663f369cafb00a42afcfe6ad5732

data/app/models/application_record.rb

@@ -29,7 +29,7 @@ class ApplicationRecord < ActiveRecord::Base
   def self.serialize_symbolized_hash_array(*keys)
     keys.each do |field|
       serialize field
-      define_method(field) { self[field]&.map { |it| it.symbolize_keys } }
+      define_method(field) { self[field]&.map { |it| it.deep_symbolize_keys } }
     end
   end
 

data/app/models/concerns/navigation/terminal_navigation.rb

@@ -18,4 +18,8 @@ module TerminalNavigation
   def siblings
     []
   end
+
+  def next_for(_user)
+    nil
+  end
 end

data/app/models/concerns/with_soft_deletion.rb

@@ -0,0 +1,16 @@
+module WithSoftDeletion
+  extend ActiveSupport::Concern
+
+  included do
+    enum deletion_motive: %i(self_deleted inappropriate_content shares_solution discloses_personal_information)
+    belongs_to :deleted_by, class_name: 'User', optional: true
+  end
+
+  def soft_delete!(motive, deleter)
+    update! deletion_motive: motive, deleted_by: deleter, deleted_at: Time.now
+  end
+
+  def deleted?
+    deleted_at.present?
+  end
+end

data/app/models/discussion.rb

@@ -28,7 +28,7 @@ class Discussion < ApplicationRecord
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status
 
-  MODERATOR_REVIEW_AVERAGE_TIME = 10.minutes
+  MODERATOR_REVIEW_AVERAGE_TIME = 17.minutes
 
   scope :for_user, -> (user) do
     if user.try(:moderator_here?)
@@ -38,6 +38,10 @@ class Discussion < ApplicationRecord
     end
   end
 
+  def visible_messages
+    messages.where.not(deletion_motive: :self_deleted).or(messages.where(deletion_motive: nil))
+  end
+
   def try_solve!
     if opened?
       update! status: reachable_statuses_for(initiator).first
@@ -73,7 +77,7 @@ class Discussion < ApplicationRecord
   end
 
   def last_message_date
-    messages.last&.created_at || created_at
+    visible_messages.last&.created_at || created_at
   end
 
   def friendly
@@ -125,11 +129,11 @@ class Discussion < ApplicationRecord
   end
 
   def has_messages?
-    messages.exists? || description.present?
+    visible_messages.exists? || description.present?
   end
 
   def responses_count
-    messages.where.not(sender: initiator.uid).count
+    visible_messages.where.not(sender: initiator.uid).count
   end
 
   def has_responses?
@@ -186,6 +190,6 @@ class Discussion < ApplicationRecord
   private
 
   def messages_by_updated_at(direction = :desc)
-    messages.reorder(updated_at: direction)
+    messages.where(deletion_motive: nil).reorder(updated_at: direction)
   end
 end

data/app/models/exam_authorization_request.rb

@@ -18,6 +18,17 @@ class ExamAuthorizationRequest < ApplicationRecord
     exam_registration.description
   end
 
+  def icon
+    case status.to_sym
+    when :pending
+      { class: 'info-circle', type: 'info' }
+    when :approved
+      { class: 'check-circle', type: 'success' }
+    when :rejected
+      { class: 'times-circle', type: 'danger' }
+    end
+  end
+
   private
 
   def notify_user!

data/app/models/exercise.rb

@@ -29,7 +29,7 @@ class Exercise < ApplicationRecord
   defaults { self.submissions_count = 0 }
 
   def self.default_scope
-    where(manual_evaluation: false) if Organization.safe_current&.prevent_manual_evaluation_content
+    where(manual_evaluation: false) if hide_manual_evaluation?
   end
 
   alias_method :progress_for, :assignment_for
@@ -256,6 +256,10 @@ class Exercise < ApplicationRecord
     layouts.keys[0]
   end
 
+  def self.hide_manual_evaluation?
+    Organization.safe_current&.prevent_manual_evaluation_content
+  end
+
   def self.with_pending_assignments_for(user, relation)
     relation.
         joins("left join assignments assignments
@@ -266,6 +270,7 @@ class Exercise < ApplicationRecord
                   #{Mumuki::Domain::Status::Submission::Passed.to_i},
                   #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
                 )").
-        where('assignments.id is null')
+        where('assignments.id is null').
+        where(('exercises.manual_evaluation = false' if hide_manual_evaluation?))
   end
 end

data/app/models/message.rb

@@ -1,4 +1,5 @@
 class Message < ApplicationRecord
+  include WithSoftDeletion
 
   belongs_to :discussion, optional: true
   belongs_to :assignment, foreign_key: :submission_id, primary_key: :submission_id, optional: true
@@ -10,7 +11,6 @@ class Message < ApplicationRecord
   validates_presence_of :submission_id, :unless => :discussion_id?
 
   after_save :update_counters_cache!
-  after_destroy :update_counters_cache!
 
   markdown_on :content
 
@@ -43,7 +43,8 @@ class Message < ApplicationRecord
   end
 
   def to_resource_h
-    as_json(except: [:id, :type, :discussion_id, :approved, :not_actually_a_question],
+    as_json(except: [:id, :type, :discussion_id, :approved, :approved_at, :approved_by_id,
+                     :not_actually_a_question, :deletion_motive, :deleted_at, :deleted_by_id],
             include: {exercise: {only: [:bibliotheca_id]}})
         .merge(organization: Organization.current.name)
   end

data/app/models/user.rb

@@ -16,6 +16,8 @@ class User < ApplicationRecord
 
   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
 
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
@@ -211,6 +213,10 @@ class User < ApplicationRecord
     name.split.map(&:first).map(&:capitalize).join(' ')
   end
 
+  def abbreviated_name
+    "#{first_name} #{last_name.first.capitalize + '.' if last_name.present?}".strip
+  end
+
   def progress_at(content, organization)
     Indicator.find_or_initialize_by(user: self, organization: organization, content: content)
   end
@@ -283,11 +289,11 @@ class User < ApplicationRecord
   end
 
   def formal_first_name
-    verified_first_name || first_name
+    verified_first_name.presence || first_name
   end
 
   def formal_last_name
-    verified_last_name || last_name
+    verified_last_name.presence || last_name
   end
 
   def formal_full_name
@@ -308,6 +314,18 @@ class User < ApplicationRecord
     UserMailer.certificate(certificate).deliver_later
   end
 
+  def clear_progress_for!(organization)
+    location = { organization: organization }.compact
+
+    target_assignments = assignments.where(location)
+
+    messages.where(assignment: target_assignments).delete_all
+
+    target_assignments.delete_all
+    indicators.where(location).delete_all
+    user_stats.where(location).delete_all
+  end
+
   private
 
   def welcome_to_new_organizations!

data/app/models/user_stats.rb

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

data/db/migrate/20210318191512_add_deletion_fields_to_message.rb

@@ -0,0 +1,7 @@
+class AddDeletionFieldsToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :deletion_motive, :integer
+    add_column :messages, :deleted_at, :datetime
+    add_reference :messages, :deleted_by, index: true
+  end
+end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.1.0'
+    VERSION = '9.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -301,6 +301,7 @@ files:
 - app/models/concerns/with_scoped_queries/page.rb
 - app/models/concerns/with_scoped_queries/sort.rb
 - app/models/concerns/with_slug.rb
+- app/models/concerns/with_soft_deletion.rb
 - app/models/concerns/with_target_audience.rb
 - app/models/concerns/with_terms_acceptance.rb
 - app/models/concerns/with_timed_enablement.rb
@@ -661,6 +662,7 @@ files:
 - db/migrate/20210302181654_add_faqs_to_organizations.rb
 - db/migrate/20210308145910_add_approved_by_and_at_to_message.rb
 - db/migrate/20210310195602_add_delete_account_token_to_user.rb
+- db/migrate/20210318191512_add_deletion_fields_to_message.rb
 - db/migrate/20210318194559_add_dates_to_certificate_program.rb
 - db/migrate/20210318195238_rename_certificate_dates.rb
 - db/migrate/20210330175706_create_exam_registration_user_join_table.rb