Merge pull request #190 from transitland/changeset-callbacks

route changeset callbacks conflicting

Author: drewda

app/models/route.rb

@@ -66,10 +66,16 @@ def csv_row_values
     kind_of_model_tracked: :onestop_entity,
     virtual_attributes: [:serves, :does_not_serve, :operated_by, :identified_by, :not_identified_by, :imported_from_feed_onestop_id]
   })
+
+  # FIXME: this is a temporary fix to run both the following `before_create_making_history` changeset
+  # callback as well as the callback of the same name that is included from IsAnEntityWithIdentifiers
+  class << Route
+    alias_method :existing_before_create_making_history, :before_create_making_history
+  end
   def self.before_create_making_history(new_model, changeset)
     operator = Operator.find_by_onestop_id!(new_model.operated_by)
     new_model.operator = operator
-    super(new_model, changeset)
+    self.existing_before_create_making_history(new_model, changeset)
   end
   def self.after_create_making_history(created_model, changeset)
     OperatorRouteStopRelationship.manage_multiple(

spec/services/gtfsgraph_spec.rb

@@ -46,7 +46,7 @@ def load_feed(import_level=1)
       expect(r).to be_truthy
       expect(r.name).to eq('Bullet')
       expect(r.onestop_id).to eq('r-9q9j-bullet')
-      # expect(r.identifiers).to match_array(["gtfs://f-9q9-caltrain/r/bullet"])
+      expect(r.identifiers).to match_array(["gtfs://f-9q9-caltrain/r/Bu-121"])
       expect(r.tags['vehicle_type']).to eq('rail')
       expect(r.tags['route_long_name']).to eq('Bullet')
       expect(r.geometry).to be