diff --git a/.gitignore b/.gitignore index 91bd95ac..881769d1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ !/tmp/storage/.keep /tmp/imports/* !/tmp/imports/ +/tmp/imports/watched/* !/tmp/imports/watched/ !/tmp/imports/watched/.keep !/tmp/imports/watched/put-your-files-here.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf540cc..f893841b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Monkey patch for Geocoder to support http along with https for Photon API host was removed becausee it was breaking the reverse geocoding process. Now you can use only https for the Photon API host. This might be changed in the future +### Fixed + +- Stats update is now being correctly triggered every 6 hours + # [0.14.7] - 2024-10-01 ### Fixed diff --git a/app/jobs/stat_creating_job.rb b/app/jobs/stat_creating_job.rb index 26d84b99..d4bd97de 100644 --- a/app/jobs/stat_creating_job.rb +++ b/app/jobs/stat_creating_job.rb @@ -4,6 +4,8 @@ class StatCreatingJob < ApplicationJob queue_as :stats def perform(user_ids = nil) + user_ids = user_ids.nil? ? User.pluck(:id) : Array(user_ids) + CreateStats.new(user_ids).call end end diff --git a/config/schedule.yml b/config/schedule.yml index 3515735b..fd6b45b9 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -1,21 +1,21 @@ # config/schedule.yml stat_creating_job: - cron: "0 */6 * * *" # every 6 hours + cron: "0 */6 * * *" # every 6 hour class: "StatCreatingJob" - queue: default + queue: stats area_visits_calculation_scheduling_job: cron: "0 0 * * *" # every day at 0:00 class: "AreaVisitsCalculationSchedulingJob" - queue: default + queue: visit_suggesting visit_suggesting_job: cron: "0 1 * * *" # every day at 1:00 class: "VisitSuggestingJob" - queue: default + queue: visit_suggesting watcher_job: cron: "0 */1 * * *" # every 1 hour class: "Import::WatcherJob" - queue: default + queue: imports diff --git a/spec/jobs/import/immich_geodata_job_spec.rb b/spec/jobs/import/immich_geodata_job_spec.rb index d78f3cd8..c755852a 100644 --- a/spec/jobs/import/immich_geodata_job_spec.rb +++ b/spec/jobs/import/immich_geodata_job_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Import::ImmichGeodataJob, type: :job do it 'calls Immich::ImportGeodata' do expect_any_instance_of(Immich::ImportGeodata).to receive(:call) - Import::ImmichGeodataJob.perform_now(user.id) + described_class.perform_now(user.id) end end end diff --git a/spec/jobs/import/watcher_job_spec.rb b/spec/jobs/import/watcher_job_spec.rb index b7efa1da..2719601f 100644 --- a/spec/jobs/import/watcher_job_spec.rb +++ b/spec/jobs/import/watcher_job_spec.rb @@ -1,5 +1,13 @@ +# frozen_string_literal: true + require 'rails_helper' RSpec.describe Import::WatcherJob, type: :job do - pending "add some examples to (or delete) #{__FILE__}" + describe '#perform' do + it 'calls Imports::Watcher' do + expect_any_instance_of(Imports::Watcher).to receive(:call) + + described_class.perform_now + end + end end diff --git a/tmp/imports/watched/aa@bb.com-gpx_track_single_segment.gpx b/tmp/imports/watched/aa@bb.com-gpx_track_single_segment.gpx deleted file mode 100644 index c7447af0..00000000 --- a/tmp/imports/watched/aa@bb.com-gpx_track_single_segment.gpx +++ /dev/null @@ -1,1239 +0,0 @@ - - - - La Zubia - balcon - - Garmin Connect - - - - - La Zubia - balcon - - - 824.93 - - - - 822.91 - - - - 819.57 - - - - 815.2 - - - - 811.41 - - - - 808.11 - - - - 805.33 - - - - 802.85 - - - - 800.8 - - - - 798.9 - - - - 797.19 - - - - 795.8 - - - - 794.31 - - - - 793.25 - - - - 792.19 - - - - 791.44 - - - - 791.24 - - - - 791.47 - - - - 792.04 - - - - 792.18 - - - - 793.94 - - - - 795.29 - - - - 796.89 - - - - 798.7 - - - - 801.44 - - - - 803.97 - - - - 806.6 - - - - 809.27 - - - - 811.96 - - - - 814.62 - - - - 817.54 - - - - 820.18 - - - - 822.76 - - - - 825.25 - - - - 827.89 - - - - 830.82 - - - - 833.17 - - - - 835.42 - - - - 837.9 - - - - 839.89 - - - - 841.98 - - - - 844.17 - - - - 846.01 - - - - 847.32 - - - - 848.51 - - - - 849.54 - - - - 850.3 - - - - 850.74 - - - - 851.11 - - - - 851.31 - - - - 851.37 - - - - 851.36 - - - - 851.21 - - - - 851.04 - - - - 850.86 - - - - 850.41 - - - - 849.94 - - - - 849.54 - - - - 849.08 - - - - 848.67 - - - - 848.36 - - - - 848.08 - - - - 847.87 - - - - 847.77 - - - - 847.74 - - - - 847.75 - - - - 847.81 - - - - 847.96 - - - - 848.17 - - - - 848.37 - - - - 848.68 - - - - 849.01 - - - - 849.24 - - - - 849.47 - - - - 849.7 - - - - 849.88 - - - - 850.1 - - - - 850.25 - - - - 850.38 - - - - 850.47 - - - - 850.46 - - - - 850.35 - - - - 850.35 - - - - 850.02 - - - - 849.6 - - - - 849.05 - - - - 848.37 - - - - 847.54 - - - - 846.57 - - - - 845.55 - - - - 844.29 - - - - 842.85 - - - - 841.43 - - - - 839.98 - - - - 838.63 - - - - 837.18 - - - - 835.48 - - - - 833.92 - - - - 832.43 - - - - 831.06 - - - - 829.84 - - - - 829.04 - - - - 828.42 - - - - 828.15 - - - - 828.11 - - - - 828.51 - - - - 829.55 - - - - 830.31 - - - - 831.12 - - - - 831.93 - - - - 832.91 - - - - 833.85 - - - - 834.91 - - - - 836.07 - - - - 837.2 - - - - 838.38 - - - - 839.56 - - - - 840.58 - - - - 841.58 - - - - 842.46 - - - - 843.23 - - - - 843.46 - - - - 843.41 - - - - 842.64 - - - - 841.84 - - - - 840.81 - - - - 839.56 - - - - 837.86 - - - - 836.03 - - - - 833.91 - - - - 831.55 - - - - 828.71 - - - - 825.47 - - - - 820.96 - - - - 817.85 - - - - 814.71 - - - - 811.52 - - - - 808.25 - - - - 805.03 - - - - 801.68 - - - - 798.27 - - - - 794.91 - - - - 791.73 - - - - 788.61 - - - - 785.48 - - - - 782.4 - - - - 779.42 - - - - 776.47 - - - - 773.67 - - - - 770.99 - - - - 768.4 - - - - 765.66 - - - - 763.1 - - - - 760.26 - - - - 757.88 - - - - 755.75 - - - - 753.7 - - - - 751.75 - - - - 749.94 - - - - 748.17 - - - - 746.34 - - - - 744.47 - - - - 743.18 - - - - 742.0 - - - - 741.01 - - - - 740.17 - - - - 739.53 - - - - 738.88 - - - - 738.42 - - - - 738.16 - - - - 738.01 - - - - 738.01 - - - - 738.11 - - - - 738.36 - - - - 738.8 - - - - 739.13 - - - - 739.78 - - - - 740.12 - - - - 740.55 - - - - 740.93 - - - - 741.31 - - - - 741.6 - - - - 741.82 - - - - 741.89 - - - - 741.94 - - - - 741.89 - - - - 742.0 - - - - 742.05 - - - - 742.17 - - - - 742.28 - - - - 742.49 - - - - 742.74 - - - - 742.86 - - - - 743.34 - - - - 744.01 - - - - 744.96 - - - - 746.14 - - - - 747.41 - - - - 748.68 - - - - 750.03 - - - - 751.57 - - - - 753.47 - - - - 755.4 - - - - 757.49 - - - - 759.68 - - - - 762.09 - - - - 764.56 - - - - 767.4 - - - - 770.3 - - - - 773.45 - - - - 776.83 - - - - 780.51 - - - - 783.74 - - - - 786.94 - - - - 790.76 - - - - 794.06 - - - - 797.36 - - - - 800.75 - - - - 804.12 - - - - 807.53 - - - - 811.02 - - - - 814.61 - - - - 818.13 - - - - 821.6 - - - - 825.29 - - - - 828.89 - - - - 832.37 - - - - 836.28 - - - - 839.49 - - - - 842.19 - - - - 844.74 - - - - 847.21 - - - - 849.34 - - - - 851.3 - - - - 852.93 - - - - 854.35 - - - - 855.69 - - - - 856.86 - - - - 857.72 - - - - 858.43 - - - - 858.78 - - - - 859.01 - - - - 859.0 - - - - 858.97 - - - - 859.21 - - - - 859.45 - - - - 859.73 - - - - 860.06 - - - - 860.45 - - - - 861.08 - - - - 861.61 - - - - 862.29 - - - - 863.0 - - - - 863.9 - - - - 864.96 - - - - 866.07 - - - - 867.3 - - - - 869.0 - - - - 870.45 - - - - 871.97 - - - - 873.37 - - - - 874.8 - - - - 876.17 - - - - 877.6 - - - - 879.15 - - - - 880.87 - - - - 882.54 - - - - 884.28 - - - - 886.01 - - - - 887.84 - - - - 889.62 - - - - 891.29 - - - - 892.83 - - - - 893.87 - - - - 894.78 - - - - 895.66 - - - - 896.51 - - - - 896.83 - - - - 896.95 - - - - 896.98 - - - - 896.67 - - - - 896.92 - - - - 897.13 - - - - 897.08 - - - - 897.65 - - - - 898.62 - - - - 899.59 - - - - 900.3 - - - - 901.06 - - - - 901.98 - - - - 902.94 - - - - 904.14 - - - - 905.06 - - - - 905.5 - - - - 905.8 - - - - 905.47 - - - - 905.91 - - - - 906.01 - - - - 905.66 - - - - 904.85 - - - - 904.4 - - - - 903.49 - - - - 903.02 - - - - 901.8 - - - - 901.42 - - - - -