Merge pull request #6 from Freika/basic_tests

Basic tests

Author: Freika

.rubocop.yml

@@ -1 +1,4 @@
 require: rubocop-rails
+
+Style/Documentation:
+  Enabled: false

Gemfile

@@ -15,10 +15,11 @@ gem 'stimulus-rails'
 gem 'tailwindcss-rails'
 gem 'turbo-rails'
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
-gem "importmap-rails"
-gem "chartkick"
+gem 'importmap-rails'
+gem 'chartkick'
 gem 'geocoder'
 gem 'sidekiq'
+gem 'sidekiq-cron'
 
 
 group :development, :test do
@@ -42,4 +43,4 @@ group :development do
 end
 
 # Use Redis for Action Cable
-gem "redis"
+gem 'redis'

Gemfile.lock

@@ -106,13 +106,18 @@ GEM
       railties (>= 6.1)
     drb (2.2.1)
     erubi (1.12.0)
+    et-orbi (1.2.11)
+      tzinfo
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     ffaker (2.23.0)
     foreman (0.87.2)
+    fugit (1.10.1)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     geocoder (1.8.2)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -178,6 +183,7 @@ GEM
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)
+    raabro (1.4.0)
     racc (1.7.3)
     rack (3.0.10)
     rack-session (2.0.0)
@@ -274,6 +280,10 @@ GEM
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.19.0)
+    sidekiq-cron (1.12.0)
+      fugit (~> 1.8)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -343,6 +353,7 @@ DEPENDENCIES
   rubocop-rails
   shoulda-matchers
   sidekiq
+  sidekiq-cron
   simplecov
   sprockets-rails
   stimulus-rails

Procfile.dev

@@ -1,3 +1,3 @@
 web: bin/rails server -p 3000 -b 0.0.0.0
 css: bin/rails tailwindcss:watch
-worker: bundle exec sidekiq
+worker: bundle exec sidekiq -C config/sidekiq.yml

app/controllers/api/v1/points_controller.rb

@@ -2,15 +2,9 @@ class Api::V1::PointsController < ApplicationController
   skip_forgery_protection
 
   def create
-    parsed_params = OwnTracks::Params.new(point_params).call
+    PointCreatingJob.perform_later(point_params)
 
-    @point = Point.create(parsed_params)
-
-    if @point.valid?
-      render json: @point, status: :ok
-    else
-      render json: @point.errors, status: :unprocessable_entity
-    end
+    render json: {}, status: :ok
   end
 
   def destroy

app/controllers/points_controller.rb

@@ -11,20 +11,21 @@ def index
     @distance = distance
     @start_at = Time.zone.at(start_at)
     @end_at = Time.zone.at(end_at)
+    @years = (@start_at.year..@end_at.year).to_a
   end
 
   private
 
   def start_at
     return 1.month.ago.beginning_of_day.to_i if params[:start_at].nil?
 
-    params[:start_at].to_datetime.to_i
+    Time.parse(params[:start_at]).to_i
   end
 
   def end_at
     return Time.zone.today.end_of_day.to_i if params[:end_at].nil?
 
-    params[:end_at].to_datetime.to_i
+    Time.parse(params[:end_at]).to_i
   end
 
   def distance

app/helpers/application_helper.rb

@@ -17,10 +17,18 @@ def month_timespan(stat)
   end
 
   def year_timespan(year)
-    start_at = DateTime.new(year).beginning_of_year.to_time.strftime('%Y-%m-%dT%H:%M')
-    end_at = DateTime.new(year).end_of_year.to_time.strftime('%Y-%m-%dT%H:%M')
+    start_at = Time.utc(year).in_time_zone('Europe/Berlin').beginning_of_year.strftime('%Y-%m-%dT%H:%M')
+    end_at = Time.utc(year).in_time_zone('Europe/Berlin').end_of_year.strftime('%Y-%m-%dT%H:%M')
 
-    { start_at: start_at, end_at: end_at }
+    { start_at:, end_at: }
+  end
+
+  def timespan(month, year)
+    month = DateTime.new(year, month).in_time_zone(Time.zone)
+    start_at = month.beginning_of_month.to_time.strftime('%Y-%m-%dT%H:%M')
+    end_at = month.end_of_month.to_time.strftime('%Y-%m-%dT%H:%M')
+
+    { start_at:, end_at: }
   end
 
   def header_colors
@@ -38,4 +46,14 @@ def countries_and_cities_stat(year)
   def year_distance_stat_in_km(year)
     Stat.year_distance(year).sum { _1[1] }
   end
+
+  def is_past?(year, month)
+    DateTime.new(year, month).past?
+  end
+
+  def points_exist?(year, month)
+    Point.where(
+      timestamp: DateTime.new(year, month).beginning_of_month..DateTime.new(year, month).end_of_month
+    ).exists?
+  end
 end

app/jobs/point_creating_job.rb

@@ -0,0 +1,9 @@
+class PointCreatingJob < ApplicationJob
+  queue_as :default
+
+  def perform(point_params)
+    parsed_params = OwnTracks::Params.new(point_params).call
+
+    point = Point.create(parsed_params)
+  end
+end

app/jobs/stat_creating_job.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class StatCreatingJob < ApplicationJob
   queue_as :default
 
-  def perform(user_id)
-    CreateStats.new(user_id).call
+  def perform(user_ids = nil)
+    CreateStats.new(user_ids).call
   end
 end

app/models/stat.rb

@@ -5,20 +5,16 @@ class Stat < ApplicationRecord
 
   belongs_to :user
 
-  def timespan
-    DateTime.new(year, month).beginning_of_month..DateTime.new(year, month).end_of_month
-  end
-
   def distance_by_day
     timespan.to_a.map.with_index(1) do |day, index|
       beginning_of_day = day.beginning_of_day.to_i
       end_of_day = day.end_of_day.to_i
 
-      data = { day: index, distance: 0 }
-
       # We have to filter by user as well
       points = Point.where(timestamp: beginning_of_day..end_of_day)
 
+      data = { day: index, distance: 0 }
+
       points.each_cons(2) do |point1, point2|
         distance = Geocoder::Calculations.distance_between(
           [point1.latitude, point1.longitude], [point2.latitude, point2.longitude]
@@ -49,6 +45,18 @@ def self.year_cities_and_countries(year)
 
     data = CountriesAndCities.new(points).call
 
-    { countries: data.count, cities: data.sum { |country| country[:cities].count } }
+    { countries: data.map { _1[:country] }.uniq.count, cities: data.sum { |country| country[:cities].count } }
+  end
+
+  def self.years
+    starting_year = select(:year).min&.year || Time.current.year
+
+    (starting_year..Time.current.year).to_a.reverse
+  end
+
+  private
+
+  def timespan
+    DateTime.new(year, month).beginning_of_month..DateTime.new(year, month).end_of_month
   end
 end