mumuki-domain 7.12.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e176a8030ca77ad3bfe8319f3cbad4eccef1f66b5f18ed293261a2b64bde1b
-  data.tar.gz: 6cedd7c76389861d2bbf2f850d4a3f1f66b57f2277ecd6ebe3fb1dcd12b1cf84
+  metadata.gz: cd4418eebed893926b600b43b22080be43205ef4b857e16df1be7e50ea625e9b
+  data.tar.gz: 69d81e7072172101767cc3655cfad7bafdcf9fc726c3438432a9777792e744c0
 SHA512:
-  metadata.gz: 3bf0726d9a3b8b0fb2e3a869a6db125e98a67934285780566e903994a16c0693c7fb879fd044a94807cce5ea03102955a9b69096fb78d6599aa39842153c2866
-  data.tar.gz: aed09dedbfe35d98c18f3d6c290b96650e95973f549990402a2e02af831fb29b7d040c1ad8d79d6dff0343d81006c686694cc4330bd4a7e6992b8894e0d11139
+  metadata.gz: d28c8e9e981e2669f11a5f581f25639c318df1dc17bdf1c94bcd127010426f2b846ff801f7ee2362941f2fb42ea188a36694b91add542555085f5d363603cc11
+  data.tar.gz: 2e95982034e482f748425c8445791349b5eb9c206a962b6620aea4412d4ef01a17ecf2d79ac0ca12cca75a458a51e0f4ce671951213ac434381475592e235ac2

data/app/models/application_record.rb

@@ -70,9 +70,8 @@ class ApplicationRecord < ActiveRecord::Base
   end
 
   def update_and_notify!(data)
-    update! data
-    notify!
-    self
+    assign_attributes data
+    save_and_notify!
   end
 
   def self.aggregate_of(association)
@@ -105,7 +104,7 @@ class ApplicationRecord < ActiveRecord::Base
     obj
   end
 
-  def self.whitelist_attributes(a_hash, options={})
+  def self.whitelist_attributes(a_hash, options = {})
     attributes = attribute_names
     attributes += reflections.keys if options[:relations]
     a_hash.with_indifferent_access.slice(*attributes).except(*options[:except])

data/app/models/assignment.rb

@@ -52,6 +52,14 @@ class Assignment < Progress
     self.organization = Organization.current
   end
 
+  def recontextualize!(new_organization = Organization.current)
+    if organization != new_organization
+      dirty_parent_by_submission! if organization.present? && exercise.used_in?(organization)
+      self.organization = new_organization
+      self.parent_id = nil
+    end
+  end
+
   def set_default_top_submission_status
     self.top_submission_status ||= 0
   end
@@ -118,7 +126,7 @@ class Assignment < Progress
   end
 
   def content=(content)
-    if content.present?
+    unless exercise.reading?
       self.solution = exercise.single_choice? ? exercise.choice_index_for(content) : content
     end
   end
@@ -145,6 +153,10 @@ class Assignment < Progress
     end
   end
 
+  def manual_evaluation_pending!
+    update! submission_status: :manual_evaluation_pending
+  end
+
   def passed!
     update! submission_status: :passed
   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_terms_acceptance.rb

@@ -7,6 +7,14 @@ module WithTermsAcceptance
     !has_accepted_all?(profile_terms)
   end
 
+  def has_role_terms_to_accept?
+    !has_accepted_all?(role_specific_terms)
+  end
+
+  def role_specific_terms
+    @role_specific_terms ||= Term.role_specific_terms_for(self)
+  end
+
   def forum_terms
     @forum_terms ||= Term.forum_related_terms
   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/exam.rb

@@ -5,7 +5,7 @@ class Exam < ApplicationRecord
   include TerminalNavigation
 
   belongs_to :organization
-  belongs_to :course, optional: true
+  belongs_to :course
 
   has_many :authorizations, class_name: 'ExamAuthorization', dependent: :destroy
   has_many :users, through: :authorizations
@@ -186,8 +186,6 @@ class Exam < ApplicationRecord
     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)

data/app/models/exercise.rb

@@ -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
@@ -231,6 +239,10 @@ class Exercise < ApplicationRecord
     guide.pending_exercises(user)
   end
 
+  def reading?
+    is_a? ::Reading
+  end
+
   private
 
   def evaluation_class

data/app/models/guide.rb

@@ -51,7 +51,10 @@ class Guide < Content
         joins("left join public.assignments assignments
                 on assignments.exercise_id = exercises.id
                 and assignments.submitter_id = #{user.id}
-                and assignments.submission_status = #{Mumuki::Domain::Status::Submission::Passed.to_i}").
+                and assignments.submission_status in (
+                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
+                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
+                )").
         where('assignments.id is null')
   end
 

data/app/models/topic.rb

@@ -48,7 +48,10 @@ class Topic < Content
       joins("left join public.assignments assignments
                 on assignments.exercise_id = exercises.id
                 and assignments.submitter_id = #{user.id}
-                and assignments.submission_status = #{Mumuki::Domain::Status::Submission::Passed.to_i}").
+                and assignments.submission_status in (
+                  #{Mumuki::Domain::Status::Submission::Passed.to_i},
+                  #{Mumuki::Domain::Status::Submission::ManualEvaluationPending.to_i}
+                )").
       where('assignments.id is null').
       group('public.guides.id', 'lessons.number').map(&:lesson)
   end

data/app/models/user.rb

@@ -139,9 +139,9 @@ class User < ApplicationRecord
 
   def interpolations
     {
-      'user_email' => email,
-      'user_first_name' => first_name,
-      'user_last_name' => last_name
+        'user_email' => email,
+        'user_first_name' => first_name,
+        'user_last_name' => last_name
     }
   end
 
@@ -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,14 +243,35 @@ 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
   end
 
+  def notify_permissions_changed!
+    return if permissions_before_last_save == permissions
+    Mumukit::Nuntius.notify! 'user-permissions-changed', user: {
+      uid: uid,
+      old_permissions: permissions_before_last_save.as_json,
+      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/extensions/array.rb

@@ -15,6 +15,10 @@ class Array
   def single?
     size == 1
   end
+
+  def multiple?
+    size > 1
+  end
 end
 
 class NilClass

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :term do
-    content { Faker::Lorem.sentence(word_count: 2000) }
+    content { Faker::Lorem.sentence(word_count: 100) }
     header { Faker::Lorem.sentence(word_count: 5) }
   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!
@@ -41,7 +41,7 @@ module Mumuki::Domain::Helpers::Organization
   end
 
   def url_for(path)
-    Mumukit::Platform.application.organic_url_for(name, path)
+    Mumukit::Platform.laboratory.organic_url_for(name, path)
   end
 
   def url

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

@@ -8,6 +8,7 @@ module Mumuki::Domain::Helpers::User
   delegate :has_role?,
            :add_permission!,
            :remove_permission!,
+           :update_permission!,
            :has_permission?,
            :has_permission_delegation?,
            :protect!,
@@ -100,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
@@ -119,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
 
@@ -64,14 +72,13 @@ module Mumuki::Domain
     # Terms
     # ========
 
-    def accepted_profile_terms?
-      true
-    end
-
-    def accepted_forum_terms?
-      true
+    # It avoids role terms acceptance redirections
+    def has_role_terms_to_accept?
+      false
     end
 
+    # It makes terms UI to be shown as if no terms were accepted
+    # It does not force any term to be accepted though
     def has_accepted?(term)
       false
     end

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

@@ -36,6 +36,6 @@ class Mumuki::Domain::Organization::Profile < Mumukit::Platform::Model
   end
 
   def open_graph_image_url
-    @open_graph_image_url ||= Mumukit::Platform.application.url_for("logo-alt.png")  # Best image size: 256x256
+    @open_graph_image_url ||= Mumukit::Platform.laboratory.url_for("logo-alt.png")  # Best image size: 256x256
   end
 end

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

@@ -53,7 +53,7 @@ class Mumuki::Domain::Submission::Base
 
   def save_submission!(assignment)
     assignment.content = content
-    assignment.organization = Organization.current
+    assignment.recontextualize!
     assignment.save!
   end
 

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.12.0'
+    VERSION = '8.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.12.0
+  version: 8.1.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        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
@@ -756,7 +757,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model