bobhr 0.5.28 → 0.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517aaa5bb5c24baa4d78f669c1e6ffe70aa3d2024bd5307384ce45d7ff606092
-  data.tar.gz: a0fd0d5e69441b3fb531abe3a69f71df15505345192168069ff7370f03c151e7
+  metadata.gz: af0ce519ead83ac6e4a359e0d019e2e2861e6da21f77acdd4a1659396a2b0956
+  data.tar.gz: a723f5aaa8a16f7a59e8685308a79eca951971fbd013a1674a2b5db02516f5f7
 SHA512:
-  metadata.gz: eda0b5d8399ebf9792ec68a06dd6997cd94a3402460bd0cd78576a0462a3124c72df22f82ac3f5b841d2e02460677d6f4ee7cbcdba8c4e4186123257e8182151
-  data.tar.gz: 27c3aa148f7bc244f7cedced5c84a1c77defe68e5cbe8828dc1cd13d3ac54418f4f1c50247c19caae8d140cc69d27ee9685b8c5dd892ce2f8bc4cbf405311137
+  metadata.gz: 55cb85f2e257e413e8b68a207bbff01068f1dfb3a9422e1fbda4892a7d4353b1279570f1b9446ffeb36933cbca37f2f9a9197e71889e34bdc603942028dc63c4
+  data.tar.gz: edee5c4022ef1f61ba4642f4ba1328b71febda69d9ca686345ed408f75939310c6b986dec84f721f81606142d70513e3980ba9d1a052a36284f3d7f188aa3792

data/lib/bob/api/employees.rb

@@ -20,9 +20,24 @@ module Bob
 
     def self.all_leavers(start_date:, end_date:)
       all({ includeHumanReadable: true, showInactive: true }).select do |employee|
+
         next unless employee.internal.status == 'Inactive' && employee.internal.termination_date.present?
 
-        termination_date = Date.parse(employee.internal.termination_date)
+        # Don't process employees that left before the period we are looking into
+        internal_term_date = Date.parse(employee.internal.termination_date)
+        next if internal_term_date.before?(start_date)
+
+        # Need to fetch lifecycle statuses, as garden leavers have left before the actual internal term date
+        lifecycle_statuses = Bob::Employee::LifecycleHistory.all(employee.id)
+        garden_leave_status = lifecycle_statuses.find { |status| status.status == 'garden leave' }
+
+        if garden_leave_status
+          lifecycle_statuses = Bob::Employee::LifecycleHistory.all(employee.id)
+          garden_leave_status = lifecycle_statuses.find { |status| status.status == 'garden leave' }
+          termination_date = Date.parse(garden_leave_status.effective_date)
+        end
+
+        termination_date ||= Date.parse(employee.internal.termination_date)
         (start_date..end_date).include?(termination_date)
       end
     end

data/lib/bob/models/employee.rb

@@ -27,7 +27,7 @@ module Models
     end
 
     def entity
-      human_readable.work.custom_columns.column_1633980105047
+      human_readable.work.custom_columns&.column_1633980105047
     end
 
     def city

data/lib/bob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bob
-  VERSION = '0.5.28'
+  VERSION = '0.5.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobhr
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.30
 platform: ruby
 authors:
 - Lien Van Den Steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json