directory_diff 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e07baf8cd9794e7c7725ff856c366829f17de7
-  data.tar.gz: 97966de2c4dbd7e6361fa6669fef1e57d8cbf68e
+  metadata.gz: 8c2bfcffa269d189122f5a26e497e67413990319
+  data.tar.gz: a97ad9941677dcf9f4da9e40225a0080c3226fc7
 SHA512:
-  metadata.gz: 7dad0393c22d490b7b9d777b1217183dc144da9d8feb36d4575e80e879a97bdaaf2aab77a5f9e0d0b98b06dffc0d3cd23fcbe661d1fb540c37d4710e6c151442
-  data.tar.gz: 12f8cdb06594281b48664bb96ace66c7a671ff69493dae688a283e1c461fd3c9b125842047bb61fd98acac0cc2f7585a0783527677d3884efd016355e86f43b6
+  metadata.gz: 41cac991119fab2db6acf885eba8f4767d3159a40c4bf3ea49f3dfd5c7cf2c52ae2ae1f0e2fa505a968592cbce79983b868977e465fe56d19cda286fc422ad80
+  data.tar.gz: bf5a930f70ccc7af38f87a8607f83772b8ca16e0a602fedac351e28cd10db3433f48befbdcf392db3df5ceba8ca72db5d290d0d79a35bc44942b6f2f12eec9aa

data/lib/directory_diff/transformer/in_memory.rb

@@ -64,11 +64,24 @@ module DirectoryDiff
             original_assistant_value = new_employee[3]
           end
 
+          # phone_number may be nil. we only use the csv to *set* phone numbers if
+          # it has a value. if it was nil, we backfill from current employee so that
+          # the new record apperas to the be same as the current record
+          phone_number = new_employee[2].presence
+          if phone_number.nil?
+            original_phone_number_value = nil
+            new_employee[2] = old_employee&.fetch(2)
+          else
+            original_phone_number_value = new_employee[2]
+          end
+
           if old_employee.nil?
             add_transform(:insert, new_employee)
           elsif new_employee[0, 4] == old_employee[0, 4]
             # restore assistant value after cleanup like missing assistants and own email
             new_employee[3] = original_assistant_value
+            # restore phone number value
+            new_employee[2] = original_phone_number_value
             add_transform(:noop, new_employee) unless options[:skip_noop]
           else
             add_transform(:update, new_employee)

data/lib/directory_diff/transformer/temp_table.rb

@@ -2,12 +2,6 @@
 
 require "activerecord_pg_stuff"
 
-Arel::Predications.module_eval do
-  def contains(other)
-    Arel::Nodes::InfixOperation.new(:"@>", self, other)
-  end
-end
-
 module DirectoryDiff
   module Transformer
     class TempTable
@@ -36,9 +30,14 @@ module DirectoryDiff
             attributes_unchanged = employees[:name].eq(csv[:name])
                                     .and(
                                       employees[:phone_number].eq(csv[:phone_number])
+                                        .or(csv[:phone_number].eq(""))
+                                        # ☝🏽 Comparing to an empty string because we cast
+                                        # phone number to an empty string. The reason is
+                                        # comparing NULL = NULL is always false in SQL
                                     )
                                     .and(
-                                      employees[:assistants].contains(csv[:assistants])
+                                      employees[:assistants].eq(csv[:assistants])
+                                        .or(csv[:assistants].eq("{}"))
                                     )
 
             # Creates joins between the temp table and the csv table and
@@ -59,7 +58,8 @@ module DirectoryDiff
 
             connection.execute(SQL.cleanup_sql(csv.name))
 
-            csv_fields = [:name, :email, :phone_number, :assistants, :extra]
+            csv_fields = %I[name email phone_number assistants extra].map { |c| csv[c] }
+            emp_fields = %I[name email phone_number assistants].map { |c| employees[c] }
 
             # new records are records in the new directory that don't exist in
             # the current directory
@@ -71,7 +71,8 @@ module DirectoryDiff
             # exist in the new directory
             deleted_records = employee_records
                                 .select("'delete'::varchar operation, row_number")
-                                .select(csv_fields)
+                                .select(emp_fields)
+                                .select("null extra")
                                 .where({ csv.name => { email: nil } })
             # changed records are records that have difference in name, phone
             # number and/or assistants
@@ -169,7 +170,12 @@ module DirectoryDiff
           if activerecord52?
             rel = ActiveRecord::Relation.new(dec)
           else
-            rel = ActiveRecord::Relation.new(dec, dec.arel_table, dec.predicate_builder, {})
+            rel = ActiveRecord::Relation.new(
+              dec,
+              dec.arel_table,
+              dec.predicate_builder,
+              {}
+            )
           end
           rel.readonly!
           block.call(rel)

data/lib/directory_diff/version.rb

@@ -1,3 +1,3 @@
 module DirectoryDiff
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: directory_diff
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Kamal Mahyuddin