caboose-rets 0.0.36 → 0.0.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzMwNmY2NDFlYjEzOGFkMjY3NzI1YjAzNDI2MGUwYTI5MmE5ODQ2ZA==
+    ZjQ2MGMwMDQxY2M2ODI5MzAxNjc0N2NkMGJmNzUwZTA1ZGMyZjhjYw==
   data.tar.gz: !binary |-
-    ODNhOTM0NjBhNTY2ZTIxZjI2MjYxODQzYTFhMjhmN2M4ZDhmNDAwNQ==
+    NzEzMDdlODFmODkzODZkNTgxMDcxNmUzMWMxMjZlOTEzMzIwYzgxOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGM5MjNiZTA1NzVlNjNjNDBhOWMwZDRmOTZiMjA0YmMxMjg3OWFhOTM1YmMw
-    MDNjNGM5OGYyYjFiYjRiOGUzMGM1ZjVjNDBiMzJiNDYyNjg5MzlkOTMxMDM4
-    MjJmOGM2ZjVlNjA5NTZhOTRkM2U5OTRlMmE4MDBhYWZlM2M2MDE=
+    MzNmMGM5ZmFiYWIxNTUzOTdmMGJhZjQyOGQwYjU3ZTE0ZWEzNjk1ODgyMTc4
+    NTUxZjFlNjkxZWYxYTFjMGRiZGE2MDY2NzU2OTljMDZiYTE0MjAxMjY0MWUw
+    YzJmZGRmODY4MTFkYjliMGY1YjRjZTBhZGYxYzgzMGE0YTkwZTU=
   data.tar.gz: !binary |-
-    ZDJmMzc0ZWRjYmIyMjk3YWU0OWQ3M2Q5ODgyNjFjNTk5OGRjMWZiMjk0OTMz
-    YzhhYTBjYzExMDE2ZjNhOGYzNzJlMzdlNDViMWI0OGIyZmE3ZDJiMmI2MDZi
-    NWFlMGVkMTQ3NmZjZjJmZmEwYjcwY2M4ZjQzN2MwNGE3ZjM2MmU=
+    Y2NmYzg1MThiYWM1YzdjNzI3Nzk4MWRjYzE2MDY2MWMwMDNkYzYzZTVlNDAw
+    YTRlNmVlMzUxZTExMjMzZDFlOTAwZDI2YmUyNWY4ODE3MWRmMjc0NTEzODcx
+    N2VkZDAyMDNjN2EwNmU5ZWZjZDQxNTVjNTQxNDQyNjUzZjFjNWQ=

data/app/controllers/caboose_rets/commercial_controller.rb

@@ -5,26 +5,28 @@ module CabooseRets
     # GET /commercial
     def index
       @gen = Caboose::PageBarGenerator.new(params, {
-          'name'                      => '',
-          'current_price_gte'         => '',
-          'current_price_lte'         => '',
-          'street_num_concat_street_name_like' => '',
-          'prop_type'                 => '',
-          'tot_heat_sqft_gte'         => '',
-          'city'                      => '',
-          'county'                    => '',
-          'zip'                       => '',
-          'mls_acct'                  => '',
-         # 'added_by_advantage'        => '',
-          'lo_code'                   => '',
-          'address'                   => '',
-          'status'                    => 'Active'
+          'name'                 => '',
+          'current_price_gte'    => '',
+          'current_price_lte'    => '',
+          'address_like'         => '',          
+          'prop_type'            => '',
+          'tot_heat_sqft_gte'    => '',
+          'city'                 => '',
+          'county'               => '',
+          'zip'                  => '',
+          'mls_acct'             => '',
+         # 'added_by_advantage'   => '',
+          'lo_code'              => '',
+          'address'              => '',          
+          'status'               => 'Active'
       },{
           'model'           => 'CabooseRets::CommercialProperty',          
           'sort'            => CabooseRets::default_property_sort,
           'desc'            => false,
-          'skip'            => ['status'],
-          'abbreviations'   => { 'street_num_concat_street_name_like' => 'address_like' },
+          'skip'            => ['status'],          
+          'abbreviations'   => { 
+            'address_like' => 'street_num_concat_street_name_like'  
+          },
           'base_url'        => '/commercial/search',
           'items_per_page'  => 10
       })

data/app/controllers/caboose_rets/land_controller.rb

@@ -50,7 +50,7 @@ module CabooseRets
           'so_code'                     => '',          
           'state'                       => '',
           'status'                      => 'Active',
-          'street_num_concat_street_name_like' => '',
+          'address_like'                => '',          
           'street_name_like'            => '',
           'street_num_like'             => '',          
           'subdivision'                 => '',          
@@ -63,7 +63,9 @@ module CabooseRets
           'sort'            => CabooseRets::default_property_sort,          
           'desc'            => false,
           'skip'            => ['status'],
-          'abbreviations'   => { 'street_num_concat_street_name_like' => 'address_like' },
+          'abbreviations'   => {
+            'address_like' => 'street_num_concat_street_name_like' 
+          },          
           'base_url'        => '/land/search',          
           'items_per_page'  => 10
       })

data/app/controllers/caboose_rets/multi_family_controller.rb

@@ -33,7 +33,7 @@ module CabooseRets
         'mls_acct'           => '',
         'subdivision'        => '',
         'foreclosure_yn'     => '',
-        'street_num_concat_street_name_like' => '',
+        'address_like'       => '',        
         'street_name_like'   => '',
         'street_num_like'    => '',
         'date_created_gte'   => '',
@@ -46,7 +46,9 @@ module CabooseRets
         'sort'            => CabooseRets::default_property_sort,
         'desc'            => false,
         'skip'            => ['status'],
-        'abbreviations'   => { 'street_num_concat_street_name_like' => 'address_like' },
+        'abbreviations'   => { 
+          'address_like' => 'street_num_concat_street_name_like'
+        },
         'base_url'        => '/multi-family/search',
         'items_per_page'  => 10
       })      

data/app/controllers/caboose_rets/residential_controller.rb

@@ -31,8 +31,8 @@ module CabooseRets
         'ftr_lotdesc_like'   => '',
         'mls_acct'           => '',
         'subdivision'        => '',
-        'foreclosure_yn'     => '',        
-        'street_num_concat_street_name_like' => '',
+        'foreclosure_yn'     => '',
+        'address_like'       => '',        
         'street_name_like'   => '',
         'street_num_like'    => '',
         'date_created_gte'   => '',
@@ -44,7 +44,9 @@ module CabooseRets
         'model'           => 'CabooseRets::ResidentialProperty',
         'sort'            => CabooseRets::default_property_sort,
         'desc'            => false,
-        'abbreviations'   => { 'street_num_concat_street_name_like' => 'address_like' },
+        'abbreviations'   => { 
+          'address_like' => 'street_num_concat_street_name_like'  
+        },
         'skip'            => ['status'],
         'base_url'        => '/residential/search',
         'items_per_page'  => 10

data/app/models/caboose_rets/rets_importer.rb

@@ -159,11 +159,12 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
       obj = nil
       self.client.search(params) do |data|        
         m = @@models[class_type].constantize
-        key_field = @@key_fields[search_type]
-        id = data[key_field].to_i
-        obj = m.exists?(id) ? m.find(id) : m.new
+        #key_field = @@key_fields[search_type]
+        #id = data[key_field].to_i
+        #obj = m.exists?(id) ? m.find(id) : m.new
+        obj = self.get_instance_with_id(m, data)
         obj.parse(data)
-        obj.id = id
+        #obj.id = id
         obj.save        
       end
       
@@ -174,6 +175,21 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
   end
   
+  def self.get_instance_with_id(model, data)
+    m = nil
+    case model
+      when CabooseRets::OpenHouse             then m = model.where(:id       => data['ID']            ).exists? ? model.where(:id       => data['ID']            ).first : model.new(:id       => data['ID']            )
+      when CabooseRets::Media                 then m = model.where(:media_id => data['MEDIA_ID']      ).exists? ? model.where(:media_id => data['MEDIA_ID']      ).first : model.new(:media_id => data['MEDIA_ID']      )
+      when CabooseRets::CommercialProperty    then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )
+      when CabooseRets::LandProperty          then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
+      when CabooseRets::MultiFamilyProperty   then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
+      when CabooseRets::ResidentialProperty   then m = model.where(:id       => data['MLS_ACCT'].to_i ).exists? ? model.where(:id       => data['MLS_ACCT'].to_i ).first : model.new(:id       => data['MLS_ACCT'].to_i )   
+      when CabooseRets::Agent                 then m = model.where(:la_code  => data['LA_LA_CODE']    ).exists? ? model.where(:la_code  => data['LA_LA_CODE']    ).first : model.new(:la_code  => data['LA_LA_CODE']    )
+      when CabooseRets::Office                then m = model.where(:lo_code  => data['LO_LO_CODE']    ).exists? ? model.where(:lo_code  => data['LO_LO_CODE']    ).first : model.new(:lo_code  => data['LO_LO_CODE']    )
+    end
+    return m    
+  end
+  
   #=============================================================================
   # Agent Images
   #=============================================================================

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms