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 pull request #1010 from Freika/feature/subscription

Browse source 
Feature/subscription
This commit is contained in:
Evgenii Burmakin 2025-04-04 22:54:21 +02:00 committed by GitHub
commit 92e1cbec84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 551 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -42,8 +42,10 @@ gem 'strong_migrations'
gem 'tailwindcss-rails'
gem 'turbo-rails'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'jwt'
group :development, :test do
gem 'brakeman', require: false
gem 'debug', platforms: %i[mri mingw x64_mingw]
gem 'dotenv-rails'
gem 'factory_bot_rails'

6
Gemfile.lock
View file

@ -101,6 +101,8 @@ GEM
bigdecimal (3.1.9)
bootsnap (1.18.4)
msgpack (~> 1.2)
brakeman (7.0.2)
racc
builder (3.3.0)
byebug (11.1.3)
chartkick (5.1.3)
@ -181,6 +183,8 @@ GEM
json (2.10.1)
json-schema (5.0.1)
addressable (~> 2.8)
jwt (2.10.1)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
@ -474,6 +478,7 @@ DEPENDENCIES
aws-sdk-kms (~> 1.96.0)
aws-sdk-s3 (~> 1.177.0)
bootsnap
brakeman
chartkick
data_migrate
database_consistency
@ -489,6 +494,7 @@ DEPENDENCIES
groupdate
httparty
importmap-rails
jwt
kaminari
lograge
oj

6
app/controllers/application_controller.rb
View file

@ -31,6 +31,12 @@ class ApplicationController < ActionController::Base
redirect_to root_path, notice: 'Your account is not active.', status: :see_other
end
def authenticate_non_self_hosted!
return unless DawarichSettings.self_hosted?
redirect_to root_path, notice: 'You are not authorized to perform this action.', status: :see_other
end
private
def set_self_hosted_status

34
app/controllers/settings/subscriptions_controller.rb Normal file
View file

@ -0,0 +1,34 @@
# frozen_string_literal: true
class Settings::SubscriptionsController < ApplicationController
before_action :authenticate_user!
before_action :authenticate_non_self_hosted!
def index; end
def subscription_callback
token = params[:token]
begin
decoded_token = JWT.decode(
token,
ENV['JWT_SECRET_KEY'],
true,
{ algorithm: 'HS256' }
).first.symbolize_keys
unless decoded_token[:user_id] == current_user.id
redirect_to settings_subscriptions_path, alert: 'Invalid subscription update request.'
return
end
current_user.update!(status: decoded_token[:status], active_until: decoded_token[:active_until])
redirect_to settings_subscriptions_path, notice: 'Your subscription has been updated successfully!'
rescue JWT::DecodeError
redirect_to settings_subscriptions_path, alert: 'Failed to verify subscription update.'
rescue ArgumentError
redirect_to settings_subscriptions_path, alert: 'Invalid subscription data received.'
end
end
end

13
app/helpers/application_helper.rb
View file

@ -137,4 +137,17 @@ module ApplicationHelper
speed * 3.6
end
def days_left(active_until)
return unless active_until
time_words = distance_of_time_in_words(Time.zone.now, active_until)
content_tag(
:span,
time_words,
class: 'tooltip',
data: { tip: "Expires on #{active_until.iso8601}" }
)
end
end

9
app/models/concerns/distanceable.rb
View file

@ -59,12 +59,11 @@ module Distanceable
return 0 if points.length < 2
total_meters = points.each_cons(2).sum do |point1, point2|
connection.select_value(<<-SQL.squish)
SELECT ST_Distance(
ST_GeomFromEWKT('#{point1.lonlat}')::geography,
ST_GeomFromEWKT('#{point2.lonlat}')::geography
connection.select_value(
'SELECT ST_Distance(ST_GeomFromEWKT($1)::geography, ST_GeomFromEWKT($2)::geography)',
nil,
[point1.lonlat, point2.lonlat]
)
SQL
end
total_meters.to_f / DISTANCE_UNITS[unit.to_sym]

16
app/models/user.rb
View file

@ -100,6 +100,22 @@ class User < ApplicationRecord
end
end
def can_subscribe?
active_until&.past? && !DawarichSettings.self_hosted?
end
def generate_subscription_token
payload = {
user_id: id,
email: email,
exp: 30.minutes.from_now.to_i
}
secret_key = ENV['JWT_SECRET_KEY']
JWT.encode(payload, secret_key, 'HS256')
end
private
def create_api_key

10
app/services/visits/find_within_bounding_box.rb
View file

@ -12,13 +12,17 @@ module Visits
end
def call
bounding_box = "ST_MakeEnvelope(#{sw_lng}, #{sw_lat}, #{ne_lng}, #{ne_lat}, 4326)"
Visit
.includes(:place)
.where(user:)
.joins(:place)
.where("ST_Contains(#{bounding_box}, ST_SetSRID(places.lonlat::geometry, 4326))")
.where(
'ST_Contains(ST_MakeEnvelope(?, ?, ?, ?, 4326), ST_SetSRID(places.lonlat::geometry, 4326))',
sw_lng,
sw_lat,
ne_lng,
ne_lat
)
.order(started_at: :desc)
end

3
app/views/settings/_navigation.html.erb
View file

@ -5,4 +5,7 @@
<%= link_to 'Background Jobs', settings_background_jobs_path, role: 'tab', class: "tab #{active_tab?(settings_background_jobs_path)}" %>
<% end %>
<%= link_to 'Map', settings_maps_path, role: 'tab', class: "tab #{active_tab?(settings_maps_path)}" %>
<% if !DawarichSettings.self_hosted? %>
<%= link_to 'Subscriptions', settings_subscriptions_path, role: 'tab', class: "tab #{active_tab?(settings_subscriptions_path)}" %>
<% end %>
</div>

30
app/views/settings/subscriptions/index.html.erb Normal file
View file

@ -0,0 +1,30 @@
<% content_for :title, "Subscriptions" %>
<div class="min-h-content w-full my-5">
<%= render 'settings/navigation' %>
<div class="hero bg-base-200 min-h-80">
<div class="hero-content text-center">
<div class="max-w-md">
<h1 class="text-5xl font-bold">Hello there!</h1>
<% if current_user.active_until.future? %>
<p class="py-6">
You are currently subscribed to Dawarich, hurray!
</p>
<p>
Your subscription will be valid for the next <span class="text-accent"><%= days_left(current_user.active_until) %></span>.
</p>
<%= link_to 'Manage subscription', "#{ENV['SUBSCRIPTION_URL']}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-primary my-4' %>
<% else %>
<p class="py-6">
You are currently not subscribed to Dawarich. How about we fix that?
</p>
<%= link_to 'Manage subscription', "#{ENV['SUBSCRIPTION_URL']}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-primary my-4' %>
<% end %>
</div>
</div>
</div>
</div>

7
app/views/shared/_navbar.html.erb
View file

@ -19,6 +19,9 @@
</ul>
</details>
</li>
<% if user_signed_in? && current_user.can_subscribe? %>
<li><%= link_to 'Subscribe', "#{ENV['SUBSCRIPTION_URL']}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-sm btn-success' %></li>
<% end %>
</ul>
</div>
<%= link_to 'Dawarich', root_path, class: 'btn btn-ghost normal-case text-xl'%>
@ -67,6 +70,10 @@
<div class="navbar-end">
<ul class="menu menu-horizontal bg-base-100 rounded-box px-1">
<% if user_signed_in? %>
<% if current_user.can_subscribe? %>
<li><%= link_to 'Subscribe', "#{ENV['SUBSCRIPTION_URL']}/auth/dawarich?token=#{current_user.generate_subscription_token}", class: 'btn btn-sm btn-success' %></li>
<% end %>
<div class="dropdown dropdown-end dropdown-bottom dropdown-hover"
data-controller="notifications"
data-notifications-user-id-value="<%= current_user.id %>">

5
config/routes.rb
View file

@ -22,6 +22,11 @@ Rails.application.routes.draw do
resources :users, only: %i[index create destroy edit update]
resources :maps, only: %i[index]
patch 'maps', to: 'maps#update'
resources :subscriptions, only: %i[index] do
collection do
get :subscription_callback
end
end
end
patch 'settings', to: 'settings#update'

2
db/data_schema.rb
View file

@ -1 +1 @@
DataMigrate::Data.define(version: 20250404182629)
DataMigrate::Data.define(version: 20_250_404_182_629)

447
db/schema.rb generated
View file

@ -10,261 +10,264 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2025_04_04_182437) do
ActiveRecord::Schema[8.0].define(version: 20_250_404_182_437) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
enable_extension "postgis"
enable_extension 'pg_catalog.plpgsql'
enable_extension 'postgis'
create_table "action_text_rich_texts", force: :cascade do |t|
t.string "name", null: false
t.text "body"
t.string "record_type", null: false
t.bigint "record_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
create_table 'action_text_rich_texts', force: :cascade do |t|
t.string 'name', null: false
t.text 'body'
t.string 'record_type', null: false
t.bigint 'record_id', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.index %w[record_type record_id name], name: 'index_action_text_rich_texts_uniqueness', unique: true
end
create_table "active_storage_attachments", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
t.bigint "record_id", null: false
t.bigint "blob_id", null: false
t.datetime "created_at", null: false
t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
create_table 'active_storage_attachments', force: :cascade do |t|
t.string 'name', null: false
t.string 'record_type', null: false
t.bigint 'record_id', null: false
t.bigint 'blob_id', null: false
t.datetime 'created_at', null: false
t.index ['blob_id'], name: 'index_active_storage_attachments_on_blob_id'
t.index %w[record_type record_id name blob_id], name: 'index_active_storage_attachments_uniqueness',
unique: true
end
create_table "active_storage_blobs", force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
t.text "metadata"
t.string "service_name", null: false
t.bigint "byte_size", null: false
t.string "checksum"
t.datetime "created_at", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
create_table 'active_storage_blobs', force: :cascade do |t|
t.string 'key', null: false
t.string 'filename', null: false
t.string 'content_type'
t.text 'metadata'
t.string 'service_name', null: false
t.bigint 'byte_size', null: false
t.string 'checksum'
t.datetime 'created_at', null: false
t.index ['key'], name: 'index_active_storage_blobs_on_key', unique: true
end
create_table "active_storage_variant_records", force: :cascade do |t|
t.bigint "blob_id", null: false
t.string "variation_digest", null: false
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
create_table 'active_storage_variant_records', force: :cascade do |t|
t.bigint 'blob_id', null: false
t.string 'variation_digest', null: false
t.index %w[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
end
create_table "areas", force: :cascade do |t|
t.string "name", null: false
t.bigint "user_id", null: false
t.decimal "longitude", precision: 10, scale: 6, null: false
t.decimal "latitude", precision: 10, scale: 6, null: false
t.integer "radius", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["user_id"], name: "index_areas_on_user_id"
create_table 'areas', force: :cascade do |t|
t.string 'name', null: false
t.bigint 'user_id', null: false
t.decimal 'longitude', precision: 10, scale: 6, null: false
t.decimal 'latitude', precision: 10, scale: 6, null: false
t.integer 'radius', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.index ['user_id'], name: 'index_areas_on_user_id'
end
create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do |t|
create_table 'data_migrations', primary_key: 'version', id: :string, force: :cascade do |t|
end
create_table "exports", force: :cascade do |t|
t.string "name", null: false
t.string "url"
t.integer "status", default: 0, null: false
t.bigint "user_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "file_format", default: 0
t.datetime "start_at"
t.datetime "end_at"
t.index ["status"], name: "index_exports_on_status"
t.index ["user_id"], name: "index_exports_on_user_id"
create_table 'exports', force: :cascade do |t|
t.string 'name', null: false
t.string 'url'
t.integer 'status', default: 0, null: false
t.bigint 'user_id', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.integer 'file_format', default: 0
t.datetime 'start_at'
t.datetime 'end_at'
t.index ['status'], name: 'index_exports_on_status'
t.index ['user_id'], name: 'index_exports_on_user_id'
end
create_table "imports", force: :cascade do |t|
t.string "name", null: false
t.bigint "user_id", null: false
t.integer "source", default: 0
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "raw_points", default: 0
t.integer "doubles", default: 0
t.integer "processed", default: 0
t.jsonb "raw_data"
t.integer "points_count", default: 0
t.index ["source"], name: "index_imports_on_source"
t.index ["user_id"], name: "index_imports_on_user_id"
create_table 'imports', force: :cascade do |t|
t.string 'name', null: false
t.bigint 'user_id', null: false
t.integer 'source', default: 0
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.integer 'raw_points', default: 0
t.integer 'doubles', default: 0
t.integer 'processed', default: 0
t.jsonb 'raw_data'
t.integer 'points_count', default: 0
t.index ['source'], name: 'index_imports_on_source'
t.index ['user_id'], name: 'index_imports_on_user_id'
end
create_table "notifications", force: :cascade do |t|
t.string "title", null: false
t.text "content", null: false
t.bigint "user_id", null: false
t.integer "kind", default: 0, null: false
t.datetime "read_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["kind"], name: "index_notifications_on_kind"
t.index ["user_id"], name: "index_notifications_on_user_id"
create_table 'notifications', force: :cascade do |t|
t.string 'title', null: false
t.text 'content', null: false
t.bigint 'user_id', null: false
t.integer 'kind', default: 0, null: false
t.datetime 'read_at'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.index ['kind'], name: 'index_notifications_on_kind'
t.index ['user_id'], name: 'index_notifications_on_user_id'
end
create_table "place_visits", force: :cascade do |t|
t.bigint "place_id", null: false
t.bigint "visit_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["place_id"], name: "index_place_visits_on_place_id"
t.index ["visit_id"], name: "index_place_visits_on_visit_id"
create_table 'place_visits', force: :cascade do |t|
t.bigint 'place_id', null: false
t.bigint 'visit_id', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.index ['place_id'], name: 'index_place_visits_on_place_id'
t.index ['visit_id'], name: 'index_place_visits_on_visit_id'
end
create_table "places", force: :cascade do |t|
t.string "name", null: false
t.decimal "longitude", precision: 10, scale: 6, null: false
t.decimal "latitude", precision: 10, scale: 6, null: false
t.string "city"
t.string "country"
t.integer "source", default: 0
t.jsonb "geodata", default: {}, null: false
t.datetime "reverse_geocoded_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.geography "lonlat", limit: {srid: 4326, type: "st_point", geographic: true}
t.index ["lonlat"], name: "index_places_on_lonlat", using: :gist
create_table 'places', force: :cascade do |t|
t.string 'name', null: false
t.decimal 'longitude', precision: 10, scale: 6, null: false
t.decimal 'latitude', precision: 10, scale: 6, null: false
t.string 'city'
t.string 'country'
t.integer 'source', default: 0
t.jsonb 'geodata', default: {}, null: false
t.datetime 'reverse_geocoded_at'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.geography 'lonlat', limit: { srid: 4326, type: 'st_point', geographic: true }
t.index ['lonlat'], name: 'index_places_on_lonlat', using: :gist
end
create_table "points", force: :cascade do |t|
t.integer "battery_status"
t.string "ping"
t.integer "battery"
t.string "tracker_id"
t.string "topic"
t.integer "altitude"
t.decimal "longitude", precision: 10, scale: 6
t.string "velocity"
t.integer "trigger"
t.string "bssid"
t.string "ssid"
t.integer "connection"
t.integer "vertical_accuracy"
t.integer "accuracy"
t.integer "timestamp"
t.decimal "latitude", precision: 10, scale: 6
t.integer "mode"
t.text "inrids", default: [], array: true
t.text "in_regions", default: [], array: true
t.jsonb "raw_data", default: {}
t.bigint "import_id"
t.string "city"
t.string "country"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "user_id"
t.jsonb "geodata", default: {}, null: false
t.bigint "visit_id"
t.datetime "reverse_geocoded_at"
t.decimal "course", precision: 8, scale: 5
t.decimal "course_accuracy", precision: 8, scale: 5
t.string "external_track_id"
t.geography "lonlat", limit: {srid: 4326, type: "st_point", geographic: true}
t.index ["altitude"], name: "index_points_on_altitude"
t.index ["battery"], name: "index_points_on_battery"
t.index ["battery_status"], name: "index_points_on_battery_status"
t.index ["city"], name: "index_points_on_city"
t.index ["connection"], name: "index_points_on_connection"
t.index ["country"], name: "index_points_on_country"
t.index ["external_track_id"], name: "index_points_on_external_track_id"
t.index ["geodata"], name: "index_points_on_geodata", using: :gin
t.index ["import_id"], name: "index_points_on_import_id"
t.index ["latitude", "longitude"], name: "index_points_on_latitude_and_longitude"
t.index ["lonlat", "timestamp", "user_id"], name: "index_points_on_lonlat_timestamp_user_id", unique: true
t.index ["lonlat"], name: "index_points_on_lonlat", using: :gist
t.index ["reverse_geocoded_at"], name: "index_points_on_reverse_geocoded_at"
t.index ["timestamp"], name: "index_points_on_timestamp"
t.index ["trigger"], name: "index_points_on_trigger"
t.index ["user_id"], name: "index_points_on_user_id"
t.index ["visit_id"], name: "index_points_on_visit_id"
create_table 'points', force: :cascade do |t|
t.integer 'battery_status'
t.string 'ping'
t.integer 'battery'
t.string 'tracker_id'
t.string 'topic'
t.integer 'altitude'
t.decimal 'longitude', precision: 10, scale: 6
t.string 'velocity'
t.integer 'trigger'
t.string 'bssid'
t.string 'ssid'
t.integer 'connection'
t.integer 'vertical_accuracy'
t.integer 'accuracy'
t.integer 'timestamp'
t.decimal 'latitude', precision: 10, scale: 6
t.integer 'mode'
t.text 'inrids', default: [], array: true
t.text 'in_regions', default: [], array: true
t.jsonb 'raw_data', default: {}
t.bigint 'import_id'
t.string 'city'
t.string 'country'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.bigint 'user_id'
t.jsonb 'geodata', default: {}, null: false
t.bigint 'visit_id'
t.datetime 'reverse_geocoded_at'
t.decimal 'course', precision: 8, scale: 5
t.decimal 'course_accuracy', precision: 8, scale: 5
t.string 'external_track_id'
t.geography 'lonlat', limit: { srid: 4326, type: 'st_point', geographic: true }
t.index ['altitude'], name: 'index_points_on_altitude'
t.index ['battery'], name: 'index_points_on_battery'
t.index ['battery_status'], name: 'index_points_on_battery_status'
t.index ['city'], name: 'index_points_on_city'
t.index ['connection'], name: 'index_points_on_connection'
t.index ['country'], name: 'index_points_on_country'
t.index ['external_track_id'], name: 'index_points_on_external_track_id'
t.index ['geodata'], name: 'index_points_on_geodata', using: :gin
t.index ['import_id'], name: 'index_points_on_import_id'
t.index %w[latitude longitude], name: 'index_points_on_latitude_and_longitude'
t.index %w[lonlat timestamp user_id], name: 'index_points_on_lonlat_timestamp_user_id', unique: true
t.index ['lonlat'], name: 'index_points_on_lonlat', using: :gist
t.index ['reverse_geocoded_at'], name: 'index_points_on_reverse_geocoded_at'
t.index ['timestamp'], name: 'index_points_on_timestamp'
t.index ['trigger'], name: 'index_points_on_trigger'
t.index ['user_id'], name: 'index_points_on_user_id'
t.index ['visit_id'], name: 'index_points_on_visit_id'
end
create_table "stats", force: :cascade do |t|
t.integer "year", null: false
t.integer "month", null: false
t.integer "distance", null: false
t.jsonb "toponyms"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "user_id", null: false
t.jsonb "daily_distance", default: {}
t.index ["distance"], name: "index_stats_on_distance"
t.index ["month"], name: "index_stats_on_month"
t.index ["user_id"], name: "index_stats_on_user_id"
t.index ["year"], name: "index_stats_on_year"
create_table 'stats', force: :cascade do |t|
t.integer 'year', null: false
t.integer 'month', null: false
t.integer 'distance', null: false
t.jsonb 'toponyms'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.bigint 'user_id', null: false
t.jsonb 'daily_distance', default: {}
t.index ['distance'], name: 'index_stats_on_distance'
t.index ['month'], name: 'index_stats_on_month'
t.index ['user_id'], name: 'index_stats_on_user_id'
t.index ['year'], name: 'index_stats_on_year'
end
create_table "trips", force: :cascade do |t|
t.string "name", null: false
t.datetime "started_at", null: false
t.datetime "ended_at", null: false
t.integer "distance"
t.bigint "user_id", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.geometry "path", limit: {srid: 3857, type: "line_string"}
t.index ["user_id"], name: "index_trips_on_user_id"
create_table 'trips', force: :cascade do |t|
t.string 'name', null: false
t.datetime 'started_at', null: false
t.datetime 'ended_at', null: false
t.integer 'distance'
t.bigint 'user_id', null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.geometry 'path', limit: { srid: 3857, type: 'line_string' }
t.index ['user_id'], name: 'index_trips_on_user_id'
end
create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "api_key", default: "", null: false
t.string "theme", default: "dark", null: false
t.jsonb "settings", default: {"fog_of_war_meters" => "100", "meters_between_routes" => "1000", "minutes_between_routes" => "60"}
t.boolean "admin", default: false
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.integer "status", default: 0
t.datetime "active_until"
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
create_table 'users', force: :cascade do |t|
t.string 'email', default: '', null: false
t.string 'encrypted_password', default: '', null: false
t.string 'reset_password_token'
t.datetime 'reset_password_sent_at'
t.datetime 'remember_created_at'
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.string 'api_key', default: '', null: false
t.string 'theme', default: 'dark', null: false
t.jsonb 'settings',
default: { 'fog_of_war_meters' => '100', 'meters_between_routes' => '1000',
'minutes_between_routes' => '60' }
t.boolean 'admin', default: false
t.integer 'sign_in_count', default: 0, null: false
t.datetime 'current_sign_in_at'
t.datetime 'last_sign_in_at'
t.string 'current_sign_in_ip'
t.string 'last_sign_in_ip'
t.integer 'status', default: 0
t.datetime 'active_until'
t.index ['email'], name: 'index_users_on_email', unique: true
t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
end
add_check_constraint "users", "admin IS NOT NULL", name: "users_admin_null", validate: false
add_check_constraint 'users', 'admin IS NOT NULL', name: 'users_admin_null', validate: false
create_table "visits", force: :cascade do |t|
t.bigint "area_id"
t.bigint "user_id", null: false
t.datetime "started_at", null: false
t.datetime "ended_at", null: false
t.integer "duration", null: false
t.string "name", null: false
t.integer "status", default: 0, null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "place_id"
t.index ["area_id"], name: "index_visits_on_area_id"
t.index ["place_id"], name: "index_visits_on_place_id"
t.index ["started_at"], name: "index_visits_on_started_at"
t.index ["user_id"], name: "index_visits_on_user_id"
create_table 'visits', force: :cascade do |t|
t.bigint 'area_id'
t.bigint 'user_id', null: false
t.datetime 'started_at', null: false
t.datetime 'ended_at', null: false
t.integer 'duration', null: false
t.string 'name', null: false
t.integer 'status', default: 0, null: false
t.datetime 'created_at', null: false
t.datetime 'updated_at', null: false
t.bigint 'place_id'
t.index ['area_id'], name: 'index_visits_on_area_id'
t.index ['place_id'], name: 'index_visits_on_place_id'
t.index ['started_at'], name: 'index_visits_on_started_at'
t.index ['user_id'], name: 'index_visits_on_user_id'
end
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "areas", "users"
add_foreign_key "notifications", "users"
add_foreign_key "place_visits", "places"
add_foreign_key "place_visits", "visits"
add_foreign_key "points", "users"
add_foreign_key "points", "visits"
add_foreign_key "stats", "users"
add_foreign_key "trips", "users"
add_foreign_key "visits", "areas"
add_foreign_key "visits", "places"
add_foreign_key "visits", "users"
add_foreign_key 'active_storage_attachments', 'active_storage_blobs', column: 'blob_id'
add_foreign_key 'active_storage_variant_records', 'active_storage_blobs', column: 'blob_id'
add_foreign_key 'areas', 'users'
add_foreign_key 'notifications', 'users'
add_foreign_key 'place_visits', 'places'
add_foreign_key 'place_visits', 'visits'
add_foreign_key 'points', 'users'
add_foreign_key 'points', 'visits'
add_foreign_key 'stats', 'users'
add_foreign_key 'trips', 'users'
add_foreign_key 'visits', 'areas'
add_foreign_key 'visits', 'places'
add_foreign_key 'visits', 'users'
end

2
spec/jobs/bulk_visits_suggesting_job_spec.rb
View file

@ -7,7 +7,7 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do
let(:start_at) { 1.day.ago.beginning_of_day }
let(:end_at) { 1.day.ago.end_of_day }
let(:user) { create(:user) }
let(:inactive_user) { create(:user, status: :inactive) }
let(:inactive_user) { create(:user, :inactive) }
let(:user_with_points) { create(:user) }
let(:time_chunks) { [[start_at, end_at]] }

2
spec/jobs/visit_suggesting_job_spec.rb
View file

@ -98,7 +98,7 @@ RSpec.describe VisitSuggestingJob, type: :job do
context 'when user is inactive' do
before do
user.update(status: :inactive)
user.update(status: :inactive, active_until: 1.day.ago)
allow(Visits::Suggest).to receive(:new).and_call_original
allow_any_instance_of(Visits::Suggest).to receive(:call)

50
spec/models/user_spec.rb
View file

@ -31,7 +31,7 @@ RSpec.describe User, type: :model do
describe '#activate' do
context 'when self-hosted' do
let!(:user) { create(:user, status: :inactive, active_until: 1.day.ago) }
let!(:user) { create(:user, :inactive) }
before do
allow(DawarichSettings).to receive(:self_hosted?).and_return(true)
@ -49,7 +49,7 @@ RSpec.describe User, type: :model do
end
it 'does not activate user' do
user = create(:user, status: :inactive, active_until: 1.day.ago)
user = create(:user, :inactive)
expect(user.active?).to be_falsey
expect(user.active_until).to be_within(1.minute).of(1.day.ago)
@ -178,5 +178,51 @@ RSpec.describe User, type: :model do
expect(user.years_tracked).to eq([{ year: 2024, months: ['Jan'] }])
end
end
describe '#can_subscribe?' do
context 'when Dawarich is self-hosted' do
before do
allow(DawarichSettings).to receive(:self_hosted?).and_return(true)
end
context 'when user is active' do
let!(:user) { create(:user, status: :active, active_until: 1000.years.from_now) }
it 'returns false' do
expect(user.can_subscribe?).to be_falsey
end
end
context 'when user is inactive' do
let(:user) { create(:user, :inactive) }
it 'returns false' do
expect(user.can_subscribe?).to be_falsey
end
end
end
context 'when Dawarich is not self-hosted' do
before do
allow(DawarichSettings).to receive(:self_hosted?).and_return(false)
end
context 'when user is active' do
let(:user) { create(:user, status: :active, active_until: 1000.years.from_now) }
it 'returns false' do
expect(user.can_subscribe?).to be_falsey
end
end
context 'when user is inactive' do
let(:user) { create(:user, :inactive) }
it 'returns true' do
expect(user.can_subscribe?).to be_truthy
end
end
end
end
end
end

141
spec/requests/settings/subscriptions_spec.rb Normal file
View file

@ -0,0 +1,141 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe 'Settings::Subscriptions', type: :request do
let(:user) { create(:user, :inactive) }
let(:jwt_secret) { ENV['JWT_SECRET_KEY'] }
before do
stub_const('ENV', ENV.to_h.merge('JWT_SECRET_KEY' => 'test_secret'))
stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags')
.to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {})
end
context 'when Dawarich is not self-hosted' do
before do
allow(DawarichSettings).to receive(:self_hosted?).and_return(false)
end
describe 'GET /settings/subscriptions' do
context 'when user is not authenticated' do
it 'redirects to login page' do
get settings_subscriptions_path
expect(response).to redirect_to(new_user_session_path)
end
end
context 'when user is authenticated' do
before { sign_in user }
it 'returns successful response' do
get settings_subscriptions_path
expect(response).to be_successful
end
end
end
describe 'GET /settings/subscriptions/callback' do
context 'when user is not authenticated' do
it 'redirects to login page' do
get subscription_callback_settings_subscriptions_path(token: 'invalid')
expect(response).to redirect_to(new_user_session_path)
end
end
context 'when user is authenticated' do
before { sign_in user }
context 'with valid token' do
let(:token) do
JWT.encode(
{ user_id: user.id, status: 'active', active_until: 1.year.from_now },
jwt_secret,
'HS256'
)
end
it 'updates user status and redirects with success message' do
get subscription_callback_settings_subscriptions_path(token: token)
expect(user.reload.status).to eq('active')
expect(user.active_until).to be_within(1.day).of(1.year.from_now)
expect(response).to redirect_to(settings_subscriptions_path)
expect(flash[:notice]).to eq('Your subscription has been updated successfully!')
end
end
context 'with token for different user' do
let(:other_user) { create(:user) }
let(:token) do
JWT.encode(
{ user_id: other_user.id, status: 'active' },
jwt_secret,
'HS256'
)
end
it 'does not update status and redirects with error' do
get subscription_callback_settings_subscriptions_path(token: token)
expect(user.reload.status).not_to eq('active')
expect(response).to redirect_to(settings_subscriptions_path)
expect(flash[:alert]).to eq('Invalid subscription update request.')
end
end
context 'with invalid token' do
it 'redirects with decode error message' do
get subscription_callback_settings_subscriptions_path(token: 'invalid')
expect(response).to redirect_to(settings_subscriptions_path)
expect(flash[:alert]).to eq('Failed to verify subscription update.')
end
end
context 'with malformed token data' do
let(:token) do
JWT.encode({ user_id: 'invalid', status: nil }, jwt_secret, 'HS256')
end
it 'redirects with invalid data message' do
get subscription_callback_settings_subscriptions_path(token: token)
expect(response).to redirect_to(settings_subscriptions_path)
expect(flash[:alert]).to eq('Invalid subscription update request.')
end
end
end
end
end
context 'when Dawarich is self-hosted' do
before do
allow(DawarichSettings).to receive(:self_hosted?).and_return(true)
sign_in user
end
describe 'GET /settings/subscriptions' do
context 'when user is not authenticated' do
it 'redirects to root path' do
get settings_subscriptions_path
expect(response).to redirect_to(root_path)
end
end
end
describe 'GET /settings/subscriptions/callback' do
context 'when user is not authenticated' do
it 'redirects to root path' do
get subscription_callback_settings_subscriptions_path(token: 'invalid')
expect(response).to redirect_to(root_path)
end
end
end
end
end