2019-04-11 08:17:24 -04:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2014-03-25 08:48:02 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-06-24 11:08:50 -04:00
|
|
|
RSpec.describe EventCreateService do
|
2017-07-25 13:09:00 -04:00
|
|
|
let(:service) { described_class.new }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2020-06-04 17:08:11 -04:00
|
|
|
let_it_be(:user, reload: true) { create :user }
|
|
|
|
let_it_be(:project) { create(:project) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
shared_examples 'it records the event in the event counter' do
|
|
|
|
specify do
|
|
|
|
tracking_params = { event_action: event_action, date_from: Date.yesterday, date_to: Date.today }
|
|
|
|
|
|
|
|
expect { subject }
|
2020-11-24 04:09:32 -05:00
|
|
|
.to change { Gitlab::UsageDataCounters::TrackUniqueEvents.count_unique_events(**tracking_params) }
|
2020-09-02 08:10:35 -04:00
|
|
|
.by(1)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-03-25 08:48:02 -04:00
|
|
|
describe 'Issues' do
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#open_issue' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:issue) { create(:issue) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.open_issue(issue, issue.author)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-11 11:30:18 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.open_issue(issue, issue.author) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#close_issue' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:issue) { create(:issue) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.close_issue(issue, issue.author)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-11 11:30:18 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.close_issue(issue, issue.author) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#reopen_issue' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:issue) { create(:issue) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.reopen_issue(issue, issue.author)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-11 11:30:18 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.reopen_issue(issue, issue.author) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
describe 'Merge Requests', :clean_gitlab_redis_shared_state do
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#open_mr' do
|
2020-09-02 08:10:35 -04:00
|
|
|
subject(:open_mr) { service.open_mr(merge_request, merge_request.author) }
|
|
|
|
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it { expect(open_mr).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2020-09-02 08:10:35 -04:00
|
|
|
expect { open_mr }.to change { Event.count }
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::MERGE_REQUEST_ACTION }
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#close_mr' do
|
2020-09-02 08:10:35 -04:00
|
|
|
subject(:close_mr) { service.close_mr(merge_request, merge_request.author) }
|
|
|
|
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it { expect(close_mr).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2020-09-02 08:10:35 -04:00
|
|
|
expect { close_mr }.to change { Event.count }
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::MERGE_REQUEST_ACTION }
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#merge_mr' do
|
2020-09-02 08:10:35 -04:00
|
|
|
subject(:merge_mr) { service.merge_mr(merge_request, merge_request.author) }
|
|
|
|
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it { expect(merge_mr).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2020-09-02 08:10:35 -04:00
|
|
|
expect { merge_mr }.to change { Event.count }
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::MERGE_REQUEST_ACTION }
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#reopen_mr' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.reopen_mr(merge_request, merge_request.author)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.reopen_mr(merge_request, merge_request.author) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
2020-07-03 05:08:53 -04:00
|
|
|
|
|
|
|
describe '#approve_mr' do
|
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
|
|
|
|
it { expect(service.approve_mr(merge_request, user)).to be_truthy }
|
|
|
|
|
|
|
|
it 'creates new event' do
|
|
|
|
service.approve_mr(merge_request, user)
|
|
|
|
|
|
|
|
change { Event.approved_action.where(target: merge_request).count }.by(1)
|
|
|
|
end
|
|
|
|
end
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'Milestone' do
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#open_milestone' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:milestone) { create(:milestone) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.open_milestone(milestone, user)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.open_milestone(milestone, user) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#close_mr' do
|
2014-03-25 08:48:02 -04:00
|
|
|
let(:milestone) { create(:milestone) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(service.close_milestone(milestone, user)).to be_truthy }
|
2014-03-25 08:48:02 -04:00
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2014-03-25 08:48:02 -04:00
|
|
|
expect { service.close_milestone(milestone, user) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
2015-08-31 00:51:34 -04:00
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#destroy_mr' do
|
2015-08-31 00:51:34 -04:00
|
|
|
let(:milestone) { create(:milestone) }
|
|
|
|
|
|
|
|
it { expect(service.destroy_milestone(milestone, user)).to be_truthy }
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "creates new event" do
|
2015-08-31 00:51:34 -04:00
|
|
|
expect { service.destroy_milestone(milestone, user) }.to change { Event.count }
|
|
|
|
end
|
|
|
|
end
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|
2016-10-06 11:19:27 -04:00
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
shared_examples_for 'service for creating a push event' do |service_class|
|
2016-11-25 11:10:25 -05:00
|
|
|
it 'creates a new event' do
|
2019-10-17 08:07:33 -04:00
|
|
|
expect { subject }.to change { Event.count }
|
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
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates the push event payload' do
|
2019-10-17 08:07:33 -04:00
|
|
|
expect(service_class).to receive(:new)
|
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
|
|
|
.with(an_instance_of(PushEvent), push_data)
|
|
|
|
.and_call_original
|
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
subject
|
2016-11-25 11:10:25 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'updates user last activity' do
|
2019-10-17 08:07:33 -04:00
|
|
|
expect { subject }.to change { user.last_activity_on }.to(Date.today)
|
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
|
|
|
end
|
|
|
|
|
2017-09-01 06:50:14 -04:00
|
|
|
it 'caches the last push event for the user' do
|
2019-12-16 07:07:43 -05:00
|
|
|
expect_next_instance_of(Users::LastPushEventService) do |instance|
|
|
|
|
expect(instance).to receive(:cache_last_push_event).with(an_instance_of(PushEvent))
|
|
|
|
end
|
2017-09-01 06:50:14 -04:00
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
subject
|
2017-09-01 06:50:14 -04:00
|
|
|
end
|
|
|
|
|
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
|
|
|
it 'does not create any event data when an error is raised' do
|
|
|
|
payload_service = double(:service)
|
|
|
|
|
|
|
|
allow(payload_service).to receive(:execute)
|
|
|
|
.and_raise(RuntimeError)
|
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
allow(service_class).to receive(:new)
|
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
|
|
|
.and_return(payload_service)
|
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
expect { subject }.to raise_error(RuntimeError)
|
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
|
|
|
expect(Event.count).to eq(0)
|
|
|
|
expect(PushEventPayload.count).to eq(0)
|
2016-11-25 11:10:25 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-07-15 11:09:21 -04:00
|
|
|
describe '#wiki_event', :clean_gitlab_redis_shared_state do
|
2020-03-24 08:09:42 -04:00
|
|
|
let_it_be(:user) { create(:user) }
|
|
|
|
let_it_be(:wiki_page) { create(:wiki_page) }
|
|
|
|
let_it_be(:meta) { create(:wiki_page_meta, :for_wiki_page, wiki_page: wiki_page) }
|
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
let(:fingerprint) { generate(:sha) }
|
2020-03-24 08:09:42 -04:00
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
def create_event
|
|
|
|
service.wiki_event(meta, user, action, fingerprint)
|
|
|
|
end
|
2020-07-15 11:09:21 -04:00
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
where(:action) { Event::WIKI_ACTIONS.map { |action| [action] } }
|
2020-07-15 11:09:21 -04:00
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
with_them do
|
2020-09-02 08:10:35 -04:00
|
|
|
subject { create_event }
|
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
it 'creates the event' do
|
|
|
|
expect(create_event).to have_attributes(
|
|
|
|
wiki_page?: true,
|
|
|
|
valid?: true,
|
|
|
|
persisted?: true,
|
|
|
|
action: action.to_s,
|
|
|
|
wiki_page: wiki_page,
|
|
|
|
author: user,
|
|
|
|
fingerprint: fingerprint
|
|
|
|
)
|
|
|
|
end
|
2020-05-11 23:09:31 -04:00
|
|
|
|
2020-07-20 08:09:34 -04:00
|
|
|
it 'is idempotent', :aggregate_failures do
|
|
|
|
event = nil
|
|
|
|
expect { event = create_event }.to change(Event, :count).by(1)
|
|
|
|
duplicate = nil
|
|
|
|
expect { duplicate = create_event }.not_to change(Event, :count)
|
|
|
|
|
|
|
|
expect(duplicate).to eq(event)
|
|
|
|
end
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::WIKI_ACTION }
|
2020-03-24 08:09:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-05-28 11:08:02 -04:00
|
|
|
(Event.actions.keys - Event::WIKI_ACTIONS).each do |bad_action|
|
2020-03-24 08:09:42 -04:00
|
|
|
context "The action is #{bad_action}" do
|
2020-07-20 08:09:34 -04:00
|
|
|
let(:action) { bad_action }
|
|
|
|
|
2020-03-24 08:09:42 -04:00
|
|
|
it 'raises an error' do
|
2020-07-20 08:09:34 -04:00
|
|
|
expect { create_event }.to raise_error(described_class::IllegalActionError)
|
2020-03-24 08:09:42 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-10-17 08:07:33 -04:00
|
|
|
describe '#push', :clean_gitlab_redis_shared_state do
|
|
|
|
let(:push_data) do
|
|
|
|
{
|
|
|
|
commits: [
|
|
|
|
{
|
|
|
|
id: '1cf19a015df3523caf0a1f9d40c98a267d6a2fc2',
|
|
|
|
message: 'This is a commit'
|
|
|
|
}
|
|
|
|
],
|
|
|
|
before: '0000000000000000000000000000000000000000',
|
|
|
|
after: '1cf19a015df3523caf0a1f9d40c98a267d6a2fc2',
|
|
|
|
total_commits_count: 1,
|
|
|
|
ref: 'refs/heads/my-branch'
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
subject { service.push(project, user, push_data) }
|
|
|
|
|
|
|
|
it_behaves_like 'service for creating a push event', PushEventPayloadService
|
2020-07-15 11:09:21 -04:00
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::PUSH_ACTION }
|
2020-07-15 11:09:21 -04:00
|
|
|
end
|
2019-10-17 08:07:33 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe '#bulk_push', :clean_gitlab_redis_shared_state do
|
|
|
|
let(:push_data) do
|
|
|
|
{
|
|
|
|
action: :created,
|
|
|
|
ref_count: 4,
|
|
|
|
ref_type: :branch
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
subject { service.bulk_push(project, user, push_data) }
|
|
|
|
|
|
|
|
it_behaves_like 'service for creating a push event', BulkPushEventPayloadService
|
2020-07-15 11:09:21 -04:00
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::PUSH_ACTION }
|
2020-07-15 11:09:21 -04:00
|
|
|
end
|
2019-10-17 08:07:33 -04:00
|
|
|
end
|
|
|
|
|
2016-10-06 11:19:27 -04:00
|
|
|
describe 'Project' do
|
|
|
|
describe '#join_project' do
|
|
|
|
subject { service.join_project(project, user) }
|
|
|
|
|
|
|
|
it { is_expected.to be_truthy }
|
|
|
|
it { expect { subject }.to change { Event.count }.from(0).to(1) }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expired_leave_project' do
|
|
|
|
subject { service.expired_leave_project(project, user) }
|
|
|
|
|
|
|
|
it { is_expected.to be_truthy }
|
|
|
|
it { expect { subject }.to change { Event.count }.from(0).to(1) }
|
|
|
|
end
|
|
|
|
end
|
2020-06-04 17:08:11 -04:00
|
|
|
|
2020-07-15 11:09:21 -04:00
|
|
|
describe 'design events', :clean_gitlab_redis_shared_state do
|
2020-06-04 17:08:11 -04:00
|
|
|
let_it_be(:design) { create(:design, project: project) }
|
|
|
|
let_it_be(:author) { user }
|
|
|
|
|
|
|
|
describe '#save_designs' do
|
|
|
|
let_it_be(:updated) { create_list(:design, 5) }
|
|
|
|
let_it_be(:created) { create_list(:design, 3) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
subject(:result) { service.save_designs(author, create: created, update: updated) }
|
2020-06-04 17:08:11 -04:00
|
|
|
|
|
|
|
specify { expect { result }.to change { Event.count }.by(8) }
|
|
|
|
|
|
|
|
specify { expect { result }.not_to exceed_query_limit(1) }
|
|
|
|
|
|
|
|
it 'creates 3 created design events' do
|
|
|
|
ids = result.pluck('id')
|
|
|
|
events = Event.created_action.where(id: ids)
|
|
|
|
|
|
|
|
expect(events.map(&:design)).to match_array(created)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates 5 created design events' do
|
|
|
|
ids = result.pluck('id')
|
|
|
|
events = Event.updated_action.where(id: ids)
|
|
|
|
|
|
|
|
expect(events.map(&:design)).to match_array(updated)
|
|
|
|
end
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION }
|
2020-07-15 11:09:21 -04:00
|
|
|
end
|
2020-06-04 17:08:11 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe '#destroy_designs' do
|
|
|
|
let_it_be(:designs) { create_list(:design, 5) }
|
|
|
|
let_it_be(:author) { create(:user) }
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
subject(:result) { service.destroy_designs(designs, author) }
|
2020-06-04 17:08:11 -04:00
|
|
|
|
|
|
|
specify { expect { result }.to change { Event.count }.by(5) }
|
|
|
|
|
|
|
|
specify { expect { result }.not_to exceed_query_limit(1) }
|
|
|
|
|
|
|
|
it 'creates 5 destroyed design events' do
|
|
|
|
ids = result.pluck('id')
|
|
|
|
events = Event.destroyed_action.where(id: ids)
|
|
|
|
|
|
|
|
expect(events.map(&:design)).to match_array(designs)
|
|
|
|
end
|
|
|
|
|
2020-09-02 08:10:35 -04:00
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#leave_note' do
|
|
|
|
subject(:leave_note) { service.leave_note(note, author) }
|
|
|
|
|
|
|
|
let(:note) { create(:note) }
|
|
|
|
let(:author) { create(:user) }
|
|
|
|
let(:event_action) { Gitlab::UsageDataCounters::TrackUniqueEvents::MERGE_REQUEST_ACTION }
|
|
|
|
|
|
|
|
it { expect(leave_note).to be_truthy }
|
|
|
|
|
|
|
|
it "creates new event" do
|
|
|
|
expect { leave_note }.to change { Event.count }.by(1)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when it is a diff note' do
|
|
|
|
it_behaves_like "it records the event in the event counter" do
|
|
|
|
let(:note) { create(:diff_note_on_merge_request) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when it is not a diff note' do
|
|
|
|
it 'does not change the unique action counter' do
|
2020-08-20 11:10:18 -04:00
|
|
|
counter_class = Gitlab::UsageDataCounters::TrackUniqueEvents
|
2020-09-02 08:10:35 -04:00
|
|
|
tracking_params = { event_action: event_action, date_from: Date.yesterday, date_to: Date.today }
|
2020-07-15 11:09:21 -04:00
|
|
|
|
2020-11-24 04:09:32 -05:00
|
|
|
expect { subject }.not_to change { counter_class.count_unique_events(**tracking_params) }
|
2020-07-15 11:09:21 -04:00
|
|
|
end
|
2020-06-04 17:08:11 -04:00
|
|
|
end
|
|
|
|
end
|
2014-03-25 08:48:02 -04:00
|
|
|
end
|