Issue 53 #2

app/models/thing.rb

@@ -1,5 +1,4 @@
 require 'geokit'
-require 'obscenity/active_model'
 
 class Thing < ActiveRecord::Base
   extend Forwardable

config/application.rb

@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'obscenity/active_model'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

db/migrate/20160111062953_add_system_use_code_to_things.rb

@@ -0,0 +1,5 @@
+class AddSystemUseCodeToThings < ActiveRecord::Migration
+  def change
+    add_column :things, :system_use_code, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 5) do
+ActiveRecord::Schema.define(version: 20160111062953) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -47,10 +47,11 @@
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name"
-    t.decimal  "lat",        precision: 16, scale: 14, null: false
-    t.decimal  "lng",        precision: 17, scale: 14, null: false
-    t.integer  "city_id"
+    t.decimal  "lat",             precision: 16, scale: 14, null: false
+    t.decimal  "lng",             precision: 17, scale: 14, null: false
+    t.string   "city_id"
     t.integer  "user_id"
+    t.string   "system_use_code"
   end
 
   add_index "things", ["city_id"], name: "index_things_on_city_id", unique: true, using: :btree

lib/tasks/data.rake

@@ -1,3 +1,5 @@
+require 'rake'
+
 namespace :data do
   require 'open-uri'
   require 'csv'
@@ -12,26 +14,23 @@ namespace :data do
     drains.each do |drain|
       next unless ['Storm Water Inlet Drain', 'Catch Basin Drain'].include?(drain['Drain_Type'])
 
-      name = drain['Drain_Type']
-      city_id = drain['PUC_Maximo_Asset_ID']
-      city_id.gsub!('N-', '') # Strip `N-` from the Asset ID
-      location = drain['Location']
-      location.delete!('(') # Cleanup brackets
-      location.delete!(')')
-
-      latlng = location.split(',')
-      lat = latlng[0].strip
-      lng = latlng[1].strip
+      (lat, lng) = drain['Location'].delete('()').split(',').map(&:strip)
 
       thing_hash = {
-        name: name,
-        city_id: city_id,
+        name: drain['Drain_Type'],
+        system_use_code: drain['System_Use_Code'],
         lat: lat,
         lng: lng,
       }
 
-      thing = Thing.create!(thing_hash)
-      puts "Created Thing #{thing.id} - #{thing.name}"
+      thing = Thing.where(city_id: drain['PUC_Maximo_Asset_ID'].gsub!('N-', '')).first_or_initialize
+      if thing.new_record?
+        puts "Updating thing #{thing_hash[:city_id]}"
+      else
+        puts "Creating thing #{thing_hash[:city_id]}"
+      end
+
+      thing.update_attributes!(thing_hash)
     end
   end
 end