Skip to content

Commit

Permalink
Trace import: remove activerecord-import gem
Browse files Browse the repository at this point in the history
Fixes #4994
  • Loading branch information
mmd-osm committed Aug 28, 2024
1 parent 549a46c commit 669ffa8
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Rails/SkipsModelValidations:
Exclude:
- 'db/migrate/*.rb'
- 'app/controllers/users_controller.rb'
- 'app/models/trace.rb'

Style/Documentation:
Enabled: false
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ gem "file_exists"

# Load rails plugins
gem "actionpack-page_caching", ">= 1.2.0"
gem "activerecord-import"
gem "active_record_union"
gem "bootstrap", "~> 5.3.2"
gem "bootstrap_form", "~> 5.0"
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ GEM
activemodel (= 7.1.4)
activesupport (= 7.1.4)
timeout (>= 0.4.0)
activerecord-import (1.8.0)
activerecord (>= 4.2)
activestorage (7.1.4)
actionpack (= 7.1.4)
activejob (= 7.1.4)
Expand Down Expand Up @@ -617,7 +615,6 @@ DEPENDENCIES
aasm
actionpack-page_caching (>= 1.2.0)
active_record_union
activerecord-import
addressable (~> 2.8)
annotate
argon2
Expand Down
5 changes: 3 additions & 2 deletions app/models/trace.rb
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,17 @@ def import
tp.timestamp = point.timestamp
tp.gpx_id = id
tp.trackid = point.segment
tp.validate!
tracepoints << tp
end

# Run the before_save and before_create callbacks, and then import them in bulk with activerecord-import
# Run the before_save and before_create callbacks, and then do a bulk insert
tracepoints.each do |tp|
tp.run_callbacks(:save) { false }
tp.run_callbacks(:create) { false }
end

Tracepoint.import!(tracepoints)
Tracepoint.insert_all!(tracepoints.map(&:attributes))
end

if gpx.actual_points.positive?
Expand Down
20 changes: 18 additions & 2 deletions test/controllers/api/traces_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,31 @@ def test_create
create(:user_preference, :user => user, :k => "gps.trace.visibility", :v => "identifiable")
assert_not_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v
auth_header = basic_authorization_header user.display_name, "test"
post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header

# Create trace and import tracepoints in background job
perform_enqueued_jobs do
post gpx_create_path, :params => { :file => file, :description => "New Trace", :tags => "new,trace", :visibility => "trackable" }, :headers => auth_header
end
assert_response :success

trace = Trace.find(response.body.to_i)
assert_equal "a.gpx", trace.name
assert_equal "New Trace", trace.description
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
assert_equal "trackable", trace.visibility
assert_not trace.inserted
assert trace.inserted
assert_equal File.new(fixture).read, trace.file.blob.download

# Validate tracepoints
assert_equal 1, trace.points.size
tp = trace.points.first
assert_equal 10000000, tp.latitude
assert_equal 10000000, tp.longitude
assert_equal 3221331576, tp.tile
assert_equal 0, tp.trackid
assert_in_delta(134.0, tp.altitude)
assert_equal DateTime.parse("2008-10-01T10:10:10.000Z"), tp.timestamp

trace.destroy
assert_equal "trackable", user.preferences.find_by(:k => "gps.trace.visibility").v

Expand Down

0 comments on commit 669ffa8

Please sign in to comment.