mumuki-domain 7.11.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0741bd4448950db1d082d665156e2c44f6dffbdf5446b2bcdb292645b541e7f
-  data.tar.gz: b1fc47e3b26d394b05a74b3e79956c2f76374604f4cdce281c72590f3d11190c
+  metadata.gz: 9075756cb0cd46b955959afe62c837fb11a293cf520f7e7a3e0666c88e9bc014
+  data.tar.gz: a775162a5319a08a2a2953586bd59efd3cca7ebffddb9c72b236175c5dcbb1a8
 SHA512:
-  metadata.gz: 4d3162dfff77952888d226889a51a88a12058634253dfd2a64154701c3be0322a0d374e050a94ccfca6ef614062c8f9ebc97817e75b5e19eeea14ef6d8aa5f82
-  data.tar.gz: 7361c7ed82288dcc41ec41294811130cfc4f9cd8ba38761087589001ed2d3ea13b0b64d4e1906918442b7f63aad2c13dada768a2a59fba5121285c9d6f10090d
+  metadata.gz: '08190f559ca10836c7d2cfd9c98a864ea18d31fb1f13115727ffc9738a7913fe4af136571b0036c1701b166162e61d2d726653a0cb8f3f1711f9677bde815e03'
+  data.tar.gz: ed6f365ac0c552ccd2f5136fd825052b51da29846a6ea042d27a57e991008d5cfe02265a5450eb2a9b62756ddfb96300c5be1f47dd699b26a8d47b57883c3758

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

@@ -0,0 +1,65 @@
+module WithTermsAcceptance
+  def has_forum_terms_to_accept?
+    !has_accepted_all?(forum_terms)
+  end
+
+  def has_profile_terms_to_accept?
+    !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
+
+  def profile_terms
+    @profile_terms ||= Term.profile_terms_for(self)
+  end
+
+  def accept_profile_terms!
+    accept_terms! profile_terms
+  end
+
+  def accept_forum_terms!
+    accept_terms! forum_terms
+  end
+
+  def has_accepted?(term)
+    term_accepted_at_for(term.scope).try { |it| it > term.updated_at }.present?
+  end
+
+  private
+
+  def unaccepted_terms_in(terms)
+    terms.reject { |term| has_accepted? term}
+  end
+
+  def unaccepted_terms_scopes_in(terms)
+    unaccepted_terms_in(terms).map(&:scope)
+  end
+
+  def has_accepted_all?(terms)
+    unaccepted_terms_in(terms).blank?
+  end
+
+  def term_accepted_at_for(role)
+    send term_acceptance_field_for(role)
+  end
+
+  def term_acceptance_field_for(role)
+    "#{role}_terms_accepted_at"
+  end
+
+  def accept_terms!(terms)
+    update! unaccepted_terms_scopes_in(terms).to_h { |scope| [term_acceptance_field_for(scope), Time.now] }
+  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/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/term.rb

@@ -0,0 +1,40 @@
+class Term < ApplicationRecord
+  attribute :locale, :string, default: 'es'
+  markdown_on :content
+
+  GENERAL = %w(legal privacy student)
+  ROLE_SPECIFIC = %w(headmaster janitor teacher moderator)
+  FORUM_RELATED = %w(forum)
+
+  validates :locale, uniqueness: { scope: :scope }
+  validates :content, :scope, :header, presence: true
+
+  def self.terms_for(scope, locale)
+    where(scope: scope, locale: locale)
+  end
+
+  def self.profile_terms_for(user, locale = I18n.locale)
+    general_terms(locale) + role_specific_terms_for(user, locale)
+  end
+
+  def self.role_specific_terms_for(user, locale = I18n.locale)
+    terms_for(current_role_terms_for(user), locale)
+  end
+
+  def self.general_terms(locale = I18n.locale)
+    terms_for(GENERAL, locale)
+  end
+
+  def self.forum_related_terms(locale = I18n.locale)
+    terms_for(FORUM_RELATED, locale)
+  end
+
+  def self.current_role_terms_for(user)
+    return [] unless user.present?
+    (user.any_granted_roles & ROLE_SPECIFIC).to_a
+  end
+
+  def accepted_by?(user)
+    user.term_accepted_at_for(scope).try { |it| it > updated_at }.present?
+  end
+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

@@ -6,12 +6,13 @@ class User < ApplicationRecord
           WithDiscussionCreation,
           Awardee,
           Disabling,
+          WithTermsAcceptance,
           Mumuki::Domain::Helpers::User
 
   serialize :permissions, Mumukit::Auth::Permissions
 
-  has_many :assignments, foreign_key: :submitter_id
 
+  has_many :assignments, foreign_key: :submitter_id
   has_many :messages, -> { order(created_at: :desc) }, through: :assignments
 
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
@@ -37,6 +38,7 @@ class User < ApplicationRecord
   before_validation :set_uid!
   validates :uid, presence: true
 
+  validates :terms_of_service, acceptance: true
   after_save :welcome_to_new_organizations!, if: :gained_access_to_new_orga?
   after_initialize :init
   PLACEHOLDER_IMAGE_URL = 'user_shape.png'.freeze
@@ -137,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
 
@@ -241,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/20201007143455_add_terms_for_user.rb

@@ -0,0 +1,14 @@
+class AddTermsForUser < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :headmaster_terms_accepted_at, :datetime
+    add_column :users, :janitor_terms_accepted_at, :datetime
+    add_column :users, :moderator_terms_accepted_at, :datetime
+    add_column :users, :student_terms_accepted_at, :datetime
+    add_column :users, :teacher_terms_accepted_at, :datetime
+
+    add_column :users, :privacy_terms_accepted_at, :datetime
+    add_column :users, :legal_terms_accepted_at, :datetime
+
+    add_column :users, :forum_terms_accepted_at, :datetime
+  end
+end

data/db/migrate/20201027152806_create_terms.rb

@@ -0,0 +1,12 @@
+class CreateTerms < ActiveRecord::Migration[5.1]
+  def change
+    create_table :terms do |t|
+      t.string :locale
+      t.string :scope
+      t.text :content
+      t.text :header
+
+      t.timestamps
+    end
+  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.rb

@@ -15,6 +15,7 @@ require_relative './factories/login_settings_factory'
 require_relative './factories/medal_factory'
 require_relative './factories/message_factory'
 require_relative './factories/organization_factory'
+require_relative './factories/term_factory'
 require_relative './factories/topic_factory'
 require_relative './factories/usage_factory'
 require_relative './factories/user_factory'

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :term do
+    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!,
@@ -15,6 +16,7 @@ module Mumuki::Domain::Helpers::User
            :protect_permissions_assignment!,
            :student_granted_organizations,
            :any_granted_organizations,
+           :any_granted_roles,
            to: :permissions
 
   def platform_class_name
@@ -99,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
@@ -118,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,10 +52,37 @@ 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
 
+    def any_granted_roles
+      []
+    end
+
+    # ========
+    # Terms
+    # ========
+
+    # 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
+
     # ========
     # Visiting
     # ========

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.11.1'
+    VERSION = '8.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.11.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.8'
+        version: '7.9'
 - !ruby/object:Gem::Dependency
   name: mumukit-assistant
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: mumukit-directives
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -296,6 +296,7 @@ files:
 - 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_terms_acceptance.rb
 - app/models/concerns/with_usages.rb
 - app/models/concerns/with_user_navigation.rb
 - app/models/content.rb
@@ -323,6 +324,7 @@ files:
 - app/models/progress.rb
 - app/models/stats.rb
 - app/models/subscription.rb
+- app/models/term.rb
 - app/models/topic.rb
 - app/models/upvote.rb
 - app/models/usage.rb
@@ -627,11 +629,13 @@ files:
 - db/migrate/20200828162829_add_medal_to_content.rb
 - db/migrate/20200915123020_add_polymorphic_avatars_to_users.rb
 - db/migrate/20200915131621_add_once_completed_to_indicators.rb
+- db/migrate/20201007143455_add_terms_for_user.rb
 - db/migrate/20201009193949_add_status_updated_fields_to_discussion.rb
 - db/migrate/20201019191036_add_misplaced_flag_to_submission.rb
 - db/migrate/20201026222942_add_display_name_and_description_to_organizations.rb
 - db/migrate/20201026225312_add_organization_wins_page_flag.rb
 - db/migrate/20201027134205_add_immersible_to_organization.rb
+- db/migrate/20201027152806_create_terms.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb
 - lib/mumuki/domain/engine.rb
@@ -671,6 +675,7 @@ files:
 - lib/mumuki/domain/factories/medal_factory.rb
 - lib/mumuki/domain/factories/message_factory.rb
 - lib/mumuki/domain/factories/organization_factory.rb
+- lib/mumuki/domain/factories/term_factory.rb
 - lib/mumuki/domain/factories/topic_factory.rb
 - lib/mumuki/domain/factories/usage_factory.rb
 - lib/mumuki/domain/factories/user_factory.rb