Merge branch 'AP-359-nojob-nogood' into 'master'

If no jobs are found skip user

See merge request lap/alma-user-load!50

Author: steve-sullivan

config/settings.yml

@@ -6,7 +6,7 @@ Settings:
   upload_host: "upload.lib.berkeley.edu"
   upload_user: "ssullivan"
   last_alma_purge: "2023-06-30"
-  application_version: "1.5.6"
+  application_version: "1.5.8"
 
 # TODO - flesh this out
 # http://docopt.org/

lib/ucpath/jobs.rb

@@ -9,21 +9,6 @@ module UCPath
   class Jobs
     attr_accessor :job, :first_job
 
-    class << self
-      # We're no longer skipping users who do not have an eligible job.
-      # But we still need a "job record" quick and dirty to create a dummy job
-      # and set the expiration date (expected_end_date) to today.
-      def dummy_job
-        OpenStruct.new(
-          hr_status_code: 'I',
-          expected_end_date: Date.today.to_s,
-          org_relationship_code: nil,
-          dept_desc: 'NO_JOB_FOUND',
-          job_code: nil
-        )
-      end
-    end
-
     def initialize(id)
       # Fetch the raw job data
       job_data = fetch_jobs(id)

lib/ucpath/user.rb

@@ -58,15 +58,22 @@ def initialize(id)
       # date to the current date so that they will get purged from Alma.
       # We'll either use the first job found (which is the users most recent job)
       # or we'll create a dummy job with the expected_end_date set to today.
+      # AP-359: Update, if there is no job (elgible or otherwise) then, like
+      # Gandalf said: YOU SHALL NOT PASS!
       unless @jobs.eligible_job?
         if @jobs.first_job
           logger.info "#{id} - No eligible job found, using first job"
           @jobs.job = @jobs.first_job
 
           @jobs.job.expected_end_date = Date.today.to_s
         else
-          logger.info "#{id} - No job found, using a dummy job"
-          @jobs.job = Jobs.dummy_job
+          @eligible = false
+          @jobs = nil
+          @user = nil
+          @ucpath_rec = nil
+
+          logger.info "#{id} - Eligible: #{eligible?}"
+          return
         end
       end
 

spec/lib/ucpath_spec.rb

@@ -524,26 +524,14 @@
     expect(u.rec.job_description).to eq('FIRST_JOB_DESCRIPTION')
   end
 
-  it 'uses a dummy job if no jobs are found' do
+  it 'skips a user if no jobs are found' do
     id = '999999999'
     stub_ucpath_user(id)
     stub_ucpath_jobs(id)
 
-    # Stub our LDAP
-    ldap_id = '0000'
-    ldap_stub = stub_ldap(ldap_id)
-    entries = [
-      { 'sn' => ['test_last_name'] },
-      { 'givenname' => ['test_first_name'] }
-    ]
-
-    allow(Net::LDAP).to receive(:new).with(ldap_stub['params']).and_return(ldap_stub['connection'])
-    expect(ldap_stub['connection']).to receive(:bind)
-    expect(ldap_stub['connection']).to receive(:search).with(ldap_stub['base']).and_yield(entries[0]).and_yield(entries[1])
-
     u = UCPath::User.new(id)
 
-    expect(u.rec.job_description).to eq('NO_JOB_FOUND')
+    expect(u.eligible?).to be(false)
   end
 
   it 'skips users that have a termination date before the last Alma purge date' do