From b6caa2e4e13d4b5286e6e8beb8e0c96a6d7070e9 Mon Sep 17 00:00:00 2001 From: Eito Katagiri Date: Sun, 9 Oct 2022 23:05:25 +0900 Subject: [PATCH] inherit ApplicationRecord instead (#926) --- app/models/admin.rb | 2 +- app/models/bgeigie_log.rb | 2 +- app/models/device.rb | 2 +- app/models/drive_log.rb | 2 +- app/models/map.rb | 2 +- app/models/measurement.rb | 2 +- app/models/measurement_import.rb | 2 +- app/models/measurement_import_log.rb | 2 +- app/models/uploader_contact_history.rb | 2 +- app/models/user.rb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/admin.rb b/app/models/admin.rb index 28d60f0e9..bbfad0549 100644 --- a/app/models/admin.rb +++ b/app/models/admin.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Admin < ActiveRecord::Base +class Admin < ApplicationRecord devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable def identifier diff --git a/app/models/bgeigie_log.rb b/app/models/bgeigie_log.rb index 8f8a35539..778ee15a6 100644 --- a/app/models/bgeigie_log.rb +++ b/app/models/bgeigie_log.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class BgeigieLog < ActiveRecord::Base +class BgeigieLog < ApplicationRecord include MeasurementConcerns # # Note diff --git a/app/models/device.rb b/app/models/device.rb index 742a93b3b..60ee76c3d 100644 --- a/app/models/device.rb +++ b/app/models/device.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Device < ActiveRecord::Base +class Device < ApplicationRecord has_many :measurements # has_and_belongs_to_many :maps diff --git a/app/models/drive_log.rb b/app/models/drive_log.rb index cc195b910..4b8e968ec 100644 --- a/app/models/drive_log.rb +++ b/app/models/drive_log.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'digest/md5' -class DriveLog < ActiveRecord::Base +class DriveLog < ApplicationRecord def update_md5sum # rubocop:disable Metrics/AbcSize # rubocop:disable Layout/LineLength self.md5sum = Digest::MD5.hexdigest(%("#{id}","#{drive_import_id}","#{reading_date}","#{reading_value}","#{unit_id}","#{alt_reading_value}","#{alt_unit_id}",#{rolling_count},#{total_count},"#{latitude}","#{longitude}","#{gps_quality_indicator}","#{satellite_num}","#{gps_precision}","#{gps_altitude}","#{gps_device_name}","#{measurement_type}","#{zoom_7_grid}","#{created_at}","#{updated_at}")) diff --git a/app/models/map.rb b/app/models/map.rb index b8d7b9f9e..997d88134 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true -class Map < ActiveRecord::Base +class Map < ApplicationRecord end diff --git a/app/models/measurement.rb b/app/models/measurement.rb index d2eb50f4f..d92ada8d1 100644 --- a/app/models/measurement.rb +++ b/app/models/measurement.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Measurement < ActiveRecord::Base +class Measurement < ApplicationRecord include MeasurementConcerns include SwaggerBlocks::Models::Measurement diff --git a/app/models/measurement_import.rb b/app/models/measurement_import.rb index 0820e7600..082ba1bbd 100644 --- a/app/models/measurement_import.rb +++ b/app/models/measurement_import.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class MeasurementImport < ActiveRecord::Base +class MeasurementImport < ApplicationRecord validates :source, presence: true, on: :create validate :uniqueness_of_md5sum has_many :measurement_import_logs diff --git a/app/models/measurement_import_log.rb b/app/models/measurement_import_log.rb index 7d2a71b10..2df3c06b2 100644 --- a/app/models/measurement_import_log.rb +++ b/app/models/measurement_import_log.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true -class MeasurementImportLog < ActiveRecord::Base +class MeasurementImportLog < ApplicationRecord end diff --git a/app/models/uploader_contact_history.rb b/app/models/uploader_contact_history.rb index 5b5fb81ba..3cca323a7 100644 --- a/app/models/uploader_contact_history.rb +++ b/app/models/uploader_contact_history.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class UploaderContactHistory < ActiveRecord::Base +class UploaderContactHistory < ApplicationRecord belongs_to :administrator, class_name: 'User' belongs_to :bgeigie_import diff --git a/app/models/user.rb b/app/models/user.rb index da8abce0e..eb897ac65 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class User < ActiveRecord::Base +class User < ApplicationRecord include UserConcerns include Swagger::Blocks