kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 09:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix smart detect spec

Browse source
This commit is contained in:
Eugene Burmakin 2025-03-04 21:16:45 +01:00
parent 9d68458622
commit bc91004713
3 changed files with 31 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/services/visits/smart_detect.rb
View file

@ -21,8 +21,9 @@ class Visits::SmartDetect
potential_visits = detect_potential_visits
merged_visits = merge_consecutive_visits(potential_visits)
significant_visits = filter_significant_visits(merged_visits)
create_visits(significant_visits)
grouped_visits = group_nearby_visits(merged_visits).flatten
create_visits(grouped_visits)
end
private
@ -230,21 +231,6 @@ class Visits::SmartDetect
].compact.uniq.join(', ')
end
def filter_significant_visits(visits)
# Group nearby visits to identify significant places
grouped_visits = group_nearby_visits(visits).flatten
# grouped_visits.flat_map do |group|
# is_significant = group.size >= SIGNIFICANT_PLACE_VISITS ||
# significant_duration?(group) ||
# near_known_place?(group.first)
# group.each do |visit|
# visit[:status] = is_significant ? :significant : :suggested
# end
# end
end
def group_nearby_visits(visits)
visits.group_by do |visit|
[

3
spec/models/user_spec.rb
View file

@ -67,7 +67,8 @@ RSpec.describe User, type: :model do
let!(:stat2) { create(:stat, user:, toponyms: [{ 'country' => 'France' }]) }
it 'returns array of countries' do
expect(subject).to eq(%w[Germany France])
expect(subject).to include('Germany', 'France')
expect(subject.count).to eq(2)
end
end

144
spec/services/visits/smart_detect_spec.rb
View file

@ -262,12 +262,6 @@ RSpec.describe Visits::SmartDetect do
]
end
before do
# Override the factory's random coordinates
allow_any_instance_of(Point).to receive(:latitude).and_return(0)
allow_any_instance_of(Point).to receive(:longitude).and_return(0)
end
it 'assigns correct points to each visit' do
visits = detector.call
@ -287,19 +281,8 @@ RSpec.describe Visits::SmartDetect do
]
end
before do
# Ensure points are within the area's radius
allow_any_instance_of(Point).to receive(:latitude).and_return(0)
allow_any_instance_of(Point).to receive(:longitude).and_return(0)
end
it 'associates the visit with the area' do
visits = detector.call
puts "Found #{visits.count} visits"
visits.each_with_index do |v, i|
puts "Visit #{i + 1} points: #{v.points.map(&:timestamp)}"
puts "Visit #{i + 1} area: #{v.area&.name}"
end
visit = visits.first
expect(visit).not_to be_nil
@ -338,12 +321,6 @@ RSpec.describe Visits::SmartDetect do
it 'prefers area name over geodata' do
visits = detector.call
puts "Found #{visits.count} visits"
puts "Area coordinates: #{area.latitude}, #{area.longitude}"
visits.each_with_index do |v, i|
puts "Visit #{i + 1} points: #{v.points.map { |p| [p.latitude, p.longitude] }}"
puts "Visit #{i + 1} area: #{v.area&.name}"
end
visit = visits.first
expect(visit).not_to be_nil
@ -355,71 +332,47 @@ RSpec.describe Visits::SmartDetect do
context 'with points too far apart' do
let!(:points) do
[
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: start_at + 10.minutes),
create(:point, user:, lonlat: 'POINT(10 10)',
timestamp: start_at + 15.minutes),
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: start_at + 20.minutes)
create(:point, user:, lonlat: 'POINT(0 0)', timestamp: start_at),
create(:point, user:, lonlat: 'POINT(0 0)', timestamp: start_at + 5.minutes),
create(:point, user:, lonlat: 'POINT(0 0)', timestamp: start_at + 10.minutes),
create(:point, user:, lonlat: 'POINT(10 10)', timestamp: start_at + 15.minutes),
create(:point, user:, lonlat: 'POINT(10 10)', timestamp: start_at + 20.minutes),
create(:point, user:, lonlat: 'POINT(10 10)', timestamp: start_at + 25.minutes)
]
end
before do
# Don't override coordinates, but ensure they're consistent
first_point = points.first
allow(first_point).to receive(:latitude).and_return(0)
allow(first_point).to receive(:longitude).and_return(0)
middle_point = points.second
allow(middle_point).to receive(:latitude).and_return(10)
allow(middle_point).to receive(:longitude).and_return(10)
last_point = points.last
allow(last_point).to receive(:latitude).and_return(0)
allow(last_point).to receive(:longitude).and_return(0)
end
it 'creates separate visits' do
visits = detector.call
puts "Found #{visits.count} visits"
puts 'Points coordinates:'
points.each { |p| puts " #{p.latitude}, #{p.longitude}" }
visits.each_with_index do |v, i|
puts "Visit #{i + 1} points: #{v.points.map { |p| [p.latitude, p.longitude] }}"
end
expect(visits.count).to eq(2)
expect { detector.call }.to change(Visit, :count).by(2)
end
end
context 'with points too far apart in time' do
# Extend end_at to accommodate the later point
let(:end_at) { start_at + 3.hours }
# Use a wider time range to ensure all points are within the detector's window
let(:end_at) { DateTime.new(2025, 3, 1, 15, 0, 0) }
let!(:points) do
[
# First visit with more points to ensure it's significant
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: start_at + 10.minutes),
timestamp: DateTime.new(2025, 3, 1, 12, 0, 0)),
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: start_at + 2.hours)
timestamp: DateTime.new(2025, 3, 1, 12, 5, 0)),
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: DateTime.new(2025, 3, 1, 12, 10, 0)),
# Second visit - with a gap of 40 minutes (beyond MAXIMUM_VISIT_GAP)
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: DateTime.new(2025, 3, 1, 12, 50, 0)),
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: DateTime.new(2025, 3, 1, 12, 55, 0)),
create(:point, user:, lonlat: 'POINT(0 0)',
timestamp: DateTime.new(2025, 3, 1, 13, 0, 0))
]
end
before do
allow_any_instance_of(Point).to receive(:latitude).and_return(0)
allow_any_instance_of(Point).to receive(:longitude).and_return(0)
end
it 'creates separate visits' do
visits = detector.call
puts "Found #{visits.count} visits"
puts 'Points timestamps:'
points.each { |p| puts " #{p.timestamp}" }
visits.each_with_index do |v, i|
puts "Visit #{i + 1} timestamps: #{v.points.map(&:timestamp)}"
end
expect(visits.count).to eq(2)
expect { detector.call }.to change(Visit, :count).by(2)
end
end
@ -436,22 +389,10 @@ RSpec.describe Visits::SmartDetect do
]
end
before do
# Ensure points are within the place's location
allow_any_instance_of(Point).to receive(:latitude).and_return(0)
allow_any_instance_of(Point).to receive(:longitude).and_return(0)
end
it 'associates the visit with the place' do
visits = detector.call
puts "Found #{visits.count} visits"
puts "Points count: #{Point.count}"
puts "Place coordinates: #{place.latitude}, #{place.longitude}"
visits.each_with_index do |v, i|
puts "Visit #{i + 1} coordinates: #{v.points.map { |p| [p.latitude, p.longitude] }}"
end
visit = visits.first
expect(visit).not_to be_nil
expect(visit.place).to eq(place)
expect(visit.name).to eq('Coffee Shop')
@ -488,46 +429,13 @@ RSpec.describe Visits::SmartDetect do
it 'prefers existing place name over geodata' do
visits = detector.call
puts "Found #{visits.count} visits"
puts "Place coordinates: #{place.latitude}, #{place.longitude}"
visits.each_with_index do |v, i|
puts "Visit #{i + 1} coordinates: #{v.points.map { |p| [p.latitude, p.longitude] }}"
puts "Visit #{i + 1} place: #{v.place&.name}"
end
visit = visits.first
expect(visit).not_to be_nil
expect(visit.place).to eq(place)
expect(visit.name).to eq('Coffee Shop')
end
end
end
context 'with different geocoder results' do
before do
allow(Geocoder).to \
receive(:search).with([40.123, -74.456]) \
.and_return(
[
double(
data: {
'address' => {
'road' => 'Different Street',
'house_number' => '456',
'postcode' => '67890',
'city' => 'Different City',
'country' => 'Different Country'
},
'name' => 'Different Place'
}
)
]
)
end
it 'uses the stubbed geocoder results' do
# Your test that relies on these specific geocoder results
end
end
end
end