mumuki-domain 7.7.1 → 7.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1efee52b12a7be242fdb13883331838d1ee17e0a396d5b0df95b54c3d209bdb
-  data.tar.gz: a6e75dfa224cd6a3642c77d23d1190906d427506b0fb90905b1f636f2c9ecd72
+  metadata.gz: f58b3302ee7ffdf0a503a9a4dc816e00a9f11c62d2b6792512834c9289e190a9
+  data.tar.gz: fd9b0bdcecb5dd0cc3a56234af7718e6b6a4440b3117f620786f5fd5aa981295
 SHA512:
-  metadata.gz: f66e5cb6acf1f40de30d9a1da7056626eeb513db95822a75b4b59fae0fbe0718795fd5ad33c38fd2df1e5a277d3a1b5390c78b87558c4976b4cc72921912f86f
-  data.tar.gz: 6f2e61ba1908513448c72c448cb1e0f92582e502304d6756bdb82f4ca4d0a9dfe783fc12669613ea4bf99cd3e1bf2b8397ac6142e28cad8517dd0123175dbfcb
+  metadata.gz: 85ec2a5cc695671fdc09471348b62bf88456ea5ad95c40225c1e66dfd45851dcfaff45d0b5e834e119834ab09dfb83e6579955c68d0fbc6e2fdf7c2b87b7687b
+  data.tar.gz: e011c6f5cef571718d98980a58b51ecad15d8efcdecd253892889eb64ae7ca1b3521e30068454e67ff519204f77110d96b90d6cdee91fe5beb195bdaace31959

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

@@ -105,17 +105,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

@@ -169,6 +169,22 @@ 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

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

@@ -1,20 +1,21 @@
 class Mumuki::Domain::Organization::Settings < Mumukit::Platform::Model
   include Mumukit::Login::LoginSettingsHelpers
 
-  model_attr_accessor :login_methods,
-                      :login_provider,
-                      :login_provider_settings,
-                      :forum_discussions_minimal_role,
-                      :raise_hand_enabled?,
-                      :feedback_suggestions_enabled?,
-                      :public?,
+  model_attr_accessor :disabled_from,
                       :embeddable?,
-                      :immersive?,
+                      :feedback_suggestions_enabled?,
+                      :forum_discussions_minimal_role,
                       :forum_enabled?,
-                      :report_issue_enabled?,
-                      :disabled_from,
+                      :forum_only_for_trusted?,
+                      :gamification_enabled?,
+                      :immersive?,
                       :in_preparation_until,
-                      :gamification_enabled?
+                      :login_methods,
+                      :login_provider,
+                      :login_provider_settings,
+                      :public?,
+                      :raise_hand_enabled?,
+                      :report_issue_enabled?
 
   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/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.7.1'
+    VERSION = '7.7.2'
   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.7.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -611,6 +611,7 @@ files:
 - 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
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/area.rb