Renamed related content times_reported column to flags_count
This commit is contained in:
@@ -1,4 +1,6 @@
|
|||||||
class RelatedContent < ActiveRecord::Base
|
class RelatedContent < ActiveRecord::Base
|
||||||
|
include Flaggable
|
||||||
|
|
||||||
RELATED_CONTENTS_REPORT_THRESHOLD = Setting['related_contents_report_threshold'].to_i
|
RELATED_CONTENTS_REPORT_THRESHOLD = Setting['related_contents_report_threshold'].to_i
|
||||||
RELATIONABLE_MODELS = %w{proposals debates}.freeze
|
RELATIONABLE_MODELS = %w{proposals debates}.freeze
|
||||||
|
|
||||||
@@ -15,10 +17,10 @@ class RelatedContent < ActiveRecord::Base
|
|||||||
after_create :create_opposite_related_content, unless: proc { opposite_related_content.present? }
|
after_create :create_opposite_related_content, unless: proc { opposite_related_content.present? }
|
||||||
after_destroy :destroy_opposite_related_content, if: proc { opposite_related_content.present? }
|
after_destroy :destroy_opposite_related_content, if: proc { opposite_related_content.present? }
|
||||||
|
|
||||||
scope :not_hidden, -> { where('times_reported <= ?', RELATED_CONTENTS_REPORT_THRESHOLD) }
|
scope :not_hidden, -> { where('flags_count <= ?', RELATED_CONTENTS_REPORT_THRESHOLD) }
|
||||||
|
|
||||||
def hidden_by_reports?
|
def hidden_by_reports?
|
||||||
times_reported > RELATED_CONTENTS_REPORT_THRESHOLD
|
flags_count > RELATED_CONTENTS_REPORT_THRESHOLD
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
class ChangeRelatedContentTimesReportedColumn < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
rename_column :related_contents, :times_reported, :flags_count
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20171212193323) do
|
ActiveRecord::Schema.define(version: 20171215152244) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
@@ -862,7 +862,7 @@ ActiveRecord::Schema.define(version: 20171212193323) do
|
|||||||
t.integer "related_content_id"
|
t.integer "related_content_id"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.integer "times_reported", default: 0
|
t.integer "flags_count", default: 0
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "related_contents", ["child_relationable_type", "child_relationable_id"], name: "index_related_contents_on_child_relationable", using: :btree
|
add_index "related_contents", ["child_relationable_type", "child_relationable_id"], name: "index_related_contents_on_child_relationable", using: :btree
|
||||||
|
|||||||
@@ -51,18 +51,18 @@ describe RelatedContent do
|
|||||||
|
|
||||||
# TODO: Move this into a Relationable shared context
|
# TODO: Move this into a Relationable shared context
|
||||||
describe '#report_related_content' do
|
describe '#report_related_content' do
|
||||||
it 'increments both relation and opposite relation times_reported counters' do
|
it 'increments both relation and opposite relation flags_count counters' do
|
||||||
related_content = create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
|
related_content = create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
|
||||||
parent_relationable.report_related_content(child_relationable)
|
parent_relationable.report_related_content(child_relationable)
|
||||||
|
|
||||||
expect(related_content.reload.times_reported).to eq(1)
|
expect(related_content.reload.flags_count).to eq(1)
|
||||||
expect(related_content.reload.opposite_related_content.times_reported).to eq(1)
|
expect(related_content.reload.opposite_related_content.flags_count).to eq(1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#relationed_contents' do
|
describe '#relationed_contents' do
|
||||||
before do
|
before do
|
||||||
create(:related_content, parent_relationable: parent_relationable, child_relationable: create(:proposal), times_reported: 6)
|
create(:related_content, parent_relationable: parent_relationable, child_relationable: create(:proposal), flags_count: 6)
|
||||||
create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
|
create(:related_content, parent_relationable: parent_relationable, child_relationable: child_relationable)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user