Fix Circular dependency loading

fairmondo · Feb 12, 2020 · 9b18b2c · 9b18b2c
1 parent 54d6131
commit 9b18b2c
Show file tree

Hide file tree

Showing 59 changed files with 1,487 additions and 1,416 deletions.
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
@@ -121,7 +121,7 @@ def similar_articles query
 
   def change_state
     # For changing the state of an article
-    # Refer to Article::State
+    # Refer to ArticleConcerns::State
     if params[:activate]
       activate
     elsif params[:deactivate]

diff --git a/app/models/article.rb b/app/models/article.rb
@@ -8,10 +8,18 @@ class Article < ApplicationRecord
   extend Sanitization
 
   # Article module concerns
-  include Validations, ActiveRecordOverwrites, Associations,
-          Commendation, FeesAndDonations,
-          Images, ExtendedAttributes, State, Scopes,
-          Checks, Delegates, Commentable
+  include ArticleConcerns::Validations
+  include ArticleConcerns::ActiveRecordOverwrites
+  include ArticleConcerns::Associations
+  include ArticleConcerns::Commendation
+  include ArticleConcerns::FeesAndDonations
+  include ArticleConcerns::Images
+  include ArticleConcerns::ExtendedAttributes
+  include ArticleConcerns::State
+  include ArticleConcerns::Scopes
+  include ArticleConcerns::Checks
+  include ArticleConcerns::Delegates
+  include ArticleConcerns::Commentable
 
   ############### Friendly_id for beautiful links
   def slug_candidates

diff --git a/app/models/business_transaction.rb b/app/models/business_transaction.rb
@@ -9,7 +9,9 @@ class BusinessTransaction < ApplicationRecord
   extend Sanitization
   extend RailsAdminStatistics
 
-  include BusinessTransaction::Refundable, BusinessTransaction::Discountable, BusinessTransaction::Scopes
+  include BusinessTransactionConcerns::Refundable
+  include BusinessTransactionConcerns::Discountable
+  include BusinessTransactionConcerns::Scopes
 
   belongs_to :article, inverse_of: :business_transactions
 

diff --git a/app/models/concerns/article/active_record_overwrites.rb b/app/models/concerns/article/active_record_overwrites.rb
diff --git a/app/models/concerns/article/associations.rb b/app/models/concerns/article/associations.rb
diff --git a/app/models/concerns/article/checks.rb b/app/models/concerns/article/checks.rb
diff --git a/app/models/concerns/article/commendation.rb b/app/models/concerns/article/commendation.rb
diff --git a/app/models/concerns/article/delegates.rb b/app/models/concerns/article/delegates.rb