mumuki-domain 8.0.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e3057a4511ba66a280fe3f5bf53052a33161ecd9a45dfb6851d2dc21ea7ad20
-  data.tar.gz: bb89fde6326417de9590369040b1d61a13ec35ea1abe8d365c0d21aa66777315
+  metadata.gz: 5ea9b10953e5031cfcfa680763efb0eac02e63b91219c3dbf71b0d30b5dd3250
+  data.tar.gz: 8fda448216e9d80cb4de41a7f43825882e043895705c66c1c6b9b4bc68c5bfec
 SHA512:
-  metadata.gz: 586446caac1b0eeecf18d5754e1fb1120e1d0f5a87a4d386152f64af9d6f0b5f18b089676cc994c7f717baa3382b120d7ea71e011263e8761ad5b830dbfefb02
-  data.tar.gz: 77d0ddcfaea1ffaae2d22e5cb7e9b30e08b3d6ef4d303fad9df0062294353dab7834f35fd8fdf339fa770cc233c293f6bf6173442262f11e98eef2521bf3d952
+  metadata.gz: f2f8f341502367fa4a7ba037eb086f0506c19fede8290aba4921430fb22e33cc338faf01bc85d23d9df89fca006dba97705e377f48c3eae789170291644562e5
+  data.tar.gz: e5044aa8475aba10ea9d1140eceefccd9fc36de384cf215007f4f239568aebf9f06583074249af630fff81db9da8d429604fa428db0c509a55c4f9092b25965d

data/app/models/assignment.rb

@@ -23,6 +23,8 @@ class Assignment < Progress
 
   delegate :completed?, :solved?, to: :submission_status
 
+  delegate :content_available_in?, to: :parent
+
   alias_attribute :status, :submission_status
   alias_attribute :attempts_count, :attemps_count
 
@@ -52,10 +54,10 @@ class Assignment < Progress
     self.organization = Organization.current
   end
 
-  def recontextualize!
-    if organization != Organization.current
+  def recontextualize!(new_organization = Organization.current)
+    if organization != new_organization
       dirty_parent_by_submission! if organization.present? && exercise.used_in?(organization)
-      self.organization = Organization.current
+      self.organization = new_organization
       self.parent_id = nil
     end
   end
@@ -126,7 +128,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present?
+    if exercise.solvable?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end
@@ -263,6 +265,10 @@ class Assignment < Progress
 
   private
 
+  def duplicates_key
+    { exercise: exercise, submitter: submitter }
+  end
+
   def update_submissions_count!
     self.class.connection.execute(
       "update public.exercises
@@ -278,5 +284,4 @@ class Assignment < Progress
   def update_last_submission!
     submitter.update!(last_submission_date: DateTime.current, last_exercise: exercise)
   end
-
 end

data/app/models/concerns/container.rb

@@ -20,6 +20,14 @@ module Container
     content.progress_for(user, organization)
   end
 
+  def navigable_content_in(organization = Organization.current)
+    content.usage_in_organization(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   private
 
   # Generally we are calling progress_for for each sibling. That method needs the

data/app/models/concerns/with_expectations.rb

@@ -18,16 +18,12 @@ module WithExpectations
     self[:expectations] = expectations.map(&:stringify_keys)
   end
 
-  def own_expectations
+  def raw_expectations
     self[:expectations]
   end
 
-  def own_custom_expectations
-    self[:custom_expectations]
-  end
-
   def ensure_expectations_format
-    errors.add :own_expectations,
-               :invalid_format unless own_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
+    errors.add :raw_expectations,
+               :invalid_format unless raw_expectations.to_a.all? { |it| Mulang::Expectation.valid? it }
   end
 end

data/app/models/concerns/with_randomizations.rb

@@ -35,8 +35,7 @@ module WithRandomizations
 
     def randomize_field(selector)
       define_method(selector) do |*args|
-        return unless super(*args)
-        randomizer.randomize!(super(*args), seed)
+        super(*args).randomize_with randomizer, seed
       end
     end
   end

data/app/models/concerns/with_usages.rb

@@ -16,6 +16,18 @@ module WithUsages
     item.is_a?(type) ? item : nil
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
+  def used_in?(organization)
+    usage_in_organization(organization).present?
+  end
+
   class_methods do
     def aggregate_of(association)
       super

data/app/models/discussion.rb

@@ -44,6 +44,10 @@ class Discussion < ApplicationRecord
     end
   end
 
+  def navigable_content_in(_)
+    nil
+  end
+  
   def used_in?(organization)
     organization == self.organization
   end

data/app/models/exercise.rb

@@ -1,5 +1,5 @@
 class Exercise < ApplicationRecord
-  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test]
+  RANDOMIZED_FIELDS = [:default_content, :description, :extra, :hint, :test, :expectations, :custom_expectations]
   BASIC_RESOURCE_FIELDS = %i(
     name layout editor corollary teacher_info manual_evaluation locale
     choices assistance_rules randomizations tag_list extra_visible goal
@@ -47,6 +47,14 @@ class Exercise < ApplicationRecord
     guide.usage_in_organization(organization).present?
   end
 
+  def navigable_content_in(organization = Organization.current)
+    self if used_in?(organization)
+  end
+
+  def content_used_in?(organization)
+    navigable_content_in(organization).present?
+  end
+
   def structural_parent
     guide
   end
@@ -127,8 +135,6 @@ class Exercise < ApplicationRecord
     language_resource_h = language.to_embedded_resource_h if language != guide.language
     as_json(only: BASIC_RESOURCE_FIELDS)
       .merge(id: bibliotheca_id, language: language_resource_h, type: type.underscore)
-      .merge(expectations: self[:expectations])
-      .merge(custom_expectations: self[:custom_expectations])
       .merge(settings: self[:settings])
       .merge(RANDOMIZED_FIELDS.map { |it| [it, self[it]] }.to_h)
       .symbolize_keys
@@ -231,6 +237,10 @@ class Exercise < ApplicationRecord
     guide.pending_exercises(user)
   end
 
+  def solvable?
+    is_a? ::Problem
+  end
+
   private
 
   def evaluation_class

data/app/models/exercise/challenge.rb

@@ -8,8 +8,10 @@ class Challenge < Exercise
     self.layout = self.class.default_layout
   end
 
-  def extra(*)
-    [guide.extra, super]
+  alias_method :own_extra, :extra
+
+  def extra
+    [guide.extra, own_extra]
       .compact
       .join("\n")
       .strip

data/app/models/exercise/problem.rb

@@ -21,20 +21,15 @@ class Problem < QueriableChallenge
     self.expectations = []
   end
 
+  alias_method :own_expectations, :expectations
+  alias_method :own_custom_expectations, :custom_expectations
+
   def expectations
-    own_expectations + guide_expectations
+    own_expectations + guide.expectations
   end
 
   def custom_expectations
-    "#{own_custom_expectations}\n#{guide_custom_expectations}"
-  end
-
-  def guide_expectations
-    guide.expectations
-  end
-
-  def guide_custom_expectations
-    guide.custom_expectations
+    "#{own_custom_expectations}\n#{guide.custom_expectations}"
   end
 
   def evaluation_criteria?

data/app/models/indicator.rb

@@ -66,8 +66,43 @@ class Indicator < Progress
     where(content: content, organization: organization).delete_all
   end
 
+  def _move_to!(organization)
+    move_children_to!(organization)
+    super
+  end
+
+  def _copy_to!(organization)
+    progress_item = super
+    children.each { |it| it._copy_to! organization }
+    progress_item
+  end
+
+  def move_children_to!(organization)
+    children.update_all(organization_id: organization.id)
+
+    indicators.each { |it| it.move_children_to!(organization) }
+  end
+
+  def cascade_delete_children!
+    indicators.each(&:cascade_delete_children!)
+    children.delete_all(:delete_all)
+  end
+
+  def content_available_in?(organization)
+    content.usage_in_organization(organization).present?
+  end
+
+  def delete_duplicates_in!(organization)
+    duplicates_in(organization).each(&:cascade_delete_children!)
+    super
+  end
+
   private
 
+  def duplicates_key
+    { content: content, user: user }
+  end
+
   def children
     indicators.presence || assignments
   end

data/app/models/progress.rb

@@ -12,4 +12,39 @@ class Progress < ApplicationRecord
   def dirty_parent_by_submission!
     parent&.dirty_by_submission!
   end
+
+  def _copy_to!(organization)
+    dup.transfer_to!(organization)
+  end
+
+  def transfer_to!(organization)
+    update! organization: organization, parent: nil
+    self
+  end
+
+  alias_method :_move_to!, :transfer_to!
+
+  %w(copy move).each do |transfer_type|
+    define_method "#{transfer_type}_to!" do |organization|
+      "Mumuki::Domain::ProgressTransfer::#{transfer_type.camelize}".constantize.new(self, organization).execute!
+    end
+  end
+
+  def guide_indicator?
+    is_a?(Indicator) && content_type == 'Guide'
+  end
+
+  def has_duplicates_in?(organization)
+    duplicates_in(organization).present?
+  end
+
+  def delete_duplicates_in!(organization)
+    duplicates_in(organization).delete_all
+  end
+
+  private
+
+  def duplicates_in(organization)
+    self.class.where(duplicates_key.merge(organization: organization)).where.not(id: id)
+  end
 end

data/app/models/user.rb

@@ -182,7 +182,7 @@ class User < ApplicationRecord
   # 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)
+    organization.forum_enabled? && discusser_of?(organization) && trusted_as_discusser_in?(organization) && !banned_from_forum?
   end
 
   def trusted_as_discusser_in?(organization)
@@ -243,9 +243,9 @@ class User < ApplicationRecord
     Organization.current? ?  Organization.current : main_organization
   end
 
-  def current_immersive_context_at(exercise)
+  def current_immersive_context_at(path_item)
     if Organization.current?
-      immersive_organization_at(exercise) || Organization.current
+      immersive_organization_at(path_item) || Organization.current
     else
       main_organization
     end
@@ -259,13 +259,19 @@ class User < ApplicationRecord
       new_permissions: permissions.as_json
     }
   end
-  
+
   def save_and_notify!
     save!
     notify_permissions_changed!
     self
   end
 
+  def current_immersive_context_and_content_at(path_item)
+    immersive_organization_with_content_at(path_item).tap do |orga, _|
+      return [Organization.current, path_item] unless orga.present?
+    end
+  end
+
   private
 
   def welcome_to_new_organizations!

data/db/migrate/20201130163114_add_banned_from_forum_to_users.rb

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

data/lib/mumuki/domain.rb

@@ -38,6 +38,7 @@ require_relative './domain/workspace'
 require_relative './domain/helpers'
 require_relative './domain/syncable'
 require_relative './domain/store'
+require_relative './domain/progress_transfer'
 
 class Mumukit::Assistant
   def self.valid?(rules)

data/lib/mumuki/domain/extensions.rb

@@ -1,5 +1,7 @@
 require_relative './extensions/string'
+require_relative './extensions/symbol'
 require_relative './extensions/array'
 require_relative './extensions/module'
 require_relative './extensions/hash'
+require_relative './extensions/nil'
 require_relative './extensions/time'

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

@@ -15,10 +15,12 @@ class Array
   def single?
     size == 1
   end
-end
 
-class NilClass
-  def insert_last(element)
-    [element]
+  def multiple?
+    size > 1
+  end
+
+  def randomize_with(randomizer, seed)
+    map { |it| it.randomize_with randomizer, seed }
   end
 end

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

@@ -11,4 +11,8 @@ class Hash
   def markdownified(*keys, **options)
     map { |k, v| key.in?(keys) ? v.markdownified(options) : v }.to_h
   end
+
+  def randomize_with(randomizer, seed)
+    transform_values { |v| v.randomize_with randomizer, seed }
+  end
 end

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

@@ -0,0 +1,17 @@
+class NilClass
+  def affable
+  end
+
+  def markdownified(**options)
+  end
+
+  def sanitized
+  end
+
+  def randomize_with(randomizer, seed)
+  end
+
+  def insert_last(element)
+    [element]
+  end
+end

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

@@ -59,15 +59,8 @@ class String
   def sanitized
     Mumukit::ContentType::Sanitizer.sanitize self
   end
-end
-
-class NilClass
-  def affable
-  end
 
-  def markdownified(**options)
-  end
-
-  def sanitized
+  def randomize_with(randomizer, seed)
+    randomizer.randomize!(self, seed)
   end
 end

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

@@ -0,0 +1,5 @@
+class Symbol
+  def randomize_with(randomizer, seed)
+    self.to_s.randomize_with(randomizer, seed).to_sym
+  end
+end

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

@@ -29,7 +29,7 @@ module Mumuki::Domain::Helpers::Organization
   end
 
   def immersed_in?(other)
-    immersible? && other.immersive? && target_audience == other.target_audience
+    immersible? && other.immersive? && !other.disabled? && target_audience == other.target_audience
   end
 
   def switch!

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

@@ -101,12 +101,21 @@ module Mumuki::Domain::Helpers::User
   end
 
   def immersive_organizations_at(path_item, current = Organization.current)
-    return [] unless current.immersible?
-
     usage_filter = path_item ? lambda { |it| path_item.used_in?(it) } : lambda { |_| true }
-    student_granted_organizations
-      .select { |it| current.immersed_in?(it) }
-      .select(&usage_filter)
+    immersive_organizations_for(current).select(&usage_filter)
+  end
+
+  def immersive_organization_with_content_at(path_item, current = Organization.current)
+    orga = immersive_organizations_with_content_at(path_item, current).single
+    [orga, path_item&.navigable_content_in(orga)]
+  end
+
+  def immersive_organizations_with_content_at(path_item, current = Organization.current)
+    immersive_without_usage = immersive_organizations_for(current)
+    return immersive_without_usage unless path_item.present?
+
+    immersive_with_usage = immersive_without_usage.select { |it| path_item.content_used_in? it }
+    immersive_with_usage.empty? ? immersive_without_usage : immersive_with_usage
   end
 
   ## API Exposure
@@ -120,4 +129,12 @@ module Mumuki::Domain::Helpers::User
       [:first_name, :last_name, :gender, :birthdate]
     end
   end
+
+  private
+
+  def immersive_organizations_for(organization)
+    return [] unless organization.immersible?
+
+    student_granted_organizations.select { |it| organization.immersed_in?(it) }
+  end
 end

data/lib/mumuki/domain/incognito.rb

@@ -52,7 +52,15 @@ module Mumuki::Domain
       nil
     end
 
-    def immersive_organizations_at(_)
+    def current_immersive_context_and_content_at(_)
+      [nil, nil]
+    end
+
+    def immersive_organizations_with_content_at(_, _ = nil)
+      []
+    end
+
+    def immersive_organizations_at(_, _ = nil)
       []
     end
 

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

@@ -15,7 +15,7 @@ en:
           attributes:
             randomizations:
               invalid_format: 'format is invalid'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'format is invalid'
             assistance_rules:
               invalid_format: 'format is invalid'

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

@@ -32,7 +32,7 @@ es-CL:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

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

@@ -32,7 +32,7 @@ es:
           attributes:
             randomizations:
               invalid_format: 'formato inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'formato inválido'
             assistance_rules:
               invalid_format: 'formato inválido'

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

@@ -15,7 +15,7 @@ pt:
           attributes:
             randomizations:
               invalid_format: 'o formato é inválido'
-            own_expectations:
+            raw_expectations:
               invalid_format: 'o formato é inválido'
             assistance_rules:
               invalid_format: 'o formato é inválido'

data/lib/mumuki/domain/progress_transfer.rb

@@ -0,0 +1,8 @@
+module Mumuki::Domain
+  module ProgressTransfer
+  end
+end
+
+require_relative './progress_transfer/base'
+require_relative './progress_transfer/move'
+require_relative './progress_transfer/copy'

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

@@ -0,0 +1,44 @@
+class Mumuki::Domain::ProgressTransfer::Base
+  attr_reader *%i(source_organization destination_organization progress_item transferred_item)
+
+  delegate :user, to: :progress_item
+
+  def initialize(progress_item, destination_organization)
+    @progress_item = progress_item
+    @destination_organization = destination_organization
+  end
+
+  def execute!
+    ActiveRecord::Base.transaction do
+      pre_transfer!
+      transfer!
+      post_transfer!
+    end
+  end
+
+  def pre_transfer!
+    validate_transferrable!
+    @source_organization = progress_item.organization
+    progress_item.delete_duplicates_in!(destination_organization)
+  end
+
+  def transfer!
+    @transferred_item = do_transfer!
+  end
+
+  def post_transfer!
+    transferred_item.dirty_parent_by_submission!
+    notify_transfer!
+    transferred_item
+  end
+
+  def validate_transferrable!
+    raise "Transferred progress' content must be available in destination!" unless progress_item.content_available_in?(destination_organization)
+    raise 'User must be student in destination organization' unless user.student_of?(destination_organization)
+    raise 'Transfer only supported for guide indicators' unless progress_item.guide_indicator?
+  end
+
+  def notify_transfer!
+    Mumukit::Nuntius.notify! 'progress-transfers', { from: source_organization.name, to: destination_organization.name, item_type: transferred_item.class.to_s, item_id: transferred_item.id, transfer_type: transfer_type }
+  end
+end

data/lib/mumuki/domain/progress_transfer/copy.rb

@@ -0,0 +1,9 @@
+class Mumuki::Domain::ProgressTransfer::Copy < Mumuki::Domain::ProgressTransfer::Base
+  def transfer_type
+    :copy
+  end
+
+  def do_transfer!
+    progress_item._copy_to!(destination_organization)
+  end
+end

data/lib/mumuki/domain/progress_transfer/move.rb

@@ -0,0 +1,14 @@
+class Mumuki::Domain::ProgressTransfer::Move < Mumuki::Domain::ProgressTransfer::Base
+  def transfer_type
+    :move
+  end
+
+  def pre_transfer!
+    super
+    progress_item.dirty_parent_by_submission!
+  end
+
+  def do_transfer!
+    progress_item._move_to!(destination_organization)
+  end
+end

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

@@ -10,6 +10,6 @@ module Mumuki::Domain::Status::Submission::ManualEvaluationPending
   end
 
   def self.iconize
-    {class: :info, type: 'clock-o'}
+    {class: :info, type: 'clock'}
   end
 end

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

@@ -50,4 +50,8 @@ module Mumuki::Domain::Status::Submission
   def exp_given
     0
   end
+
+  def dup
+    self
+  end
 end

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '8.0.0'
+    VERSION = '8.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mumukit-sync
   requirement: !ruby/object:Gem::Requirement
@@ -636,6 +636,7 @@ files:
 - db/migrate/20201026225312_add_organization_wins_page_flag.rb
 - db/migrate/20201027134205_add_immersible_to_organization.rb
 - db/migrate/20201027152806_create_terms.rb
+- db/migrate/20201130163114_add_banned_from_forum_to_users.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -655,7 +656,9 @@ files:
 - lib/mumuki/domain/extensions/array.rb
 - lib/mumuki/domain/extensions/hash.rb
 - lib/mumuki/domain/extensions/module.rb
+- lib/mumuki/domain/extensions/nil.rb
 - lib/mumuki/domain/extensions/string.rb
+- lib/mumuki/domain/extensions/symbol.rb
 - lib/mumuki/domain/extensions/time.rb
 - lib/mumuki/domain/factories.rb
 - lib/mumuki/domain/factories/api_client_factory.rb
@@ -701,6 +704,10 @@ files:
 - lib/mumuki/domain/organization/profile.rb
 - lib/mumuki/domain/organization/settings.rb
 - lib/mumuki/domain/organization/theme.rb
+- lib/mumuki/domain/progress_transfer.rb
+- lib/mumuki/domain/progress_transfer/base.rb
+- lib/mumuki/domain/progress_transfer/copy.rb
+- lib/mumuki/domain/progress_transfer/move.rb
 - lib/mumuki/domain/seed.rb
 - lib/mumuki/domain/status.rb
 - lib/mumuki/domain/status/discussion/closed.rb
@@ -756,7 +763,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model