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

Merge branch 'dev' into fix/imports/gpx-empty-tracks

Browse source
This commit is contained in:
Evgenii Burmakin 2025-01-22 12:04:19 +01:00 committed by GitHub
commit 988e5a1a63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/). and this project adheres to [Semantic Versioning](http://semver.org/).
# 0.23.4 - 2025-01-21 # 0.23.4 - 2025-01-22
### Added ### Added

2
app/controllers/api/v1/countries/visited_cities_controller.rb
View file

@ -17,6 +17,6 @@ class Api::V1::Countries::VisitedCitiesController < ApiController
private private
def required_params def required_params
%i[start_at end_at api_key] %i[start_at end_at]
end end
end end

5
app/services/tasks/imports/google_records.rb
View file

@ -30,12 +30,11 @@ class Tasks::Imports::GoogleRecords
def process_file_in_batches(import_id) def process_file_in_batches(import_id)
batch = [] batch = []
index = 0
Oj.load_file(@file_path, mode: :compat) do |record| Oj.load_file(@file_path, mode: :compat) do |record|
next unless record.is_a?(Hash) && record['locations'] next unless record.is_a?(Hash) && record['locations']
index = 0
record['locations'].each do |location| record['locations'].each do |location|
batch << location batch << location
@ -47,7 +46,7 @@ class Tasks::Imports::GoogleRecords
end end
end end
Import::GoogleTakeoutJob.perform_later(import_id, Oj.dump(batch)) if batch.any? Import::GoogleTakeoutJob.perform_later(import_id, Oj.dump(batch), index) if batch.any?
end end
def log_start def log_start