mirror of
https://github.com/we-promise/sure.git
synced 2026-04-07 22:34:47 +00:00
* Add customizable budget month start day (#253) Allow users to set a custom month-to-date start date (1st-28th) for budgeting and MTD calculations. Useful for users who want budget periods aligned with their pay schedule (e.g., 25th to 24th). Changes: - Add month_start_day column to families table (default: 1) - Add database check constraint for valid range (1-28) - Add Family#uses_custom_month_start?, custom_month_start_for, custom_month_end_for, current_custom_month_period helper methods - Add Period.current_month_for(family), last_month_for(family) methods - Update Budget model for custom month boundaries in find_or_bootstrap, param_to_date, budget_date_valid?, current?, and name methods - Add month_start_day setting to Settings > Preferences UI - Add warning message when custom month start day is configured - Add comprehensive tests with travel_to for date robustness Fixes #253 * Add /api/v1/user endpoint for Flutter mobile app and PWA Expose user preferences including month_start_day via API endpoint following existing pattern for default_period. This allows Flutter mobile app and PWA to read/update user preferences through a consistent API contract. Endpoints: - GET /api/v1/user - Read user preferences including family settings - PATCH /api/v1/user - Update user preferences Response includes: id, email, first_name, last_name, default_period, locale, and family settings (currency, timezone, date_format, country, month_start_day). * Update Periodable to use family-aware MTD periods When users select 'current_month' or 'last_month' period filters on dashboard/reports, now respects the family's custom month_start_day setting instead of using static calendar month boundaries. This ensures MTD filter on dashboard is consistent with how budgets calculate their periods when custom month start day is configured. * Fix param_to_date to correctly map budget params to custom periods When a family uses a custom start day, the previous implementation called custom_month_start_for on the 1st of the month, which incorrectly shifted dates before the start day to the previous month. Now we directly construct the date using family.month_start_day, so 'jan-2026' with month_start_day=25 correctly returns Jan 25, 2026 instead of Dec 25, 2025. * Fix param_to_date and use Current pattern in API controller - Fix param_to_date to directly construct date with family.month_start_day instead of using custom_month_start_for which incorrectly shifted dates - Replace current_user with Current.user/Current.family in API controller to follow project convention used in other API v1 controllers * Add i18n for budget name method Use I18n.t for localizable budget period names to follow project conventions for user-facing strings. * Remove unused budget_end variable in budget_date_valid? * Use Date.current for timezone consistency in Budget#current? * Address PR review feedback - Remove API users endpoint (mobile won't use yet) - Remove user route from config/routes.rb - Remove ai_summary/document_type schema bleed from pdf-import-ai branch * Pass family to param_to_date for custom month logic * Run migration to add month_start_day column to schema * Schema regressions --------- Co-authored-by: mkdev11 <jaysmth689+github@users.noreply.github.com> Co-authored-by: Juan José Mata <juanjo.mata@gmail.com>
122 lines
3.8 KiB
Ruby
122 lines
3.8 KiB
Ruby
class UsersController < ApplicationController
|
|
before_action :set_user
|
|
before_action :ensure_admin, only: %i[reset reset_with_sample_data]
|
|
|
|
def resend_confirmation_email
|
|
if @user.resend_confirmation_email
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
else
|
|
redirect_to settings_profile_path, alert: t("no_pending_change")
|
|
end
|
|
end
|
|
|
|
def update
|
|
@user = Current.user
|
|
|
|
if email_changed?
|
|
if @user.initiate_email_change(user_params[:email])
|
|
if Rails.application.config.app_mode.self_hosted? && !Setting.require_email_confirmation
|
|
handle_redirect(t(".success"))
|
|
else
|
|
redirect_to settings_profile_path, notice: t(".email_change_initiated")
|
|
end
|
|
else
|
|
error_message = @user.errors.any? ? @user.errors.full_messages.to_sentence : t(".email_change_failed")
|
|
redirect_to settings_profile_path, alert: error_message
|
|
end
|
|
else
|
|
was_ai_enabled = @user.ai_enabled
|
|
@user.update!(user_params.except(:redirect_to, :delete_profile_image))
|
|
@user.profile_image.purge if should_purge_profile_image?
|
|
|
|
# Add a special notice if AI was just enabled or disabled
|
|
notice = if !was_ai_enabled && @user.ai_enabled
|
|
"AI Assistant has been enabled successfully."
|
|
elsif was_ai_enabled && !@user.ai_enabled
|
|
"AI Assistant has been disabled."
|
|
else
|
|
t(".success")
|
|
end
|
|
|
|
respond_to do |format|
|
|
format.html { handle_redirect(notice) }
|
|
format.json { head :ok }
|
|
end
|
|
end
|
|
end
|
|
|
|
def reset
|
|
FamilyResetJob.perform_later(Current.family)
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
end
|
|
|
|
def reset_with_sample_data
|
|
FamilyResetJob.perform_later(Current.family, load_sample_data_for_email: @user.email)
|
|
redirect_to settings_profile_path, notice: t(".success")
|
|
end
|
|
|
|
def destroy
|
|
if @user.deactivate
|
|
Current.session.destroy
|
|
redirect_to root_path, notice: t(".success")
|
|
else
|
|
redirect_to settings_profile_path, alert: @user.errors.full_messages.to_sentence
|
|
end
|
|
end
|
|
|
|
def rule_prompt_settings
|
|
@user.update!(rule_prompt_settings_params)
|
|
redirect_back_or_to settings_profile_path
|
|
end
|
|
|
|
private
|
|
def handle_redirect(notice)
|
|
case user_params[:redirect_to]
|
|
when "onboarding_preferences"
|
|
redirect_to preferences_onboarding_path
|
|
when "home"
|
|
redirect_to root_path
|
|
when "preferences"
|
|
redirect_to settings_preferences_path, notice: notice
|
|
when "goals"
|
|
redirect_to goals_onboarding_path
|
|
when "trial"
|
|
redirect_to trial_onboarding_path
|
|
when "ai_prompts"
|
|
redirect_to settings_ai_prompts_path, notice: notice
|
|
else
|
|
redirect_to settings_profile_path, notice: notice
|
|
end
|
|
end
|
|
|
|
def should_purge_profile_image?
|
|
user_params[:delete_profile_image] == "1" &&
|
|
user_params[:profile_image].blank?
|
|
end
|
|
|
|
def email_changed?
|
|
user_params[:email].present? && user_params[:email] != @user.email
|
|
end
|
|
|
|
def rule_prompt_settings_params
|
|
params.require(:user).permit(:rule_prompt_dismissed_at, :rule_prompts_disabled)
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(
|
|
:first_name, :last_name, :email, :profile_image, :redirect_to, :delete_profile_image, :onboarded_at,
|
|
:show_sidebar, :default_period, :default_account_order, :show_ai_sidebar, :ai_enabled, :theme, :set_onboarding_preferences_at, :set_onboarding_goals_at, :locale,
|
|
family_attributes: [ :name, :currency, :country, :date_format, :timezone, :locale, :month_start_day, :id ],
|
|
goals: []
|
|
)
|
|
end
|
|
|
|
def set_user
|
|
@user = Current.user
|
|
end
|
|
|
|
def ensure_admin
|
|
redirect_to settings_profile_path, alert: I18n.t("users.reset.unauthorized") unless Current.user.admin?
|
|
end
|
|
end
|