mumuki-domain 7.6.0 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40391bc2dcc0ab54965e1d82a289c8960dac3f68cf4c8fb2a3d097e774b899b4
-  data.tar.gz: 205ce356bcc3365491551226eaa2b076ae58d7ac1255fb51294424b419ea4ffb
+  metadata.gz: 14a6d0b035451e69ddc77479e3f32854ecae51ca0a3c6bc3031f8d68a4b7fcdd
+  data.tar.gz: a1dbea618e7a152e55417174cecf35a0338a464cd199b02114d524c65c7c23c5
 SHA512:
-  metadata.gz: 3741ef7ad7daf3f6cfc2d829d8fbf336512e4ec719257734d2e3bcc0b960081a6c50bdc3f31e2c82dc59abbc1d2d1719ab68ace80ec8c7ff1a908613b1123409
-  data.tar.gz: cf4e192e33fcdd94f68398f074715b22088169d50b88acc9d1aa0457bb15850a8288f2280ecbcf5aec874dd8c85f01c952a430762113fe5a383c19816bcbb5c2
+  metadata.gz: d3e2039abf83cd21c0ef3d6b33bcfcef54db1dc7df1eb91fb771ab218076b484b34a4a7c034a1e945d5ab3f84e739fdffbdba05999e2bb1878430af4698e4678
+  data.tar.gz: 1cc3cb4565b4999bfac4f351fffb0d937c28db74c93e26a94267332b9c15ca8812f0bce4c19e2298169a957d008546bde95442a2ca7d798f9912b2bd3c9c39e8

data/app/models/assignment.rb

@@ -20,6 +20,8 @@ class Assignment < Progress
   delegate :language, :name, :navigable_parent, :settings,
            :limited?, :input_kids?, :choice?, :results_hidden?, to: :exercise
 
+  delegate :completed?, :solved?, to: :submission_status
+
   alias_attribute :status, :submission_status
   alias_attribute :attempts_count, :attemps_count
 

data/app/models/book.rb

@@ -8,8 +8,6 @@ class Book < Content
   has_many :complements, dependent: :destroy
 
   has_many :exercises, through: :chapters
-  has_many :discussions, through: :exercises
-  organic_on :discussions
 
   delegate :first_lesson, to: :first_chapter
 
@@ -19,6 +17,10 @@ class Book < Content
     slug
   end
 
+  def discussions_in_organization(organization = Organization.current)
+    Discussion.where(organization: organization).includes(exercise: [:language, :guide])
+  end
+
   def first_chapter
     chapters.first
   end

data/app/models/concerns/contextualization.rb

@@ -25,7 +25,7 @@ module Contextualization
 
     delegate :visible_success_output?, to: :exercise
     delegate :output_content_type, to: :language
-    delegate :should_retry?, :to_submission_status, :completed?, :solved?, *Mumuki::Domain::Status::Submission.test_selectors, to: :submission_status
+    delegate :should_retry?, :to_submission_status, *Mumuki::Domain::Status::Submission.test_selectors, to: :submission_status
     delegate :inspection_keywords, to: :exercise
   end
 

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

@@ -1,11 +1,11 @@
 module SiblingsNavigation
 
   def next_for(user)
-    pending_siblings_for(user).select { |it| it.number > number }.sort_by(&:number).first
+    user.pending_siblings_at(self).select { |it| it.number > number }.sort_by(&:number).first
   end
 
   def restart(user)
-    pending_siblings_for(user).sort_by(&:number).first
+    user.pending_siblings_at(self).sort_by(&:number).first
   end
 
   def siblings

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

@@ -1,13 +1,19 @@
 module Solvable
-  def submit_solution!(user, attributes={})
-    assignment, _ = find_assignment_and_submit! user, attributes[:content].to_mumuki_solution(language)
-    try_solve_discussions(user) if assignment.solved?
+  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
 
   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/submittable/submittable.rb

@@ -5,7 +5,7 @@ module Submittable
 
   def find_assignment_and_submit!(user, submission)
     assignment = assignment_for user
-    results = submission.run! assignment, evaluation_class.new
+    results = user.run_submission! submission, assignment, evaluation_class.new
     [assignment, results]
   end
 end

data/app/models/concerns/with_assignments.rb

@@ -28,6 +28,6 @@ module WithAssignments
   end
 
   def assignment_for(user, organization=Organization.current)
-    find_assignment_for(user, organization) || user.assignments.build(exercise: self, organization: organization)
+    find_assignment_for(user, organization) || user.build_assignment(self, organization)
   end
 end

data/app/models/concerns/with_discussions.rb

@@ -7,18 +7,21 @@ 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(_)
     nil
   end
 
-  def try_solve_discussions(user)
+  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

@@ -1,6 +1,6 @@
 module WithProgress
   def progress_for(user, organization)
-    Indicator.find_or_initialize_by(user: user, organization: organization, content: self)
+    user.progress_at(self, organization)
   end
 
   def completion_percentage_for(user, organization=Organization.current)

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

@@ -14,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)
@@ -22,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
 
@@ -42,8 +40,8 @@ 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
@@ -53,4 +51,12 @@ class Course < ApplicationRecord
   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)
@@ -105,10 +105,6 @@ class Discussion < ApplicationRecord
     reachable_statuses_for(user).include? status
   end
 
-  def allowed_statuses_for(user)
-    status.allowed_statuses_for(user, self)
-  end
-
   def update_status!(status, user)
     update!(status: status) if reachable_status_for?(user, status)
   end
@@ -125,14 +121,56 @@ class Discussion < ApplicationRecord
     responses_count > 0
   end
 
+  def has_validated_responses?
+    validated_messages_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?
+    has_moderator_response = messages_query.find { |it| it.validated? || it.question? }&.validated?
+    update! messages_count: messages_query.count,
+            validated_messages_count: validated_messages.count,
+            requires_moderator_response: !has_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/guide.rb

@@ -42,7 +42,7 @@ class Guide < Content
   end
 
   def next_exercise(user)
-    pending_exercises(user).order('public.exercises.number asc').first
+    user.next_exercise_at(self)
   end
 
   # TODO: Make use of pending_siblings logic

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

@@ -18,6 +18,7 @@ class Organization < ApplicationRecord
   has_many :usages
 
   validates_presence_of :contact_email, :locale
+  validates_presence_of :welcome_email_template, if: :greet_new_users?
   validates :name, uniqueness: true,
                    presence: true,
                    format: { with: Mumukit::Platform::Organization.anchored_valid_name_regex }
@@ -105,17 +106,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)

data/app/models/user.rb

@@ -39,6 +39,8 @@ class User < ApplicationRecord
   before_validation :set_uid!
   validates :uid, presence: true
 
+  after_save :welcome_to_new_organizations!, if: :gained_access_to_new_orga?
+
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
 
   def last_lesson
@@ -169,17 +171,76 @@ class User < ApplicationRecord
     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
+
+  def progress_at(content, organization)
+    Indicator.find_or_initialize_by(user: self, organization: organization, content: content)
+  end
+
+  def build_assignment(exercise, organization)
+    assignments.build(exercise: exercise, organization: organization)
+  end
+
+  def pending_siblings_at(content)
+    content.pending_siblings_for(self)
+  end
+
+  def next_exercise_at(guide)
+    guide.pending_exercises(self).order('public.exercises.number asc').first
+  end
+
+  def run_submission!(submission, assignment, evaluation)
+    submission.run! assignment, evaluation
+  end
+
+  def incognito?
+    false
+  end
+
   private
 
+  def welcome_to_new_organizations!
+    new_accessible_organizations.each do |organization|
+      UserMailer.welcome_email(self, organization).deliver_later if organization.greet_new_users?
+    end
+  end
+
+  def gained_access_to_new_orga?
+    new_accessible_organizations.present?
+  end
+
+  def new_accessible_organizations
+    return [] unless saved_change_to_permissions?
+
+    old, new = saved_change_to_permissions
+    new_organizations = (new.any_granted_organizations - old.any_granted_organizations).to_a
+    Organization.where(name: new_organizations)
+  end
+
   def set_uid!
     self.uid ||= email
   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/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/db/migrate/20200804191643_add_incognito_mode_enabled_to_organization.rb

@@ -0,0 +1,5 @@
+class AddIncognitoModeEnabledToOrganization < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :incognito_mode_enabled, :boolean
+  end
+end

data/lib/mumuki/domain.rb

@@ -26,6 +26,7 @@ Mumukit::Platform.configure do |config|
 end
 
 require_relative './domain/area'
+require_relative './domain/incognito'
 require_relative './domain/evaluation'
 require_relative './domain/submission'
 require_relative './domain/status'

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

@@ -0,0 +1,112 @@
+module Mumuki::Domain
+  class IncognitoClass
+
+    def incognito?
+      true
+    end
+
+    # ============
+    # Permissions
+    # ============
+
+    def ensure_enabled!
+    end
+
+    def has_student_granted_organizations?
+      false
+    end
+
+    def teacher_here?
+      false
+    end
+
+    def teacher_of?(*)
+      false
+    end
+
+    def profile_completed?
+      true
+    end
+
+    def writer?
+      false
+    end
+
+    def moderator_here?
+      false
+    end
+
+    def can_discuss_here?
+      false
+    end
+
+    # ========
+    # Visiting
+    # ========
+
+    def visit!(*)
+    end
+
+    # ========
+    # Progress
+    # ========
+
+    def next_exercise_at(guide)
+      guide.exercises.first
+    end
+
+    # def completed_containers_with_lookahead(*)
+    #   raise 'Unsupported operation. Userless mode and progressive display modes are incompatible'
+    # end
+
+    def progress_at(content, organization)
+      Indicator.new content: content, organization: organization
+    end
+
+    def build_assignment(exercise, organization)
+      Assignment.new exercise: exercise, organization: organization, submitter: self
+    end
+
+    def pending_siblings_at(content)
+      []
+    end
+
+    # ============
+    # ActiveRecord
+    # ============
+
+    def id
+      '<incognito>'
+    end
+
+    def is_a?(other)
+      other.is_a?(Class) && other.name == 'User' || super
+    end
+
+    def _read_attribute(key)
+      return id if key == 'id'
+      raise "unknown attribute #{key}"
+    end
+
+    def self.primary_key
+      'id'
+    end
+
+    # ==========
+    # Evaluation
+    # ==========
+
+    def interpolations
+      []
+    end
+
+    def run_submission!(submission, assignment, evaluation)
+      results = submission.dry_run! assignment, evaluation
+      assignment.assign_attributes results
+      results
+    end
+
+  end
+
+  Incognito = IncognitoClass.new
+end

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

@@ -11,7 +11,8 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
                       :contact_email,
                       :terms_of_service,
                       :community_link,
-                      :errors_explanations
+                      :errors_explanations,
+                      :welcome_email_template
 
   def locale_json
     locale_h.to_json

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

@@ -1,19 +1,22 @@
 class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   include Mumukit::Login::LoginSettingsHelpers
 
-  model_attr_accessor :login_methods,
+  model_attr_accessor :disabled_from,
+                      :embeddable?,
+                      :feedback_suggestions_enabled?,
+                      :forum_discussions_minimal_role,
+                      :forum_enabled?,
+                      :forum_only_for_trusted?,
+                      :gamification_enabled?,
+                      :immersive?,
+                      :in_preparation_until,
+                      :login_methods,
                       :login_provider,
                       :login_provider_settings,
-                      :forum_discussions_minimal_role,
-                      :raise_hand_enabled?,
-                      :feedback_suggestions_enabled?,
                       :public?,
-                      :embeddable?,
-                      :immersive?,
-                      :forum_enabled?,
+                      :raise_hand_enabled?,
                       :report_issue_enabled?,
-                      :disabled_from,
-                      :in_preparation_until
+                      :greet_new_users?
 
   def private?
     !public?

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

@@ -14,10 +14,6 @@ module Mumuki::Domain::Status::Discussion
     define_method(selector) { false }
   end
 
-  def allowed_for?(*)
-    true
-  end
-
   def reachable_statuses_for_moderator(*)
     []
   end
@@ -38,10 +34,6 @@ module Mumuki::Domain::Status::Discussion
     end
   end
 
-  def allowed_statuses_for(user, discussion)
-    STATUSES.select { |it| it.allowed_for?(user, discussion) }
-  end
-
   def as_json(_options={})
     to_s
   end

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
@@ -20,12 +21,21 @@ class Mumuki::Domain::Submission::Base
 
   def run!(assignment, evaluation)
     save_submission! assignment
-    results = evaluation.evaluate! assignment, self
+    results = dry_run! assignment, evaluation
     save_results! results, assignment
     notify_results! results, assignment
     results
   end
 
+  def dry_run!(assignment, evaluation)
+    evaluation.evaluate! assignment, self
+  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.6.0'
+    VERSION = '7.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 7.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.6'
+        version: '7.8'
 - !ruby/object:Gem::Dependency
   name: mumukit-assistant
   requirement: !ruby/object:Gem::Requirement
@@ -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/20200730221001_add_trusted_for_forum_to_user.rb
+- db/migrate/20200731081757_add_last_moderator_access_fields_to_discussion.rb
+- db/migrate/20200804191643_add_incognito_mode_enabled_to_organization.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -649,6 +658,7 @@ files:
 - lib/mumuki/domain/helpers/course.rb
 - lib/mumuki/domain/helpers/organization.rb
 - lib/mumuki/domain/helpers/user.rb
+- lib/mumuki/domain/incognito.rb
 - lib/mumuki/domain/locales/activerecord/en.yml
 - lib/mumuki/domain/locales/activerecord/es.yml
 - lib/mumuki/domain/locales/activerecord/pt.yml
@@ -714,8 +724,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