mumuki-domain 7.5.1 → 7.7.2

data/app/models/exam/passing_criterion.rb

@@ -0,0 +1,53 @@
+class Exam::PassingCriterion
+
+  attr_reader :value
+
+  def initialize(value)
+    @value = value
+  end
+
+  def type
+    self.class.name.demodulize.underscore
+  end
+
+  def as_json
+    {type: type, value: value}
+  end
+
+  def ensure_valid!
+    raise "Invalid criterion value #{value} for #{type}" unless valid_passing_grade?
+  end
+
+  def self.parse(type, value)
+    parse_criterion_type(type, value)
+  end
+
+  def self.parse_criterion_type(type, value)
+    "Exam::PassingCriterion::#{type.camelize}".constantize.new(value)
+  rescue
+    raise "Invalid criterion type #{type}"
+  end
+
+end
+
+class Exam::PassingCriterion::None < Exam::PassingCriterion
+  def initialize(_)
+    @value = nil
+  end
+
+  def valid_passing_grade?
+    !value
+  end
+end
+
+class Exam::PassingCriterion::Percentage < Exam::PassingCriterion
+  def valid_passing_grade?
+    value.between? 0, 100
+  end
+end
+
+class Exam::PassingCriterion::PassedExercises < Exam::PassingCriterion
+  def valid_passing_grade?
+    value >= 0
+  end
+end

data/app/models/exercise/challenge.rb

@@ -20,6 +20,6 @@ class Challenge < Exercise
 
   def defaults
     super
-    self.layout = self.class.default_layout
+    self.layout ||= self.class.default_layout
   end
 end

data/app/models/exercise/problem.rb

@@ -45,6 +45,12 @@ class Problem < QueriableChallenge
     own_expectations.present? || own_custom_expectations.present?
   end
 
+  # Sets the layout. This method accepts input_kids as a synonym of input_primary
+  # for historical reasons
+  def layout=(layout)
+    self[:layout] = layout.like?(:input_kids) ? :input_primary : layout
+  end
+
   private
 
   def ensure_evaluation_criteria

data/app/models/exercise/reading.rb

@@ -11,6 +11,10 @@ class Reading < Exercise
     false
   end
 
+  def layout=(layout)
+    raise 'can not set a layout different to input_bottom on readings' unless layout.like? :input_bottom
+  end
+
   def queriable?
     false
   end

data/app/models/invitation.rb

@@ -2,12 +2,18 @@ class Invitation < ApplicationRecord
   include Mumuki::Domain::Syncable
 
   belongs_to :course
+
+  validate :ensure_not_expired, on: :create
   validates_uniqueness_of :code
 
   defaults do
     self.code ||= self.class.generate_code
   end
 
+  def ensure_not_expired
+    errors.add(:base, :invitation_expired) if expired?
+  end
+
   def import_from_resource_h!(json)
     update! json.merge(course: Course.locate!(json[:course]))
   end
@@ -25,7 +31,7 @@ class Invitation < ApplicationRecord
   end
 
   def to_resource_h
-    { code: code, course: course_slug, expiration_date: expiration_date }
+    {code: code, course: course_slug, expiration_date: expiration_date}
   end
 
   def navigation_end?

data/app/models/message.rb

@@ -6,6 +6,10 @@ class Message < ApplicationRecord
 
   validates_presence_of :content, :sender
   validates_presence_of :submission_id, :unless => :discussion_id?
+
+  after_save :update_counters_cache!
+  after_destroy :update_counters_cache!
+
   markdown_on :content
 
   def notify!
@@ -16,6 +20,10 @@ class Message < ApplicationRecord
     sender_user == discussion&.initiator
   end
 
+  def from_moderator?
+    sender_user.moderator_here?
+  end
+
   def from_user?(user)
     sender_user == user
   end
@@ -33,9 +41,9 @@ class Message < ApplicationRecord
   end
 
   def to_resource_h
-    as_json(except: [:id, :type, :discussion_id, :approved],
+    as_json(except: [:id, :type, :discussion_id, :approved, :not_actually_a_question],
             include: {exercise: {only: [:bibliotheca_id]}})
-      .merge(organization: Organization.current.name)
+        .merge(organization: Organization.current.name)
   end
 
   def read!
@@ -46,11 +54,27 @@ class Message < ApplicationRecord
     toggle! :approved
   end
 
+  def toggle_not_actually_a_question!
+    toggle! :not_actually_a_question
+  end
+
+  def validated?
+    approved? || from_moderator?
+  end
+
+  def update_counters_cache!
+    discussion&.update_counters!
+  end
+
+  def question?
+    from_initiator? && !not_actually_a_question?
+  end
+
   def self.parse_json(json)
     message = json.delete 'message'
     json
-      .except('uid', 'exercise_id')
-      .merge(message)
+        .except('uid', 'exercise_id')
+        .merge(message)
   end
 
   def self.read_all!

data/app/models/organization.rb

@@ -1,6 +1,7 @@
 class Organization < ApplicationRecord
   include Mumuki::Domain::Syncable
   include Mumuki::Domain::Helpers::Organization
+  include Mumuki::Domain::Area
 
   include Mumukit::Login::OrganizationHelpers
 
@@ -11,6 +12,7 @@ class Organization < ApplicationRecord
   markdown_on :description
 
   validate :ensure_consistent_public_login
+  validate :ensure_valid_activity_range
 
   belongs_to :book
   has_many :usages
@@ -103,17 +105,8 @@ class Organization < ApplicationRecord
   # ask for help in this organization
   #
   # Warning: this method does not strictly check user's permission
-  def ask_for_help_enabled?(user = nil)
-    report_issue_enabled? || community_link.present? || can_create_discussions?(user)
-  end
-
-  # Tells if the given user can
-  # create discussion in this organization
-  #
-  # This is true only when this organization has a forum and the user
-  # has the discusser pseudo-permission
-  def can_create_discussions?(user = nil)
-    forum_enabled? && (!user || user.discusser_of?(self))
+  def ask_for_help_enabled?(user)
+    report_issue_enabled? || community_link.present? || user.can_discuss_in?(self)
   end
 
   def import_from_resource_h!(resource_h)
@@ -126,12 +119,26 @@ class Organization < ApplicationRecord
     super.merge(book: book.slug)
   end
 
+  def to_organization
+    self
+  end
+
+  def enable_progressive_display!(lookahead: 1)
+    update! progressive_display_lookahead: lookahead
+  end
+
   private
 
   def ensure_consistent_public_login
     errors.add(:base, :consistent_public_login) if settings.customized_login_methods? && public?
   end
 
+  def ensure_valid_activity_range
+    if in_preparation_until.present? && disabled_from.present?
+      errors.add(:base, :invalid_activity_range) if in_preparation_until.to_datetime >= disabled_from.to_datetime
+    end
+  end
+
   def notify_assignments!(assignments)
     assignments.each { |assignment| assignment.notify! }
   end

data/app/models/user.rb

@@ -154,6 +154,41 @@ class User < ApplicationRecord
     update! self.class.buried_profile.merge(accepts_reminders: false, gender: nil, birthdate: nil)
   end
 
+  # Takes a didactic - ordered - sequence of content containers
+  # and returns those that have been completed
+  def completed_containers(sequence, organization)
+    sequence.take_while { |it| it.content.completed_for?(self, organization) }
+  end
+
+  # Like `completed_containers`, returns a slice of the completed containers
+  # in the sequence, but adding a configurable number of trailing, non-completed contaienrs
+  def completed_containers_with_lookahead(sequence, organization, lookahead: 1)
+    raise 'invalid lookahead' if lookahead < 1
+
+    count = completed_containers(sequence, organization).size
+    sequence[0..count + lookahead - 1]
+  end
+
+  # Tells if the given user can discuss in an organization
+  #
+  # This is true only when this organization has the forum enabled and the user
+  # has the discusser pseudo-permission and the discusser is trusted
+  def can_discuss_in?(organization)
+    organization.forum_enabled? && discusser_of?(organization) && trusted_as_discusser_in?(organization)
+  end
+
+  def trusted_as_discusser_in?(organization)
+    trusted_for_forum? || !organization.forum_only_for_trusted?
+  end
+
+  def can_discuss_here?
+    can_discuss_in? Organization.current
+  end
+
+  def name_initials
+    name.split.map(&:first).map(&:capitalize).join(' ')
+  end
+
   private
 
   def set_uid!
@@ -161,10 +196,7 @@ class User < ApplicationRecord
   end
 
   def init
-    # Temporarily keep using image_url until avatars are created
-    # self.avatar = Avatar.sample unless profile_picture.present?
-
-    self.image_url ||= "user_shape.png"
+    self.avatar = Avatar.sample unless profile_picture.present?
   end
 
   def self.sync_key_id_field

data/db/migrate/20200601203033_add_course_to_exam.rb

@@ -0,0 +1,5 @@
+class AddCourseToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :exams, :course
+  end
+end

data/db/migrate/20200605161350_add_passing_criterions_to_exam.rb

@@ -0,0 +1,6 @@
+class AddPassingCriterionsToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exams, :passing_criterion_type, :integer, default: 0
+    add_column :exams, :passing_criterion_value, :integer
+  end
+end

data/db/migrate/20200608132959_add_progressive_display_lookahead_to_organizations.rb

@@ -0,0 +1,5 @@
+class AddProgressiveDisplayLookaheadToOrganizations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :progressive_display_lookahead, :integer
+  end
+end

data/db/migrate/20200702165503_add_messages_count_to_discussion.rb

@@ -0,0 +1,6 @@
+class AddMessagesCountToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :messages_count, :integer, default: 0
+    add_column :discussions, :validated_messages_count, :integer, default: 0
+  end
+end

data/db/migrate/20200728162727_add_not_actually_a_question_field_to_messages.rb

@@ -0,0 +1,5 @@
+class AddNotActuallyAQuestionFieldToMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :not_actually_a_question, :boolean, default: false
+  end
+end

data/db/migrate/20200728163038_add_requires_moderator_response_to_discussions.rb

@@ -0,0 +1,5 @@
+class AddRequiresModeratorResponseToDiscussions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :requires_moderator_response, :boolean, default: true
+  end
+end

data/db/migrate/20200730221001_add_trusted_for_forum_to_user.rb

@@ -0,0 +1,5 @@
+class AddTrustedForForumToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :trusted_for_forum, :boolean
+  end
+end

data/db/migrate/20200731081757_add_last_moderator_access_fields_to_discussion.rb

@@ -0,0 +1,6 @@
+class AddLastModeratorAccessFieldsToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :last_moderator_access_by_id, :string
+    add_column :discussions, :last_moderator_access_at, :datetime
+  end
+end

data/lib/mumuki/domain.rb

@@ -25,6 +25,7 @@ Mumukit::Platform.configure do |config|
   config.organization_class_name = 'Organization'
 end
 
+require_relative './domain/area'
 require_relative './domain/evaluation'
 require_relative './domain/submission'
 require_relative './domain/status'
@@ -32,6 +33,7 @@ require_relative './domain/exceptions'
 require_relative './domain/file'
 require_relative './domain/extensions'
 require_relative './domain/organization'
+require_relative './domain/workspace'
 require_relative './domain/helpers'
 require_relative './domain/syncable'
 require_relative './domain/store'

data/lib/mumuki/domain/area.rb

@@ -0,0 +1,13 @@
+module Mumuki::Domain::Area
+  extend ActiveSupport::Concern
+
+  def to_mumukit_grant
+    slug.to_mumukit_grant
+  end
+
+  def to_mumukit_slug
+    slug
+  end
+
+  required :to_organization
+end

data/lib/mumuki/domain/exceptions.rb

@@ -4,3 +4,5 @@ require_relative './exceptions/not_found_error'
 require_relative './exceptions/unauthorized_error'
 require_relative './exceptions/disabled_error'
 require_relative './exceptions/blocked_forum_error'
+require_relative './exceptions/unprepared_organization_error'
+require_relative './exceptions/disabled_organization_error'

data/lib/mumuki/domain/exceptions/disabled_organization_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Domain::DisabledOrganizationError < StandardError
+end

data/lib/mumuki/domain/exceptions/unprepared_organization_error.rb

@@ -0,0 +1,2 @@
+class Mumuki::Domain::UnpreparedOrganizationError < StandardError
+end

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

@@ -2,8 +2,10 @@ FactoryBot.define do
   factory :course do
     period { '2016' }
     shifts { %w(morning) }
+    code { "k1234-#{SecureRandom.uuid}" }
     days { %w(monday wednesday) }
     description { 'test' }
     organization_id { 1 }
+    slug { "#{Organization.current.name}/#{period}-#{code}" }
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :discussion do
-    title { 'A discussion' }
-    description { 'A discussion description' }
+    title { Faker::Lorem.sentence(word_count: 2) }
+    description { Faker::Lorem.sentence(word_count: 5) }
     initiator { create(:user) }
     item { create(:exercise) }
     organization { Organization.current rescue nil }

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

@@ -3,6 +3,7 @@ FactoryBot.define do
   factory :exam, traits: [:guide_container] do
     duration { Faker::Number.between(from: 10, to:60).minutes }
     organization { Organization.current }
+    course { create(:course) }
     start_time { 5.minutes.ago }
     end_time { 10.minutes.since }
   end

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

@@ -1,11 +1,6 @@
 FactoryBot.define do
 
   factory :message do
-    exercise_id { Faker::Internet.number(2) }
-    assignment
-    submission_id { assignment.id }
-    sender { Faker::Internet.email }
-    type { 'success' }
-    content { Faker::Lorem.sentence(3) }
+    content { Faker::Lorem.sentence(word_count: 3) }
   end
 end

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

@@ -4,7 +4,7 @@ module Mumuki::Domain::Helpers::Organization
 
   included do
     delegate *Mumuki::Domain::Organization::Theme.accessors, to: :theme
-    delegate *Mumuki::Domain::Organization::Settings.accessors, :private?, :login_settings, to: :settings
+    delegate *Mumuki::Domain::Organization::Settings.accessors, :private?, :login_settings, :in_preparation?, :disabled?, to: :settings
     delegate *Mumuki::Domain::Organization::Profile.accessors, :locale_json, to: :profile
   end
 
@@ -48,6 +48,11 @@ module Mumuki::Domain::Helpers::Organization
     Mumukit::Platform.application.organic_domain(name)
   end
 
+  def validate_active!
+    raise Mumuki::Domain::DisabledOrganizationError if disabled?
+    raise Mumuki::Domain::UnpreparedOrganizationError if in_preparation?
+  end
+
   ## API Exposure
 
   def to_param