From 50c9762ae7a06ee186a5623a903129bba11f17ca Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 14 May 2016 18:52:38 +0900 Subject: [PATCH] move `after_destroy` callback to `Recorder` --- app/models/concerns/recorder.rb | 2 ++ app/models/event.rb | 2 -- app/models/place.rb | 2 -- app/models/travel.rb | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/concerns/recorder.rb b/app/models/concerns/recorder.rb index 9de963e5..39a1dc29 100644 --- a/app/models/concerns/recorder.rb +++ b/app/models/concerns/recorder.rb @@ -2,6 +2,8 @@ module Recorder extend ActiveSupport::Concern included do + after_destroy :record_deleted_datum + def record_deleted_datum DeletedDatum.create!(table_name: self.class.table_name, datum_id: self.id, user_id: self.try(:user_id) || self.try(:owner_id)) end diff --git a/app/models/event.rb b/app/models/event.rb index 17703ab5..c1ee0439 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -7,8 +7,6 @@ class Event < ApplicationRecord validates :name, presence: true, length: { maximum: 255 } validates :detail, length: { maximum: 1024 } - after_destroy :record_deleted_datum - scope :future, -> do where('end_date >= ?', Date.current) end diff --git a/app/models/place.rb b/app/models/place.rb index e26d52b2..edacf8c2 100644 --- a/app/models/place.rb +++ b/app/models/place.rb @@ -40,8 +40,6 @@ class Place < ActiveRecord::Base validates :latitude, presence: true, if: -> { address.present? } validates :longitude, presence: true, if: -> { address.present? } - after_destroy :record_deleted_datum - paginates_per 10 class << self diff --git a/app/models/travel.rb b/app/models/travel.rb index 285ea446..c3ab074d 100644 --- a/app/models/travel.rb +++ b/app/models/travel.rb @@ -39,7 +39,6 @@ class Travel < ActiveRecord::Base end before_save :adjust_travel_dates - after_destroy :record_deleted_datum validates :name, presence: true, length: { maximum: 255 } validates :start_date, presence: true