Merge pull request #1767 from psu-libraries/1766-libanswer-ticket-change

1766 libanswer ticket change

Author: jlandiseigsti

app/models/actor.rb

@@ -95,6 +95,17 @@ def update_index(_options = {})
     Collection.reindex_all(relation: created_collections)
   end
 
+  # Whether an actor/depositor is still an active part of the PSU community
+  # Staff, students, etc. will have their affiliation listed in the PsuIdentity.affiliation array
+  # But those with only "MEMBER" are those that are not PSU affiliated.
+  # This could be incoming students, outgoing staff, people with those "Friends of Penn State" accounts
+  def active?
+    identity = PsuIdentity::SearchService::Client.new.userid(psu_id)
+    identity.affiliation != ['MEMBER']
+  rescue PsuIdentity::SearchService::NotFound
+    false
+  end
+
   # Fields that contain single values automatically remove blank values
   %i[
     surname

app/services/libanswers_api_service.rb

@@ -9,7 +9,9 @@ class LibanswersApiError < StandardError; end
 
   def admin_create_ticket(id, type = 'work_curation', base_url = '')
     depositor = get_depositor(id, type)
-    raise LibanswersApiError, I18n.t('resources.contact_depositor_button.error_message') unless depositor_active?(depositor)
+    if type != 'work_accessibility' && !depositor.active?
+      raise LibanswersApiError, I18n.t('resources.contact_depositor_button.error_message')
+    end
 
     admin_subject = get_admin_subject(id, type)
     ticket_details = get_ticket_details(id, type, admin_subject, base_url)
@@ -42,14 +44,6 @@ def get_depositor(id, type)
       deposit.depositor
     end
 
-    def depositor_active?(depositor)
-      access_id = depositor.psu_id
-      identity = PsuIdentity::SearchService::Client.new.userid(access_id)
-      identity.affiliation != ['MEMBER']
-    rescue PsuIdentity::SearchService::NotFound
-      false
-    end
-
     def get_admin_subject(id, type)
       case type
       when 'collection'
@@ -132,12 +126,4 @@ def oauth_token_path
     def host
       'https://psu.libanswers.com'
     end
-
-    def user_active?(work)
-      access_id = work.depositor.psu_id
-      identity = PsuIdentity::SearchService::Client.new.userid(access_id)
-      identity.affiliation != ['MEMBER']
-    rescue PsuIdentity::SearchService::NotFound
-      false
-    end
 end

app/views/dashboard/works/edit.html.erb

@@ -57,6 +57,9 @@
       <h1 class="h2 mb-2"><%= t('.heading', work_title: @work.latest_version.title) %></h1>
       <% if current_user.admin? %>
         <div class="row no-gutters">
+          <% unless @work.depositor.active? %>
+            <p><%= I18n.t('resources.contact_depositor_button.warning') %></p>
+          <% end %>
         <%= button_to I18n.t('resources.contact_depositor_button.text'),
                       admin_create_curation_ticket_url(id: @work.id, ticket_type: 'curation'),
                       class: 'btn btn-primary mr-2 mb-2',

config/locales/en.yml

@@ -745,6 +745,7 @@ en:
       text: 'Contact Depositor via LibAnswers >>'
       confirm_message: 'This will create a ticket in LibAnswers and direct you to it.  An email will not be sent to the depositor until the form is completed in LibAnswers.'
       error_message: 'Depositor access no longer active'
+      warning: 'This work no longer has an active depositor. The depositor will not respond to any request for curation.'
     contact_accessibility_team_button:
       text: 'Contact Accessibility Team via LibAnswers >>'
       confirm_message: 'This will create a ticket in LibAnswers and direct you to it.  An email will not be sent to the accessibility team until the form is completed in LibAnswers.'

spec/features/dashboard/work_settings_spec.rb

@@ -452,7 +452,13 @@
   end
 
   describe 'Contact depositor button' do
+    let(:active_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['FACULTY', 'MEMBER']) }
+    let(:inactive_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
+    let(:mock_identity_search) { instance_spy('PsuIdentity::SearchService::Client') }
+
     before do
+      allow(PsuIdentity::SearchService::Client).to receive(:new).and_return(mock_identity_search)
+      allow(mock_identity_search).to receive(:userid).and_return(active_member)
       visit edit_dashboard_work_path(work)
     end
 
@@ -490,12 +496,27 @@
       end
 
       describe 'clicking the accessibility team depositor button' do
-        context 'when there is no error' do
-          it 'directs to that ticket in libanswers', :vcr do
-            click_button I18n.t('resources.contact_accessibility_team_button.text')
-          rescue ActionController::RoutingError
-            expect(page.driver.browser.last_response['Location']).to eq 'https://psu.libanswers.com/admin/ticket?qid=14782516'
-          end
+        it 'directs to that ticket in libanswers', :vcr do
+          click_button I18n.t('resources.contact_accessibility_team_button.text')
+        rescue ActionController::RoutingError
+          expect(page.driver.browser.last_response['Location']).to eq 'https://psu.libanswers.com/admin/ticket?qid=14782516'
+        end
+      end
+
+      describe 'when the depositor is active' do
+        it 'does not display the inactive warning' do
+          expect(page).to have_no_content(I18n.t('resources.contact_depositor_button.warning'))
+        end
+      end
+
+      describe 'when the depositor is no longer active' do
+        before do
+          allow(mock_identity_search).to receive(:userid).and_return(inactive_member)
+          visit edit_dashboard_work_path(work)
+        end
+
+        it 'displays an inactive warning to the admin' do
+          expect(page).to have_content(I18n.t('resources.contact_depositor_button.warning'))
         end
       end
     end

spec/models/actor_spec.rb

@@ -126,6 +126,32 @@
     end
   end
 
+  describe '#active?' do
+    let(:actor) { create(:actor) }
+    let(:mock_identity_search) { instance_spy('PsuIdentity::SearchService::Client') }
+    let!(:member_only_actor) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
+    let!(:active_actor) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER', 'STUDENT']) }
+
+    before do
+      allow(PsuIdentity::SearchService::Client).to receive(:new).and_return(mock_identity_search)
+    end
+
+    it 'returns false if an error is thrown' do
+      allow(mock_identity_search).to receive(:userid).and_raise(PsuIdentity::SearchService::NotFound)
+      expect(actor.active?).to eq(false)
+    end
+
+    it 'returns false if identity affiliation is only MEMBER' do
+      allow(mock_identity_search).to receive(:userid).and_return(member_only_actor)
+      expect(actor.active?).to eq(false)
+    end
+
+    it 'returns true if identity affiliation is more than just member' do
+      allow(mock_identity_search).to receive(:userid).and_return(active_actor)
+      expect(actor.active?).to eq(true)
+    end
+  end
+
   describe 'singlevalued fields' do
     it_behaves_like 'a singlevalued field', :surname
     it_behaves_like 'a singlevalued field', :given_name

spec/services/libanswers_api_service_spec.rb

@@ -52,20 +52,6 @@
         allow(mock_faraday_connection).to receive(:post).and_return dummy_response
       end
 
-      context 'when the user is not an active member' do
-        let!(:inactive_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
-
-        before do
-          allow(mock_identity_search).to receive(:userid).and_return(inactive_member)
-        end
-
-        it 'raises an error' do
-          expect { described_class.new.admin_create_ticket(work.id) }.to raise_error(
-            LibanswersApiService::LibanswersApiError, I18n.t('resources.contact_depositor_button.error_message')
-          )
-        end
-      end
-
       context 'when the ticket is a Work Curation Ticket' do
         it 'uses id 5477 for quid and ScholarSphere Deposit Curation for question' do
           described_class.new.admin_create_ticket(work.id, 'work_curation')
@@ -75,6 +61,20 @@
             work.latest_version.title}&pname=#{work.display_name}&pemail=#{work.email}"
           )
         end
+
+        context 'when the user is not an active member' do
+          let!(:inactive_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
+
+          before do
+            allow(mock_identity_search).to receive(:userid).and_return(inactive_member)
+          end
+
+          it 'raises an error' do
+            expect { described_class.new.admin_create_ticket(work.id, 'work_curation') }.to raise_error(
+              LibanswersApiService::LibanswersApiError, I18n.t('resources.contact_depositor_button.error_message')
+            )
+          end
+        end
       end
 
       context 'when the ticket is a Collection Curation Ticket' do
@@ -86,6 +86,20 @@
             collection.metadata['title']}&pname=#{collection.depositor.display_name}&pemail=#{work.depositor.email}"
           )
         end
+
+        context 'when the user is not an active member' do
+          let!(:inactive_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
+
+          before do
+            allow(mock_identity_search).to receive(:userid).and_return(inactive_member)
+          end
+
+          it 'raises an error' do
+            expect { described_class.new.admin_create_ticket(collection.id, 'collection') }.to raise_error(
+              LibanswersApiService::LibanswersApiError, I18n.t('resources.contact_depositor_button.error_message')
+            )
+          end
+        end
       end
 
       context 'when the ticket is a Work Accessibility Ticket' do
@@ -100,6 +114,23 @@
           )
         end
 
+        context 'when the user is not an active member' do
+          let!(:inactive_member) { object_double(PsuIdentity::SearchService::Person.new, affiliation: ['MEMBER']) }
+
+          before do
+            allow(mock_identity_search).to receive(:userid).and_return(inactive_member)
+          end
+
+          it 'creates a ticket' do
+            described_class.new.admin_create_ticket(work.id, 'work_accessibility', base_url)
+            expect(mock_faraday_connection).to have_received(:post).with(
+              '/api/1.1/ticket/create',
+              "quid=#{accessibility_quid}&pquestion=ScholarSphere Deposit Accessibility Curation: #{
+                work.latest_version.title}&pname=#{work.display_name}&pemail=#{work.email}"
+            )
+          end
+        end
+
         context 'when accessibility report exists' do
           let!(:work_2) { create(:work, depositor: user.actor) }
           let(:file_resource) { create(:file_resource, :pdf) }