Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/models/ownership_transfer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ class OwnershipTransfer < ApplicationRecord

belongs_to :school

attr_accessor :skip_request_email

enum :status, {
pending: 'pending', completed: 'completed', rejected: 'rejected', cancelled: 'cancelled'
}, default: :pending, validate: true
Expand All @@ -20,7 +18,7 @@ class OwnershipTransfer < ApplicationRecord
on: :create
validate :nominee_has_the_school_teacher_role_for_the_school

after_create_commit :send_ownership_transfer_request_email, unless: :skip_request_email
after_create_commit :send_ownership_transfer_request_email, unless: :admin_initiated?
after_update_commit :send_ownership_transfer_cancelled_email,
if: -> { saved_change_to_status?(from: 'pending', to: 'cancelled') }
after_update_commit :send_ownership_transfer_completed_email,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddAdminInitiatedToOwnershipTransfers < ActiveRecord::Migration[8.1]
def change
add_column :ownership_transfers, :admin_initiated, :boolean, default: false, null: false
end
end
3 changes: 2 additions & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/concepts/ownership_transfer/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
class OwnershipTransfer
class Create
class << self
def call(school:, nominated_user_id:, requested_by_user_id:, skip_request_email: false)
def call(school:, nominated_user_id:, requested_by_user_id:, admin_initiated: false)
response = OperationResponse.new
ownership_transfer = build_ownership_transfer(school:, nominated_user_id:, requested_by_user_id:)
ownership_transfer.skip_request_email = skip_request_email
ownership_transfer.admin_initiated = admin_initiated

if ownership_transfer.save
response[:ownership_transfer] = ownership_transfer
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/school_management.rake
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace :school_management do
school:,
nominated_user_id: new_owner[:id],
requested_by_user_id: old_owner[:id],
skip_request_email: true
admin_initiated: true
)

raise ActiveRecord::Rollback unless result.success?
Expand Down
3 changes: 2 additions & 1 deletion spec/lib/tasks/school_management_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
status: 'completed',
nominated_user_id: new_user_id,
requested_by_user_id: old_user_id,
email_address: 'new_owner@example.com'
email_address: 'new_owner@example.com',
admin_initiated: true
)
end

Expand Down
4 changes: 2 additions & 2 deletions spec/models/ownership_transfer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@
)
end

it 'is not enqueued when skip_request_email is set' do
ownership_transfer.skip_request_email = true
it 'is not enqueued when admin_initiated is set' do
ownership_transfer.admin_initiated = true

expect do
ownership_transfer.save!
Expand Down
Loading