Merge pull request #1163 from sparc-request/jm-email-requester-bug

JM- (SPARCRequest) Email "Requester" Column Feature [#151517872]
sparc-request · Nov 2, 2017 · 309e3b0 · 309e3b0
2 parents 2b044e4 + d7a31f0
commit 309e3b0
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 90 deletions.
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
@@ -51,12 +51,10 @@ def notify_user(project_role, service_request, ssr, approval, user_current, audi
     @role = project_role.role
     @full_name = @identity.full_name
     @audit_report = audit_report
-
-    @service_requester_id = service_requester_id(@service_request, deleted_ssrs)
     @portal_link = Setting.find_by_key("dashboard_link").value + "/protocols/#{@protocol.id}"
 
     if admin_delete_ssr
-      @ssrs_to_be_displayed = [deleted_ssrs]
+      @ssrs_to_be_displayed = [@deleted_ssrs]
     else
       @ssrs_to_be_displayed = individual_ssr ? [ssr] : @service_request.sub_service_requests
     end
@@ -91,8 +89,6 @@ def notify_admin(submission_email_address, user_current, ssr, audit_report=nil,
 
     @role = 'none'
     @full_name = submission_email_address
-
-    @service_requester_id = service_requester_id(@service_request, ssr)
     @ssrs_to_be_displayed = [ssr]
 
     @portal_link = Setting.find_by_key("dashboard_link").value + "/protocols/#{@protocol.id}"
@@ -119,8 +115,6 @@ def notify_service_provider(service_provider, service_request, user_current, ssr
 
     @role = 'none'
     @full_name = service_provider.identity.full_name
-
-    @service_requester_id = service_requester_id(@service_request, ssr)
     @audit_report = audit_report
 
     @portal_link = Setting.find_by_key("dashboard_link").value + "/protocols/#{@protocol.id}"
@@ -318,8 +312,4 @@ def email_title(status, protocol, ssr)
       t('mailer.email_title.general', email_status: email_status, type: "Protocol", id: protocol.id)
     end
   end
-
-  def service_requester_id(service_request, deleted_ssr)
-    service_request.sub_service_requests.first.present? ? service_request.sub_service_requests.first.service_requester_id : AuditRecovery.where(auditable_id: deleted_ssr.id, auditable_type: 'SubServiceRequest', action: 'destroy').first.audited_changes['service_requester_id']
-  end
 end
diff --git a/app/views/notifier/_deleted_srid_information.html.haml b/app/views/notifier/_deleted_srid_information.html.haml
@@ -20,17 +20,20 @@
 %table.table{cellpadding: 3}
   %thead
     %tr.skinny-black-border
-      %td{:colspan => 2}
+      %td{:colspan => 3}
         %strong= t(:notifier)[:srid_info]
   %tr
     %th.skinny-black-border= t(:notifier)[:sr_id_acronym]
     %th.skinny-black-border= t(:notifier)[:organization]
+    %th.skinny-black-border= t(:notifier)[:requester]
   %tbody
     - @ssrs_to_be_displayed.each do |ssr|
       %tr.skinny-black-border
         %td.skinny-black-border.center
           %strike= ssr.display_id
         %td.skinny-black-border.center
           %strike= ssr.org_tree_display
+        %td.skinny-black-border.center
+          %strike= ssr.service_requester.try(&:full_name) || 'N/A'
 %br
 %br
diff --git a/app/views/notifier/_srid_information.html.haml b/app/views/notifier/_srid_information.html.haml
@@ -27,6 +27,7 @@
     %th.skinny-black-border= t(:notifier)[:sr_id_acronym]
     %th.skinny-black-border= t(:notifier)[:organization]
     %th.skinny-black-border= t(:notifier)[:status]
+    %th.skinny-black-border= t(:notifier)[:requester]
   %tbody
     - @ssrs_to_be_displayed.each do |ssr|
       - link = Setting.find_by_key("dashboard_link").value + '/sub_service_requests/' + ssr.id.to_s
@@ -38,5 +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.service_requester.try(&:full_name) || 'N/A'
 %br
 %br
diff --git a/app/views/notifier/_user_information.html.haml b/app/views/notifier/_user_information.html.haml
@@ -33,11 +33,8 @@
     - @protocol.project_roles.each do |pr|
       %tr.skinny-black-border
         %td.skinny-black-border.center= pr.identity.full_name
-        %td.skinny-black-border.center= pr.identity.email
-        - if pr.identity.id == @service_requester_id
-          %td.skinny-black-border.center= pr.role.titleize + " " + t(:notifier)[:requester]
-        - else
-          %td.skinny-black-border.center= pr.role.titleize
+        %td.skinny-black-border.center= pr.identity.email 
+        %td.skinny-black-border.center= pr.role.titleize
         - if @protocol.selected_for_epic
           %td.skinny-black-border.center= pr.epic_access == true ? "Yes" : "No"
 %br

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1528,7 +1528,7 @@ en:
     proxy: "Proxy Rights:"
     request_amendment: "Request Amendment"
     request_amendment_intro:  "Services have been added or deleted in SPARCRequest and is awaiting your review in"
-    requester:  "(Requester)"
+    requester:  "Requester"
     role: "Role"
     s_name: "Sponsor Name"
     service: "Service"

diff --git a/spec/controllers/dashboard/sub_service_requests/delete_destroy_spec.rb b/spec/controllers/dashboard/sub_service_requests/delete_destroy_spec.rb
@@ -23,13 +23,14 @@
 RSpec.describe Dashboard::SubServiceRequestsController do
   describe 'DELETE #destroy' do
     before :each do
+      service_requester     = create(:identity)
       @logged_in_user = create(:identity)
       log_in_dashboard_identity(obj: @logged_in_user)
 
       @protocol             = create(:protocol_federally_funded, type: 'Study', primary_pi: @logged_in_user)
       @service_request      = create(:service_request_without_validations, protocol: @protocol)
       @organization         = create(:organization)
-      @sub_service_request  = create(:sub_service_request_without_validations, service_request: @service_request, organization: @organization, protocol_id: @protocol.id)
+      @sub_service_request  = create(:sub_service_request_without_validations, service_request: @service_request, organization: @organization, protocol_id: @protocol.id, service_requester: service_requester)
     end
 
     #####AUTHORIZATION#####

diff --git a/spec/lib/notifier_logic/ssr_deletion_emails_spec.rb b/spec/lib/notifier_logic/ssr_deletion_emails_spec.rb
@@ -32,22 +32,23 @@
   context '#ssr_deletion_emails(ssr, ssr_destroyed: true, request_amendment: false) for an entire SR' do
     context 'deleted an entire SSR' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
-        @org2         = create(:organization_with_process_ssrs)
+        @org2        = create(:organization_with_process_ssrs)
         ### ADMIN EMAIL ###
         @org2.submission_emails.create(email: 'hedwig@owlpost.com')
         @admin_email = 'hedwig@owlpost.com'
-        service     = create(:service, organization: @org, one_time_fee: true)
-        protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
+        service      = create(:service, organization: @org, one_time_fee: true)
+        protocol     = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        @ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
+        @ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        ssr2         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
         ### LINE ITEM SETUP ###
-        li          = create(:line_item, service_request: @sr, sub_service_request: @ssr, service: service)
-        li_1        = create(:line_item, service_request: @sr, sub_service_request: ssr2, service: service)
+        li           = create(:line_item, service_request: @sr, sub_service_request: @ssr, service: service)
+        li_1         = create(:line_item, service_request: @sr, sub_service_request: ssr2, service: service)
         @service_provider = create(:service_provider, identity: logged_in_user, organization: @org2)
         ### DELETE LINE ITEM WHICH IN TURNS DELETES SSR ###
         # mimics the service_requests_controller remove_service method

diff --git a/spec/lib/notifier_logic/update_ssrs_and_send_emails_spec.rb b/spec/lib/notifier_logic/update_ssrs_and_send_emails_spec.rb
@@ -41,6 +41,7 @@
   context '#update_ssrs_and_send_emails for an entire SR' do
     context 'create a new SR with all new services' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -52,8 +53,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: nil)
         ### SSR SETUP ###
-        @ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, submitted_at: nil)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, submitted_at: nil)
+        @ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, submitted_at: nil, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, submitted_at: nil, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: @ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: @ssr2, service: service)
@@ -119,6 +120,7 @@
 
     context 'deleted an entire SSR and resubmit SR' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -130,8 +132,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: ssr2, service: service)
@@ -206,6 +208,7 @@
 
     context 'added a service to a new SSR, then delete that same service which destroys that SSR and resubmit SR' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -216,8 +219,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: nil, submitted_at: nil)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: nil, submitted_at: nil, service_requester: service_requester)
         @ssr2.update_attribute(:status, 'draft')
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
@@ -284,6 +287,7 @@
 
     context 'added a service to a new SSR and resubmit SR' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -295,8 +299,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'draft', submitted_at: nil)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'draft', submitted_at: nil, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: @ssr2, service: service)
@@ -367,6 +371,7 @@
 
     context 'previously submitted ssr that has added services' do
       before :each do
+        service_requester     = create(:identity)
          ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -378,8 +383,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: @ssr2, service: service)
@@ -452,6 +457,7 @@
 
     context 'previously submitted ssr that has deleted services' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -464,8 +470,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: @ssr2, service: service)
@@ -544,6 +550,7 @@
 
     context 'previously submitted SSR (existing SSR) that has added and deleted services' do
       before :each do
+        service_requester     = create(:identity)
         ### SR SETUP ###
         ### PREVIOUSLY SUBMITTED SSR ###
         @org         = create(:organization_with_process_ssrs)
@@ -554,8 +561,8 @@
         protocol    = create(:protocol_federally_funded, primary_pi: logged_in_user, type: 'Study')
         @sr          = create(:service_request_without_validations, protocol: protocol, submitted_at: Time.now.yesterday.utc)
         ### SSR SETUP ###
-        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc)
-        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc)
+        ssr         = create(:sub_service_request_without_validations, service_request: @sr, organization: @org2, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
+        @ssr2        = create(:sub_service_request_without_validations, service_request: @sr, organization: @org, status: 'submitted', submitted_at: Time.now.yesterday.utc, service_requester: service_requester)
         ### LINE ITEM SETUP ###
         li          = create(:line_item, service_request: @sr, sub_service_request: ssr, service: service)
         li_1        = create(:line_item, service_request: @sr, sub_service_request: @ssr2, service: service)