Commit 28592691 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Serialize last_fetched_at as a string with seconds

parent 7ec5ff4d
...@@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController ...@@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController
before_filter :authorize_admin_note!, only: [:update, :destroy] before_filter :authorize_admin_note!, only: [:update, :destroy]
def index def index
current_fetched_at = Time.now current_fetched_at = Time.now.to_i
@notes = NotesFinder.new.execute(project, current_user, params) @notes = NotesFinder.new.execute(project, current_user, params)
notes_json = { notes: [], last_fetched_at: current_fetched_at } notes_json = { notes: [], last_fetched_at: current_fetched_at }
......
...@@ -4,7 +4,7 @@ class NotesFinder ...@@ -4,7 +4,7 @@ class NotesFinder
def execute(project, current_user, params) def execute(project, current_user, params)
target_type = params[:target_type] target_type = params[:target_type]
target_id = params[:target_id] target_id = params[:target_id]
last_fetched_at = params.fetch(:last_fetched_at) last_fetched_at = Time.at(params.fetch(:last_fetched_at).to_i)
notes = case target_type notes = case target_type
when "commit" when "commit"
......
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
= render "projects/notes/form" = render "projects/notes/form"
:javascript :javascript
new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, Time.now) new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, #{Time.now.to_i})
...@@ -12,7 +12,7 @@ describe NotesFinder do ...@@ -12,7 +12,7 @@ describe NotesFinder do
end end
describe :execute do describe :execute do
let(:params) { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago } } let(:params) { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago.to_i } }
before do before do
note1 note1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment