Merge remote-tracking branch 'upstream/pull/4226'

[rails.git] / app / models / diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 2a24d800296b80902fffdd33656e67447505e9a5..e83dfb9ee47af81706161260781f7bb663a8fc88 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,8 +2,8 @@
 #
 # Table name: diary_entries
 #
-#  id            :integer          not null, primary key
-#  user_id       :integer          not null
+#  id            :bigint(8)        not null, primary key
+#  user_id       :bigint(8)        not null
 #  title         :string           not null
 #  body          :text             not null
 #  created_at    :datetime         not null
@@ -26,19 +26,19 @@
 #  diary_entries_user_id_fkey        (user_id => users.id)
 #
 
-class DiaryEntry < ActiveRecord::Base
+class DiaryEntry < ApplicationRecord
   belongs_to :user, :counter_cache => true
-  belongs_to :language, :foreign_key => "language_code"
+  belongs_to :language, :foreign_key => "language_code", :inverse_of => :diary_entries
 
-  has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
+  has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment", :inverse_of => :diary_entry
   has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w[active confirmed] }).order(:id) }, :class_name => "DiaryComment"
   has_many :subscriptions, :class_name => "DiaryEntrySubscription"
   has_many :subscribers, :through => :subscriptions, :source => :user
 
   scope :visible, -> { where(:visible => true) }
 
-  validates :title, :body, :presence => true
-  validates :title, :length => 1..255
+  validates :title, :presence => true, :length => 1..255, :characters => true
+  validates :body, :presence => true, :characters => true
   validates :latitude, :allow_nil => true,
                        :numericality => { :greater_than_or_equal_to => -90,
                                           :less_than_or_equal_to => 90 }