Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4878 from tgxworld/fix_topic_timestamp_changer 

Fix topic timestamp changer
This commit is contained in:
Guo Xiang Tan 2017-05-22 16:07:54 +08:00 committed by GitHub
parent f57914ccd8 238a156300
commit ded9575c32
6 changed files with 94 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
View File

@ -1,6 +1,7 @@
import ModalFunctionality from 'discourse/mixins/modal-functionality';
import computed from 'ember-addons/ember-computed-decorators';
import DiscourseURL from 'discourse/lib/url';
import Topic from 'discourse/models/topic';
// Modal related to changing the timestamp of posts
export default Ember.Controller.extend(ModalFunctionality, {
@ -43,7 +44,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
const self = this,
topic = this.get('topicController.model');
Discourse.Topic.changeTimestamp(
Topic.changeTimestamp(
topic.get('id'),
this.get('createdAt').unix()
).then(function() {

8
app/controllers/topics_controller.rb
View File

@ -558,11 +558,13 @@ class TopicsController < ApplicationController
guardian.ensure_can_change_post_timestamps!
begin
PostTimestampChanger.new( topic_id: params[:topic_id].to_i,
timestamp: params[:timestamp].to_i ).change!
TopicTimestampChanger.new(
topic_id: params[:topic_id].to_i,
timestamp: params[:timestamp].to_f
).change!
render json: success_json
rescue ActiveRecord::RecordInvalid
rescue ActiveRecord::RecordInvalid, TopicTimestampChanger::InvalidTimestampError
render json: failed_json, status: 422
end
end

2
app/jobs/regular/publish_topic_to_category.rb
View File

@ -7,7 +7,7 @@ module Jobs
topic = topic_timer.topic
return if topic.blank?
PostTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
TopicTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
if topic.private_message?
topic = TopicConverter.new(topic, Discourse.system_user)
.convert_to_public_topic(topic_timer.category_id)

15
app/services/post_timestamp_changer.rb → app/services/topic_timestamp_changer.rb
View File

@ -1,8 +1,14 @@
class PostTimestampChanger
def initialize(params)
@topic = params[:topic] || Topic.with_deleted.find(params[:topic_id])
class TopicTimestampChanger
class InvalidTimestampError < StandardError; end
def initialize(timestamp:, topic: nil, topic_id: nil)
@topic = topic || Topic.with_deleted.find(topic_id)
@posts = @topic.posts
@timestamp = Time.at(params[:timestamp])
@current_timestamp = Time.zone.now
@timestamp = Time.zone.at(timestamp)
raise InvalidTimestampError if @timestamp.to_f > @current_timestamp.to_f
@time_difference = calculate_time_difference
end
@ -15,6 +21,7 @@ class PostTimestampChanger
update_post(post, @timestamp)
else
new_created_at = Time.at(post.created_at.to_f + @time_difference)
new_created_at = @current_timestamp if new_created_at > @current_timestamp
last_posted_at = new_created_at if new_created_at > last_posted_at
update_post(post, new_created_at)
end

62
spec/services/post_timestamp_changer_spec.rb
View File

@ -1,62 +0,0 @@
require 'rails_helper'
describe PostTimestampChanger do
describe "change!" do
let(:old_timestamp) { Time.zone.now }
let(:new_timestamp) { old_timestamp + 1.day }
let!(:topic) { Fabricate(:topic, created_at: old_timestamp) }
let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) }
let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
let(:params) { { topic_id: topic.id, timestamp: new_timestamp.to_f } }
it 'changes the timestamp of the topic and opening post' do
PostTimestampChanger.new(params).change!
topic.reload
[:created_at, :updated_at, :bumped_at].each do |column|
expect(topic.public_send(column)).to be_within_one_second_of(new_timestamp)
end
p1.reload
[:created_at, :updated_at].each do |column|
expect(p1.public_send(column)).to be_within_one_second_of(new_timestamp)
end
expect(topic.last_posted_at).to be_within_one_second_of(p2.reload.created_at)
end
describe 'predated timestamp' do
it 'updates the timestamp of posts in the topic with the time difference applied' do
PostTimestampChanger.new(params).change!
p2.reload
[:created_at, :updated_at].each do |column|
expect(p2.public_send(column)).to be_within_one_second_of(old_timestamp + 2.day)
end
end
end
describe 'backdated timestamp' do
let(:new_timestamp) { old_timestamp - 1.day }
it 'updates the timestamp of posts in the topic with the time difference applied' do
PostTimestampChanger.new(params).change!
p2.reload
[:created_at, :updated_at].each do |column|
expect(p2.public_send(column)).to be_within_one_second_of(old_timestamp)
end
end
end
it 'deletes the stats cache' do
$redis.set AdminDashboardData.stats_cache_key, "X"
$redis.set About.stats_cache_key, "X"
PostTimestampChanger.new(params).change!
expect($redis.get(AdminDashboardData.stats_cache_key)).to eq(nil)
expect($redis.get(About.stats_cache_key)).to eq(nil)
end
end
end

75
spec/services/topic_timestamp_changer_spec.rb Normal file
View File

@ -0,0 +1,75 @@
require 'rails_helper'
describe TopicTimestampChanger do
describe "change!" do
let(:old_timestamp) { Time.zone.now }
let(:new_timestamp) { old_timestamp + 1.day }
let(:topic) { Fabricate(:topic, created_at: old_timestamp) }
let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) }
let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
context 'new timestamp is in the future' do
let(:new_timestamp) { old_timestamp + 2.day }
it 'should raise the right error' do
expect { TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change! }
.to raise_error(TopicTimestampChanger::InvalidTimestampError)
end
end
context 'new timestamp is in the past' do
let(:new_timestamp) { old_timestamp - 2.day }
it 'changes the timestamp of the topic and opening post' do
Timecop.freeze do
TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
topic.reload
[:created_at, :updated_at, :bumped_at].each do |column|
expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
end
p1.reload
[:created_at, :updated_at].each do |column|
expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
end
p2.reload
[:created_at, :updated_at].each do |column|
expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
end
expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
end
end
describe 'when posts have timestamps in the future' do
let(:new_timestamp) { Time.zone.now }
let(:p3) { Fabricate(:post, topic: topic, created_at: new_timestamp + 3.day) }
it 'should set the new timestamp as the default timestamp' do
Timecop.freeze do
p3
TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
p3.reload
[:created_at, :updated_at].each do |column|
expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
end
end
end
end
end
it 'deletes the stats cache' do
$redis.set AdminDashboardData.stats_cache_key, "X"
$redis.set About.stats_cache_key, "X"
TopicTimestampChanger.new(topic: topic, timestamp: Time.zone.now.to_f).change!
expect($redis.get(AdminDashboardData.stats_cache_key)).to eq(nil)
expect($redis.get(About.stats_cache_key)).to eq(nil)
end
end
end