Merge branch 'main' of github.com:cs169/snapcon

Author: warrenlet

app/controllers/users_controller.rb

@@ -2,7 +2,6 @@
 
 class UsersController < ApplicationController
   before_action :authenticate_user!, only: :search
-  before_action :set_currency_options, only: [:edit, :new, :create, :update]
   load_and_authorize_resource
 
   # GET /users/1
@@ -41,7 +40,7 @@ def search
 
   def user_params
     params[:user][:timezone] = params[:user][:timezone].presence || nil
-    params.require(:user).permit(:name, :biography, :nickname, :affiliation, :default_currency,
+    params.require(:user).permit(:name, :biography, :nickname, :affiliation,
                                  :picture, :picture_cache, :timezone)
   end
 
@@ -50,9 +49,5 @@ def user_params
   def load_user
     @user ||= (params[:id] && params[:id] != 'current' && User.find(params[:id])) || current_user
   end
-
   # rubocop:enable Naming/MemoizedInstanceVariableName
-  def set_currency_options
-    @currency_options = CurrencyConversion::VALID_CURRENCIES.map { |currency| [currency, currency] }
-  end
 end

app/models/currency_conversion.rb

@@ -24,7 +24,5 @@ class CurrencyConversion < ApplicationRecord
   VALID_CURRENCIES = %w[AUD CAD CHF CNY EUR GBP JPY USD].freeze
   belongs_to :conference
   validates :rate, numericality: { greater_than: 0 }
-  # Ensure from_currency and to_currency are among the VALID_CURRENCIES
-  validates :from_currency, :to_currency, inclusion: { in: VALID_CURRENCIES }
   validates :from_currency, uniqueness: { scope: :to_currency }, on: :create
 end

app/models/user.rb

@@ -16,7 +16,6 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null

app/views/users/edit.html.haml

@@ -23,9 +23,6 @@
             The timezone setting will update the event schedules to show using the time you selected.
             Your browser is current set to
             %span.js-localTimezone
-        .form-group
-          = f.label :default_currency, 'Default Currency'
-          = f.select :default_currency, options_for_select(@currency_options, selected: @user.default_currency), {}, { class: 'form-control' }
         .form-group
           = f.label :avatar
           %br

db/schema.rb

@@ -10,9 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-
-ActiveRecord::Schema[7.0].define(version: 2024_03_06_000725) do
-
+ActiveRecord::Schema[7.0].define(version: 2024_02_26_175634) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
   enable_extension "plpgsql"
@@ -626,7 +624,6 @@
     t.boolean "is_disabled", default: false
     t.string "picture"
     t.string "timezone"
-    t.string "default_currency"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true

spec/factories/users.rb

@@ -16,7 +16,6 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null

spec/models/user_spec.rb

@@ -16,7 +16,6 @@
 #  confirmed_at           :datetime
 #  current_sign_in_at     :datetime
 #  current_sign_in_ip     :string
-#  default_currency       :string
 #  email                  :string           default(""), not null
 #  email_public           :boolean          default(FALSE)
 #  encrypted_password     :string           default(""), not null