0395c47193
This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
326 lines
9.8 KiB
Ruby
326 lines
9.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe UsersController do
|
|
let(:user) { create(:user) }
|
|
|
|
describe 'GET #show' do
|
|
context 'with rendered views' do
|
|
render_views
|
|
|
|
describe 'when logged in' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
it 'renders the show template' do
|
|
get :show, username: user.username
|
|
|
|
expect(response).to be_success
|
|
expect(response).to render_template('show')
|
|
end
|
|
end
|
|
|
|
describe 'when logged out' do
|
|
it 'renders the show template' do
|
|
get :show, username: user.username
|
|
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to render_template('show')
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when public visibility level is restricted' do
|
|
before do
|
|
stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC])
|
|
end
|
|
|
|
context 'when logged out' do
|
|
it 'redirects to login page' do
|
|
get :show, username: user.username
|
|
expect(response).to redirect_to new_user_session_path
|
|
end
|
|
end
|
|
|
|
context 'when logged in' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
it 'renders show' do
|
|
get :show, username: user.username
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to render_template('show')
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when a user by that username does not exist' do
|
|
context 'when logged out' do
|
|
it 'redirects to login page' do
|
|
get :show, username: 'nonexistent'
|
|
expect(response).to redirect_to new_user_session_path
|
|
end
|
|
end
|
|
|
|
context 'when logged in' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
it 'renders 404' do
|
|
get :show, username: 'nonexistent'
|
|
expect(response).to have_http_status(404)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #calendar' do
|
|
it 'renders calendar' do
|
|
sign_in(user)
|
|
|
|
get :calendar, username: user.username, format: :json
|
|
|
|
expect(response).to have_http_status(200)
|
|
end
|
|
|
|
context 'forked project' do
|
|
let(:project) { create(:project) }
|
|
let(:forked_project) { Projects::ForkService.new(project, user).execute }
|
|
|
|
before do
|
|
sign_in(user)
|
|
project.team << [user, :developer]
|
|
|
|
push_data = Gitlab::DataBuilder::Push.build_sample(project, user)
|
|
|
|
fork_push_data = Gitlab::DataBuilder::Push
|
|
.build_sample(forked_project, user)
|
|
|
|
EventCreateService.new.push(project, user, push_data)
|
|
EventCreateService.new.push(forked_project, user, fork_push_data)
|
|
end
|
|
|
|
it 'includes forked projects' do
|
|
get :calendar, username: user.username
|
|
expect(assigns(:contributions_calendar).projects.count).to eq(2)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #calendar_activities' do
|
|
let!(:project) { create(:project) }
|
|
let(:user) { create(:user) }
|
|
|
|
before do
|
|
allow_any_instance_of(User).to receive(:contributed_projects_ids).and_return([project.id])
|
|
|
|
sign_in(user)
|
|
project.team << [user, :developer]
|
|
end
|
|
|
|
it 'assigns @calendar_date' do
|
|
get :calendar_activities, username: user.username, date: '2014-07-31'
|
|
expect(assigns(:calendar_date)).to eq(Date.parse('2014-07-31'))
|
|
end
|
|
|
|
it 'renders calendar_activities' do
|
|
get :calendar_activities, username: user.username
|
|
expect(response).to render_template('calendar_activities')
|
|
end
|
|
end
|
|
|
|
describe 'GET #snippets' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
context 'format html' do
|
|
it 'renders snippets page' do
|
|
get :snippets, username: user.username
|
|
expect(response).to have_http_status(200)
|
|
expect(response).to render_template('show')
|
|
end
|
|
end
|
|
|
|
context 'format json' do
|
|
it 'response with snippets json data' do
|
|
get :snippets, username: user.username, format: :json
|
|
expect(response).to have_http_status(200)
|
|
expect(JSON.parse(response.body)).to have_key('html')
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'GET #exists' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
context 'when user exists' do
|
|
it 'returns JSON indicating the user exists' do
|
|
get :exists, username: user.username
|
|
|
|
expected_json = { exists: true }.to_json
|
|
expect(response.body).to eq(expected_json)
|
|
end
|
|
|
|
context 'when the casing is different' do
|
|
let(:user) { create(:user, username: 'CamelCaseUser') }
|
|
|
|
it 'returns JSON indicating the user exists' do
|
|
get :exists, username: user.username.downcase
|
|
|
|
expected_json = { exists: true }.to_json
|
|
expect(response.body).to eq(expected_json)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when the user does not exist' do
|
|
it 'returns JSON indicating the user does not exist' do
|
|
get :exists, username: 'foo'
|
|
|
|
expected_json = { exists: false }.to_json
|
|
expect(response.body).to eq(expected_json)
|
|
end
|
|
|
|
context 'when a user changed their username' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'old-username') }
|
|
|
|
it 'returns JSON indicating a user by that username does not exist' do
|
|
get :exists, username: 'old-username'
|
|
|
|
expected_json = { exists: false }.to_json
|
|
expect(response.body).to eq(expected_json)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#ensure_canonical_path' do
|
|
before do
|
|
sign_in(user)
|
|
end
|
|
|
|
context 'for a GET request' do
|
|
context 'when requesting users at the root path' do
|
|
context 'when requesting the canonical path' do
|
|
let(:user) { create(:user, username: 'CamelCaseUser') }
|
|
|
|
context 'with exactly matching casing' do
|
|
it 'responds with success' do
|
|
get :show, username: user.username
|
|
|
|
expect(response).to be_success
|
|
end
|
|
end
|
|
|
|
context 'with different casing' do
|
|
it 'redirects to the correct casing' do
|
|
get :show, username: user.username.downcase
|
|
|
|
expect(response).to redirect_to(user)
|
|
expect(controller).not_to set_flash[:notice]
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when requesting a redirected path' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'old-path') }
|
|
|
|
it 'redirects to the canonical path' do
|
|
get :show, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user)
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
|
|
context 'when the old path is a substring of the scheme or host' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'http') }
|
|
|
|
it 'does not modify the requested host' do
|
|
get :show, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user)
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
end
|
|
|
|
context 'when the old path is substring of users' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'ser') }
|
|
|
|
it 'redirects to the canonical path' do
|
|
get :show, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user)
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when requesting users under the /users path' do
|
|
context 'when requesting the canonical path' do
|
|
let(:user) { create(:user, username: 'CamelCaseUser') }
|
|
|
|
context 'with exactly matching casing' do
|
|
it 'responds with success' do
|
|
get :projects, username: user.username
|
|
|
|
expect(response).to be_success
|
|
end
|
|
end
|
|
|
|
context 'with different casing' do
|
|
it 'redirects to the correct casing' do
|
|
get :projects, username: user.username.downcase
|
|
|
|
expect(response).to redirect_to(user_projects_path(user))
|
|
expect(controller).not_to set_flash[:notice]
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when requesting a redirected path' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'old-path') }
|
|
|
|
it 'redirects to the canonical path' do
|
|
get :projects, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user_projects_path(user))
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
|
|
context 'when the old path is a substring of the scheme or host' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'http') }
|
|
|
|
it 'does not modify the requested host' do
|
|
get :projects, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user_projects_path(user))
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
end
|
|
|
|
context 'when the old path is substring of users' do
|
|
let(:redirect_route) { user.namespace.redirect_routes.create(path: 'ser') }
|
|
|
|
# I.e. /users/ser should not become /ufoos/ser
|
|
it 'does not modify the /users part of the path' do
|
|
get :projects, username: redirect_route.path
|
|
|
|
expect(response).to redirect_to(user_projects_path(user))
|
|
expect(controller).to set_flash[:notice].to(user_moved_message(redirect_route, user))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def user_moved_message(redirect_route, user)
|
|
"User '#{redirect_route.path}' was moved to '#{user.full_path}'. Please update any links and bookmarks that may still have the old path."
|
|
end
|
|
end
|