mumuki-domain 9.7.0 → 9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0a85995ceefa3f9400d60e29b11c3907b1c42853c2d1517138bc7fa4532239
-  data.tar.gz: d468a495d0c21ee1139b4087c7ce5653936d7b9289a5a06d2e7c338f443fe128
+  metadata.gz: 51a03f1d01bc567c0b91939577bd7fad54968380794122c8f93a6355b4d2fd87
+  data.tar.gz: e953f4fdca9d236bfef4e9ab6d9543fec286229b668cf071830d6c98f38bfa39
 SHA512:
-  metadata.gz: f5ddf066cff9cf215e1ad83041b418cf615dcf3f5674b97cc569725d53f2107f2fc4c33b5d75fc3ae36e9a16694eeac90318062a65b3b1f1c003f97924359119
-  data.tar.gz: 0200b8bf90e1e7c08797fd2f3c417b744be4c455ff40cff1063fd7f8bf9a28f143f7d272a85e765ef02b663f10957b1ee5fa647b32331ea953bb6b7d8cbf4e0c
+  metadata.gz: 46ef5320c51569aab17dda636d81fcba3cc27cbbf7e9f22f78c96a67b97aa1f7f3d25127c9cd7bded347a5764a91b970c1ec5809c84bb904930d61212cd81cda
+  data.tar.gz: c3ffff05f15964f1bac7ea31adc0e5c78e09ce7ccc47dee8f95347205b692aa93be2c0f79ed9162fbf27a664eb60e205eeaf7f078e5456b5356a2e73b4db7f2f

data/app/models/application_record.rb

@@ -152,7 +152,7 @@ class ApplicationRecord < ActiveRecord::Base
   def self.active_between(start_date_field, end_date_field, **options)
     define_singleton_method(:active) do |actually_filter=true|
       if actually_filter
-        self.where("(#{start_date_field} IS NULL OR #{start_date_field} < :now) AND (#{end_date_field} IS NULL OR #{end_date_field} > :now)", now: Time.now)
+        self.where("(#{start_date_field} IS NULL OR #{start_date_field} < :now) AND (#{end_date_field} IS NULL OR #{end_date_field} > :now)", now: Time.current)
       else
         all
       end

data/app/models/assignment.rb

@@ -7,11 +7,7 @@ class Assignment < Progress
 
   belongs_to :exercise
   has_one :guide, through: :exercise
-  has_many :messages,
-           -> { where.not(submission_id: nil).order(date: :desc) },
-           foreign_key: :submission_id,
-           primary_key: :submission_id,
-           dependent: :destroy
+  has_many :messages, -> { order(date: :desc) }, dependent: :destroy
 
   belongs_to :organization
   belongs_to :submitter, class_name: 'User'
@@ -28,13 +24,13 @@ class Assignment < Progress
   alias_attribute :status, :submission_status
   alias_attribute :attempts_count, :attemps_count
 
-  scope :by_exercise_ids, -> (exercise_ids) {
+  scope :by_exercise_ids, -> (exercise_ids) do
     where(exercise_id: exercise_ids) if exercise_ids
-  }
+  end
 
-  scope :by_usernames, -> (usernames) {
+  scope :by_usernames, -> (usernames) do
     joins(:submitter).where('users.name' => usernames) if usernames
-  }
+  end
 
   defaults do
     self.query_results = []
@@ -86,11 +82,10 @@ class Assignment < Progress
     end
   end
 
-  def persist_submission!(submission)
+  def save_submission!(submission)
     transaction do
-      messages.destroy_all if submission_id.present?
       update! submission_id: submission.id
-      update! submitted_at: DateTime.current
+      update! submitted_at: Time.current
       update_submissions_count!
       update_last_submission!
     end
@@ -286,6 +281,6 @@ class Assignment < Progress
   end
 
   def update_last_submission!
-    submitter.update!(last_submission_date: DateTime.current, last_exercise: exercise)
+    submitter.update!(last_submission_date: Time.current, last_exercise: exercise)
   end
 end

data/app/models/concerns/onomastic.rb

@@ -0,0 +1,37 @@
+module Onomastic
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method :name, :full_name
+  end
+
+  def formal_first_name
+    verified_first_name.presence || first_name
+  end
+
+  def formal_last_name
+    verified_last_name.presence || last_name
+  end
+
+  def has_verified_full_name?
+    verified_first_name? && verified_last_name?
+  end
+
+  def formal_full_name
+    join_names formal_first_name, formal_last_name
+  end
+
+  def full_name
+    join_names first_name, last_name
+  end
+
+  def verified_full_name
+    join_names verified_first_name, verified_last_name
+  end
+
+  private
+
+  def join_names(first, last)
+    "#{first} #{last}".strip
+  end
+end

data/app/models/concerns/with_messages.rb

@@ -9,7 +9,7 @@ module WithMessages
   end
 
   def build_message(body)
-    messages.build({date: DateTime.current}.merge(body))
+    messages.build({date: Time.current, submission_id: submission_id}.merge(body))
   end
 
   def has_messages?

data/app/models/concerns/with_reminders.rb

@@ -11,7 +11,7 @@ module WithReminders
 
   def remind!
     build_reminder.deliver_now
-    update! last_reminded_date: Time.now
+    update! last_reminded_date: Time.current
   end
 
   def should_remind?

data/app/models/concerns/with_responsible_moderator.rb

@@ -34,7 +34,7 @@ module WithResponsibleModerator
   private
 
   def responsible!(moderator)
-    update! responsible_moderator_at: Time.now, responsible_moderator_by: moderator
+    update! responsible_moderator_at: Time.current, responsible_moderator_by: moderator
   end
 
   def no_responsible!

data/app/models/concerns/with_soft_deletion.rb

@@ -7,7 +7,7 @@ module WithSoftDeletion
   end
 
   def soft_delete!(motive, deleter)
-    update! deletion_motive: motive, deleted_by: deleter, deleted_at: Time.now
+    update! deletion_motive: motive, deleted_by: deleter, deleted_at: Time.current
   end
 
   def deleted?

data/app/models/concerns/with_terms_acceptance.rb

@@ -58,8 +58,7 @@ module WithTermsAcceptance
   end
 
   def accept_terms!(terms)
-    update! unaccepted_terms_scopes_in(terms).to_h { |scope| [term_acceptance_field_for(scope), Time.now] }
+    update! unaccepted_terms_scopes_in(terms).to_h { |scope| [term_acceptance_field_for(scope), Time.current] }
   end
 
 end
-

data/app/models/concerns/with_timed_enablement.rb

@@ -2,7 +2,7 @@ module WithTimedEnablement
   extend ActiveSupport::Concern
 
   def enabled?
-    enabled_range.cover? DateTime.current
+    enabled_range.cover? Time.current
   end
 
   def enabled_range

data/app/models/course.rb

@@ -14,7 +14,7 @@ class Course < ApplicationRecord
   resource_fields :slug, :shifts, :code, :days, :period, :description, :period_start, :period_end
 
   def current_invitation
-    invitations.where('expiration_date > ?', Time.now).first
+    invitations.where('expiration_date > ?', Time.current).first
   end
 
   def import_from_resource_h!(resource_h)
@@ -49,7 +49,7 @@ class Course < ApplicationRecord
     period =~ /^(\d{4})?/
     year = $1.to_i
 
-    return nil unless year.between? 2014, (DateTime.now.year + 1)
+    return nil unless year.between? 2014, (Time.current.year + 1)
 
     self.period_start = DateTime.new(year).beginning_of_year
     self.period_end = DateTime.new(year).end_of_year

data/app/models/discussion.rb

@@ -15,14 +15,20 @@ class Discussion < ApplicationRecord
 
   scope :by_language, -> (language) { includes(:exercise).joins(exercise: :language).where(languages: {name: language}) }
   scope :order_by_responses_count, -> (direction) { reorder(validated_messages_count: direction, messages_count: opposite(direction)) }
-  scope :by_requires_moderator_response, -> (boolean) { where(requires_moderator_response: boolean.to_boolean) }
+  scope :by_requires_attention, -> (boolean) { opened_and_requires_moderator_response(boolean).or(pending_review).no_responsible_moderator }
+  scope :opened_and_requires_moderator_response, -> (boolean) { where(requires_moderator_response: boolean.to_boolean)
+                                                                  .where(status: :opened) }
+  scope :no_responsible_moderator, -> { where('responsible_moderator_at < ?', Time.now - MODERATOR_MAX_RESPONSIBLE_TIME)
+                                          .or(where(responsible_moderator_at: nil)) }
+  scope :pending_review, -> { where(status: :pending_review) }
+  scope :unread_first, -> { (includes(:subscriptions).reorder('subscriptions.read')) }
 
   after_create :subscribe_initiator!
 
   markdown_on :description
 
   sortable :responses_count, :upvotes_count, :created_at, default: :created_at_desc
-  filterable :status, :language, :requires_moderator_response
+  filterable :status, :language, :requires_attention
   pageable
 
   delegate :language, to: :item
@@ -37,7 +43,7 @@ class Discussion < ApplicationRecord
   end
 
   def visible_messages
-    messages.where.not(deletion_motive: :self_deleted).or(messages.where(deletion_motive: nil))
+    messages.visible
   end
 
   def try_solve!
@@ -49,7 +55,7 @@ class Discussion < ApplicationRecord
   def navigable_content_in(_)
     nil
   end
-  
+
   def target
     self
   end
@@ -123,7 +129,7 @@ class Discussion < ApplicationRecord
     if reachable_status_for?(user, status)
       update! status: status,
               status_updated_by: user,
-              status_updated_at: Time.now
+              status_updated_at: Time.current
 
       no_responsible! if responsible?(user)
     end
@@ -145,6 +151,14 @@ class Discussion < ApplicationRecord
     validated_messages_count > 0
   end
 
+  def requires_attention_for?(user)
+    user&.moderator_here? && requires_attention?
+  end
+
+  def requires_attention?
+    no_current_responsible? && status.requires_attention_for?(self)
+  end
+
   def subscribe_initiator!
     initiator.subscribe_to! self
   end

data/app/models/exam.rb

@@ -32,7 +32,7 @@ class Exam < ApplicationRecord
   end
 
   def enabled_for?(user)
-    enabled_range_for(user).cover? DateTime.current
+    enabled_range_for(user).cover? Time.current
   end
 
   def in_progress_for?(user)
@@ -179,8 +179,8 @@ class Exam < ApplicationRecord
     exam[:organization_id] = Organization.current.id
     exam[:course_id] = Course.locate!(exam[:course].to_s).id
     exam[:users] = User.where(uid: exam[:uids])
-    exam[:start_time] = exam[:start_time].to_time
-    exam[:end_time] = exam[:end_time].to_time
+    exam[:start_time] = exam[:start_time].in_time_zone
+    exam[:end_time] = exam[:end_time].in_time_zone
     exam[:classroom_id] = exam[:eid] if exam[:eid].present?
   end
 

data/app/models/exam_authorization.rb

@@ -4,7 +4,7 @@ class ExamAuthorization < ApplicationRecord
   belongs_to :exam
 
   def start!
-    update!(started: true, started_at: Time.now) unless started?
+    update!(started: true, started_at: Time.current) unless started?
   end
 
 end

data/app/models/exam_registration.rb

@@ -17,7 +17,7 @@ class ExamRegistration < ApplicationRecord
 
   alias_attribute :name, :description
 
-  scope :should_process, -> { where(processed: false).where(arel_table[:end_time].lt(Time.now)) }
+  scope :should_process, -> { where(processed: false).where(arel_table[:end_time].lt(Time.current)) }
 
   def authorization_criterion
     @authorization_criterion ||= ExamRegistration::AuthorizationCriterion.parse(authorization_criterion_type, authorization_criterion_value)

data/app/models/exercise.rb

@@ -168,14 +168,6 @@ class Exercise < ApplicationRecord
     Exercise.find(id)
   end
 
-  def messages_path_for(user)
-    "api/guides/#{guide.slug}/#{bibliotheca_id}/student/#{URI.escape user.uid}/messages?language=#{language}"
-  end
-
-  def messages_url_for(user)
-    Mumukit::Platform.classroom_api.organic_url_for(Organization.current, messages_path_for(user))
-  end
-
   def description_context
     splitted_description.first.markdownified
   end

data/app/models/exercise/playground.rb

@@ -3,8 +3,9 @@ class Playground < QueriableChallenge
 
   name_model_as Exercise
 
-  def setup_query_assignment!(assignment)
+  def save_query_submission!(assignment, submission)
     assignment.running!
+    assignment.save_submission! submission
   end
 
   def save_query_results!(assignment)

data/app/models/exercise/problem.rb

@@ -9,7 +9,7 @@ class Problem < QueriableChallenge
 
   name_model_as Exercise
 
-  def setup_query_assignment!(assignment)
+  def save_query_submission!(_assignment, _submission)
   end
 
   def save_query_results!(assignment)

data/app/models/message.rb

@@ -2,18 +2,48 @@ class Message < ApplicationRecord
   include WithSoftDeletion
 
   belongs_to :discussion, optional: true
-  belongs_to :assignment, foreign_key: :submission_id, primary_key: :submission_id, optional: true
+  belongs_to :assignment, optional: true
   belongs_to :approved_by, class_name: 'User', optional: true
 
   has_one :exercise, through: :assignment
 
   validates_presence_of :content, :sender
-  validates_presence_of :submission_id, :unless => :discussion_id?
+  validate :ensure_contextualized
 
   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.
+  scope :visible, -> () do
+    where.not(deletion_motive: :self_deleted)
+      .or(where(deletion_motive: nil))
+      .where(assignment_id: nil)
+  end
+
+  def contextualization
+    direct? ? assignment : discussion
+  end
+
+  def contextualized?
+    assignment_id.present? ^ discussion_id.present?
+  end
+
+  # Whether this message is stale, that is, it
+  # targets a submission that is not the latest one.
+  #
+  # Only direct messages may become stale.
+  def stale?
+    direct? && assignment.submission_id != submission_id
+  end
+
+  # Whether this message is direct, that is, whether it comes from rise-hand feature.
+  # Forum messages are non-direct.
+  def direct?
+    submission_id.present?
+  end
+
   def notify!
     Mumukit::Nuntius.notify! 'student-messages', to_resource_h unless Organization.silenced?
   end
@@ -85,33 +115,29 @@ class Message < ApplicationRecord
     self
   end
 
-  def self.parse_json(json)
-    message = json.delete 'message'
-    json
-        .except('uid', 'exercise_id')
-        .merge(message)
-  end
-
   def self.read_all!
     update_all read: true
   end
 
-  def self.import_from_resource_h!(json)
-    message_data = parse_json json
-    Organization.find_by!(name: message_data.delete('organization')).switch!
-
-    if message_data['submission_id'].present?
-      Assignment.find_by(submission_id: message_data.delete('submission_id'))&.receive_answer! message_data
+  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'],
+                                  content: resource_h['message']['content']
     end
   end
 
   private
 
   def approve!(user)
-    update! approved: true, approved_at: Time.now, approved_by: user
+    update! approved: true, approved_at: Time.current, approved_by: user
   end
 
   def disapprove!
     update! approved: false, approved_at: nil, approved_by: nil
   end
+
+  def ensure_contextualized
+    errors.add(:base, :not_properly_contextualized) unless contextualized?
+  end
 end

data/app/models/organization.rb

@@ -23,7 +23,7 @@ class Organization < ApplicationRecord
 
   has_many :certificate_programs
 
-  validates_presence_of :contact_email, :locale
+  validates_presence_of :contact_email, :locale, :time_zone
   validates_presence_of :welcome_email_template, if: :greet_new_users?
   validates :name, uniqueness: true,
                    presence: true,

data/app/models/user.rb

@@ -9,6 +9,7 @@ class User < ApplicationRecord
           Disabling,
           WithTermsAcceptance,
           WithPreferences,
+          Onomastic,
           Mumuki::Domain::Helpers::User
 
   serialize :permissions, Mumukit::Auth::Permissions
@@ -251,7 +252,7 @@ class User < ApplicationRecord
 
   def age
     if birthdate.present?
-      @age ||= Time.now.round_years_since(birthdate.to_time)
+      @age ||= Time.current.round_years_since(birthdate.in_time_zone)
     end
   end
 
@@ -288,18 +289,6 @@ class User < ApplicationRecord
     end
   end
 
-  def formal_first_name
-    verified_first_name.presence || first_name
-  end
-
-  def formal_last_name
-    verified_last_name.presence || last_name
-  end
-
-  def formal_full_name
-    "#{formal_first_name} #{formal_last_name}"
-  end
-
   def certificates_in_organization(organization = Organization.current)
     certificates.where certificate_program: CertificateProgram.where(organization: organization)
   end

data/db/migrate/20210707143002_add_assignment_id_to_message.rb

@@ -0,0 +1,5 @@
+class AddAssignmentIdToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :messages, :assignment, index: true
+  end
+end

data/lib/mumuki/domain/factories/exercise_factory.rb

@@ -28,12 +28,20 @@ FactoryBot.define do
   end
 
   factory :exercise_base do
+    transient do
+      indexed { false }
+    end
+
     language { guide ? guide.language : create(:language) }
     sequence(:bibliotheca_id) { |n| n }
     sequence(:number) { |n| n }
 
     locale { :en }
     guide
+
+    after(:build) do |exercise, evaluator|
+      exercise.guide = create(:indexed_guide) if evaluator.indexed
+    end
   end
 
   factory :challenge, parent: :exercise_base do
@@ -73,7 +81,7 @@ FactoryBot.define do
   factory :exercise, parent: :problem
 
   factory :indexed_exercise, parent: :exercise do
-    guide { create(:indexed_guide) }
+    indexed { true }
   end
 
   factory :x_equal_5_exercise, parent: :exercise do

data/lib/mumuki/domain/helpers/user.rb

@@ -61,12 +61,6 @@ module Mumuki::Domain::Helpers::User
 
   ## Profile
 
-  def full_name
-    "#{first_name} #{last_name}".strip
-  end
-
-  alias_method :name, :full_name
-
   def profile_completed?
     self.class.profile_fields.map { |it| self[it] }.all? &:present?
   end

data/lib/mumuki/domain/organization/profile.rb

@@ -41,7 +41,7 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
   end
 
   def time_zone
-    @time_zone || 'Buenos Aires'
+    @time_zone
   end
 
 end

data/lib/mumuki/domain/organization/settings.rb

@@ -32,11 +32,11 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   end
 
   def disabled_from=(disabled_from)
-    @disabled_from = disabled_from&.to_time
+    @disabled_from = disabled_from&.in_time_zone
   end
 
   def in_preparation_until=(in_preparation_until)
-    @in_preparation_until = in_preparation_until&.to_time
+    @in_preparation_until = in_preparation_until&.in_time_zone
   end
 
   def disabled?

data/lib/mumuki/domain/status/discussion/closed.rb

@@ -12,4 +12,8 @@ module Mumuki::Domain::Status::Discussion::Closed
   def self.iconize
     {class: :danger, type: 'times-circle'}
   end
+
+  def self.requires_attention_for?(_)
+    false
+  end
 end

data/lib/mumuki/domain/status/discussion/opened.rb

@@ -28,4 +28,8 @@ module Mumuki::Domain::Status::Discussion::Opened
   def self.should_be_shown?(*)
     true
   end
+
+  def self.requires_attention_for?(discussion)
+    discussion.requires_moderator_response?
+  end
 end

data/lib/mumuki/domain/status/discussion/pending_review.rb

@@ -12,4 +12,8 @@ module Mumuki::Domain::Status::Discussion::PendingReview
   def self.iconize
     {class: :info, type: 'hourglass'}
   end
+
+  def self.requires_attention_for?(_)
+    true
+  end
 end

data/lib/mumuki/domain/status/discussion/solved.rb

@@ -16,4 +16,8 @@ module Mumuki::Domain::Status::Discussion::Solved
   def self.should_be_shown?(*)
     true
   end
+
+  def self.requires_attention_for?(_)
+    false
+  end
 end

data/lib/mumuki/domain/submission/persistent_submission.rb

@@ -2,6 +2,6 @@ class Mumuki::Domain::Submission::PersistentSubmission < Mumuki::Domain::Submiss
   def save_submission!(assignment)
     assignment.running!
     super
-    assignment.persist_submission! self
+    assignment.save_submission! self
   end
 end

data/lib/mumuki/domain/submission/query.rb

@@ -6,7 +6,7 @@ class Mumuki::Domain::Submission::Query < Mumuki::Domain::Submission::ConsoleSub
   end
 
   def save_submission!(assignment)
-    assignment.exercise.setup_query_assignment!(assignment)
+    assignment.exercise.save_query_submission!(assignment, self)
     super
   end
 

data/lib/mumuki/domain/submission/question.rb

@@ -5,7 +5,6 @@ class Mumuki::Domain::Submission::Question < Mumuki::Domain::Submission::Base
   end
 
   def save_submission!(assignment)
-    assignment.persist_submission! self
   end
 
   def try_evaluate!(*)

data/lib/mumuki/domain/submission/try.rb

@@ -8,6 +8,7 @@ class Mumuki::Domain::Submission::Try < Mumuki::Domain::Submission::ConsoleSubmi
   def save_submission!(assignment)
     assignment.query_results = [] if cookie.blank?
     assignment.queries = cookie.insert_last(query)
+    assignment.save_submission! self
     assignment.save!
   end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '9.7.0'
+    VERSION = '9.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 9.7.0
+  version: 9.10.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ files:
 - app/models/concerns/navigation/parent_navigation.rb
 - app/models/concerns/navigation/siblings_navigation.rb
 - app/models/concerns/navigation/terminal_navigation.rb
+- app/models/concerns/onomastic.rb
 - app/models/concerns/submittable/confirmable.rb
 - app/models/concerns/submittable/queriable.rb
 - app/models/concerns/submittable/questionable.rb
@@ -670,6 +671,7 @@ files:
 - db/migrate/20210330175706_create_exam_registration_user_join_table.rb
 - db/migrate/20210512200453_add_processed_flag_to_exam_registration.rb
 - db/migrate/20210518100153_rename_last_moderator_access.rb
+- db/migrate/20210707143002_add_assignment_id_to_message.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb