Refs #6367; Add metadata to other versioned models

57 files changed, 74 insertions, 65 deletions

diff --git a/app/models/api/v1/api_key.rb b/app/models/api/v1/api_key.rb
index 09c6f77ac..890e8e175 100644
--- a/app/models/api/v1/api_key.rb
+++ b/app/models/api/v1/api_key.rb
@@ -1,7 +1,8 @@
 module Api
   module V1
-    class ApiKey < ::ActiveRecord::Base
-      has_paper_trail
+    class ApiKey < ::ApplicationModel
+      include MetadataSupport
+      has_metadata
       before_create :generate_access_token
       belongs_to :referential, :class_name => '::Referential'
       belongs_to :organisation, :class_name => '::Organisation'
@@ -47,4 +48,3 @@ module Api
     end
   end
 end
-
diff --git a/app/models/application_model.rb b/app/models/application_model.rb
new file mode 100644
index 000000000..1a2a5099d
--- /dev/null
+++ b/app/models/application_model.rb
@@ -0,0 +1,5 @@
+class ApplicationModel < ::ActiveRecord::Base
+  include MetadataSupport
+
+  self.abstract_class = true
+end
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 32eedf9ea..4b0ff8379 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -2,13 +2,14 @@ require 'range_ext'
 require_relative 'calendar/date_value'
 require_relative 'calendar/period'
 
-class Calendar < ActiveRecord::Base
+class Calendar < ApplicationModel
   include DateSupport
   include PeriodSupport
   include ApplicationDaysSupport
   include TimetableSupport
+  include MetadataSupport
 
-  has_paper_trail class_name: 'PublicVersion'
+  has_metadata
   belongs_to :organisation
   belongs_to :workgroup
 
diff --git a/app/models/calendar/date_value.rb b/app/models/calendar/date_value.rb
index a4a405d43..f50b4237c 100644
--- a/app/models/calendar/date_value.rb
+++ b/app/models/calendar/date_value.rb
@@ -1,4 +1,4 @@
-class Calendar < ActiveRecord::Base
+class Calendar < ApplicationModel
 
   class DateValue
     include ActiveAttr::Model
diff --git a/app/models/calendar/period.rb b/app/models/calendar/period.rb
index 8b3e4109b..07926e818 100644
--- a/app/models/calendar/period.rb
+++ b/app/models/calendar/period.rb
@@ -1,4 +1,4 @@
-class Calendar < ActiveRecord::Base
+class Calendar < ApplicationModel
 
   class Period
     include ActiveAttr::Model
diff --git a/app/models/chouette/access_link.rb b/app/models/chouette/access_link.rb
index 6b08443be..7ab8ca715 100644
--- a/app/models/chouette/access_link.rb
+++ b/app/models/chouette/access_link.rb
@@ -1,6 +1,6 @@
 module Chouette
   class AccessLink < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ObjectidSupport
 
     attr_accessor :access_link_type, :link_orientation_type, :link_key
diff --git a/app/models/chouette/access_point.rb b/app/models/chouette/access_point.rb
index ac6580015..884460881 100644
--- a/app/models/chouette/access_point.rb
+++ b/app/models/chouette/access_point.rb
@@ -4,7 +4,7 @@ require 'geo_ruby'
 
 module Chouette
   class AccessPoint < Chouette::ActiveRecord
-    has_paper_trail
+    has_metadata
 
     include Geokit::Mappable
     include ProjectionFields
diff --git a/app/models/chouette/active_record.rb b/app/models/chouette/active_record.rb
index b010384ea..27f5426b3 100644
--- a/app/models/chouette/active_record.rb
+++ b/app/models/chouette/active_record.rb
@@ -1,9 +1,8 @@
 #require "active_record"
 require 'deep_cloneable'
 module Chouette
-  class ActiveRecord < ::ActiveRecord::Base
-    include MetadataSupport
-    
+  class ActiveRecord < ::ApplicationModel
+
     self.abstract_class = true
     before_save :nil_if_blank, :set_data_source_ref
 
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index 8d6dbee92..cb2266a3d 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -1,12 +1,12 @@
 module Chouette
   class Company < Chouette::ActiveRecord
+    has_metadata
+
     include CompanyRestrictions
     include LineReferentialSupport
     include ObjectidSupport
     include CustomFieldsSupport
 
-    has_paper_trail class_name: 'PublicVersion'
-
     has_many :lines
 
     validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true
diff --git a/app/models/chouette/connection_link.rb b/app/models/chouette/connection_link.rb
index c53d6f5f1..fb93e5f90 100644
--- a/app/models/chouette/connection_link.rb
+++ b/app/models/chouette/connection_link.rb
@@ -1,6 +1,6 @@
 module Chouette
   class ConnectionLink < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ObjectidSupport
     include ConnectionLinkRestrictions
 
diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb
index 3b6a7cea7..a30c34ce7 100644
--- a/app/models/chouette/group_of_line.rb
+++ b/app/models/chouette/group_of_line.rb
@@ -1,6 +1,6 @@
 module Chouette
   class GroupOfLine < Chouette::ActiveRecord
-    has_paper_trail
+    has_metadata
     include ObjectidSupport
     include GroupOfLineRestrictions
     include LineReferentialSupport
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 5a5132200..830a6a808 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -1,6 +1,6 @@
 module Chouette
   class JourneyPattern < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ChecksumSupport
     include JourneyPatternRestrictions
     include ObjectidSupport
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index c8a02da1f..51851fc2e 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,6 +1,6 @@
 module Chouette
   class Line < Chouette::ActiveRecord
-    has_paper_trail class_name: 'PublicVersion'
+    has_metadata
     include LineRestrictions
     include LineReferentialSupport
     include ObjectidSupport
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index 942fc5d67..4802d7592 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -1,6 +1,6 @@
 module Chouette
   class Network < Chouette::ActiveRecord
-    has_paper_trail class_name: 'PublicVersion'
+    has_metadata
     include NetworkRestrictions
     include LineReferentialSupport
     include ObjectidSupport
diff --git a/app/models/chouette/pt_link.rb b/app/models/chouette/pt_link.rb
index 399539d44..680632a14 100644
--- a/app/models/chouette/pt_link.rb
+++ b/app/models/chouette/pt_link.rb
@@ -2,7 +2,7 @@ require 'geokit'
 
 module Chouette
   class PtLink < Chouette::ActiveRecord
-    has_paper_trail
+    has_metadata
     include Geokit::Mappable
 
     def geometry
diff --git a/app/models/chouette/purchase_window.rb b/app/models/chouette/purchase_window.rb
index 4c8014780..e10b106ec 100644
--- a/app/models/chouette/purchase_window.rb
+++ b/app/models/chouette/purchase_window.rb
@@ -11,7 +11,7 @@ module Chouette
 
     enumerize :color, in: %w(#9B9B9B #FFA070 #C67300 #7F551B #41CCE3 #09B09C #3655D7 #6321A0 #E796C6 #DD2DAA)
 
-    has_paper_trail
+    has_metadata
     belongs_to :referential
     has_and_belongs_to_many :vehicle_journeys, :class_name => 'Chouette::VehicleJourney'
 
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index 58703598e..886eadc6c 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -1,6 +1,6 @@
 module Chouette
   class RoutingConstraintZone < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ChecksumSupport
     include ObjectidSupport
 
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index c263fa987..9f28b7ee6 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -2,7 +2,7 @@ require 'geokit'
 require 'geo_ruby'
 module Chouette
   class StopArea < Chouette::ActiveRecord
-    has_paper_trail class_name: 'PublicVersion'
+    has_metadata
     include ProjectionFields
     include StopAreaRestrictions
     include StopAreaReferentialSupport
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index da2da998a..1df1a664a 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -1,6 +1,6 @@
 module Chouette
   class StopPoint < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     def self.policy_class
       RoutePolicy
     end
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 506e498b8..b59c95665 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -1,6 +1,6 @@
 module Chouette
   class TimeTable < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ChecksumSupport
     include TimeTableRestrictions
     include ObjectidSupport
diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb
index 5a4e17b98..38260b755 100644
--- a/app/models/chouette/timeband.rb
+++ b/app/models/chouette/timeband.rb
@@ -9,7 +9,7 @@ module Chouette
 
   class Timeband < Chouette::TridentActiveRecord
     include ObjectidSupport
-    has_paper_trail
+    has_metadata
 
     validates :start_time, :end_time, presence: true
     validates_with Chouette::TimebandValidator
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index be05d4053..54aad290c 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 module Chouette
   class VehicleJourney < Chouette::TridentActiveRecord
-    has_paper_trail
+    has_metadata
     include ChecksumSupport
     include CustomFieldsSupport
     include VehicleJourneyRestrictions
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index 7aab7f32e..ec47489e9 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -1,4 +1,4 @@
-class CleanUp < ActiveRecord::Base
+class CleanUp < ApplicationModel
   extend Enumerize
   include AASM
   belongs_to :referential
diff --git a/app/models/clean_up_result.rb b/app/models/clean_up_result.rb
index 24d262deb..dff4f5acd 100644
--- a/app/models/clean_up_result.rb
+++ b/app/models/clean_up_result.rb
@@ -1,3 +1,3 @@
-class CleanUpResult < ActiveRecord::Base
+class CleanUpResult < ApplicationModel
   belongs_to :clean_up
 end
diff --git a/app/models/compliance_check.rb b/app/models/compliance_check.rb
index 9d817e146..4ef6170e9 100644
--- a/app/models/compliance_check.rb
+++ b/app/models/compliance_check.rb
@@ -1,4 +1,4 @@
-class ComplianceCheck < ActiveRecord::Base
+class ComplianceCheck < ApplicationModel
   include ComplianceItemSupport
 
   self.inheritance_column = nil
diff --git a/app/models/compliance_check_block.rb b/app/models/compliance_check_block.rb
index 059547e1b..e4f4c1c37 100644
--- a/app/models/compliance_check_block.rb
+++ b/app/models/compliance_check_block.rb
@@ -1,4 +1,4 @@
-class ComplianceCheckBlock < ActiveRecord::Base
+class ComplianceCheckBlock < ApplicationModel
   include StifTransportModeEnumerations
   include StifTransportSubmodeEnumerations
 
diff --git a/app/models/compliance_check_message.rb b/app/models/compliance_check_message.rb
index 738bd4a4b..a4b1062f6 100644
--- a/app/models/compliance_check_message.rb
+++ b/app/models/compliance_check_message.rb
@@ -1,4 +1,4 @@
-class ComplianceCheckMessage < ActiveRecord::Base
+class ComplianceCheckMessage < ApplicationModel
   extend Enumerize
 
   belongs_to :compliance_check_set
diff --git a/app/models/compliance_check_resource.rb b/app/models/compliance_check_resource.rb
index 777254aaf..d2f782e2b 100644
--- a/app/models/compliance_check_resource.rb
+++ b/app/models/compliance_check_resource.rb
@@ -1,4 +1,4 @@
-class ComplianceCheckResource < ActiveRecord::Base
+class ComplianceCheckResource < ApplicationModel
   extend Enumerize
 
   belongs_to :compliance_check_set
diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb
index 49d324c53..c4da2789d 100644
--- a/app/models/compliance_check_set.rb
+++ b/app/models/compliance_check_set.rb
@@ -1,6 +1,8 @@
-class ComplianceCheckSet < ActiveRecord::Base
+class ComplianceCheckSet < ApplicationModel
   extend Enumerize
-  has_paper_trail class_name: 'PublicVersion'
+  include MetadataSupport
+  
+  has_metadata
 
   belongs_to :referential
   belongs_to :compliance_control_set
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 1cc06f927..672fb128c 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -1,4 +1,4 @@
-class ComplianceControl < ActiveRecord::Base
+class ComplianceControl < ApplicationModel
   include ComplianceItemSupport
 
   class << self
diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index bc5d6fd4a..6a3c8a34e 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -1,4 +1,4 @@
-class ComplianceControlBlock < ActiveRecord::Base
+class ComplianceControlBlock < ApplicationModel
   include StifTransportModeEnumerations
   include StifTransportSubmodeEnumerations
 
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index c0ea692f2..e44744381 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -1,5 +1,7 @@
-class ComplianceControlSet < ActiveRecord::Base
-  has_paper_trail class_name: 'PublicVersion'
+class ComplianceControlSet < ApplicationModel
+  include MetadataSupport
+  
+  has_metadata
   belongs_to :organisation
   has_many :compliance_control_blocks, dependent: :destroy
   has_many :compliance_controls, dependent: :destroy
diff --git a/app/models/concerns/metadata_support.rb b/app/models/concerns/metadata_support.rb
index a1daf6b2e..0075d9391 100644
--- a/app/models/concerns/metadata_support.rb
+++ b/app/models/concerns/metadata_support.rb
@@ -41,7 +41,7 @@ module MetadataSupport
 
     def method_missing(mid, *args)
       out = super(mid, *args)
-      owner.write_attribute attribute_name, @table
+      owner.send :write_attribute, attribute_name, @table
       out = out&.to_time if args.length == 0 && is_timestamp_attr?(mid)
       out
     end
@@ -64,7 +64,7 @@ module MetadataSupport
         define_singleton_method("#{name}=") do |x|
           modifiable[timestamp_attr_name] = Time.now if timestamp_attr_name
           modifiable[name] = x
-          owner.write_attribute attribute_name, @table
+          owner.send :write_attribute, attribute_name, @table
         end
         modifiable[timestamp_attr_name] = Time.now if timestamp_attr_name
       end
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 8347d84f9..22118a15a 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -1,4 +1,4 @@
-class CustomField < ActiveRecord::Base
+class CustomField < ApplicationModel
 
   extend Enumerize
   belongs_to :workgroup
diff --git a/app/models/export/message.rb b/app/models/export/message.rb
index b64b524ac..223429900 100644
--- a/app/models/export/message.rb
+++ b/app/models/export/message.rb
@@ -1,4 +1,4 @@
-class Export::Message < ActiveRecord::Base
+class Export::Message < ApplicationModel
   self.table_name = :export_messages
 
   include IevInterfaces::Message
diff --git a/app/models/export/resource.rb b/app/models/export/resource.rb
index 98f103be4..2a63c14a8 100644
--- a/app/models/export/resource.rb
+++ b/app/models/export/resource.rb
@@ -1,4 +1,4 @@
-class Export::Resource < ActiveRecord::Base
+class Export::Resource < ApplicationModel
   self.table_name = :export_resources
 
   include IevInterfaces::Resource
diff --git a/app/models/import/base.rb b/app/models/import/base.rb
index 62494c92e..82494b1dc 100644
--- a/app/models/import/base.rb
+++ b/app/models/import/base.rb
@@ -1,4 +1,4 @@
-class Import::Base < ActiveRecord::Base
+class Import::Base < ApplicationModel
   self.table_name = "imports"
   validates :file, presence: true
 
diff --git a/app/models/import/message.rb b/app/models/import/message.rb
index c1900a718..30b76ec5c 100644
--- a/app/models/import/message.rb
+++ b/app/models/import/message.rb
@@ -1,4 +1,4 @@
-class Import::Message < ActiveRecord::Base
+class Import::Message < ApplicationModel
   self.table_name = :import_messages
 
   include IevInterfaces::Message
diff --git a/app/models/import/resource.rb b/app/models/import/resource.rb
index 5bd011039..1951daacd 100644
--- a/app/models/import/resource.rb
+++ b/app/models/import/resource.rb
@@ -1,4 +1,4 @@
-class Import::Resource < ActiveRecord::Base
+class Import::Resource < ApplicationModel
   self.table_name = :import_resources
 
   include IevInterfaces::Resource
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index 89700c06f..08193c960 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -1,4 +1,4 @@
-class LineReferential < ActiveRecord::Base
+class LineReferential < ApplicationModel
   include ObjectidFormatterSupport
   extend StifTransportModeEnumerations
 
diff --git a/app/models/line_referential_membership.rb b/app/models/line_referential_membership.rb
index dcada25bf..8371bdc32 100644
--- a/app/models/line_referential_membership.rb
+++ b/app/models/line_referential_membership.rb
@@ -1,4 +1,4 @@
-class LineReferentialMembership < ActiveRecord::Base
+class LineReferentialMembership < ApplicationModel
   belongs_to :organisation
   belongs_to :line_referential
 
diff --git a/app/models/line_referential_sync.rb b/app/models/line_referential_sync.rb
index 75c1e48a2..39e3846f0 100644
--- a/app/models/line_referential_sync.rb
+++ b/app/models/line_referential_sync.rb
@@ -1,4 +1,4 @@
-class LineReferentialSync < ActiveRecord::Base
+class LineReferentialSync < ApplicationModel
   include AASM
   belongs_to :line_referential
   has_many :line_referential_sync_messages, :dependent => :destroy
diff --git a/app/models/line_referential_sync_message.rb b/app/models/line_referential_sync_message.rb
index 3b6cf3367..00a2b58a3 100644
--- a/app/models/line_referential_sync_message.rb
+++ b/app/models/line_referential_sync_message.rb
@@ -1,4 +1,4 @@
-class LineReferentialSyncMessage < ActiveRecord::Base
+class LineReferentialSyncMessage < ApplicationModel
   belongs_to :line_referential_sync
   enum criticity: [:info, :warning, :error]
 
diff --git a/app/models/merge.rb b/app/models/merge.rb
index e72c794fe..8038b5f0f 100644
--- a/app/models/merge.rb
+++ b/app/models/merge.rb
@@ -1,4 +1,4 @@
-class Merge < ActiveRecord::Base
+class Merge < ApplicationModel
   extend Enumerize
 
   belongs_to :workbench
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 5bef67941..5742c81e8 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class Organisation < ActiveRecord::Base
+class Organisation < ApplicationModel
   include DataFormatEnumerations
 
   has_many :users, :dependent => :destroy
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 0e48be43f..3304108d0 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class Referential < ActiveRecord::Base
+class Referential < ApplicationModel
   include DataFormatEnumerations
   include ObjectidFormatterSupport
 
diff --git a/app/models/referential_cloning.rb b/app/models/referential_cloning.rb
index d4b74bd52..f2c81009a 100644
--- a/app/models/referential_cloning.rb
+++ b/app/models/referential_cloning.rb
@@ -1,4 +1,4 @@
-class ReferentialCloning < ActiveRecord::Base
+class ReferentialCloning < ApplicationModel
   include AASM
   belongs_to :source_referential, class_name: 'Referential'
   belongs_to :target_referential, class_name: 'Referential'
diff --git a/app/models/referential_metadata.rb b/app/models/referential_metadata.rb
index 017eb1449..7a8a01774 100644
--- a/app/models/referential_metadata.rb
+++ b/app/models/referential_metadata.rb
@@ -1,7 +1,7 @@
 require 'activeattr_ext.rb'
 require 'range_ext'
 
-class ReferentialMetadata < ActiveRecord::Base
+class ReferentialMetadata < ApplicationModel
   belongs_to :referential, touch: true
   belongs_to :referential_source, class_name: 'Referential'
   has_array_of :lines, class_name: 'Chouette::Line'
diff --git a/app/models/referential_suite.rb b/app/models/referential_suite.rb
index 4f825628c..f4a72f22c 100644
--- a/app/models/referential_suite.rb
+++ b/app/models/referential_suite.rb
@@ -1,4 +1,4 @@
-class ReferentialSuite < ActiveRecord::Base
+class ReferentialSuite < ApplicationModel
   belongs_to :new, class_name: 'Referential'
   validate def validate_consistent_new
     return true if new_id.nil? || new.nil?
diff --git a/app/models/simple_interface.rb b/app/models/simple_interface.rb
index 43c740b57..7b04a07df 100644
--- a/app/models/simple_interface.rb
+++ b/app/models/simple_interface.rb
@@ -1,4 +1,4 @@
-class SimpleInterface < ActiveRecord::Base
+class SimpleInterface < ApplicationModel
   attr_accessor :configuration, :interfaces_group
 
   class << self
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb
index 4706cdd77..6c339547c 100644
--- a/app/models/stop_area_referential.rb
+++ b/app/models/stop_area_referential.rb
@@ -1,4 +1,4 @@
-class StopAreaReferential < ActiveRecord::Base
+class StopAreaReferential < ApplicationModel
   validates :registration_number_format, format: { with: /\AX*\z/ }
 
   include ObjectidFormatterSupport
diff --git a/app/models/stop_area_referential_membership.rb b/app/models/stop_area_referential_membership.rb
index fbed1c004..d507bc50e 100644
--- a/app/models/stop_area_referential_membership.rb
+++ b/app/models/stop_area_referential_membership.rb
@@ -1,4 +1,4 @@
-class StopAreaReferentialMembership < ActiveRecord::Base
+class StopAreaReferentialMembership < ApplicationModel
   belongs_to :organisation
   belongs_to :stop_area_referential
 
diff --git a/app/models/stop_area_referential_sync.rb b/app/models/stop_area_referential_sync.rb
index e6cf2ecbc..8b48d35e6 100644
--- a/app/models/stop_area_referential_sync.rb
+++ b/app/models/stop_area_referential_sync.rb
@@ -1,4 +1,4 @@
-class StopAreaReferentialSync < ActiveRecord::Base
+class StopAreaReferentialSync < ApplicationModel
   include AASM
   belongs_to :stop_area_referential
   has_many :stop_area_referential_sync_messages, :dependent => :destroy
diff --git a/app/models/stop_area_referential_sync_message.rb b/app/models/stop_area_referential_sync_message.rb
index cd2e62405..642ccfc38 100644
--- a/app/models/stop_area_referential_sync_message.rb
+++ b/app/models/stop_area_referential_sync_message.rb
@@ -1,4 +1,4 @@
-class StopAreaReferentialSyncMessage < ActiveRecord::Base
+class StopAreaReferentialSyncMessage < ApplicationModel
   belongs_to :stop_area_referential_sync
   enum criticity: [:info, :warning, :error]
 
diff --git a/app/models/user.rb b/app/models/user.rb
index eca7ede0c..29148d9e9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationModel
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable, :database_authenticatable
 
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index b5f4673bb..ef0b2eaa4 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -1,4 +1,4 @@
-class Workbench < ActiveRecord::Base
+class Workbench < ApplicationModel
   DEFAULT_WORKBENCH_NAME = "Gestion de l'offre"
 
   include ObjectidFormatterSupport
diff --git a/app/models/workgroup.rb b/app/models/workgroup.rb
index 7e3e857ec..3e8409634 100644
--- a/app/models/workgroup.rb
+++ b/app/models/workgroup.rb
@@ -1,4 +1,4 @@
-class Workgroup < ActiveRecord::Base
+class Workgroup < ApplicationModel
   belongs_to :line_referential
   belongs_to :stop_area_referential