Remove code for connecting to old borrow direct service (replaced by …

…reshare)
sul-dlss · Dec 3, 2024 · cfd4263 · cfd4263
1 parent 3cfced3
commit cfd4263
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 186 deletions.
diff --git a/Gemfile b/Gemfile
@@ -46,8 +46,6 @@ gem 'warden'
 
 gem 'nokogiri'
 
-gem 'borrow_direct'
-
 gem 'recaptcha'
 
 gem 'global_alerts'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -103,8 +103,6 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
-    borrow_direct (1.2.0)
-      httpclient (~> 2.4)
     builder (3.3.0)
     bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
@@ -206,7 +204,6 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    httpclient (2.8.3)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -473,7 +470,6 @@ PLATFORMS
 DEPENDENCIES
   axe-core-rspec
   bootsnap (>= 1.1.0)
-  borrow_direct
   capistrano (~> 3.0)
   capistrano-passenger
   capistrano-rails

diff --git a/app/models/borrow_direct_requests.rb b/app/models/borrow_direct_requests.rb
diff --git a/app/models/folio/patron.rb b/app/models/folio/patron.rb
@@ -208,13 +208,10 @@ def academic_staff_or_fellow?
     end
 
     def borrow_direct_requests
-      return [] if proxy_borrower? # Proxies can't submit borrow direct requests, so don't check.
+      # Proxies can't submit borrow direct requests, so don't check.
+      return [] unless Settings.borrow_direct_reshare.enabled && !proxy_borrower?
 
-      if Settings.borrow_direct_reshare.enabled
-        BorrowDirectReshareRequests.new(university_id).requests
-      else
-        BorrowDirectRequests.new(barcode).requests
-      end
+      BorrowDirectReshareRequests.new(university_id).requests
     end
 
     # this is all requests including self and group/proxy

diff --git a/config/initializers/borrow_direct.rb b/config/initializers/borrow_direct.rb
diff --git a/config/settings.yml b/config/settings.yml
@@ -1,8 +1,5 @@
 debug: false
 
-borrow_direct:
-  api_key: ''
-
 folio:
   okapi_url: <%= ENV['OKAPI_URL'] %>
   online_service_point_id: 7c5abc9f-f3d7-4856-b8d7-6712462ca007

diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
@@ -50,7 +50,7 @@
       let(:requests) do
         [
           instance_double(Folio::Request, key: '1', sort_key: nil),
-          instance_double(BorrowDirectRequests::Request, key: 'sta-1', sort_key: nil)
+          instance_double(BorrowDirectReshareRequests::ReshareRequest, key: 'sta-1', sort_key: nil)
         ]
       end
 

diff --git a/spec/models/borrow_direct_requests_spec.rb b/spec/models/borrow_direct_requests_spec.rb