mumuki-domain 9.0.6 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03cf2d9f0764fe073de42e72cbb94233949692b8e5ef60b97afeca431d374719
-  data.tar.gz: 5db8d1777ae3622bf9673b09f9bc06322ffc46af56780f4a47fc19e5f77462f9
+  metadata.gz: 1f51de9222a3fb2a4f3a4e1f8498d90baf49b4b47b87662193510a601e5c7905
+  data.tar.gz: b12cf9c00c8b1a2e77e5f758205c89874de9c94e2e5ee8ac3f30f39f6210f272
 SHA512:
-  metadata.gz: a3abfa44040d80767963218a039bc1eea419921bffb8a4efbd8908bff4b1d5b395cf9c4d10d1844978ee71caa9d2f783d045f4e3f365e68c69a680c930b9b08f
-  data.tar.gz: ec63d6c11722ac7dc29c6d58af654fc3dc72ed71fdc387555e60ac71d1711cf893016aaa16c55903d85c5ad961cff7aa0206dd642074f7e5a5fc6f14a246336a
+  metadata.gz: d7ec4c49f78dde3d0422309cf38db8049909eba137b0d4c0ea6b0a27a5d7b475139a351e9c2e272771f9e2b8b59c42c00395511050e3c424369b118b3b23e3d6
+  data.tar.gz: 3bc5e9b62d860e7ec0092352be7ae556ae93c19a2e4173667e3ed8ff3576de8a2bd6bf07128808c64a3ad791c06d8bb358ddfe8d248766b08a3eb1ab54ad51b0

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

@@ -2,8 +2,8 @@ class Chapter < ApplicationRecord
   include WithStats
   include WithNumber
 
-  include SiblingsNavigation
   include TerminalNavigation
+  include SiblingsNavigation
 
   include FriendlyName
 
@@ -29,8 +29,4 @@ class Chapter < ApplicationRecord
   def structural_parent
     book
   end
-
-  def pending_siblings_for(user)
-    book.pending_chapters(user)
-  end
 end

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

@@ -12,10 +12,9 @@ module SiblingsNavigation
     structural_parent.structural_children
   end
 
-  #TODO reestablish this after indicators reliably linked to assignments
-  # def pending_siblings_for(user, organization=Organization.current)
-  #   siblings.reject { |it| it.progress_for(user, organization).completed? }
-  # end
+  def pending_siblings_for(user, organization=Organization.current)
+    siblings.reject { |it| it.progress_for(user, organization).completed? }
+  end
 
   # Names
 

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

@@ -33,7 +33,7 @@ class Organization < ApplicationRecord
   after_create :reindex_usages!
   after_update :reindex_usages!, if: lambda { |user| user.saved_change_to_book_id? }
 
-  has_many :guides, through: 'usages', source: 'item', source_type: 'Guide'
+  has_many :guides, -> { where 'usages.parent_item_type' => 'Lesson' }, through: 'usages', source: 'item', source_type: 'Guide'
   has_many :exercises, through: :guides
   has_many :assignments, through: :exercises
   has_many :exams

data/app/models/user.rb

@@ -211,6 +211,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 +287,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

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.0.6'
+    VERSION = '9.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.0.6
+  version: 9.2.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-05-11 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