mumuki-domain 7.5.0 → 7.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4bc7628cef1eb1a3d8ed748fc2fd8c49830ffd9814058360aa324aa6bcde35
-  data.tar.gz: c32ffaac2a2cef4a4e7f71ded9c4f81f233db86f55a1a0d7a67bdda0792c9489
+  metadata.gz: f1efee52b12a7be242fdb13883331838d1ee17e0a396d5b0df95b54c3d209bdb
+  data.tar.gz: a6e75dfa224cd6a3642c77d23d1190906d427506b0fb90905b1f636f2c9ecd72
 SHA512:
-  metadata.gz: ce2e45ade3b54b53eec50718f7e42ef1f6cc51d9aa39706651c3cbd6e9d156b043c300d9d19e333e4ecf5955b5d2e915fe4aa0162830983e92d37892bca5f952
-  data.tar.gz: f3b7a44f946871521a943efbccd3d3d24594cfda1eb2493f6be706ab65738ca90334da2b3c1c5521a9936ad9a58c2856bb132c2e71dd0a440a72ed9914832dd1
+  metadata.gz: f66e5cb6acf1f40de30d9a1da7056626eeb513db95822a75b4b59fae0fbe0718795fd5ad33c38fd2df1e5a277d3a1b5390c78b87558c4976b4cc72921912f86f
+  data.tar.gz: 6f2e61ba1908513448c72c448cb1e0f92582e502304d6756bdb82f4ca4d0a9dfe783fc12669613ea4bf99cd3e1bf2b8397ac6142e28cad8517dd0123175dbfcb

data/app/models/book.rb

@@ -62,4 +62,17 @@ class Book < Content
   def structural_parent
     nil
   end
+
+  ## progressive display
+
+  def enabled_chapters_in(workspace)
+    workspace.enabled_containers(chapters)
+  end
+
+  # experimental API - it may change in the future.
+  # This method assumes no gaps in the sequences are introduced
+  # by enabled_chapters_in
+  def chapter_visibilities_in(workspace)
+    chapters.zip(enabled_chapters_in(workspace)).map { |chapter, enabled| [chapter, !enabled.nil?] }
+  end
 end

data/app/models/concerns/{with_content.rb → container.rb}

@@ -1,4 +1,4 @@
-module WithContent
+module Container
   extend ActiveSupport::Concern
 
   included do

data/app/models/concerns/guide_container.rb

@@ -1,6 +1,6 @@
 module GuideContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :guide

data/app/models/concerns/submittable/solvable.rb

@@ -1,6 +1,6 @@
 module Solvable
-  def submit_solution!(user, attributes={})
-    assignment, _ = find_assignment_and_submit! user, attributes[:content].to_mumuki_solution(language)
+  def submit_solution!(user, submission_attributes={})
+    assignment, _ = find_assignment_and_submit! user, solution_for(submission_attributes)
     try_solve_discussions(user) if assignment.solved?
     assignment
   end
@@ -8,6 +8,12 @@ module Solvable
   def run_tests!(params)
     language.run_tests!(params.merge(locale: locale, expectations: expectations, custom_expectations: custom_expectations))
   end
+
+  def solution_for(submission_attributes)
+    submission_attributes[:content]
+      .to_mumuki_solution(language)
+      .with_client_result(submission_attributes[:client_result])
+  end
 end
 
 class NilClass

data/app/models/concerns/topic_container.rb

@@ -1,6 +1,6 @@
 module TopicContainer
   extend ActiveSupport::Concern
-  include WithContent
+  include Container
 
   included do
     associated_content :topic

data/app/models/concerns/with_discussions.rb

@@ -7,11 +7,7 @@ module WithDiscussions
   end
 
   def discuss!(user, discussion, organization = Organization.current)
-    discussion.merge!(initiator_id: user.id, organization: organization)
-    discussion.merge!(submission: submission_for(user)) if submission_for(user).present?
-    created_discussion = discussions.create discussion
-    user.subscribe_to! created_discussion
-    created_discussion
+    new_discussion_for(user, discussion, organization).tap &:save!
   end
 
   def submission_for(_)
@@ -21,4 +17,11 @@ module WithDiscussions
   def try_solve_discussions(user)
     discussions.where(initiator: user).map(&:try_solve!)
   end
+
+  def new_discussion_for(user, discussion_h = {}, organization = Organization.current)
+    discussion_h.merge!(initiator_id: user.id, organization: organization)
+    discussion_h.merge!(submission: submission_for(user)) if submission_for(user).present?
+    discussions.new discussion_h
+  end
+
 end

data/app/models/concerns/with_layout.rb

@@ -2,6 +2,10 @@ module WithLayout
   extend ActiveSupport::Concern
 
   included do
-    enum layout: [:input_right, :input_bottom, :input_kids]
+    enum layout: [:input_right, :input_bottom, :input_primary, :input_kindergarten]
+  end
+
+  def input_kids?
+    input_primary? || input_kindergarten?
   end
 end

data/app/models/concerns/with_progress.rb

@@ -19,6 +19,10 @@ module WithProgress
     self
   end
 
+  def completed_for?(user, organization)
+    progress_for(user, organization).completed?
+  end
+
   private
 
   def structural_children_changed?(old_structural_children)

data/app/models/concerns/with_scoped_queries.rb

@@ -16,8 +16,8 @@ module WithScopedQueries
   end
 
   class_methods do
-    def query_methods
-      queriable_attributes.keys
+    def query_methods(excluded_methods)
+      queriable_attributes.keys - excluded_methods.to_a
     end
 
     def scoped_query_module(method)
@@ -28,19 +28,19 @@ module WithScopedQueries
       queriable_attributes.values.flatten
     end
 
-    def actual_params(params, excluded_param)
-      params.reject { |it| it == excluded_param.to_s }
+    def actual_params(params, excluded_params)
+      params.except(*excluded_params)
     end
 
-    def scoped_query_by(params, excluded_param=nil)
-      query_methods.inject(all) do |scope, method|
-        valid_params = valid_params_for(method, params, excluded_param)
+    def scoped_query_by(params, **options)
+      query_methods(options[:excluded_methods]).inject(all) do |scope, method|
+        valid_params = valid_params_for(method, params, options[:excluded_params])
         scoped_query_module(method).query_by valid_params, scope, self
       end
     end
 
-    def valid_params_for(method, params, excluded_param)
-      actual_params = actual_params(params, excluded_param)
+    def valid_params_for(method, params, excluded_params)
+      actual_params = actual_params(params, excluded_params)
       actual_params.permit queriable_attributes[method]
     end
   end

data/app/models/concerns/with_scoped_queries/page.rb

@@ -1,7 +1,7 @@
 module WithScopedQueries::Page
   def self.query_by(params, current_scope, _)
     page_param = params[:page] || 1
-    current_scope.page(page_param)
+    current_scope.page(page_param).per(10)
   end
 
   def self.add_queriable_attributes_to(klass, _)

data/app/models/concerns/with_scoped_queries/sort.rb

@@ -34,13 +34,18 @@ module WithScopedQueries::Sort
   end
 
   class_methods do
+    def opposite(direction)
+      dir = direction.to_s.downcase.to_sym
+      [:asc, :desc].find { |it| it != dir }
+    end
+
     def sorting_filters
       sorting_fields.product([:asc, :desc]).map do |it|
         "#{it.first}_#{it.second}"
       end
     end
 
-    def sorting_params_allowed?(sort_param, direction_param=nil)
+    def sorting_params_allowed?(sort_param, direction_param = nil)
       sorting_fields.include?(sort_param.to_sym) && [:asc, :desc].include?(direction_param&.to_sym)
     end
   end

data/app/models/course.rb

@@ -1,6 +1,7 @@
 class Course < ApplicationRecord
   include Mumuki::Domain::Syncable
   include Mumuki::Domain::Helpers::Course
+  include Mumuki::Domain::Area
 
   validates_presence_of :slug, :shifts, :code, :days, :period, :description, :organization_id
   validates_uniqueness_of :slug
@@ -13,7 +14,7 @@ class Course < ApplicationRecord
   resource_fields :slug, :shifts, :code, :days, :period, :description
 
   def current_invitation
-    invitations.where('expiration_date > ?', Time.now).take
+    invitations.where('expiration_date > ?', Time.now).first
   end
 
   def import_from_resource_h!(resource_h)
@@ -21,10 +22,8 @@ class Course < ApplicationRecord
   end
 
   def slug=(slug)
-    s = Mumukit::Auth::Slug.parse(slug)
-
-    self[:slug] = slug
-    self[:code] = s.course
+    s = slug.to_mumukit_slug
+    self[:slug] = slug.to_s
     self[:organization_id] = Organization.locate!(s.organization).id
   end
 
@@ -41,11 +40,23 @@ class Course < ApplicationRecord
   end
 
   def generate_invitation!(expiration_date)
-    invitation = invitations.build expiration_date: expiration_date, course: self
-    invitation.save_and_notify!
+    invitations.create expiration_date: expiration_date, course: self
+    current_invitation
   end
 
   def self.sync_key_id_field
     :slug
   end
+
+  def to_organization
+    organization
+  end
+
+  def to_s
+    slug.to_s
+  end
+
+  def self.allowed_for(user, organization = Organization.current)
+    where(organization: organization).select { |course| user.teacher_of? course.slug }
+  end
 end

data/app/models/discussion.rb

@@ -4,25 +4,29 @@ class Discussion < ApplicationRecord
   belongs_to :item, polymorphic: true
   has_many :messages, -> { order(:created_at) }, dependent: :destroy
   belongs_to :initiator, class_name: 'User'
+  belongs_to :last_moderator_access_by, class_name: 'User', optional: true
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
   belongs_to :organization
   has_many :subscriptions
   has_many :upvotes
 
   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) }
 
-  before_save :capitalize_title
-  validates_presence_of :title
+  after_create :subscribe_initiator!
 
   markdown_on :description
 
-  sortable :created_at, :upvotes_count, default: :created_at_desc
-  filterable :status, :language
+  sortable :responses_count, :upvotes_count, :created_at, default: :created_at_desc
+  filterable :status, :language, :requires_moderator_response
   pageable
 
   delegate :language, to: :item
   delegate :to_discussion_status, to: :status
 
+  MODERATOR_REVIEW_AVERAGE_TIME = 10.minutes
+
   scope :for_user, -> (user) do
     if user.try(:moderator_here?)
       all
@@ -37,10 +41,6 @@ class Discussion < ApplicationRecord
     end
   end
 
-  def capitalize_title
-    title.capitalize!
-  end
-
   def used_in?(organization)
     organization == self.organization
   end
@@ -66,7 +66,7 @@ class Discussion < ApplicationRecord
   end
 
   def friendly
-    title
+    initiator.name
   end
 
   def subscription_for(user)
@@ -125,14 +125,52 @@ class Discussion < ApplicationRecord
     responses_count > 0
   end
 
+  def subscribe_initiator!
+    initiator.subscribe_to! self
+  end
+
   def extra_preview_html
     # FIXME this is buggy, because the extra
     # may have changed since the submission of this discussion
     exercise.assignment_for(initiator).extra_preview_html
   end
 
+  def update_counters!
+    messages_query = messages_by_updated_at
+    validated_messages = messages_query.select &:validated?
+    requires_moderator_response = messages_query.find { |it| it.validated? || it.question? }&.from_initiator?
+    update! messages_count: messages_query.count,
+            validated_messages_count: validated_messages.count,
+            requires_moderator_response: requires_moderator_response
+  end
+
+  def update_last_moderator_access!(user)
+    if user&.moderator_here? && !last_moderator_access_visible_for?(user)
+      update! last_moderator_access_at: Time.now,
+              last_moderator_access_by: user
+    end
+  end
+
+  def being_accessed_by_moderator?
+    last_moderator_access_at.present? && last_moderator_access_at > Time.now - MODERATOR_REVIEW_AVERAGE_TIME
+  end
+
+  def last_moderator_access_visible_for?(user)
+    show_last_moderator_access_for?(user) && being_accessed_by_moderator?
+  end
+
+  def show_last_moderator_access_for?(user)
+    user&.moderator_here? && last_moderator_access_by != user
+  end
+
   def self.debatable_for(klazz, params)
     debatable_id = params[:"#{klazz.underscore}_id"]
     klazz.constantize.find(debatable_id)
   end
+
+  private
+
+  def messages_by_updated_at(direction = :desc)
+    messages.reorder(updated_at: direction)
+  end
 end

data/app/models/exam.rb

@@ -1,19 +1,28 @@
 class Exam < ApplicationRecord
+
   include GuideContainer
   include FriendlyName
-
-  validates_presence_of :start_time, :end_time
+  include TerminalNavigation
 
   belongs_to :organization
+  belongs_to :course, optional: true
 
   has_many :authorizations, class_name: 'ExamAuthorization', dependent: :destroy
   has_many :users, through: :authorizations
 
+  enum passing_criterion_type: [:none, :percentage, :passed_exercises], _prefix: :passing_criterion
+
+  validates_presence_of :start_time, :end_time
+  validates_numericality_of :max_problem_submissions, :max_choice_submissions, greater_than_or_equal_to: 1, allow_nil: true
+
+  before_save :set_default_criterion_type!
+  before_save :ensure_valid_passing_criterion!
+
+  before_create :set_classroom_id!
+
   after_destroy { |record| Usage.destroy_usages_for record }
   after_create :reindex_usages!
 
-  include TerminalNavigation
-
   def used_in?(organization)
     organization == self.organization
   end
@@ -116,10 +125,41 @@ class Exam < ApplicationRecord
     index_usage! organization
   end
 
+  def attempts_left_for(assignment)
+    max_attempts_for(assignment.exercise) - (assignment.attempts_count || 0)
+  end
+
+  def limited_for?(exercise)
+    max_attempts_for(exercise).present?
+  end
+
+  def results_hidden_for?(exercise)
+    exercise.choice? && results_hidden_for_choices?
+  end
+
+  def resettable?
+    false
+  end
+
+  def set_classroom_id!
+    self.classroom_id ||= SecureRandom.hex(8)
+  end
+
+  def passing_criterion
+    @passing_criterion ||= Exam::PassingCriterion.parse(passing_criterion_type, passing_criterion_value)
+  end
+
+  def ensure_valid_passing_criterion!
+    passing_criterion.ensure_valid!
+  end
+
+  def set_default_criterion_type!
+    self.passing_criterion_type ||= :none
+  end
+
   def self.import_from_resource_h!(json)
     exam_data = json.with_indifferent_access
-    organization = Organization.locate! exam_data[:organization]
-    organization.switch!
+    Organization.locate!(exam_data[:organization].to_s).switch!
     adapt_json_values exam_data
     remove_previous_version exam_data[:eid], exam_data[:guide_id]
     exam = where(classroom_id: exam_data[:eid]).update_or_create!(whitelist_attributes(exam_data))
@@ -141,8 +181,13 @@ class Exam < ApplicationRecord
   def self.adapt_json_values(exam)
     exam[:guide_id] = Guide.locate!(exam[:slug]).id
     exam[:organization_id] = Organization.current.id
+    exam[:course_id] = Course.locate!(exam[:course].to_s).id
     exam[:users] = User.where(uid: exam[:uids])
-    [:start_time, :end_time].each { |param| exam[param] = exam[param].to_time }
+    exam[:start_time] = exam[:start_time].to_time
+    exam[:end_time] = exam[:end_time].to_time
+    exam[:classroom_id] = exam[:eid] if exam[:eid].present?
+    exam[:passing_criterion_type] = exam.dig(:passing_criterion, :type)
+    exam[:passing_criterion_value] = exam.dig(:passing_criterion, :value)
   end
 
   def self.remove_previous_version(eid, guide_id)
@@ -153,25 +198,10 @@ class Exam < ApplicationRecord
     end
   end
 
-  def attempts_left_for(assignment)
-    max_attempts_for(assignment.exercise) - (assignment.attempts_count || 0)
-  end
-
-  def limited_for?(exercise)
-    max_attempts_for(exercise).present?
-  end
-
-  def results_hidden_for?(exercise)
-    exercise.choice? && results_hidden_for_choices?
-  end
-
-  def resettable?
-    false
-  end
-
   private
 
   def max_attempts_for(exercise)
     exercise.choice? ? max_choice_submissions : max_problem_submissions
   end
+
 end

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
@@ -126,12 +128,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

@@ -32,7 +32,7 @@ class User < ApplicationRecord
 
   after_initialize :init
 
-  enum gender: %i(female male other)
+  enum gender: %i(female male other unspecified)
 
   belongs_to :avatar, optional: true
 
@@ -154,6 +154,25 @@ 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
+
+  def name_initials
+    name.split.map(&:first).map(&:capitalize).join(' ')
+  end
+
   private
 
   def set_uid!
@@ -161,10 +180,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/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/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/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

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

@@ -28,9 +28,9 @@ module Mumuki::Domain::Helpers::User
     role_here = "#{role}_here?"
 
     # Tells whether this user has #{role} permissions in
-    # the given organization
-    define_method role_of do |organization|
-      has_permission? role, organization.slug
+    # the given `slug_like`
+    define_method role_of do |slug_like|
+      has_permission? role, slug_like.to_mumukit_slug
     end
 
     # Tells whether this user has #{role} permissions in
@@ -49,9 +49,9 @@ module Mumuki::Domain::Helpers::User
   (Mumukit::Auth::Roles::ROLES - [:owner]).each do |role|
 
     # Assignes the #{role} role to this user
-    # for the given slug
-    define_method "make_#{role}_of!" do |slug|
-      add_permission! role, slug
+    # for the given `grant_like`
+    define_method "make_#{role}_of!" do |grant_like|
+      add_permission! role, grant_like.to_mumukit_grant
     end
   end
 

data/lib/mumuki/domain/locales/activerecord/en.yml

@@ -27,3 +27,4 @@ en:
           attributes:
             base:
               consistent_public_login: 'A public organization can not restrict login methods'
+              invalid_activity_range: 'The organization activity range are not valid'

data/lib/mumuki/domain/locales/activerecord/es.yml

@@ -44,6 +44,7 @@ es:
           attributes:
             base:
               consistent_public_login: 'Una organización pública no puede restringir los métodos de login'
+              invalid_activity_range: 'La fecha de deshabilitación no puede ser anterior a la de inicio del recorrido'
     models:
       exercise:
         one: Ejercicio

data/lib/mumuki/domain/locales/activerecord/pt.yml

@@ -27,3 +27,4 @@ pt:
           attributes:
             base:
               consistent_public_login: 'Uma organização pública não pode restringir métodos de login'
+              invalid_activity_range: 'O intervalo de atividades da organização não é válido'

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

@@ -11,7 +11,10 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
                       :embeddable?,
                       :immersive?,
                       :forum_enabled?,
-                      :report_issue_enabled?
+                      :report_issue_enabled?,
+                      :disabled_from,
+                      :in_preparation_until,
+                      :gamification_enabled?
 
   def private?
     !public?
@@ -24,4 +27,12 @@ class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   def forum_discussions_minimal_role
     (@forum_discussions_minimal_role || 'student').to_sym
   end
+
+  def disabled?
+    disabled_from.present? && disabled_from.to_datetime < DateTime.now
+  end
+
+  def in_preparation?
+    in_preparation_until.present? && in_preparation_until.to_datetime > DateTime.now
+  end
 end

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

@@ -41,4 +41,8 @@ module Mumuki::Domain::Status::Discussion
   def allowed_statuses_for(user, discussion)
     STATUSES.select { |it| it.allowed_for?(user, discussion) }
   end
+
+  def as_json(_options={})
+    to_s
+  end
 end

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

@@ -5,14 +5,6 @@ module Mumuki::Domain::Status::Discussion::Opened
     true
   end
 
-  def self.reachable_statuses_for_initiator(discussion)
-    if discussion.has_responses?
-      [Mumuki::Domain::Status::Discussion::PendingReview]
-    else
-      [Mumuki::Domain::Status::Discussion::Closed]
-    end
-  end
-
   def self.reachable_statuses_for_moderator(discussion)
     if discussion.has_responses?
       [Mumuki::Domain::Status::Discussion::Closed, Mumuki::Domain::Status::Discussion::Solved]

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

@@ -9,6 +9,7 @@ class Mumuki::Domain::Submission::Base
                 :submission_id, :queries, :query_results, :manual_evaluation_comment]
 
   attr_accessor *ATTRIBUTES
+  attr_accessor :client_result
 
   def self.from_attributes(*args)
     new ATTRIBUTES.zip(args).to_h
@@ -26,6 +27,11 @@ class Mumuki::Domain::Submission::Base
     results
   end
 
+  def with_client_result(result)
+    self.client_result = result if result.present?
+    self
+  end
+
   def evaluate!(assignment)
     try_evaluate! assignment
   rescue => e

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

@@ -2,6 +2,8 @@ class Mumuki::Domain::Submission::Solution < Mumuki::Domain::Submission::Persist
   attr_accessor :content
 
   def try_evaluate!(assignment)
-    assignment.run_tests!(content: content).except(:response_type)
+    assignment
+      .run_tests!({client_result: client_result}.compact.merge(content: content))
+      .except(:response_type)
   end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.5.0'
+    VERSION = '7.7.1'
   end
 end

data/lib/mumuki/domain/workspace.rb

@@ -0,0 +1,38 @@
+class Mumuki::Domain::Workspace
+  attr_accessor :user, :area
+
+  # area is a organization-like or course-like object
+  # that can be converted into slugs, has content and access-rules information
+  def initialize(user, area)
+    @user = user
+    @area = area
+  end
+
+  def annonymous?
+    user.nil?
+  end
+
+  def teacher?
+    user.teacher_of? area
+  end
+
+  # Takes a didactic sequence of containers and retuns the enabled containers
+  # for this user in this workspace.
+  #
+  # This method does not check the user is actually member of the area,
+  # you should check that before sending this message
+  #
+  def enabled_containers(sequence)
+    return sequence if annonymous? || teacher?
+
+    # TODO refactor when introducing access rules
+    if area.progressive_display_lookahead
+      user.completed_containers_with_lookahead(
+        sequence,
+        area.to_organization,
+        lookahead: area.progressive_display_lookahead)
+    else
+      sequence
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.7.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - app/models/chapter.rb
 - app/models/complement.rb
 - app/models/concerns/assistable.rb
+- app/models/concerns/container.rb
 - app/models/concerns/contextualization.rb
 - app/models/concerns/disabling.rb
 - app/models/concerns/friendly_name.rb
@@ -268,7 +269,6 @@ files:
 - app/models/concerns/topic_container.rb
 - app/models/concerns/with_assignments.rb
 - app/models/concerns/with_case_insensitive_search.rb
-- app/models/concerns/with_content.rb
 - app/models/concerns/with_description.rb
 - app/models/concerns/with_discussion_creation.rb
 - app/models/concerns/with_discussion_creation/subscription.rb
@@ -299,6 +299,7 @@ files:
 - app/models/discussion.rb
 - app/models/event.rb
 - app/models/exam.rb
+- app/models/exam/passing_criterion.rb
 - app/models/exam_authorization.rb
 - app/models/exercise.rb
 - app/models/exercise/challenge.rb
@@ -604,7 +605,15 @@ files:
 - db/migrate/20200508191543_create_avatars.rb
 - db/migrate/20200518135658_add_avatar_to_users.rb
 - db/migrate/20200527180729_add_disabled_at_to_users.rb
+- db/migrate/20200601203033_add_course_to_exam.rb
+- db/migrate/20200605161350_add_passing_criterions_to_exam.rb
+- db/migrate/20200608132959_add_progressive_display_lookahead_to_organizations.rb
+- db/migrate/20200702165503_add_messages_count_to_discussion.rb
+- db/migrate/20200728162727_add_not_actually_a_question_field_to_messages.rb
+- db/migrate/20200728163038_add_requires_moderator_response_to_discussions.rb
+- db/migrate/20200731081757_add_last_moderator_access_fields_to_discussion.rb
 - lib/mumuki/domain.rb
+- lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb
 - lib/mumuki/domain/evaluation/automated.rb
@@ -612,10 +621,12 @@ files:
 - lib/mumuki/domain/exceptions.rb
 - lib/mumuki/domain/exceptions/blocked_forum_error.rb
 - lib/mumuki/domain/exceptions/disabled_error.rb
+- lib/mumuki/domain/exceptions/disabled_organization_error.rb
 - lib/mumuki/domain/exceptions/forbidden_error.rb
 - lib/mumuki/domain/exceptions/gone_error.rb
 - lib/mumuki/domain/exceptions/not_found_error.rb
 - lib/mumuki/domain/exceptions/unauthorized_error.rb
+- lib/mumuki/domain/exceptions/unprepared_organization_error.rb
 - lib/mumuki/domain/extensions.rb
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
@@ -690,6 +701,7 @@ files:
 - lib/mumuki/domain/syncable.rb
 - lib/mumuki/domain/syncable/with_resource_fields.rb
 - lib/mumuki/domain/version.rb
+- lib/mumuki/domain/workspace.rb
 homepage: https://mumuki.org
 licenses:
 - AGPL-3.0
@@ -709,8 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model