mumuki-domain 7.11.1 → 7.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0741bd4448950db1d082d665156e2c44f6dffbdf5446b2bcdb292645b541e7f
-  data.tar.gz: b1fc47e3b26d394b05a74b3e79956c2f76374604f4cdce281c72590f3d11190c
+  metadata.gz: 14e176a8030ca77ad3bfe8319f3cbad4eccef1f66b5f18ed293261a2b64bde1b
+  data.tar.gz: 6cedd7c76389861d2bbf2f850d4a3f1f66b57f2277ecd6ebe3fb1dcd12b1cf84
 SHA512:
-  metadata.gz: 4d3162dfff77952888d226889a51a88a12058634253dfd2a64154701c3be0322a0d374e050a94ccfca6ef614062c8f9ebc97817e75b5e19eeea14ef6d8aa5f82
-  data.tar.gz: 7361c7ed82288dcc41ec41294811130cfc4f9cd8ba38761087589001ed2d3ea13b0b64d4e1906918442b7f63aad2c13dada768a2a59fba5121285c9d6f10090d
+  metadata.gz: 3bf0726d9a3b8b0fb2e3a869a6db125e98a67934285780566e903994a16c0693c7fb879fd044a94807cce5ea03102955a9b69096fb78d6599aa39842153c2866
+  data.tar.gz: aed09dedbfe35d98c18f3d6c290b96650e95973f549990402a2e02af831fb29b7d040c1ad8d79d6dff0343d81006c686694cc4330bd4a7e6992b8894e0d11139

data/app/models/concerns/with_terms_acceptance.rb

@@ -0,0 +1,57 @@
+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 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/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/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

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/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: 2000) }
+    header { Faker::Lorem.sentence(word_count: 5) }
+  end
+end
+

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

@@ -15,6 +15,7 @@ module Mumuki::Domain::Helpers::User
            :protect_permissions_assignment!,
            :student_granted_organizations,
            :any_granted_organizations,
+           :any_granted_roles,
            to: :permissions
 
   def platform_class_name

data/lib/mumuki/domain/incognito.rb

@@ -56,6 +56,26 @@ module Mumuki::Domain
       []
     end
 
+    def any_granted_roles
+      []
+    end
+
+    # ========
+    # Terms
+    # ========
+
+    def accepted_profile_terms?
+      true
+    end
+
+    def accepted_forum_terms?
+      true
+    end
+
+    def has_accepted?(term)
+      false
+    end
+
     # ========
     # Visiting
     # ========

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.11.1'
+    VERSION = '7.12.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: 7.12.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-05 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
@@ -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