Account namespace updates: part 1 (#893)

* Rename accountable types

* Merge conflicts

* Fix broken tests

* Add back sidebar changes

app/models/account/credit.rb

@@ -1,3 +0,0 @@
-class Account::Credit < ApplicationRecord
-  include Accountable
-end

app/models/account/crypto.rb

@@ -1,3 +0,0 @@
-class Account::Crypto < ApplicationRecord
-  include Accountable
-end

app/models/account/depository.rb

@@ -1,3 +0,0 @@
-class Account::Depository < ApplicationRecord
-  include Accountable
-end

app/models/account/loan.rb

@@ -1,3 +0,0 @@
-class Account::Loan < ApplicationRecord
-  include Accountable
-end

app/models/account/other_asset.rb

@@ -1,3 +0,0 @@
-class Account::OtherAsset < ApplicationRecord
-  include Accountable
-end

app/models/account/other_liability.rb

@@ -1,3 +0,0 @@
-class Account::OtherLiability < ApplicationRecord
-  include Accountable
-end

app/models/account/property.rb

@@ -1,3 +0,0 @@
-class Account::Property < ApplicationRecord
-  include Accountable
-end

app/models/account/vehicle.rb

@@ -1,3 +0,0 @@
-class Account::Vehicle < ApplicationRecord
-  include Accountable
-end

app/models/concerns/accountable.rb

@@ -1,28 +1,19 @@
 module Accountable
   extend ActiveSupport::Concern
 
-  ASSET_TYPES = %w[ Account::Depository Account::Investment Account::Crypto Account::OtherAsset Account::Property Account::Vehicle ]
-  LIABILITY_TYPES = %w[ Account::Credit Account::Loan Account::OtherLiability ]
+  ASSET_TYPES = %w[ Depository Investment Crypto Property Vehicle OtherAsset ]
+  LIABILITY_TYPES = %w[ CreditCard Loan OtherLiability ]
   TYPES = ASSET_TYPES + LIABILITY_TYPES
 
   def self.from_type(type)
-    return nil unless types.include?(type) || TYPES.include?(type)
-    "Account::#{type.demodulize}".constantize
+    return nil unless TYPES.include?(type)
+    type.constantize
   end
 
   def self.by_classification
     { assets: ASSET_TYPES, liabilities: LIABILITY_TYPES }
   end
 
-  def self.types(classification = nil)
-    types = classification ? (classification.to_sym == :asset ? ASSET_TYPES : LIABILITY_TYPES) : TYPES
-    types.map { |type| type.demodulize }
-  end
-
-  def self.classification(type)
-    ASSET_TYPES.include?(type) ? :asset : :liability
-  end
-
   included do
     has_one :account, as: :accountable, touch: true
   end

app/models/credit_card.rb

@@ -0,0 +1,3 @@
+class CreditCard < ApplicationRecord
+  include Accountable
+end

app/models/crypto.rb

@@ -0,0 +1,3 @@
+class Crypto < ApplicationRecord
+  include Accountable
+end

app/models/depository.rb

@@ -0,0 +1,3 @@
+class Depository < ApplicationRecord
+  include Accountable
+end

app/models/investment.rb

@@ -1,4 +1,4 @@
-class Account::Investment < ApplicationRecord
+class Investment < ApplicationRecord
   include Accountable
 
   SUBTYPES = [

app/models/loan.rb

@@ -0,0 +1,3 @@
+class Loan < ApplicationRecord
+  include Accountable
+end

app/models/other_asset.rb

@@ -0,0 +1,3 @@
+class OtherAsset < ApplicationRecord
+  include Accountable
+end

app/models/other_liability.rb

@@ -0,0 +1,3 @@
+class OtherLiability < ApplicationRecord
+  include Accountable
+end

app/models/property.rb

@@ -0,0 +1,3 @@
+class Property < ApplicationRecord
+  include Accountable
+end

app/models/vehicle.rb

@@ -0,0 +1,3 @@
+class Vehicle < ApplicationRecord
+  include Accountable
+end