2011-10-08 17:36:38 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-07-10 10:24:02 -04:00
|
|
|
describe ProjectMember do
|
2016-05-20 13:37:48 -04:00
|
|
|
describe 'associations' do
|
2016-10-18 17:20:36 -04:00
|
|
|
it { is_expected.to belong_to(:project).with_foreign_key(:source_id) }
|
2016-05-20 13:37:48 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'validations' do
|
|
|
|
it { is_expected.to allow_value('Project').for(:source_type) }
|
|
|
|
it { is_expected.not_to allow_value('project').for(:source_type) }
|
2016-06-23 11:14:31 -04:00
|
|
|
it { is_expected.to validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
|
2016-05-20 13:37:48 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'modules' do
|
|
|
|
it { is_expected.to include_module(Gitlab::ShellAdapter) }
|
|
|
|
end
|
|
|
|
|
2016-09-16 11:54:21 -04:00
|
|
|
describe '.access_level_roles' do
|
|
|
|
it 'returns Gitlab::Access.options' do
|
|
|
|
expect(described_class.access_level_roles).to eq(Gitlab::Access.options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '.add_user' do
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
it 'adds the user as a member' do
|
|
|
|
user = create(:user)
|
2017-08-02 15:55:11 -04:00
|
|
|
project = create(:project)
|
2016-09-16 11:54:21 -04:00
|
|
|
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
expect(project.users).not_to include(user)
|
2016-09-16 11:54:21 -04:00
|
|
|
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
described_class.add_user(project, user, :master, current_user: project.owner)
|
2016-09-16 11:54:21 -04:00
|
|
|
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
expect(project.users.reload).to include(user)
|
2016-09-16 11:54:21 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-02 12:05:06 -04:00
|
|
|
describe '#real_source_type' do
|
|
|
|
subject { create(:project_member).real_source_type }
|
|
|
|
|
|
|
|
it { is_expected.to eq 'Project' }
|
|
|
|
end
|
|
|
|
|
2016-05-20 13:37:48 -04:00
|
|
|
describe "#destroy" do
|
2016-06-23 11:14:31 -04:00
|
|
|
let(:owner) { create(:project_member, access_level: ProjectMember::MASTER) }
|
2016-05-20 13:37:48 -04:00
|
|
|
let(:project) { owner.project }
|
|
|
|
let(:master) { create(:project_member, project: project) }
|
|
|
|
|
|
|
|
let(:owner_todos) { (0...2).map { create(:todo, user: owner.user, project: project) } }
|
|
|
|
let(:master_todos) { (0...3).map { create(:todo, user: master.user, project: project) } }
|
|
|
|
|
|
|
|
before do
|
|
|
|
owner_todos
|
|
|
|
master_todos
|
|
|
|
end
|
|
|
|
|
2016-10-06 11:19:27 -04:00
|
|
|
it "creates an expired event when left due to expiry" do
|
|
|
|
expired = create(:project_member, project: project, expires_at: Time.now - 6.days)
|
|
|
|
expired.destroy
|
2016-10-27 00:48:26 -04:00
|
|
|
expect(Event.recent.first.action).to eq(Event::EXPIRED)
|
2016-10-06 11:19:27 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "creates a left event when left due to leave" do
|
|
|
|
master.destroy
|
2016-10-27 00:48:26 -04:00
|
|
|
expect(Event.recent.first.action).to eq(Event::LEFT)
|
2016-10-06 11:19:27 -04:00
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "destroys itself and delete associated todos" do
|
2016-05-21 12:11:26 -04:00
|
|
|
expect(owner.user.todos.size).to eq(2)
|
|
|
|
expect(master.user.todos.size).to eq(3)
|
2016-05-20 13:37:48 -04:00
|
|
|
expect(Todo.count).to eq(5)
|
|
|
|
|
|
|
|
master_todo_ids = master_todos.map(&:id)
|
|
|
|
master.destroy
|
|
|
|
|
2016-05-21 12:11:26 -04:00
|
|
|
expect(owner.user.todos.size).to eq(2)
|
2016-05-20 13:37:48 -04:00
|
|
|
expect(Todo.count).to eq(2)
|
|
|
|
master_todo_ids.each do |id|
|
|
|
|
expect(Todo.exists?(id)).to eq(false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-09-16 11:54:21 -04:00
|
|
|
describe '.import_team' do
|
2012-10-24 07:52:17 -04:00
|
|
|
before do
|
2017-08-02 15:55:11 -04:00
|
|
|
@project_1 = create(:project)
|
|
|
|
@project_2 = create(:project)
|
2012-10-24 07:52:17 -04:00
|
|
|
|
|
|
|
@user_1 = create :user
|
|
|
|
@user_2 = create :user
|
|
|
|
|
2017-02-21 18:33:53 -05:00
|
|
|
@project_1.team << [@user_1, :developer]
|
|
|
|
@project_2.team << [@user_2, :reporter]
|
2012-10-24 07:52:17 -04:00
|
|
|
|
2013-01-04 01:43:25 -05:00
|
|
|
@status = @project_2.team.import(@project_1)
|
2012-10-24 07:52:17 -04:00
|
|
|
end
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(@status).to be_truthy }
|
2012-10-24 07:52:17 -04:00
|
|
|
|
|
|
|
describe 'project 2 should get user 1 as developer. user_2 should not be changed' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(@project_2.users).to include(@user_1) }
|
|
|
|
it { expect(@project_2.users).to include(@user_2) }
|
2012-10-24 07:52:17 -04:00
|
|
|
|
2016-08-08 14:55:13 -04:00
|
|
|
it { expect(Ability.allowed?(@user_1, :create_project, @project_2)).to be_truthy }
|
|
|
|
it { expect(Ability.allowed?(@user_2, :read_project, @project_2)).to be_truthy }
|
2012-10-24 07:52:17 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'project 1 should not be changed' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(@project_1.users).to include(@user_1) }
|
|
|
|
it { expect(@project_1.users).not_to include(@user_2) }
|
2012-10-24 07:52:17 -04:00
|
|
|
end
|
|
|
|
end
|
2013-01-03 12:11:14 -05:00
|
|
|
|
2016-08-04 00:35:17 -04:00
|
|
|
describe '.add_users_to_projects' do
|
2016-09-16 11:54:21 -04:00
|
|
|
it 'adds the given users to the given projects' do
|
2017-08-02 15:55:11 -04:00
|
|
|
projects = create_list(:project, 2)
|
2016-09-16 11:54:21 -04:00
|
|
|
users = create_list(:user, 2)
|
2013-01-03 12:11:14 -05:00
|
|
|
|
2016-09-16 11:54:21 -04:00
|
|
|
described_class.add_users_to_projects(
|
2017-01-27 21:50:25 -05:00
|
|
|
[projects.first.id, projects.second.id],
|
2016-09-16 11:54:21 -04:00
|
|
|
[users.first.id, users.second],
|
|
|
|
described_class::MASTER)
|
2013-01-03 12:11:14 -05:00
|
|
|
|
2016-09-16 11:54:21 -04:00
|
|
|
expect(projects.first.users).to include(users.first)
|
|
|
|
expect(projects.first.users).to include(users.second)
|
2013-01-03 12:11:14 -05:00
|
|
|
|
2016-09-16 11:54:21 -04:00
|
|
|
expect(projects.second.users).to include(users.first)
|
|
|
|
expect(projects.second.users).to include(users.second)
|
|
|
|
end
|
2013-01-03 12:11:14 -05:00
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '.truncate_teams' do
|
2013-01-03 12:11:14 -05:00
|
|
|
before do
|
2017-08-02 15:55:11 -04:00
|
|
|
@project_1 = create(:project)
|
|
|
|
@project_2 = create(:project)
|
2013-01-03 12:11:14 -05:00
|
|
|
|
|
|
|
@user_1 = create :user
|
|
|
|
@user_2 = create :user
|
|
|
|
|
2017-02-21 18:33:53 -05:00
|
|
|
@project_1.team << [@user_1, :developer]
|
|
|
|
@project_2.team << [@user_2, :reporter]
|
2013-01-03 12:11:14 -05:00
|
|
|
|
2017-07-25 13:09:00 -04:00
|
|
|
described_class.truncate_teams([@project_1.id, @project_2.id])
|
2013-01-03 12:11:14 -05:00
|
|
|
end
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(@project_1.users).to be_empty }
|
|
|
|
it { expect(@project_2.users).to be_empty }
|
2013-01-03 12:11:14 -05:00
|
|
|
end
|
2016-04-18 12:53:32 -04:00
|
|
|
|
|
|
|
describe 'notifications' do
|
2016-06-02 12:05:06 -04:00
|
|
|
describe '#after_accept_request' do
|
|
|
|
it 'calls NotificationService.new_project_member' do
|
Migrate events into a new format
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.
2017-07-10 11:43:57 -04:00
|
|
|
member = create(:project_member, user: create(:user), requested_at: Time.now)
|
2016-04-18 12:53:32 -04:00
|
|
|
|
|
|
|
expect_any_instance_of(NotificationService).to receive(:new_project_member)
|
|
|
|
|
2016-06-02 12:05:06 -04:00
|
|
|
member.__send__(:after_accept_request)
|
2016-04-18 12:53:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2011-10-08 17:36:38 -04:00
|
|
|
end
|