Merge pull request #1699 from Freika/dev

0.30.12

Author: Freika

.app_version

@@ -1 +1 @@
-0.30.11
+0.30.12

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# [0.30.12] - 2025-08-26
+
+## Fixed
+
+- Number of user points is not being cached resulting in performance boost on certain pages and operations.
+- Logout bug
+- Api key is now shown even in trial period
+
+
 # [0.30.11] - 2025-08-23
 
 ## Changed
@@ -14,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Some types of imports were not being detected correctly and were failing to import. #1678
 
+
 # [0.30.10] - 2025-08-22
 
 ## Added
@@ -41,7 +51,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Trial version for cloud users is now available.
 
 
-
 # [0.30.8] - 2025-08-01
 
 ## Fixed
@@ -51,7 +60,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Scratch map is now working correctly.
 
 
-
 # [0.30.7] - 2025-08-01
 
 ## Fixed
@@ -100,7 +108,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Prometheus metrics are now available at `/metrics`. Configure `METRICS_USERNAME` and `METRICS_PASSWORD` environment variables for basic authentication, default values are `prometheus` for both. All other prometheus-related environment variables are also necessary.
 
-
 ## Fixed
 
 - The Warden error in jobs is now fixed. #1556

app/assets/builds/tailwind.css

@@ -8,7 +8,7 @@ def index
     end_at = DateTime.parse(params[:end_at]).to_i
 
     points = current_api_user
-             .tracked_points
+             .points
              .where(timestamp: start_at..end_at)
 
     render json: { data: CountriesAndCities.new(points).call }

app/controllers/api/v1/countries/visited_cities_controller.rb

@@ -10,7 +10,7 @@ def index
     order    = params[:order] || 'desc'
 
     points = current_api_user
-             .tracked_points
+             .points
              .where(timestamp: start_at..end_at)
              .order(timestamp: order)
              .page(params[:page])
@@ -31,15 +31,15 @@ def create
   end
 
   def update
-    point = current_api_user.tracked_points.find(params[:id])
+    point = current_api_user.points.find(params[:id])
 
     point.update(lonlat: "POINT(#{point_params[:longitude]} #{point_params[:latitude]})")
 
     render json: point_serializer.new(point).call
   end
 
   def destroy
-    point = current_api_user.tracked_points.find(params[:id])
+    point = current_api_user.points.find(params[:id])
     point.destroy
 
     render json: { message: 'Point deleted successfully' }

app/controllers/api/v1/points_controller.rb

@@ -6,6 +6,6 @@ def index
 
     redirect_to map_url if current_user
 
-    @points = current_user.tracked_points.without_raw_data if current_user
+    @points = current_user.points.without_raw_data if current_user
   end
 end

app/controllers/home_controller.rb

@@ -88,6 +88,6 @@ def points_from_import
   end
 
   def points_from_user
-    current_user.tracked_points.without_raw_data.order(timestamp: :asc)
+    current_user.points.without_raw_data.order(timestamp: :asc)
   end
 end

app/controllers/map_controller.rb

@@ -24,7 +24,7 @@ def bulk_destroy
                 alert: 'No points selected.',
                 status: :see_other and return if point_ids.blank?
 
-    current_user.tracked_points.where(id: point_ids).destroy_all
+    current_user.points.where(id: point_ids).destroy_all
 
     redirect_to points_url(preserved_params),
                 notice: 'Points were successfully destroyed.',
@@ -58,7 +58,7 @@ def import_points
   end
 
   def user_points
-    current_user.tracked_points
+    current_user.points
   end
 
   def order_by

app/controllers/points_controller.rb

@@ -86,7 +86,7 @@ def past?(year, month)
   end
 
   def points_exist?(year, month, user)
-    user.tracked_points.where(
+    user.points.where(
       timestamp: DateTime.new(year, month).beginning_of_month..DateTime.new(year, month).end_of_month
     ).exists?
   end

app/helpers/application_helper.rb

@@ -1,5 +1,6 @@
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
 
+import "@rails/ujs"
 import "@rails/actioncable"
 import "controllers"
 import "@hotwired/turbo-rails"