mumuki-domain 6.4.3 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdae8f084b4e432d998e710bb4abac76abbc7ffa0ee7c2c960c3e6ffe1f01616
-  data.tar.gz: c90a65e6d097193b4d95303892ad725578b5ee8c4c4d62ffdfd0d03471cb9c9b
+  metadata.gz: 3b741c1390b0cbdc4c23449c5a9fe3218796032ad1c42dadaac9275d5d39f128
+  data.tar.gz: c63ff4139ffb2d3edad703fa1ea9d9db5f0b57ecc4d3a849556b59d8e238a07d
 SHA512:
-  metadata.gz: 5e926415ae433e892b3d73961193fdb98c907d270faadefaa2036f9469b4fa62b95f9f845899aa9065cc175f7a6b82304cf35f7ca02138b822057088121a23c5
-  data.tar.gz: 11397f01df4e1776e68e863341d367863c7e100d75aba8d93b81eb3e5a7b9aa6554ef3e63c1ce19659cc66fb079ac275fa97f4827ba3148a81339006073f76e9
+  metadata.gz: 9f24047fb8f927deb09a72bfbf278bce2647e42216bc2766a2be6130f53725f1ad29b0c9a1268fb913be96a8c9e2f7bf8fe943f6176243e0768e83008198bfd6
+  data.tar.gz: aacc1f68926c6e1758612c949da65c85287c516e6b9e70a1be81f2389d1c4454dd38b35617eba95566331802f9b673f73bedcb76d5e72abf519e9b13d75dcae4

data/app/models/application_record.rb

@@ -38,6 +38,21 @@ class ApplicationRecord < ActiveRecord::Base
     end
   end
 
+  def destroy!
+    super
+  rescue ActiveRecord::RecordNotDestroyed => e
+    errors[:base].last.try { |it| raise ActiveRecord::RecordNotDestroyed.new it }
+    raise e
+  rescue ActiveRecord::InvalidForeignKey => e
+    raise_foreign_key_error!
+  end
+
+  def delete
+    super
+  rescue ActiveRecord::InvalidForeignKey => e
+    raise_foreign_key_error!
+  end
+
   def save_and_notify!
     save!
     notify!
@@ -85,4 +100,10 @@ class ApplicationRecord < ActiveRecord::Base
     attributes += reflections.keys if options[:relations]
     a_hash.with_indifferent_access.slice(*attributes).except(*options[:except])
   end
+
+  private
+
+  def raise_foreign_key_error!
+    raise ActiveRecord::InvalidForeignKey.new "#{model_name} is still referenced"
+  end
 end

data/app/models/assignment.rb

@@ -6,7 +6,11 @@ class Assignment < ApplicationRecord
 
   belongs_to :exercise
   has_one :guide, through: :exercise
-  has_many :messages, -> { where.not(submission_id: nil).order(date: :desc) }, foreign_key: :submission_id, primary_key: :submission_id, dependent: :delete_all
+  has_many :messages,
+           -> { where.not(submission_id: nil).order(date: :desc) },
+           foreign_key: :submission_id,
+           primary_key: :submission_id,
+           dependent: :destroy
 
   belongs_to :submitter, class_name: 'User'
 
@@ -53,7 +57,12 @@ class Assignment < ApplicationRecord
   end
 
   def notify_to_accessible_organizations!
-    submitter.accessible_organizations.each do |organization|
+    warn "Don't use notify_to_accessible_organizations!. Use notify_to_granted_organizations! instead"
+    notify_to_granted_organizations!
+  end
+
+  def notify_to_granted_organizations!
+    submitter.student_granted_organizations.each do |organization|
       organization.switch!
       notify!
     end

data/app/models/book.rb

@@ -2,8 +2,8 @@ class Book < Content
   numbered :chapters
   aggregate_of :chapters
 
-  has_many :chapters, -> { order(number: :asc) }, dependent: :delete_all
-  has_many :complements, dependent: :delete_all
+  has_many :chapters, -> { order(number: :asc) }, dependent: :destroy
+  has_many :complements, dependent: :destroy
 
   has_many :exercises, through: :chapters
   has_many :discussions, through: :exercises

data/app/models/concerns/with_discussions.rb

@@ -2,7 +2,7 @@ module WithDiscussions
   extend ActiveSupport::Concern
 
   included do
-    has_many :discussions, as: :item, dependent: :delete_all
+    has_many :discussions, as: :item, dependent: :destroy
   end
 
   def discuss!(user, discussion)

data/app/models/concerns/with_usages.rb

@@ -3,6 +3,7 @@ module WithUsages
 
   included do
     has_many :usages, as: :item
+    before_destroy :ensure_unused!
   end
 
   def usage_in_organization(organization = Organization.current)
@@ -13,4 +14,13 @@ module WithUsages
     item = usage_in_organization(organization)
     item.is_a?(type) ? item : nil
   end
+
+  private
+
+  def ensure_unused!
+    if usages.present?
+      errors.add :base, :in_use, organization: usages.first.organization.name
+      throw :abort
+    end
+  end
 end

data/app/models/discussion.rb

@@ -2,7 +2,7 @@ class Discussion < ApplicationRecord
   include WithDiscussionStatus, ParentNavigation, WithScopedQueries, Contextualization
 
   belongs_to :item, polymorphic: true
-  has_many :messages, -> { order(:created_at) }, dependent: :delete_all
+  has_many :messages, -> { order(:created_at) }, dependent: :destroy
   belongs_to :initiator, class_name: 'User'
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
   has_many :subscriptions

data/app/models/exam.rb

@@ -7,7 +7,7 @@ class Exam < ApplicationRecord
   belongs_to :guide
   belongs_to :organization
 
-  has_many :authorizations, class_name: 'ExamAuthorization', dependent: :delete_all
+  has_many :authorizations, class_name: 'ExamAuthorization', dependent: :destroy
   has_many :users, through: :authorizations
 
   after_destroy { |record| Usage.destroy_usages_for record }

data/app/models/guide.rb

@@ -6,7 +6,7 @@ class Guide < Content
   markdown_on :corollary, :sources, :learn_more, :teacher_info
 
   numbered :exercises
-  has_many :exercises, -> { order(number: :asc) }, dependent:  :delete_all
+  has_many :exercises, -> { order(number: :asc) }, dependent: :destroy
 
   self.inheritance_column = nil
 

data/db/migrate/20190312152901_add_content_fk.rb

@@ -0,0 +1,9 @@
+class AddContentFk < ActiveRecord::Migration[5.1]
+  def change
+    add_foreign_key :exams, :guides
+    add_foreign_key :lessons, :guides
+    add_foreign_key :complements, :guides
+    add_foreign_key :chapters, :topics
+    add_foreign_key :organizations, :books
+  end
+end

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     description { 'a great org' }
     locale { 'en' }
     settings {}
+    name { 'an-organization' }
     book
   end
 

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

@@ -3,6 +3,14 @@ en:
   activerecord:
     errors:
       models:
+        guide:
+          attributes:
+            base:
+              in_use: 'Guide is still in use in organization %{organization}'
+        topic:
+            attributes:
+              base:
+                in_use: 'Topic is still in use in organization %{organization}'
         exercise:
           attributes:
             randomizations:

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

@@ -20,6 +20,14 @@ es:
         content: Contenido
     errors:
       models:
+        guide:
+          attributes:
+            base:
+              in_use: 'La guía aún están siendo utilizada en la organización %{organization}'
+        topic:
+            attributes:
+              base:
+                in_use: 'El tema aún está siendo utilizado en la organización %{organization}'
         exercise:
           attributes:
             randomizations:

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

@@ -0,0 +1,29 @@
+---
+pt:
+  activerecord:
+    errors:
+      models:
+        guide:
+          attributes:
+            base:
+              in_use: 'O guia ainda está em uso na organização da %{organization}'
+        topic:
+            attributes:
+              base:
+                in_use: 'O tópico ainda está em uso na organização da %{organization}'
+        exercise:
+          attributes:
+            randomizations:
+              invalid_format: 'o formato é inválido'
+            own_expectations:
+              invalid_format: 'o formato é inválido'
+            assistance_rules:
+              invalid_format: 'o formato é inválido'
+            name:
+              invalid_format: 'must not contain /'
+            base:
+              evaluation_criteria_required:  'Você precisa fornecer testes e/ou expectativas'
+        organization:
+          attributes:
+            base:
+              consistent_public_login: 'Uma organização pública não pode restringir métodos de login'

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '6.4.3'
+    VERSION = '6.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 6.4.3
+  version: 6.5.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -534,6 +534,7 @@ files:
 - db/migrate/20181210131824_convert_course_invitation_into_fk.rb
 - db/migrate/20190123180139_add_sources_section.rb
 - db/migrate/20190123180147_add_learn_more_section.rb
+- db/migrate/20190312152901_add_content_fk.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb
@@ -570,6 +571,7 @@ files:
 - lib/mumuki/domain/file.rb
 - lib/mumuki/domain/locales/activerecord.en.yml
 - lib/mumuki/domain/locales/activerecord.es.yml
+- lib/mumuki/domain/locales/activerecord.pt.yml
 - lib/mumuki/domain/locales/narrator.en.yml
 - lib/mumuki/domain/locales/narrator.es.yml
 - lib/mumuki/domain/locales/narrator.pt.yml
@@ -621,7 +623,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mumuki Platform's Domain Model