feat(users): validation flashes for batch city and referrer

Procfile.dev

@@ -1,3 +1,3 @@
-web: bin/rails server -p 3000 -b 0.0.0.0
+web: bin/rails server -p 3000
 css: bin/rails tailwindcss:watch
 worker: bundle exec good_job start

app/controllers/users_controller.rb

@@ -94,21 +94,25 @@ def restrict_after_lock
   end
 
   def updated_params
-    {
+    params = {
       accepted_coc: form_params[:accepted_coc],
       aoc_id: form_params[:aoc_id],
       entered_hardcore: form_params[:entered_hardcore],
       username: form_params[:username],
-      city_id: form_params[:city_id],
-      referrer: User.find_by_referral_code(form_params[:referrer_code])
+      city_id: form_params[:city_id]
     }.compact
+
+    params[:batch] = nil if form_params[:batch_number]
+    params[:referrer_id] = User.find_by_referral_code(form_params[:referrer_code])&.id.to_i if form_params[:referrer_code]
+
+    params
   end
 
   def unlock_achievements
     Achievements::UnlockJob.perform_later(:city_join, current_user.id)
   end
 
   def form_params
-    params.require(:user).permit(:accepted_coc, :aoc_id, :entered_hardcore, :username, :city_id, :referrer_code)
+    params.require(:user).permit(:accepted_coc, :aoc_id, :entered_hardcore, :username, :batch_number, :city_id, :referrer_code)
   end
 end

app/models/user.rb

@@ -23,13 +23,13 @@ class User < ApplicationRecord
   has_many :achievements, dependent: :destroy
   has_many :referees, class_name: "User", inverse_of: :referrer, dependent: :nullify
 
-  validates :aoc_id, numericality: { in: 1...(2**31), message: "should be between 1 and 2^31" }, allow_nil: true
   validates :aoc_id, uniqueness: { allow_nil: true }
-  validates :username, presence: true
-
-  validates :private_leaderboard, presence: true
+  validates :username, :private_leaderboard, presence: true
 
+  validate :city_cant_change
+  validate :batch_cant_change
   validate :not_referring_self
+  validate :referrer_exists
 
   scope :admins, -> { where(uid: ADMINS.values) }
   scope :confirmed, -> { where(accepted_coc: true, synced: true).where.not(aoc_id: nil) }
@@ -39,27 +39,21 @@ class User < ApplicationRecord
   before_validation :assign_private_leaderboard, on: :create
 
   def self.from_kitt(auth)
-    batches = auth.info&.schoolings
-    oldest_batch = batches.min_by { |batch| batch.camp.starts_at }
+    oldest_batch = auth.info&.schoolings&.min_by { |batch| batch.camp.starts_at }
 
     user = find_or_initialize_by(provider: auth.provider, uid: auth.uid) do |u|
       u.username = auth.info.github_nickname
       u.batch = Batch.find_or_initialize_by(number: oldest_batch&.camp&.slug.to_i)
       u.city = City.find_or_initialize_by(name: oldest_batch&.city&.name)
     end
 
-    user.github_username = auth.info.github_nickname
-
-    user.save
+    user.update(github_username: auth.info.github_nickname)
 
     user
   end
 
   def self.find_by_referral_code(code)
-    uid = code&.gsub(/R0*/, "")&.to_i
-    return if uid.nil?
-
-    User.find_by(uid:)
+    User.find_by(uid: code.gsub(/R0*/, "").to_i)
   end
 
   def admin?
@@ -113,8 +107,20 @@ def referrer_code
 
   private
 
+  def batch_cant_change
+    errors.add(:batch, "can't be changed") if batch_changed? && batch_id_was.present?
+  end
+
+  def city_cant_change
+    errors.add(:city, "can't be changed") if city_changed? && city_id_was.present?
+  end
+
   def not_referring_self
-    errors.add(:referrer, "must not be you") if referrer == self
+    errors.add(:referrer, "can't be you") if referrer == self
+  end
+
+  def referrer_exists
+    errors.add(:referrer, "must exist") if referrer_id == 0
   end
 
   def assign_private_leaderboard

spec/presenters/scores/user_scores_presenter_spec.rb

@@ -154,7 +154,8 @@
 
   context "when user has no city" do
     before do
-      user_1.update!(city: nil)
+      user_1.city = nil
+      user_1.save(validate: false)
     end
 
     it "includes no info about it in the output" do
@@ -166,7 +167,8 @@
 
   context "when user has no batch" do
     before do
-      user_1.update!(batch: nil)
+      user_1.batch = nil
+      user_1.save(validate: false)
     end
 
     it "includes no info about it in the output" do