mumuki-domain 7.7.1 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1efee52b12a7be242fdb13883331838d1ee17e0a396d5b0df95b54c3d209bdb
-  data.tar.gz: a6e75dfa224cd6a3642c77d23d1190906d427506b0fb90905b1f636f2c9ecd72
+  metadata.gz: e4d324f2eb4b3e06fb42a0aabbbd007c4c828569899c89a789ad681432bb97ba
+  data.tar.gz: 3f540fc72a7180e247ee11535316d977920872ecc888c77c7c68346eae0c276e
 SHA512:
-  metadata.gz: f66e5cb6acf1f40de30d9a1da7056626eeb513db95822a75b4b59fae0fbe0718795fd5ad33c38fd2df1e5a277d3a1b5390c78b87558c4976b4cc72921912f86f
-  data.tar.gz: 6f2e61ba1908513448c72c448cb1e0f92582e502304d6756bdb82f4ca4d0a9dfe783fc12669613ea4bf99cd3e1bf2b8397ac6142e28cad8517dd0123175dbfcb
+  metadata.gz: ac7828f09dec30a19e4f4b96bfcfb472fe7fcfc5b53aaeb81e4fb4f5b52533d10b462e9e923d2a2857cec7367cda7d40d6222bd8f8a105dfc84e394b35e552c5
+  data.tar.gz: 40cede7e7ff373b1a3a170fbd6bf55bb40faf5c2a814af0849a698f2205a15bff49bca7ba5737577620c48265bad4e42d68e8b4befcb4bbb5d78f9ec82bf23fe

data/app/models/assignment.rb

@@ -1,6 +1,7 @@
 class Assignment < Progress
   include Contextualization
   include WithMessages
+  include Gamified
 
   markdown_on :extra_preview
 
@@ -20,6 +21,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
 
@@ -39,6 +42,7 @@ class Assignment < Progress
   alias_method :parent_content, :guide
   alias_method :user, :submitter
 
+  before_save :award_experience_points!, :update_top_submission!, if: :submission_status_changed?
   after_save :dirty_parent_by_submission!, if: :completion_changed?
   before_validation :set_current_organization!, unless: :organization
 
@@ -159,7 +163,10 @@ class Assignment < Progress
   end
 
   def to_resource_h
-    as_json(except: %i(exercise_id submission_id organization_id id submitter_id solution created_at updated_at submission_status submitted_at parent_id),
+    excluded_fields = %i(created_at exercise_id id organization_id parent_id solution submission_id
+                         submission_status submitted_at submitter_id top_submission_status updated_at)
+
+    as_json(except: excluded_fields,
               include: {
                 guide: {
                   only: [:slug, :name],
@@ -222,6 +229,10 @@ class Assignment < Progress
     exercise.files_for(current_content)
   end
 
+  def update_top_submission!
+    self.top_submission_status = submission_status unless submission_status.improved_by?(top_submission_status)
+  end
+
   private
 
   def update_submissions_count!

data/app/models/avatar.rb

@@ -1,5 +1,11 @@
 class Avatar < ApplicationRecord
+  include WithTargetAudience
+
+  def self.sample_for(user)
+    with_current_audience_for(user).sample
+  end
+
   def self.sample
-    Avatar.order('RANDOM()').first
+    order('RANDOM()').first
   end
 end

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

@@ -16,6 +16,7 @@ module Contextualization
   end
 
   included do
+    serialize :top_submission_status, Mumuki::Domain::Status::Submission
     serialize :submission_status, Mumuki::Domain::Status::Submission
     validates_presence_of :submission_status
 
@@ -25,7 +26,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/gamified.rb

@@ -0,0 +1,15 @@
+module Gamified
+  def award_experience_points!
+    points = net_experience
+
+    if points > 0
+      stats = UserStats.stats_for(submitter)
+      stats.add_exp!(points)
+      stats.save!
+    end
+  end
+
+  def net_experience
+    submission_status.exp_given - top_submission_status.exp_given
+  end
+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,7 +1,7 @@
 module Solvable
   def submit_solution!(user, submission_attributes={})
     assignment, _ = find_assignment_and_submit! user, solution_for(submission_attributes)
-    try_solve_discussions(user) if assignment.solved?
+    try_solve_discussions!(user) if assignment.solved?
     assignment
   end
 

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

@@ -14,7 +14,7 @@ module WithDiscussions
     nil
   end
 
-  def try_solve_discussions(user)
+  def try_solve_discussions!(user)
     discussions.where(initiator: user).map(&:try_solve!)
   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_reminders.rb

@@ -9,7 +9,7 @@ module WithReminders
   end
 
   def remind!
-    build_reminder.deliver
+    build_reminder.deliver_now
     update! last_reminded_date: Time.now
   end
 

data/app/models/concerns/with_target_audience.rb

@@ -0,0 +1,13 @@
+module WithTargetAudience
+  extend ActiveSupport::Concern
+
+  included do
+    enum target_audience: [:grown_ups, :kids]
+  end
+
+  class_methods do
+    def with_current_audience_for(user)
+      where(target_audience: user.current_audience)
+    end
+  end
+end

data/app/models/discussion.rb

@@ -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,6 +121,10 @@ class Discussion < ApplicationRecord
     responses_count > 0
   end
 
+  def has_validated_responses?
+    validated_messages_count > 0
+  end
+
   def subscribe_initiator!
     initiator.subscribe_to! self
   end
@@ -138,10 +138,10 @@ class Discussion < ApplicationRecord
   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?
+    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: requires_moderator_response
+            requires_moderator_response: !has_moderator_response
   end
 
   def update_last_moderator_access!(user)

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

@@ -5,6 +5,8 @@ class Organization < ApplicationRecord
 
   include Mumukit::Login::OrganizationHelpers
 
+  include WithTargetAudience
+
   serialize :profile, Mumuki::Domain::Organization::Profile
   serialize :settings, Mumuki::Domain::Organization::Settings
   serialize :theme, Mumuki::Domain::Organization::Theme
@@ -18,6 +20,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 +108,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)
@@ -136,6 +130,10 @@ class Organization < ApplicationRecord
     update! progressive_display_lookahead: lookahead
   end
 
+  def display_name
+    name.gsub(/\W/, ' ').titleize
+  end
+
   private
 
   def ensure_consistent_public_login

data/app/models/user.rb

@@ -30,15 +30,16 @@ class User < ApplicationRecord
 
   has_many :exams, through: :exam_authorizations
 
-  after_initialize :init
-
   enum gender: %i(female male other unspecified)
-
   belongs_to :avatar, optional: true
 
   before_validation :set_uid!
   validates :uid, presence: true
 
+  after_save :welcome_to_new_organizations!, if: :gained_access_to_new_orga?
+  after_initialize :init
+  PLACEHOLDER_IMAGE_URL = 'user_shape.png'.freeze
+
   resource_fields :uid, :social_id, :email, :permissions, :verified_first_name, :verified_last_name, *profile_fields
 
   def last_lesson
@@ -145,10 +146,14 @@ class User < ApplicationRecord
     exams.any? { |e| e.in_progress_for? self }
   end
 
-  def profile_picture
+  def custom_profile_picture
     avatar&.image_url || image_url
   end
 
+  def profile_picture
+    custom_profile_picture || placeholder_image_url
+  end
+
   def bury!
     # TODO change avatar
     update! self.class.buried_profile.merge(accepts_reminders: false, gender: nil, birthdate: nil)
@@ -169,18 +174,93 @@ 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
+
+  def current_audience
+    current_organic_context&.target_audience
+  end
+
+  def placeholder_image_url
+    PLACEHOLDER_IMAGE_URL
+  end
+
+  def age
+    if birthdate.present?
+      @age ||= Time.now.round_years_since(birthdate.to_time)
+    end
+  end
+
   private
 
+  def welcome_to_new_organizations!
+    new_accessible_organizations.each do |organization|
+      UserMailer.welcome_email(self, organization).deliver_now rescue nil 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
-    self.avatar = Avatar.sample unless profile_picture.present?
+    if custom_profile_picture.blank?
+      self.avatar = Avatar.sample_for(self)
+      save if persisted?
+    end
   end
 
   def self.sync_key_id_field
@@ -205,4 +285,12 @@ class User < ApplicationRecord
   def self.buried_profile
     (@buried_profile || {}).slice(:first_name, :last_name, :email)
   end
+
+  def current_organic_context
+    if Organization.current?
+      Organization.current
+    else
+      main_organization
+    end
+  end
 end

data/app/models/user_stats.rb

@@ -0,0 +1,16 @@
+class UserStats < ApplicationRecord
+  belongs_to :organization
+  belongs_to :user
+
+  def self.stats_for(user)
+    UserStats.find_or_initialize_by(user: user, organization: Organization.current)
+  end
+
+  def self.exp_for(user)
+    self.stats_for(user).exp
+  end
+
+  def add_exp!(points)
+    self.exp += points
+  end
+end

data/db/migrate/20200616160640_create_user_stats.rb

@@ -0,0 +1,10 @@
+class CreateUserStats < ActiveRecord::Migration[5.1]
+  def change
+    create_table :user_stats do |t|
+      t.integer :exp, default: 0
+
+      t.references :user, index: true
+      t.references :organization, index: true
+    end
+  end
+end

data/db/migrate/20200617142217_add_top_submission_status_to_assignments.rb

@@ -0,0 +1,5 @@
+class AddTopSubmissionStatusToAssignments < ActiveRecord::Migration[5.1]
+  def change
+    add_column :assignments, :top_submission_status, :integer, default: 0
+  end
+end

data/db/migrate/20200717143830_add_target_audience_to_organizations_and_avatars.rb

@@ -0,0 +1,6 @@
+class AddTargetAudienceToOrganizationsAndAvatars < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :target_audience, :integer, default: 0
+    add_column :avatars, :target_audience, :integer, default: 0
+  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/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/extensions.rb

@@ -2,3 +2,4 @@ require_relative './extensions/string'
 require_relative './extensions/array'
 require_relative './extensions/module'
 require_relative './extensions/hash'
+require_relative './extensions/time'

data/lib/mumuki/domain/extensions/time.rb

@@ -0,0 +1,5 @@
+class Time
+  def round_years_since(another_time)
+    (self.to_s(:number).to_i - another_time.to_s(:number).to_i) / 10e9.to_i
+  end
+end

data/lib/mumuki/domain/factories.rb

@@ -1,5 +1,6 @@
 require_relative './factories/api_client_factory'
 require_relative './factories/assignments_factory'
+require_relative './factories/avatar_factory'
 require_relative './factories/book_factory'
 require_relative './factories/chapter_factory'
 require_relative './factories/complement_factory'
@@ -15,4 +16,4 @@ require_relative './factories/message_factory'
 require_relative './factories/organization_factory'
 require_relative './factories/topic_factory'
 require_relative './factories/user_factory'
-require_relative './factories/usage_factory'
+require_relative './factories/usage_factory'

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :avatar do
+    image_url { Faker::Internet.url }
+    target_audience { :grown_ups }
+  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/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/factories/user_factory.rb

@@ -6,6 +6,5 @@ FactoryBot.define do
     last_name { Faker::Name.last_name }
     gender { 1 }
     birthdate { Date.today }
-    avatar { Avatar.new image_url: 'user_shape.png' }
   end
 end

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

@@ -66,6 +66,10 @@ module Mumuki::Domain::Helpers::Organization
       Mumukit::Platform::Organization.current
     end
 
+    def current?
+      Mumukit::Platform::Organization.current?
+    end
+
     def parse(json)
       json
         .slice(:name)

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

@@ -13,6 +13,8 @@ module Mumuki::Domain::Helpers::User
            :protect!,
            :protect_delegation!,
            :protect_permissions_assignment!,
+           :student_granted_organizations,
+           :any_granted_organizations,
            to: :permissions
 
   def platform_class_name
@@ -71,12 +73,10 @@ module Mumuki::Domain::Helpers::User
     "#{full_name} <#{email}> [#{uid}]"
   end
 
-  ## Accesible organizations
+  ## Accessible organizations
 
-  def student_granted_organizations
-    permissions.student_granted_organizations.map do |org|
-      Mumukit::Platform::Organization.find_by_name!(org) rescue nil
-    end.compact
+  revamp_accessor :any_granted_organizations, :student_granted_organizations do |_, _, result|
+    result.map { |org| Mumukit::Platform::Organization.find_by_name!(org) rescue nil }.compact
   end
 
   def has_student_granted_organizations?
@@ -84,11 +84,7 @@ module Mumuki::Domain::Helpers::User
   end
 
   def main_organization
-    student_granted_organizations.first
-  end
-
-  def has_main_organization?
-    student_granted_organizations.length == 1
+    student_granted_organizations.first || any_granted_organizations.first
   end
 
   def has_immersive_main_organization?

data/lib/mumuki/domain/incognito.rb

@@ -0,0 +1,119 @@
+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
+
+    def can_discuss_in?(*)
+      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 new_record?
+      false
+    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/locales/activerecord/es-CL.yml

@@ -0,0 +1,59 @@
+---
+es-CL:
+  activerecord:
+    attributes:
+      exercise:
+        description: Descripción
+        extra: Biblioteca
+        hint: Ayudas
+        language: Lenguaje
+        locale: Idioma
+        tag_list: Etiquetas
+        title: Título
+      guide:
+        description: Descripción
+        github_repository: Repositorio Github
+        language: Lenguaje
+        locale: Idioma
+        name: Nombre
+      submission:
+        content: Contenido
+    errors:
+      models:
+        guide:
+          attributes:
+            base:
+              in_use: 'La guía aún está siendo utilizada en la organización %{organization}'
+        topic:
+          attributes:
+            base:
+              in_use: 'El tema aún está siendo utilizado en la organización %{organization}'
+        exercise:
+          attributes:
+            randomizations:
+              invalid_format: 'formato inválido'
+            own_expectations:
+              invalid_format: 'formato inválido'
+            assistance_rules:
+              invalid_format: 'formato inválido'
+            name:
+              invalid_format: 'no debe contener /'
+            base:
+              evaluation_criteria_required:  'Tienes que proveer tests y/o expectativas'
+        organization:
+          attributes:
+            base:
+              consistent_public_login: 'Una organización pública no puede restringir los métodos de login'
+              invalid_activity_range: 'La fecha de inhabilitación no puede ser anterior a la de inicio del recorrido'
+    models:
+      exercise:
+        one: Ejercicio
+        other: Ejercicios
+      chapter:
+        one: Capítulo
+        other: Capítulos
+      guide: Guía
+      language: Lenguaje
+      submission:
+        one: Solución
+        other: Soluciones

data/lib/mumuki/domain/locales/console_submission/es-CL.yml

@@ -0,0 +1,3 @@
+es-CL:
+  console_submission:
+    try_again: ¡Ups! Algo salió mal en mumuki. Reinicia el ejercicio, espera unos segundos y vuelve a intentar.

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,20 +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,
-                      :gamification_enabled?
+                      :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/status/discussion/opened.rb

@@ -5,6 +5,14 @@ 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/status/submission/passed.rb

@@ -8,4 +8,8 @@ module Mumuki::Domain::Status::Submission::Passed
   def self.iconize
     {class: :success, type: 'check-circle'}
   end
+
+  def self.exp_given
+    100
+  end
 end

data/lib/mumuki/domain/status/submission/passed_with_warnings.rb

@@ -12,4 +12,8 @@ module Mumuki::Domain::Status::Submission::PassedWithWarnings
   def self.iconize
     {class: :warning, type: 'exclamation-circle'}
   end
+
+  def self.exp_given
+    50
+  end
 end

data/lib/mumuki/domain/status/submission/skipped.rb

@@ -8,4 +8,8 @@ module Mumuki::Domain::Status::Submission::Skipped
   def self.iconize
     {class: :success, type: 'check-circle'}
   end
+
+  def self.exp_given
+    100
+  end
 end

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

@@ -42,4 +42,12 @@ module Mumuki::Domain::Status::Submission
   def solved?
     passed? || skipped?
   end
+
+  def improved_by?(status)
+    self.exp_given < status.exp_given
+  end
+
+  def exp_given
+    0
+  end
 end

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

@@ -21,12 +21,16 @@ 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

data/lib/mumuki/domain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.7.1
+  version: 7.9.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-09-11 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
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +256,7 @@ files:
 - app/models/concerns/contextualization.rb
 - app/models/concerns/disabling.rb
 - app/models/concerns/friendly_name.rb
+- app/models/concerns/gamified.rb
 - app/models/concerns/guide_container.rb
 - app/models/concerns/navigation/parent_navigation.rb
 - app/models/concerns/navigation/siblings_navigation.rb
@@ -292,6 +293,7 @@ files:
 - app/models/concerns/with_scoped_queries/page.rb
 - app/models/concerns/with_scoped_queries/sort.rb
 - app/models/concerns/with_slug.rb
+- app/models/concerns/with_target_audience.rb
 - app/models/concerns/with_usages.rb
 - app/models/concerns/with_user_navigation.rb
 - app/models/content.rb
@@ -322,6 +324,7 @@ files:
 - app/models/upvote.rb
 - app/models/usage.rb
 - app/models/user.rb
+- app/models/user_stats.rb
 - app/models/with_stats.rb
 - db/migrate/20141120231135_create_exercises.rb
 - db/migrate/20141120231735_create_submissions.rb
@@ -608,10 +611,15 @@ files:
 - 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/20200616160640_create_user_stats.rb
+- db/migrate/20200617142217_add_top_submission_status_to_assignments.rb
 - db/migrate/20200702165503_add_messages_count_to_discussion.rb
+- db/migrate/20200717143830_add_target_audience_to_organizations_and_avatars.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
@@ -632,9 +640,11 @@ files:
 - lib/mumuki/domain/extensions/hash.rb
 - lib/mumuki/domain/extensions/module.rb
 - lib/mumuki/domain/extensions/string.rb
+- lib/mumuki/domain/extensions/time.rb
 - lib/mumuki/domain/factories.rb
 - lib/mumuki/domain/factories/api_client_factory.rb
 - lib/mumuki/domain/factories/assignments_factory.rb
+- lib/mumuki/domain/factories/avatar_factory.rb
 - lib/mumuki/domain/factories/book_factory.rb
 - lib/mumuki/domain/factories/chapter_factory.rb
 - lib/mumuki/domain/factories/complement_factory.rb
@@ -656,10 +666,13 @@ 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-CL.yml
 - lib/mumuki/domain/locales/activerecord/es.yml
 - lib/mumuki/domain/locales/activerecord/pt.yml
 - lib/mumuki/domain/locales/console_submission/en.yml
+- lib/mumuki/domain/locales/console_submission/es-CL.yml
 - lib/mumuki/domain/locales/console_submission/es.yml
 - lib/mumuki/domain/locales/console_submission/pt.yml
 - lib/mumuki/domain/organization.rb