caboose-rets 0.1.115 → 0.1.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65ba3f15f262237c87ce114ea0d6f13cdbc5268c63f230b70e6a88f521644eb
-  data.tar.gz: 573dd4c5e618eaaccd49c646aa53e72c71d93ede2f65695971e87ce1b2096ca3
+  metadata.gz: f294090601dfd6564470df919281b86bf4f8070397256128a3732fb7bb0cd1d2
+  data.tar.gz: 9dc49dec8f68574d9cd04249df03c51203b6b30bc7e0266cfb249e058c6d9b5a
 SHA512:
-  metadata.gz: e4b2ee460cefcf919dad7ffab94d931fd5eb6042688b7fa0d901cdd4f909b10d81f11203f9b9ff2d6fe4d6ba6c89655590f35a8d42b9d6ef1012cccb007e44df
-  data.tar.gz: 1eb82beffe2ac6809f010fc716ad16b151cea5256525cab7465fb0e6754ced2e824fe20b1b9cd92c4cb72db4924e53e27d516fe1219485f8bbb944ec55bdb671
+  metadata.gz: d99faf2eacf150c0f43b833dfc673e1eecb3c5a98ca3a55541dd123bc183c31c443093c8c31db6eae807ea62ebd7fa42f67702fcda38700f2c44823827bbf6b2
+  data.tar.gz: 60dbf8a0fc5787eaa61eec63b1bb946253b1dbca44404233b3e7461fe88f47b74a025ff04924177a6c7ac8b159fca4986f26487af086ebd99453185e50e358a4

data/app/models/caboose_rets/property.rb

@@ -110,16 +110,12 @@ class CabooseRets::Property <ActiveRecord::Base
      #   self.income_rental                    = data['GrossIncome']
         self.interior_features                = data['InteriorFeatures']
         self.land_features_extras             = data['LotFeatures']
-    begin
-        self.latitude                         = data['X_Location'].split(',')[0].to_f
-        self.longitude                        = data['X_Location'].split(',')[1].to_f
-    rescue
-        self.latitude                         = self.latitude
-        self.longitude                        = self.longitude
-    end
-        self.latitude = nil if self.latitude == 0.0
-        self.longitude = nil if self.longitude == 0.0
-    #    self.landscaping                      = data['Landscaping']
+        self.latitude                         = self.latitude.blank? ? nil : self.latitude
+        self.longitude                        = self.longitude.blank? ? nil : self.longitude
+        if self.latitude == 0.0 || self.latitude == '0.0' || self.longitude == 0.0 || self.longitude == '0.0' || (self.street_number != data['StreetNumber']) || (self.street_name != data['StreetName']) || (self.city != data['City']) || (self.postal_code != data['PostalCode'])
+            self.latitude = nil
+            self.longitude = nil
+        end
         self.laundry                          = data['LaundryFeatures']
         self.legal_description                = data['TaxLegalDescription']
         self.legal_lot                        = data['TaxLot']

data/app/models/caboose_rets/rets_importer.rb

@@ -210,7 +210,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     p = CabooseRets::Property.where(:mls_number => mls_id.to_s).first
     if p != nil && p.status == 'Active'
       self.download_property_images(p) if save_images == true
-      if (p.latitude.blank? || p.latitude == '0.0') || (p.longitude.blank? || p.longitude == '0.0')
+      if p.latitude.blank? || p.latitude == '0.0' || p.longitude.blank? || p.longitude == '0.0'
         self.update_coords(p) 
       end
     else
@@ -284,13 +284,16 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
   def self.download_property_images(p)
     self.log3('Property',p.mls_number,"Downloading images for #{p.mls_number}...")
+    ids_to_keep = []
     begin
       self.client.get_object(:resource => 'Property', :type => 'Photo', :location => false, :id => "#{p.matrix_unique_id}:*") do |headers, content|
         next if headers.blank?
         ind = headers['orderhint'] ? headers['orderhint'].to_i : 0
         self.log3('Media',p.mls_number,headers.to_s)
         self.log3('Media',p.mls_number,"Downloading photo with content-id #{headers['content-id']}, index #{ind}")
+        is_new = false
         m = CabooseRets::Media.where(:media_mui => headers['content-id'], :media_order => ind).first
+        is_new = true if m.nil?
         m = CabooseRets::Media.new if m.nil?
         tmp_path = "#{Rails.root}/tmp/rets_media_#{headers['content-id']}_#{ind}.jpeg"
         File.open(tmp_path, "wb") do |f|
@@ -310,7 +313,12 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
           if cm && !cm.id.blank?
             m.media_id = cm.id
             m.save
-            self.log3("Media",p.mls_number,"Created new RetsMedia object #{m.id}, media_id = #{m.media_id}")
+            ids_to_keep << m.id
+            if is_new
+              self.log3("Media",p.mls_number,"Created new RetsMedia object #{m.id}, media_id = #{m.media_id}")
+            else
+              self.log3("Media",p.mls_number,"RetsMedia object already existed #{m.id}, updated media_id = #{m.media_id}")
+            end
             self.log3("Media",p.mls_number,"Image rets_media_#{headers['content-id']}_#{ind} saved")
           else
             self.log3("Media",p.mls_number,"CabooseMedia was not created for some reason, not saving RetsMedia")
@@ -324,6 +332,17 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
       self.log3("Media",p.mls_number,"Error downloading images for property with MLS # #{p.mls_number}")
     end
 
+    # If we downloaded new images, look for old images to delete
+    if ids_to_keep.count > 0
+      self.log3("Media",p.mls_number,"Keeping new RetsMedia ids: #{ids_to_keep}")
+      self.log3("Media",p.mls_number,"Looking for old RetsMedia to delete")
+      CabooseRets::Media.where(:media_mui => p.matrix_unique_id).where("id not in (?)",ids_to_keep).each do |med|
+        self.log3("Media",p.mls_number,"Deleting old RetsMedia #{med.id} and CabooseMedia #{med.media_id}...")
+        m = Caboose::Media.where(:id => med.media_id).where("name ILIKE ?","rets_media%").first
+        m.destroy if m
+        med.destroy
+      end
+    end
 
       # # Get first image  
       # self.client.get_object(:resource => 'Property', :type => 'Photo', :location=> false, :id => "#{p.matrix_unique_id}:0") do |headers, content|

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.115'
+  VERSION = '0.1.116'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.115
+  version: 0.1.116
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms