-
<%= @trip.name %>
-
- <%= human_date(@trip.started_at) %> - <%= human_date(@trip.ended_at) %>
-
+
- <%= render "trips/countries", trip: @trip, current_user: current_user, distance_unit: current_user.safe_settings.distance_unit %>
+ <%# Side-by-side layout: map left, content right %>
+
+ <%# Left: Map (sticky on desktop) %>
+
+ <% if @trip.path.present? %>
+
+
+
+ Loading route data...
+
+ <%= render "trips/timeline_panel" %>
+
+ <% else %>
+
+
+
Trip path is being calculated...
+
+
+ <% end %>
+
+
+ <%# Right: Scrollable content panel %>
+
+ <%# Trip header %>
+
+
<%= @trip.name %>
+
+ <%= human_date(@trip.started_at) %> - <%= human_date(@trip.ended_at) %>
+
+
+ <%= render "trips/countries", trip: @trip, current_user: current_user, distance_unit: current_user.safe_settings.distance_unit %>
+
-
- <%= @trip.notes.body %>
+ <%# Map tools toolbar %>
+
+ <% if current_user.immich_integration_configured? || current_user.photoprism_integration_configured? %>
+
+ <% end %>
+
+
+
+
+
+
+ <%# Accordion days %>
+
+
+ <% (@trip.started_at.in_time_zone(@timezone).to_date..@trip.ended_at.in_time_zone(@timezone).to_date).each do |date| %>
+ <% day_key = date.strftime('%Y-%m-%d') %>
+ <% stats = @day_stats[date] %>
+
+
+
+ <%= date.strftime('%b %-d, %A') %>
+ <% if stats %>
+
+ <%= stats[:first_time].strftime('%H:%M') %> – <%= stats[:last_time].strftime('%H:%M') %>
+
+
+ <% day_distance = Trip.convert_distance(stats[:distance_m], @distance_unit) %>
+ <% if day_distance < 1 %>
+ < 1 <%= @distance_unit %>
+ <% else %>
+ <%= number_with_precision(day_distance, precision: 1) %> <%= @distance_unit %>
+ <% end %>
+
+ <% else %>
+ No data
+ <% end %>
+
+
+ <% note = @day_notes[date] %>
+ <% if note %>
+ <%= render "trips/notes/note", note: note, trip: @trip %>
+ <% else %>
+ <%= render "trips/notes/empty", trip: @trip, date: date %>
+ <% end %>
+
+
+ <% end %>
+
+
+ <%# Trip description %>
+ <% if @trip.description.body.present? %>
+
+
Trip Notes
+
+ <%= @trip.description.body %>
+
+ <% end %>
-
- <% if @photo_previews.any? %>
+ <%# Photos %>
+ <% if @photo_previews.any? %>
+
+
Photos
<% @photo_previews.each_slice(3) do |slice| %>
<% slice.each do |photo| %>
@@ -37,31 +143,29 @@
<% end %>
<% end %>
- <% end %>
+
+ <% end %>
- <% if @photo_sources.any? %>
-
- <% @photo_sources.each do |source| %>
- <%= link_to "More photos on #{source}", photo_search_url(source, current_user.settings, @trip.started_at, @trip.ended_at), class: "btn btn-primary mt-2", target: '_blank' %>
- <% end %>
-
- <% end %>
-
-
-
+ <% if @photo_sources.any? %>
+
+ <% @photo_sources.each do |source| %>
+ <%= link_to "More photos on #{source}", photo_search_url(source, current_user.settings, @trip.started_at, @trip.ended_at), class: "btn btn-primary mt-2", target: '_blank' %>
+ <% end %>
+
+ <% end %>
-
-
-
- <%= link_to "Edit this trip", edit_trip_path(@trip), class: "btn" %>
- <%= link_to "Destroy this trip",
- trip_path(@trip),
- data: {
- turbo_confirm: "Are you sure?",
- turbo_method: :delete
- },
- class: "btn" %>
- <%= link_to "Back to trips", trips_path, class: "btn" %>
+ <%# Action buttons %>
+
+ <%= link_to "Edit this trip", edit_trip_path(@trip), class: "btn" %>
+ <%= link_to "Destroy this trip",
+ trip_path(@trip),
+ data: {
+ turbo_confirm: "Are you sure?",
+ turbo_method: :delete
+ },
+ class: "btn" %>
+ <%= link_to "Back to trips", trips_path, class: "btn" %>
+
diff --git a/config/initializers/rails_icons.rb b/config/initializers/rails_icons.rb
index b0d79e401..a414d67b3 100644
--- a/config/initializers/rails_icons.rb
+++ b/config/initializers/rails_icons.rb
@@ -11,4 +11,9 @@
# config.libraries.lucide.outline.default.css = "size-6"
# config.libraries.lucide.outline.default.stroke_width = "1.5"
# config.libraries.lucide.outline.default.data = {}
+
+ # Flags library: use landscape (4x3) as default variant
+ config.libraries.flags.default_variant = 'landscape'
+
+ config.libraries.flags.landscape.default.css = 'inline-block rounded-sm h-4 w-auto'
end
diff --git a/config/routes.rb b/config/routes.rb
index 478a4a4b5..e71826695 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,7 +62,9 @@
resources :visits, only: %i[index update]
resources :places, only: %i[index destroy]
resources :exports, only: %i[index create destroy]
- resources :trips
+ resources :trips do
+ resources :notes, controller: 'trips/notes', only: %i[create update destroy]
+ end
resources :tags, except: [:show]
# Family management routes (only if feature is enabled)
@@ -228,6 +230,8 @@
resources :locations, only: [:index]
end
+ resources :notes, only: %i[index show create update destroy]
+
post 'subscriptions/callback', to: 'subscriptions#callback'
end
end
diff --git a/db/migrate/20260207075817_create_notes_and_rename_trips_rich_text.rb b/db/migrate/20260207075817_create_notes_and_rename_trips_rich_text.rb
new file mode 100644
index 000000000..6a73855a5
--- /dev/null
+++ b/db/migrate/20260207075817_create_notes_and_rename_trips_rich_text.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class CreateNotesAndRenameTripsRichText < ActiveRecord::Migration[8.0]
+ def up
+ create_table :notes do |t|
+ t.references :user, null: false, foreign_key: true
+ t.string :title
+ t.st_point :lonlat, geographic: true
+ t.string :attachable_type
+ t.bigint :attachable_id
+ t.datetime :noted_at
+ t.timestamps
+ end
+
+ add_index :notes, %i[attachable_type attachable_id]
+ add_index :notes, :lonlat, using: :gist
+ add_index :notes, %i[user_id noted_at]
+
+ execute <<-SQL.squish
+ CREATE UNIQUE INDEX index_notes_on_attachable_and_noted_date
+ ON notes (attachable_type, attachable_id, (CAST(noted_at AS date)))
+ WHERE attachable_id IS NOT NULL
+ SQL
+
+ # Rename Trip's has_rich_text :notes to :description
+ execute <<-SQL.squish
+ UPDATE action_text_rich_texts
+ SET name = 'description'
+ WHERE record_type = 'Trip' AND name = 'notes'
+ SQL
+ end
+
+ def down
+ execute <<-SQL.squish
+ UPDATE action_text_rich_texts
+ SET name = 'notes'
+ WHERE record_type = 'Trip' AND name = 'description'
+ SQL
+
+ drop_table :notes
+ end
+end
diff --git a/db/migrate/20260208223255_fix_countries_with_missing_iso_codes.rb b/db/migrate/20260208223255_fix_countries_with_missing_iso_codes.rb
new file mode 100644
index 000000000..2c3ea8d2a
--- /dev/null
+++ b/db/migrate/20260208223255_fix_countries_with_missing_iso_codes.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class FixCountriesWithMissingIsoCodes < ActiveRecord::Migration[8.0]
+ # Natural Earth data uses "-99" as a placeholder for countries/territories
+ # that lack official ISO codes. Many of these do have well-known codes that
+ # we can assign. The remaining entries (disputed/unclaimed territories like
+ # Siachen Glacier, Bir Tawil, etc.) are genuinely codeless and stay as "-99".
+ CORRECTIONS = {
+ 'France' => { iso_a2: 'FR', iso_a3: 'FRA' },
+ 'Norway' => { iso_a2: 'NO', iso_a3: 'NOR' },
+ 'Kosovo' => { iso_a2: 'XK', iso_a3: 'XKX' },
+ 'Somaliland' => { iso_a2: 'SO', iso_a3: 'SOM' },
+ 'Northern Cyprus' => { iso_a2: 'CY', iso_a3: 'CYP' },
+ 'Dhekelia Sovereign Base Area' => { iso_a2: 'GB', iso_a3: 'GBR' },
+ 'Akrotiri Sovereign Base Area' => { iso_a2: 'GB', iso_a3: 'GBR' },
+ 'US Naval Base Guantanamo Bay' => { iso_a2: 'US', iso_a3: 'USA' },
+ 'Cyprus No Mans Area' => { iso_a2: 'CY', iso_a3: 'CYP' },
+ 'Baykonur Cosmodrome' => { iso_a2: 'KZ', iso_a3: 'KAZ' },
+ 'Brazilian Island' => { iso_a2: 'BR', iso_a3: 'BRA' },
+ 'Indian Ocean Territories' => { iso_a2: 'AU', iso_a3: 'AUS' },
+ 'Coral Sea Islands' => { iso_a2: 'AU', iso_a3: 'AUS' },
+ 'Clipperton Island' => { iso_a2: 'FR', iso_a3: 'FRA' },
+ 'Ashmore and Cartier Islands' => { iso_a2: 'AU', iso_a3: 'AUS' }
+ }.freeze
+
+ def up
+ CORRECTIONS.each do |name, codes|
+ execute(sanitize_sql(
+ [
+ "UPDATE countries SET iso_a2 = ?, iso_a3 = ? WHERE name = ? AND iso_a2 = '-99'",
+ codes[:iso_a2], codes[:iso_a3], name
+ ]
+ ))
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+
+ private
+
+ def sanitize_sql(array)
+ ActiveRecord::Base.sanitize_sql_array(array)
+ end
+end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
new file mode 100644
index 000000000..225d765c6
--- /dev/null
+++ b/spec/factories/notes.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+ factory :note do
+ user
+ noted_at { Time.current }
+ body { FFaker::Lorem.sentence }
+
+ trait :standalone do
+ title { FFaker::Lorem.phrase }
+ latitude { FFaker::Geolocation.lat }
+ longitude { FFaker::Geolocation.lng }
+ end
+
+ trait :trip_day do
+ attachable { association(:trip, user: user) }
+ noted_at { attachable.started_at.to_date.to_datetime.noon }
+ end
+ end
+end
diff --git a/spec/factories/trips.rb b/spec/factories/trips.rb
index 5986e8823..bd9c9f643 100644
--- a/spec/factories/trips.rb
+++ b/spec/factories/trips.rb
@@ -6,7 +6,7 @@
name { FFaker::Lorem.word }
started_at { DateTime.new(2024, 11, 27, 17, 16, 21) }
ended_at { DateTime.new(2024, 11, 29, 17, 16, 21) }
- notes { FFaker::Lorem.sentence }
+ description { FFaker::Lorem.sentence }
distance { 100 }
path { 'LINESTRING(1 1, 2 2, 3 3)' }
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
new file mode 100644
index 000000000..143c50a22
--- /dev/null
+++ b/spec/models/note_spec.rb
@@ -0,0 +1,210 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Note, type: :model do
+ describe 'associations' do
+ it { is_expected.to belong_to(:user) }
+ it { is_expected.to belong_to(:attachable).optional }
+ end
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:noted_at) }
+
+ context 'uniqueness of date per attachable' do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+ let!(:existing_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'does not allow duplicate dates for the same attachable' do
+ duplicate = build(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ expect(duplicate).not_to be_valid
+ expect(duplicate.errors[:date]).to include('has already been taken')
+ end
+
+ it 'allows the same date for different attachables' do
+ other_trip = create(:trip, user: user, started_at: trip.started_at, ended_at: trip.ended_at)
+ note = build(:note, user: user, attachable: other_trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ expect(note).to be_valid
+ end
+
+ it 'allows multiple standalone notes on the same date' do
+ note1 = create(:note, user: user, noted_at: Time.current)
+ note2 = build(:note, user: user, noted_at: Time.current)
+ expect(note1).to be_valid
+ expect(note2).to be_valid
+ end
+ end
+
+ context 'attachable belongs to user' do
+ let(:user) { create(:user) }
+ let(:other_user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+ let(:other_trip) { create(:trip, user: other_user) }
+
+ it 'is valid when attachable belongs to the same user' do
+ note = build(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ expect(note).to be_valid
+ end
+
+ it 'is invalid when attachable belongs to a different user' do
+ note = build(:note, user: user, attachable: other_trip,
+ noted_at: other_trip.started_at.to_date.to_datetime.noon)
+ expect(note).not_to be_valid
+ expect(note.errors[:attachable]).to include('must belong to the same user')
+ end
+
+ it 'is valid when attachable is blank (standalone note)' do
+ note = build(:note, user: user, noted_at: Time.current)
+ expect(note).to be_valid
+ end
+ end
+
+ context 'date within trip range' do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+
+ it 'is valid when date is within trip range' do
+ note = build(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ expect(note).to be_valid
+ end
+
+ it 'is invalid when date is before trip start' do
+ note = build(:note, user: user, attachable: trip,
+ noted_at: (trip.started_at.to_date - 1.day).to_datetime.noon)
+ expect(note).not_to be_valid
+ expect(note.errors[:date]).to include('must be within the trip date range')
+ end
+
+ it 'is invalid when date is after trip end' do
+ note = build(:note, user: user, attachable: trip,
+ noted_at: (trip.ended_at.to_date + 1.day).to_datetime.noon)
+ expect(note).not_to be_valid
+ expect(note.errors[:date]).to include('must be within the trip date range')
+ end
+ end
+ end
+
+ describe '#date' do
+ let(:user) { create(:user) }
+
+ it 'derives date from noted_at' do
+ note = build(:note, user: user, noted_at: DateTime.new(2025, 3, 15, 14, 30))
+ expect(note.date).to eq(Date.new(2025, 3, 15))
+ end
+ end
+
+ describe '#date=' do
+ let(:user) { create(:user) }
+
+ it 'sets noted_at to noon on the given date' do
+ note = Note.new(user: user)
+ note.date = '2025-03-15'
+ expect(note.noted_at).to eq(Date.new(2025, 3, 15).to_datetime.noon)
+ end
+ end
+
+ describe 'scopes' do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+
+ describe '.standalone' do
+ let!(:standalone_note) { create(:note, user: user, noted_at: Time.current) }
+ let!(:attached_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'returns only notes without an attachable' do
+ expect(described_class.standalone).to include(standalone_note)
+ expect(described_class.standalone).not_to include(attached_note)
+ end
+ end
+
+ describe '.attached' do
+ let!(:standalone_note) { create(:note, user: user, noted_at: Time.current) }
+ let!(:attached_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'returns only notes with an attachable' do
+ expect(described_class.attached).to include(attached_note)
+ expect(described_class.attached).not_to include(standalone_note)
+ end
+ end
+
+ describe '.for_trip_day' do
+ let!(:trip_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'returns notes for a specific trip and date' do
+ result = described_class.for_trip_day(trip, trip.started_at.to_date)
+ expect(result).to include(trip_note)
+ end
+ end
+ end
+
+ describe 'rich text' do
+ let(:user) { create(:user) }
+ let(:note) { create(:note, user: user, body: 'A wonderful day exploring the city', noted_at: Time.current) }
+
+ it 'has rich text body' do
+ expect(note.body).to be_an(ActionText::RichText)
+ expect(note.body.to_plain_text).to eq('A wonderful day exploring the city')
+ end
+ end
+
+ describe 'notable concern' do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+ let!(:note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'destroys notes when attachable is destroyed' do
+ expect { trip.destroy }.to change(Note, :count).by(-1)
+ end
+ end
+
+ describe 'attachable_type validation' do
+ let(:user) { create(:user) }
+
+ it 'allows valid attachable types' do
+ %w[Trip Area Visit Place Point].each do |type|
+ note = build(:note, user: user, noted_at: Time.current)
+ note.attachable_type = type
+ note.valid?
+ expect(note.errors[:attachable_type]).to be_empty
+ end
+ end
+
+ it 'rejects invalid attachable types' do
+ note = build(:note, user: user, noted_at: Time.current, attachable_type: 'User')
+ expect(note).not_to be_valid
+ expect(note.errors[:attachable_type]).to be_present
+ end
+
+ it 'allows nil attachable_type' do
+ note = build(:note, user: user, noted_at: Time.current)
+ expect(note).to be_valid
+ end
+
+ it 'requires attachable to exist when attachable_type is set' do
+ note = build(:note, user: user, noted_at: Time.current,
+ attachable_type: 'Trip', attachable_id: 999_999)
+ expect(note).not_to be_valid
+ expect(note.errors[:attachable]).to be_present
+ end
+ end
+end
diff --git a/spec/requests/api/v1/notes_spec.rb b/spec/requests/api/v1/notes_spec.rb
new file mode 100644
index 000000000..15575a45a
--- /dev/null
+++ b/spec/requests/api/v1/notes_spec.rb
@@ -0,0 +1,221 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe '/api/v1/notes', type: :request do
+ let(:user) { create(:user) }
+ let(:headers) { { 'Authorization' => "Bearer #{user.api_key}" } }
+
+ describe 'GET /index' do
+ let!(:note) { create(:note, user: user, noted_at: Time.current) }
+
+ it 'renders a successful response' do
+ get api_v1_notes_url, headers: headers
+ expect(response).to be_successful
+ end
+
+ it 'returns notes for the current user' do
+ get api_v1_notes_url, headers: headers
+ json = JSON.parse(response.body)
+ expect(json.length).to eq(1)
+ expect(json.first['id']).to eq(note.id)
+ end
+
+ context 'with filtering params' do
+ let(:trip) { create(:trip, user: user) }
+ let!(:trip_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon)
+ end
+
+ it 'filters by attachable_type' do
+ get api_v1_notes_url, headers: headers, params: { attachable_type: 'Trip' }
+ json = JSON.parse(response.body)
+ expect(json.length).to eq(1)
+ expect(json.first['id']).to eq(trip_note.id)
+ end
+
+ it 'filters standalone notes' do
+ get api_v1_notes_url, headers: headers, params: { standalone: 'true' }
+ json = JSON.parse(response.body)
+ expect(json.length).to eq(1)
+ expect(json.first['id']).to eq(note.id)
+ end
+ end
+
+ it 'returns 401 without auth' do
+ get api_v1_notes_url
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ describe 'GET /show' do
+ let(:note) { create(:note, user: user, noted_at: Time.current) }
+
+ it 'renders a successful response' do
+ get api_v1_note_url(note), headers: headers
+ expect(response).to be_successful
+ end
+
+ it 'returns the note' do
+ get api_v1_note_url(note), headers: headers
+ json = JSON.parse(response.body)
+ expect(json['id']).to eq(note.id)
+ end
+
+ it 'returns 404 for another user note' do
+ other_note = create(:note, noted_at: Time.current)
+ get api_v1_note_url(other_note), headers: headers
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+
+ describe 'POST /create' do
+ context 'with valid parameters' do
+ let(:valid_params) do
+ { note: { body: 'A test note', noted_at: Time.current.iso8601 } }
+ end
+
+ it 'creates a new Note' do
+ expect do
+ post api_v1_notes_url, headers: headers, params: valid_params
+ end.to change(Note, :count).by(1)
+ end
+
+ it 'returns created status' do
+ post api_v1_notes_url, headers: headers, params: valid_params
+ expect(response).to have_http_status(:created)
+ end
+ end
+
+ context 'with attachable' do
+ let(:trip) { create(:trip, user: user) }
+
+ it 'creates a note attached to a trip' do
+ params = {
+ note: {
+ body: 'Trip note',
+ noted_at: trip.started_at.to_date.to_datetime.noon.iso8601,
+ attachable_type: 'Trip',
+ attachable_id: trip.id
+ }
+ }
+
+ expect do
+ post api_v1_notes_url, headers: headers, params: params
+ end.to change(Note, :count).by(1)
+
+ expect(response).to have_http_status(:created)
+ end
+ end
+
+ context 'with cross-user attachable' do
+ let(:other_user) { create(:user) }
+ let(:other_trip) { create(:trip, user: other_user) }
+
+ it 'rejects note attached to another user trip' do
+ params = {
+ note: {
+ body: 'Sneaky note',
+ noted_at: other_trip.started_at.to_date.to_datetime.noon.iso8601,
+ attachable_type: 'Trip',
+ attachable_id: other_trip.id
+ }
+ }
+
+ expect do
+ post api_v1_notes_url, headers: headers, params: params
+ end.not_to change(Note, :count)
+
+ expect(response).to have_http_status(:unprocessable_content)
+ json = JSON.parse(response.body)
+ expect(json['errors']).to include('Attachable must belong to the same user')
+ end
+ end
+
+ context 'with invalid parameters' do
+ it 'returns 422 when noted_at is missing' do
+ post api_v1_notes_url, headers: headers, params: { note: { body: 'No date' } }
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+ end
+ end
+
+ describe 'PATCH /update' do
+ let(:note) { create(:note, user: user, body: 'Original', noted_at: Time.current) }
+
+ context 'with valid parameters' do
+ it 'updates the note' do
+ patch api_v1_note_url(note), headers: headers,
+ params: { note: { body: 'Updated' } }
+ expect(response).to have_http_status(:ok)
+ json = JSON.parse(response.body)
+ expect(json['body']).to eq('Updated')
+ end
+ end
+
+ context 'with invalid parameters' do
+ it 'returns 422' do
+ patch api_v1_note_url(note), headers: headers,
+ params: { note: { noted_at: nil } }
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+ end
+
+ context 'with another user note' do
+ let(:other_note) { create(:note, noted_at: Time.current) }
+
+ it 'returns 404' do
+ patch api_v1_note_url(other_note), headers: headers,
+ params: { note: { body: 'Hijack' } }
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+
+ describe 'DELETE /destroy' do
+ let!(:note) { create(:note, user: user, noted_at: Time.current) }
+
+ it 'destroys the note' do
+ expect do
+ delete api_v1_note_url(note), headers: headers
+ end.to change(Note, :count).by(-1)
+ end
+
+ it 'returns ok status' do
+ delete api_v1_note_url(note), headers: headers
+ expect(response).to have_http_status(:ok)
+ end
+
+ context 'with another user note' do
+ let!(:other_note) { create(:note, noted_at: Time.current) }
+
+ it 'returns 404' do
+ expect do
+ delete api_v1_note_url(other_note), headers: headers
+ end.not_to change(Note, :count)
+
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+
+ describe 'POST /create with invalid attachable_type' do
+ it 'rejects an invalid attachable_type' do
+ params = {
+ note: {
+ body: 'Sneaky note',
+ noted_at: Time.current.iso8601,
+ attachable_type: 'User',
+ attachable_id: user.id
+ }
+ }
+
+ expect do
+ post api_v1_notes_url, headers: headers, params: params
+ end.not_to change(Note, :count)
+
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+ end
+end
diff --git a/spec/requests/trips/notes_spec.rb b/spec/requests/trips/notes_spec.rb
new file mode 100644
index 000000000..d70e93b27
--- /dev/null
+++ b/spec/requests/trips/notes_spec.rb
@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe '/trips/:trip_id/notes', type: :request do
+ let(:user) { create(:user) }
+ let(:trip) { create(:trip, user: user) }
+
+ before do
+ stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags')
+ .to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {})
+
+ sign_in user
+ end
+
+ describe 'POST /trips/:trip_id/notes' do
+ let(:valid_params) do
+ {
+ note: {
+ date: trip.started_at.to_date,
+ body: 'Great day exploring!'
+ }
+ }
+ end
+
+ context 'with valid parameters' do
+ it 'creates a new note' do
+ expect do
+ post trip_notes_url(trip), params: valid_params
+ end.to change(Note, :count).by(1)
+ end
+
+ it 'redirects to the trip for HTML format' do
+ post trip_notes_url(trip), params: valid_params
+ expect(response).to redirect_to(trip)
+ end
+
+ it 'responds with turbo stream for turbo requests' do
+ post trip_notes_url(trip), params: valid_params,
+ headers: { Accept: 'text/vnd.turbo-stream.html' }
+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')
+ end
+ end
+
+ context 'with find_or_initialize (idempotent create)' do
+ let!(:existing_note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon, body: 'Old note')
+ end
+
+ it 'updates existing note instead of creating a duplicate' do
+ expect do
+ post trip_notes_url(trip), params: valid_params
+ end.not_to change(Note, :count)
+
+ existing_note.reload
+ expect(existing_note.body.to_plain_text).to eq('Great day exploring!')
+ end
+ end
+
+ context 'with date outside trip range' do
+ let(:invalid_params) do
+ {
+ note: {
+ date: trip.started_at.to_date - 10.days,
+ body: 'This should fail'
+ }
+ }
+ end
+
+ it 'does not create the note' do
+ expect do
+ post trip_notes_url(trip), params: invalid_params
+ end.not_to change(Note, :count)
+ end
+ end
+
+ context 'when not authenticated' do
+ before { sign_out user }
+
+ it 'redirects to sign in' do
+ post trip_notes_url(trip), params: valid_params
+ expect(response).to redirect_to(new_user_session_path)
+ end
+ end
+
+ context 'when accessing another user trip' do
+ let(:other_user) { create(:user) }
+ let(:other_trip) { create(:trip, user: other_user) }
+
+ it 'returns not found' do
+ post trip_notes_url(other_trip), params: valid_params
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+
+ describe 'PATCH /trips/:trip_id/notes/:id' do
+ let!(:note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon, body: 'Original note')
+ end
+
+ let(:update_params) do
+ {
+ note: {
+ body: 'Updated note content'
+ }
+ }
+ end
+
+ context 'with valid parameters' do
+ it 'updates the note' do
+ patch trip_note_url(trip, note), params: update_params
+ note.reload
+ expect(note.body.to_plain_text).to eq('Updated note content')
+ end
+
+ it 'redirects to the trip for HTML format' do
+ patch trip_note_url(trip, note), params: update_params
+ expect(response).to redirect_to(trip)
+ end
+ end
+
+ context 'when accessing another user trip' do
+ let(:other_user) { create(:user) }
+ let(:other_trip) { create(:trip, user: other_user) }
+ let!(:other_note) do
+ create(:note, user: other_user, attachable: other_trip,
+ noted_at: other_trip.started_at.to_date.to_datetime.noon, body: 'Other note')
+ end
+
+ it 'returns not found' do
+ patch trip_note_url(other_trip, other_note), params: update_params
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+
+ describe 'DELETE /trips/:trip_id/notes/:id' do
+ let!(:note) do
+ create(:note, user: user, attachable: trip,
+ noted_at: trip.started_at.to_date.to_datetime.noon, body: 'Note to delete')
+ end
+
+ it 'destroys the note' do
+ expect do
+ delete trip_note_url(trip, note)
+ end.to change(Note, :count).by(-1)
+ end
+
+ it 'redirects to the trip for HTML format' do
+ delete trip_note_url(trip, note)
+ expect(response).to redirect_to(trip)
+ end
+
+ context 'when accessing another user trip' do
+ let(:other_user) { create(:user) }
+ let(:other_trip) { create(:trip, user: other_user) }
+ let!(:other_note) do
+ create(:note, user: other_user, attachable: other_trip,
+ noted_at: other_trip.started_at.to_date.to_datetime.noon, body: 'Other note')
+ end
+
+ it 'returns not found' do
+ expect do
+ delete trip_note_url(other_trip, other_note)
+ end.not_to change(Note, :count)
+
+ expect(response).to have_http_status(:not_found)
+ end
+ end
+ end
+end
diff --git a/spec/requests/trips_spec.rb b/spec/requests/trips_spec.rb
index 15d62338d..7351fd059 100644
--- a/spec/requests/trips_spec.rb
+++ b/spec/requests/trips_spec.rb
@@ -134,7 +134,7 @@
let(:new_attributes) do
{
name: 'Updated Trip Name',
- notes: 'Changed trip notes'
+ description: 'Changed trip notes'
}
end
let(:trip) { create(:trip, :with_points, user:) }
@@ -144,8 +144,8 @@
trip.reload
expect(trip.name).to eq('Updated Trip Name')
- expect(trip.notes.body.to_plain_text).to eq('Changed trip notes')
- expect(trip.notes).to be_an(ActionText::RichText)
+ expect(trip.description.body.to_plain_text).to eq('Changed trip notes')
+ expect(trip.description).to be_an(ActionText::RichText)
end
it 'redirects to the trip' do
diff --git a/spec/swagger/api/v1/notes_controller_spec.rb b/spec/swagger/api/v1/notes_controller_spec.rb
new file mode 100644
index 000000000..86f57a094
--- /dev/null
+++ b/spec/swagger/api/v1/notes_controller_spec.rb
@@ -0,0 +1,257 @@
+# frozen_string_literal: true
+
+require 'swagger_helper'
+
+describe 'Notes API', type: :request do
+ let(:user) { create(:user) }
+ let(:api_key) { user.api_key }
+
+ path '/api/v1/notes' do
+ get 'List notes' do
+ tags 'Notes'
+ produces 'application/json'
+ parameter name: :Authorization, in: :header, type: :string, required: true, description: 'Bearer token'
+ parameter name: :attachable_type, in: :query, type: :string, required: false,
+ description: 'Filter by attachable type (e.g. Trip)'
+ parameter name: :attachable_id, in: :query, type: :integer, required: false,
+ description: 'Filter by attachable ID'
+ parameter name: :standalone, in: :query, type: :string, required: false,
+ description: 'Set to "true" to return only standalone notes'
+
+ response '200', 'notes found' do
+ let(:Authorization) { "Bearer #{api_key}" }
+
+ schema type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: { type: :integer },
+ title: { type: :string, nullable: true },
+ body: { type: :string, nullable: true },
+ latitude: { type: :number, nullable: true },
+ longitude: { type: :number, nullable: true },
+ attachable_type: { type: :string, nullable: true },
+ attachable_id: { type: :integer, nullable: true },
+ date: { type: :string, nullable: true, format: :date },
+ noted_at: { type: :string, format: :datetime },
+ created_at: { type: :string, format: :datetime },
+ updated_at: { type: :string, format: :datetime }
+ },
+ required: %w[id noted_at]
+ }
+
+ run_test!
+ end
+
+ response '401', 'unauthorized' do
+ let(:Authorization) { 'Bearer invalid-token' }
+ run_test!
+ end
+ end
+
+ post 'Create note' do
+ tags 'Notes'
+ consumes 'application/json'
+ produces 'application/json'
+ parameter name: :Authorization, in: :header, type: :string, required: true, description: 'Bearer token'
+ parameter name: :note, in: :body, schema: {
+ type: :object,
+ properties: {
+ note: {
+ type: :object,
+ properties: {
+ title: { type: :string },
+ body: { type: :string },
+ latitude: { type: :number },
+ longitude: { type: :number },
+ attachable_type: { type: :string },
+ attachable_id: { type: :integer },
+ noted_at: { type: :string, format: :datetime }
+ },
+ required: %w[noted_at]
+ }
+ }
+ }
+
+ response '201', 'note created' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:note) do
+ { note: { body: 'A test note', noted_at: Time.current.iso8601 } }
+ end
+
+ schema type: :object,
+ properties: {
+ id: { type: :integer },
+ title: { type: :string, nullable: true },
+ body: { type: :string, nullable: true },
+ latitude: { type: :number, nullable: true },
+ longitude: { type: :number, nullable: true },
+ attachable_type: { type: :string, nullable: true },
+ attachable_id: { type: :integer, nullable: true },
+ date: { type: :string, nullable: true, format: :date },
+ noted_at: { type: :string, format: :datetime },
+ created_at: { type: :string, format: :datetime },
+ updated_at: { type: :string, format: :datetime }
+ }
+
+ run_test!
+ end
+
+ response '422', 'invalid request' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:note) { { note: { body: 'No date' } } }
+
+ run_test!
+ end
+
+ response '401', 'unauthorized' do
+ let(:Authorization) { 'Bearer invalid-token' }
+ let(:note) do
+ { note: { body: 'A test note', noted_at: Time.current.iso8601 } }
+ end
+
+ run_test!
+ end
+ end
+ end
+
+ path '/api/v1/notes/{id}' do
+ get 'Show note' do
+ tags 'Notes'
+ produces 'application/json'
+ parameter name: :id, in: :path, type: :integer, required: true, description: 'Note ID'
+ parameter name: :Authorization, in: :header, type: :string, required: true, description: 'Bearer token'
+
+ response '200', 'note found' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+
+ schema type: :object,
+ properties: {
+ id: { type: :integer },
+ title: { type: :string, nullable: true },
+ body: { type: :string, nullable: true },
+ latitude: { type: :number, nullable: true },
+ longitude: { type: :number, nullable: true },
+ attachable_type: { type: :string, nullable: true },
+ attachable_id: { type: :integer, nullable: true },
+ date: { type: :string, nullable: true, format: :date },
+ noted_at: { type: :string, format: :datetime },
+ created_at: { type: :string, format: :datetime },
+ updated_at: { type: :string, format: :datetime }
+ }
+
+ run_test!
+ end
+
+ response '404', 'note not found' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:id) { 999_999 }
+
+ run_test!
+ end
+
+ response '401', 'unauthorized' do
+ let(:Authorization) { 'Bearer invalid-token' }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+
+ run_test!
+ end
+ end
+
+ patch 'Update note' do
+ tags 'Notes'
+ consumes 'application/json'
+ produces 'application/json'
+ parameter name: :id, in: :path, type: :integer, required: true, description: 'Note ID'
+ parameter name: :Authorization, in: :header, type: :string, required: true, description: 'Bearer token'
+ parameter name: :note, in: :body, schema: {
+ type: :object,
+ properties: {
+ note: {
+ type: :object,
+ properties: {
+ title: { type: :string },
+ body: { type: :string },
+ latitude: { type: :number },
+ longitude: { type: :number },
+ noted_at: { type: :string, format: :datetime }
+ }
+ }
+ }
+ }
+
+ response '200', 'note updated' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+ let(:note) { { note: { body: 'Updated note' } } }
+
+ schema type: :object,
+ properties: {
+ id: { type: :integer },
+ title: { type: :string, nullable: true },
+ body: { type: :string, nullable: true },
+ latitude: { type: :number, nullable: true },
+ longitude: { type: :number, nullable: true },
+ attachable_type: { type: :string, nullable: true },
+ attachable_id: { type: :integer, nullable: true },
+ date: { type: :string, nullable: true, format: :date },
+ noted_at: { type: :string, format: :datetime },
+ created_at: { type: :string, format: :datetime },
+ updated_at: { type: :string, format: :datetime }
+ }
+
+ run_test!
+ end
+
+ response '404', 'note not found' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:id) { 999_999 }
+ let(:note) { { note: { body: 'Updated note' } } }
+
+ run_test!
+ end
+
+ response '401', 'unauthorized' do
+ let(:Authorization) { 'Bearer invalid-token' }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+ let(:note) { { note: { body: 'Updated note' } } }
+
+ run_test!
+ end
+ end
+
+ delete 'Delete note' do
+ tags 'Notes'
+ parameter name: :id, in: :path, type: :integer, required: true, description: 'Note ID'
+ parameter name: :Authorization, in: :header, type: :string, required: true, description: 'Bearer token'
+
+ response '200', 'note deleted' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+
+ run_test!
+ end
+
+ response '404', 'note not found' do
+ let(:Authorization) { "Bearer #{api_key}" }
+ let(:id) { 999_999 }
+
+ run_test!
+ end
+
+ response '401', 'unauthorized' do
+ let(:Authorization) { 'Bearer invalid-token' }
+ let(:test_note) { create(:note, user: user, noted_at: Time.current) }
+ let(:id) { test_note.id }
+
+ run_test!
+ end
+ end
+ end
+end
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index a16602d63..7475a7610 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -252,6 +252,335 @@ paths:
properties:
status:
type: string
+ "/api/v1/notes":
+ get:
+ summary: List notes
+ tags:
+ - Notes
+ parameters:
+ - name: Authorization
+ in: header
+ required: true
+ description: Bearer token
+ schema:
+ type: string
+ - name: attachable_type
+ in: query
+ required: false
+ description: Filter by attachable type (e.g. Trip)
+ schema:
+ type: string
+ - name: attachable_id
+ in: query
+ required: false
+ description: Filter by attachable ID
+ schema:
+ type: integer
+ - name: standalone
+ in: query
+ required: false
+ description: Set to "true" to return only standalone notes
+ schema:
+ type: string
+ responses:
+ '200':
+ description: notes found
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ type: object
+ properties:
+ id:
+ type: integer
+ title:
+ type: string
+ nullable: true
+ body:
+ type: string
+ nullable: true
+ latitude:
+ type: number
+ nullable: true
+ longitude:
+ type: number
+ nullable: true
+ attachable_type:
+ type: string
+ nullable: true
+ attachable_id:
+ type: integer
+ nullable: true
+ date:
+ type: string
+ nullable: true
+ format: date
+ noted_at:
+ type: string
+ format: datetime
+ created_at:
+ type: string
+ format: datetime
+ updated_at:
+ type: string
+ format: datetime
+ required:
+ - id
+ - noted_at
+ '401':
+ description: unauthorized
+ post:
+ summary: Create note
+ tags:
+ - Notes
+ parameters:
+ - name: Authorization
+ in: header
+ required: true
+ description: Bearer token
+ schema:
+ type: string
+ responses:
+ '201':
+ description: note created
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ id:
+ type: integer
+ title:
+ type: string
+ nullable: true
+ body:
+ type: string
+ nullable: true
+ latitude:
+ type: number
+ nullable: true
+ longitude:
+ type: number
+ nullable: true
+ attachable_type:
+ type: string
+ nullable: true
+ attachable_id:
+ type: integer
+ nullable: true
+ date:
+ type: string
+ nullable: true
+ format: date
+ noted_at:
+ type: string
+ format: datetime
+ created_at:
+ type: string
+ format: datetime
+ updated_at:
+ type: string
+ format: datetime
+ '422':
+ description: invalid request
+ '401':
+ description: unauthorized
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ note:
+ type: object
+ properties:
+ title:
+ type: string
+ body:
+ type: string
+ latitude:
+ type: number
+ longitude:
+ type: number
+ attachable_type:
+ type: string
+ attachable_id:
+ type: integer
+ noted_at:
+ type: string
+ format: datetime
+ required:
+ - noted_at
+ "/api/v1/notes/{id}":
+ get:
+ summary: Show note
+ tags:
+ - Notes
+ parameters:
+ - name: id
+ in: path
+ required: true
+ description: Note ID
+ schema:
+ type: integer
+ - name: Authorization
+ in: header
+ required: true
+ description: Bearer token
+ schema:
+ type: string
+ responses:
+ '200':
+ description: note found
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ id:
+ type: integer
+ title:
+ type: string
+ nullable: true
+ body:
+ type: string
+ nullable: true
+ latitude:
+ type: number
+ nullable: true
+ longitude:
+ type: number
+ nullable: true
+ attachable_type:
+ type: string
+ nullable: true
+ attachable_id:
+ type: integer
+ nullable: true
+ date:
+ type: string
+ nullable: true
+ format: date
+ noted_at:
+ type: string
+ format: datetime
+ created_at:
+ type: string
+ format: datetime
+ updated_at:
+ type: string
+ format: datetime
+ '404':
+ description: note not found
+ '401':
+ description: unauthorized
+ patch:
+ summary: Update note
+ tags:
+ - Notes
+ parameters:
+ - name: id
+ in: path
+ required: true
+ description: Note ID
+ schema:
+ type: integer
+ - name: Authorization
+ in: header
+ required: true
+ description: Bearer token
+ schema:
+ type: string
+ responses:
+ '200':
+ description: note updated
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ id:
+ type: integer
+ title:
+ type: string
+ nullable: true
+ body:
+ type: string
+ nullable: true
+ latitude:
+ type: number
+ nullable: true
+ longitude:
+ type: number
+ nullable: true
+ attachable_type:
+ type: string
+ nullable: true
+ attachable_id:
+ type: integer
+ nullable: true
+ date:
+ type: string
+ nullable: true
+ format: date
+ noted_at:
+ type: string
+ format: datetime
+ created_at:
+ type: string
+ format: datetime
+ updated_at:
+ type: string
+ format: datetime
+ '404':
+ description: note not found
+ '401':
+ description: unauthorized
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ note:
+ type: object
+ properties:
+ title:
+ type: string
+ body:
+ type: string
+ latitude:
+ type: number
+ longitude:
+ type: number
+ noted_at:
+ type: string
+ format: datetime
+ delete:
+ summary: Delete note
+ tags:
+ - Notes
+ parameters:
+ - name: id
+ in: path
+ required: true
+ description: Note ID
+ schema:
+ type: integer
+ - name: Authorization
+ in: header
+ required: true
+ description: Bearer token
+ schema:
+ type: string
+ responses:
+ '200':
+ description: note deleted
+ '404':
+ description: note not found
+ '401':
+ description: unauthorized
"/api/v1/overland/batches":
post:
summary: Creates a batch of points