requested changes

app/models/sub_service_request.rb

@@ -62,10 +62,6 @@ def consult_arranged_date=(date)
     write_attribute(:consult_arranged_date, date.present? ? Time.strptime(date, "%m/%d/%Y") : nil)
   end
 
-  def display_service_requester_name
-    self.service_requester.present? ? Identity.find(self.service_requester_id).first_name + ' ' + Identity.find(self.service_requester_id).last_name : 'N/A'
-  end
-
   def requester_contacted_date=(date)
     write_attribute(:requester_contacted_date, date.present? ? Time.strptime(date, "%m/%d/%Y") : nil)
   end

app/views/notifier/_deleted_srid_information.html.haml

@@ -34,6 +34,6 @@
         %td.skinny-black-border.center
           %strike= ssr.org_tree_display
         %td.skinny-black-border.center
-          %strike= ssr.display_service_requester_name
+          %strike= ssr.service_requester.try(&:full_name) || 'N/A'
 %br
 %br

app/views/notifier/_srid_information.html.haml

@@ -39,6 +39,6 @@
           %td.skinny-black-border.center= ssr.display_id
         %td.skinny-black-border.center= ssr.org_tree_display
         %td.skinny-black-border.center= PermissibleValue.get_value('status', ssr.reload.status)
-        %td.skinny-black-border.center= ssr.display_service_requester_name
+        %td.skinny-black-border.center= ssr.service_requester.try(&:full_name) || 'N/A'
 %br
 %br

spec/support/emails/tables.rb

@@ -85,7 +85,7 @@ def assert_email_srid_information_for_service_provider
       status = PermissibleValue.get_value('status', ssr_to_be_displayed.status)
       expect(@mail.body.parts.first.body).to have_xpath "//td//a[@href='/dashboard/sub_service_requests/#{ssr_to_be_displayed.id}']['#{ssr_to_be_displayed.display_id}']/@href"
       expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{ssr_to_be_displayed.org_tree_display}']/following-sibling::td[text()='#{status}']"
-      expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{ssr_to_be_displayed.service_requester_id.present? ? Identity.find(ssr_to_be_displayed.service_requester_id).first_name + ' ' + Identity.find(ssr_to_be_displayed.service_requester_id).last_name : 'N/A'}']"
+      expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{ssr_to_be_displayed.service_requester.try(&:full_name) || 'N/A'}']"
     end
   end
 
@@ -96,7 +96,7 @@ def assert_email_deleted_srid_information_for_service_provider
     ssrs_to_be_displayed.each do |ssr_to_be_displayed|
       expect(@mail.body).to have_xpath "//td//strike['#{ssr_to_be_displayed.display_id}']"
       expect(@mail.body).to have_xpath "//td//strike[text()='#{ssr_to_be_displayed.org_tree_display}']"
-      expect(@mail.body).to have_xpath "//td//strike[text()='#{ssr_to_be_displayed.service_requester_id.present? ? Identity.find(ssr_to_be_displayed.service_requester_id).first_name + ' ' + Identity.find(ssr_to_be_displayed.service_requester_id).last_name : 'N/A'}']"
+      expect(@mail.body).to have_xpath "//td//strike[text()='#{ssr_to_be_displayed.service_requester.try(&:full_name) || 'N/A'}']"
     end
   end
 
@@ -106,10 +106,10 @@ def assert_email_srid_information_for_admin
     expect(@mail.body.parts.first.body).to have_xpath "//th[text()='SRID']/following-sibling::th[text()='Organization']/following-sibling::th[text()='Status']/following-sibling::th[text()='Requester']"
     # Only display SSRs that are associated with that submission email
     displayed_sub_service_request = @service_request.protocol.sub_service_requests.first
-    status = PermissibleValue.get_value('status', displayed_service_request.status)
+    status = PermissibleValue.get_value('status', displayed_sub_service_request.status)
     expect(@mail.body.parts.first.body).to have_xpath "//td//a[@href='/dashboard/sub_service_requests/#{displayed_sub_service_request.id}']['#{displayed_sub_service_request.display_id}']/@href"
     expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{displayed_sub_service_request.org_tree_display}']/following-sibling::td[text()='#{status}']"    
-    expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{displayed_sub_service_request.service_requester_id.present? ? Identity.find(displayed_sub_service_request.service_requester_id).first_name + ' ' + Identity.find(displayed_sub_service_request.service_requester_id).last_name : 'N/A'}']"   
+    expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{displayed_sub_service_request.service_requester.try(&:full_name) || 'N/A'}']"   
   end
 
   def assert_email_srid_information_for_user
@@ -119,7 +119,7 @@ def assert_email_srid_information_for_user
 
     @service_request.protocol.sub_service_requests.each do |ssr|
       status = PermissibleValue.get_value('status', ssr.status)
-      expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{ssr.display_id}']/following-sibling::td[text()='#{ssr.org_tree_display}']/following-sibling::td[text()='#{status}']/following-sibling::td[text()= '#{ssr.service_requester_id.present? ? Identity.find(ssr.service_requester_id).first_name + ' ' + Identity.find(ssr.service_requester_id).last_name : 'N/A'}']"
+      expect(@mail.body.parts.first.body).to have_xpath "//td[text()='#{ssr.display_id}']/following-sibling::td[text()='#{ssr.org_tree_display}']/following-sibling::td[text()='#{status}']/following-sibling::td[text()= '#{ssr.service_requester.try(&:full_name) || 'N/A'}']"
     end
   end