contact_sync 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fca10e547dcbdc61eb98446899ab823c1f3ea86
-  data.tar.gz: 00796a313348b0b656c837eb5c0d1113d6a62f12
+  metadata.gz: 612e1896eed72d3d5b06580381ec3795bc3b9cba
+  data.tar.gz: 835712bb3edfb4a72c5a5276c856ddee426dc65d
 SHA512:
-  metadata.gz: 8fdcc62350ebbea362a642950f7c98ee536c2c1c353e543813a8513ce5e9c5636fc455e5f4b7da5d8c4959658c7896e72d9d85216fff7df987297c9ed967cb38
-  data.tar.gz: fbd6e245d7c53c89f17663c964f7987efb0f8301a2e82195ee6582b167aa7ee76f821689f1c5710d325e955785361259ac86dc4585e222a0f88383b6e0189a8b
+  metadata.gz: 935692a079c125869b94965a3a600f0ce327aa76de011528415cf472f2f1f5fc5c2e8ce04fc848b4ae0d9fc61e3ecabeb34f2ebb7c9f7d75e8fe5dfd08dad793
+  data.tar.gz: f35d1125a44869a070fa04e054932c2b0f8b8a5926a24f4346c1ec78e6ace87b8377944f0d77e9f219249a1ba1dadcd398956925a03f8397a15cb383b9550c3e

data/lib/contact_sync/syncable.rb

@@ -83,26 +83,56 @@ module ContactSync
       return result
     end
 
+
     def matched_contacts
-      matched_contacts = []
-      user_phones = []
-      user_emails = []
-      self.contacts.each do |con|
-        user_phones.concat con.phones
-        user_emails.concat con.emails
-      end
+      matched_users = []
+      other_contacts = []
 
-      user_phones.each do |phone|
-        u = User.where(encrypted_number: phone.number.encrypt(:symmetric)).limit(1).first
-        matched_contacts << u.id unless u.blank?
-      end
-      user_emails.each do |mail|
-        u = User.where(email: mail.email).limit(1).first
-        matched_contacts << u.id unless u.blank?
+      self.contacts.includes([:emails, :phones]) do |aKon|
+        aKon.phones.each do |ph|
+          matches = false
+          u = User.where(encrypted_number: ph.number.encrypt(:symmetric)).limit(1).first
+          if !u.blank?
+            matches = true
+            matched_users << {user: u.id, phone: ph.id, contact: aKon.id}
+          end
+        end
+        aKon.emails.each do |em|
+          u = User.where(email: mail.email).limit(1).first
+          if !u.blank?
+            matches = true
+            matched_users << {user: u.id, email: em.id, contact: aKon.id}
+          end
+        end
+        other_contacts << aKon if !matches
       end
-      return matched_contacts
     end
 
+
+
+    # def matched_contacts
+    #   matched_contacts = []
+    #   user_phones = []
+    #     user_emails = []
+    #   self.contacts.each do |con|
+    #     user_phones.concat con.phones
+    #     user_emails.concat con.emails
+    #   end
+    #
+    #   user_phones.each do |phone|
+    #     u = User.where(encrypted_number: phone.number.encrypt(:symmetric)).limit(1).first
+    #     matched_contacts << u.id unless u.blank?
+    #   end
+    #   user_emails.each do |mail|
+    #     u = User.where(email: mail.email).limit(1).first
+    #     if !u.blank?
+    #       matched_contacts << u.id
+    #     end
+    #   end
+    #   other_contacts = self.contacts.collect(&:id) &
+    #   return {app_users: matched_contacts, other_users: self.contacts}
+    # end
+    #
     private
     def contact_params(aContact)
       aContact.permit(:composite_name, :first_name, :middle_name, :last_name, :prefix, :suffix, :nickname, :job_title, :department, :organization, :birthdate, :note, :creation_date, :modification_date, :record_id)

data/lib/contact_sync/version.rb

@@ -1,3 +1,3 @@
 module ContactSync
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contact_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Saad Masood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails