mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-11 09:41:40 -05:00
9fba3ce4ca
Simplifies architecture by using the existing trips#update route for sharing settings management instead of a separate route. ## Changes **Routes** - Removed: PATCH /trips/:id/sharing → shared/trips#update - Now uses: PATCH /trips/:id (existing route) with sharing params **Controllers** - Shared::TripsController: Simplified to only handle public view (show) - TripsController: Added update_sharing private method to handle sharing params when present **Views** - Updated JavaScript in _sharing.html.erb to use trip_path with nested sharing params **Tests** - Updated request specs to use trip_path instead of sharing_trip_path - All params now nested under sharing key ## Benefits - Cleaner namespace separation (Shared:: only for public access) - Follows Rails conventions (one update route handles everything) - Simpler routing structure - Reduced code duplication ## Backwards Compatibility This is a breaking change for the sharing API endpoint, but since this feature was just implemented and hasn't been released yet, no migration path is needed.
110 lines
2.9 KiB
Ruby
110 lines
2.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class TripsController < ApplicationController
|
|
before_action :authenticate_user!
|
|
before_action :authenticate_active_user!, only: %i[new create]
|
|
before_action :set_trip, only: %i[show edit update destroy]
|
|
before_action :set_coordinates, only: %i[show edit]
|
|
|
|
def index
|
|
@trips = current_user.trips.order(started_at: :desc).page(params[:page]).per(6)
|
|
end
|
|
|
|
def show
|
|
@photo_previews = Rails.cache.fetch("trip_photos_#{@trip.id}", expires_in: 1.day) do
|
|
@trip.photo_previews
|
|
end
|
|
@photo_sources = @trip.photo_sources
|
|
|
|
return unless @trip.path.blank? || @trip.distance.blank? || @trip.visited_countries.blank?
|
|
|
|
Trips::CalculateAllJob.perform_later(@trip.id, current_user.safe_settings.distance_unit)
|
|
end
|
|
|
|
def new
|
|
@trip = Trip.new
|
|
@coordinates = []
|
|
end
|
|
|
|
def edit; end
|
|
|
|
def create
|
|
@trip = current_user.trips.build(trip_params)
|
|
|
|
if @trip.save
|
|
redirect_to @trip, notice: 'Trip was successfully created. Data is being calculated in the background.'
|
|
else
|
|
render :new, status: :unprocessable_content
|
|
end
|
|
end
|
|
|
|
def update
|
|
# Handle sharing settings update (JSON response)
|
|
if params[:sharing]
|
|
return update_sharing
|
|
end
|
|
|
|
# Handle regular trip update
|
|
if @trip.update(trip_params)
|
|
redirect_to @trip, notice: 'Trip was successfully updated.', status: :see_other
|
|
else
|
|
render :edit, status: :unprocessable_content
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@trip.destroy!
|
|
redirect_to trips_url, notice: 'Trip was successfully destroyed.', status: :see_other
|
|
end
|
|
|
|
private
|
|
|
|
def set_trip
|
|
@trip = current_user.trips.find(params[:id])
|
|
end
|
|
|
|
def set_coordinates
|
|
@coordinates = @trip.points.pluck(
|
|
:latitude, :longitude, :battery, :altitude, :timestamp, :velocity, :id,
|
|
:country
|
|
).map { [_1.to_f, _2.to_f, _3.to_s, _4.to_s, _5.to_s, _6.to_s, _7.to_s, _8.to_s] }
|
|
end
|
|
|
|
def update_sharing
|
|
if params[:sharing][:enabled] == '1'
|
|
sharing_options = {
|
|
expiration: params[:sharing][:expiration] || '24h'
|
|
}
|
|
|
|
# Add optional sharing settings
|
|
sharing_options[:share_notes] = params[:sharing][:share_notes] == '1'
|
|
sharing_options[:share_photos] = params[:sharing][:share_photos] == '1'
|
|
|
|
@trip.enable_sharing!(**sharing_options)
|
|
sharing_url = shared_trip_url(@trip.sharing_uuid)
|
|
|
|
render json: {
|
|
success: true,
|
|
sharing_url: sharing_url,
|
|
message: 'Sharing enabled successfully'
|
|
}
|
|
else
|
|
@trip.disable_sharing!
|
|
|
|
render json: {
|
|
success: true,
|
|
message: 'Sharing disabled successfully'
|
|
}
|
|
end
|
|
rescue StandardError => e
|
|
render json: {
|
|
success: false,
|
|
message: 'Failed to update sharing settings',
|
|
error: e.message
|
|
}, status: :unprocessable_content
|
|
end
|
|
|
|
def trip_params
|
|
params.require(:trip).permit(:name, :started_at, :ended_at, :notes)
|
|
end
|
|
end
|