Merge pull request #5233 from zanetagebka/5231-cancel-requests-deactivated-partners

feat: Allow to cancel request when partner is deactivated

Author: cielf

app/services/request_destroy_service.rb

@@ -14,7 +14,9 @@ def call
     request.status = :discarded
     request.save!
 
-    RequestMailer.request_cancel_partner_notification(request_id: request.id).deliver_later
+    unless request.partner.deactivated?
+      RequestMailer.request_cancel_partner_notification(request_id: request.id).deliver_later
+    end
 
     self
   end
@@ -28,8 +30,6 @@ def valid?
       errors.add(:base, 'request_id is invalid')
     elsif request.discarded_at.present?
       errors.add(:base, 'request already discarded')
-    elsif request.partner.deactivated?
-      errors.add(:base, 'partner is deactivated')
     end
 
     errors.none?

app/views/requests/cancelation/new.html.erb

@@ -30,11 +30,12 @@
             <div class="box w-1/2">
               <%= simple_form_for :cancelation, url: request_cancelation_path(organization: @organization, request_id: @request.id), method: :post do |f| %>
                 <div class='flex flex-col'>
-                  <%= f.input :reason, label: "Cancelation reason" %>
-                  <span class='font-light text-md text-yellow-600'>This will be included in the email notification we send to the partner</span>
+                  <%= f.input :reason, label: "Cancellation reason" %>
+                  <div class='font-light text-md text-yellow-600'>This will be included in the email notification we send to the partner</div>
+                  <div class="font-light text-sm text-red">Note: cancellation emails will not be sent to deactivated partners</div>
                 </div>
 
-                <div class='flex flex-row justify-end'>
+                <div class='flex flex-row justify-end pt-2'>
                   <%= f.submit 'Yes. Cancel Request', class: 'btn btn-primary' %>
                 </div>
               <% end %>

spec/services/request_destroy_service_spec.rb

@@ -50,8 +50,13 @@
       let!(:partner) { create(:partner, status: 'deactivated') }
       let(:request) { create(:request, partner: partner) }
 
-      it 'should have errors' do
-        expect(subject.errors.full_messages).to eq(['partner is deactivated'])
+      it 'should update the status column on the request' do
+        expect { subject }.to change { request.reload.status_discarded? }.from(false).to(true)
+      end
+
+      it 'should not send a email notification to the partner' do
+        expect(RequestMailer).not_to receive(:request_cancel_partner_notification)
+        subject
       end
     end
   end

spec/system/request_system_spec.rb

@@ -255,7 +255,7 @@
 
       it 'should set the request as canceled/discarded and contain the reason' do
         click_on 'Cancel'
-        fill_in 'Cancelation reason *', with: reason
+        fill_in 'Cancellation reason *', with: reason
         click_on 'Yes. Cancel Request'
 
         expect(page).to have_content("Request #{request.id} has been removed")