Remove archiving rows from RepositoryArchiveService

This commit is contained in:
Urban Rotnik 2020-06-24 10:35:24 +02:00
parent 91af7135c1
commit 8dc48e9f95
4 changed files with 4 additions and 90 deletions

View file

@ -9,12 +9,6 @@ module Repositories
@repositories.each do |repository|
repository.archive!(@user)
# rubocop:disable Rails/SkipsModelValidations
repository.repository_rows.active.update_all(archived_on: repository.archived_on,
archived_by_id: repository.archived_by_id,
archived: true)
# rubocop:enable Rails/SkipsModelValidations
log_activity(:archive_inventory, repository)
end
rescue ActiveRecord::RecordNotSaved

View file

@ -9,12 +9,6 @@ module Repositories
@repositories.each do |repository|
repository.restore!(@user)
# rubocop:disable Rails/SkipsModelValidations
repository.repository_rows.archived.update_all(restored_on: repository.restored_on,
restored_by_id: repository.restored_by_id,
archived: false)
# rubocop:enable Rails/SkipsModelValidations
log_activity(:restore_inventory, repository)
end
rescue ActiveRecord::RecordNotSaved

View file

@ -15,7 +15,7 @@ describe Repositories::ArchiveRepositoryService do
Repositories::ArchiveRepositoryService.call(repositories: repositories, user: user, team: team)
end
context 'when have inventory with rows' do
context 'when have valid inventory' do
it 'updates repository archived_by, archived_on, archived' do
expect { service_call }
.to(change { repository.reload.archived_on }
@ -23,32 +23,12 @@ describe Repositories::ArchiveRepositoryService do
.and(change { repository.archived }))
end
it 'update rows archived_by, archived_on, archived' do
expect { service_call }
.to(change { row_1.reload.archived_on }
.and(change { row_1.archived_by })
.and(change { row_1.archived }))
end
it 'creates 1 activity' do
expect { service_call }.to change { Activity.count }.by(1)
end
context 'when have archived row' do
let!(:row_1) do
create :repository_row, :archived, repository: repository
end
it 'does not update row\'s archived_on' do
row_1.archived_on = Time.zone.now - 10.days
row_1.save
expect { service_call }.not_to(change { row_1.reload.archived_on })
end
end
end
context 'when include invalid repository' do
context 'when have invalid repository' do
let(:second_repository) do
r = create :repository, team: team
r.name = ''
@ -69,21 +49,4 @@ describe Repositories::ArchiveRepositoryService do
expect(service_call.errors).to have_key(:archiving_error)
end
end
context 'when have invalid item' do
let!(:row_1) do
r = create :repository_row, repository: repository
r.name = ''
r.save(validate: false)
r
end
it 'archive item anyway' do
expect { service_call }.to(change { row_1.reload.archived_on })
end
it 'creates one activity' do
expect { service_call }.to change { Activity.count }.by(1)
end
end
end

View file

@ -15,7 +15,7 @@ describe Repositories::RestoreRepositoryService do
Repositories::RestoreRepositoryService.call(repositories: repositories, user: user, team: team)
end
context 'when have inventory with rows' do
context 'when have valid inventory' do
it 'updates repository restored_by, restored_on, archived' do
expect { service_call }
.to(change { repository.reload.restored_on }
@ -23,32 +23,12 @@ describe Repositories::RestoreRepositoryService do
.and(change { repository.archived }))
end
it 'update rows restored_by, restored_on, archived' do
expect { service_call }
.to(change { row_1.reload.restored_on }
.and(change { row_1.restored_by })
.and(change { row_1.archived }))
end
it 'creates 1 activity' do
expect { service_call }.to change { Activity.count }.by(1)
end
context 'when have restored row' do
let!(:row_1) do
create :repository_row, :restored, repository: repository
end
it 'does not update row\'s restored_on' do
row_1.restored_on = Time.zone.now - 10.days
row_1.save
expect { service_call }.not_to(change { row_1.reload.restored_on })
end
end
end
context 'when includes invalid repository' do
context 'when have invalid repository' do
let(:second_repository) do
r = create :repository, :archived, team: team
r.name = ''
@ -69,21 +49,4 @@ describe Repositories::RestoreRepositoryService do
expect(service_call.errors).to have_key(:restoring_error)
end
end
context 'when have invalid item' do
let!(:row_1) do
r = create :repository_row, :archived, repository: repository
r.name = ''
r.save(validate: false)
r
end
it 'restore item anyway' do
expect { service_call }.to(change { row_1.reload.restored_on })
end
it 'creates one activity' do
expect { service_call }.to change { Activity.count }.by(1)
end
end
end