From 36ed96bf94e574d62be7aaa0b89d53de4780f090 Mon Sep 17 00:00:00 2001
From: akadusei <attakusiadusei@gmail.com>
Date: Sun, 28 Jul 2024 17:35:19 +0000
Subject: [PATCH] Rename `Mixins::SaveUserName` to `ValidateUser`

---
 ...ser_name_spec.cr => validate_user_spec.cr} | 21 ++-----------------
 .../{save_user_name.cr => validate_user.cr}   |  2 +-
 src/operations/register_current_user.cr       |  2 +-
 src/operations/register_user.cr               |  2 +-
 src/operations/update_current_user.cr         |  2 +-
 src/operations/update_user.cr                 |  2 +-
 6 files changed, 7 insertions(+), 24 deletions(-)
 rename spec/app/operations/mixins/{save_user_name_spec.cr => validate_user_spec.cr} (73%)
 rename src/operations/mixins/{save_user_name.cr => validate_user.cr} (96%)

diff --git a/spec/app/operations/mixins/save_user_name_spec.cr b/spec/app/operations/mixins/validate_user_spec.cr
similarity index 73%
rename from spec/app/operations/mixins/save_user_name_spec.cr
rename to spec/app/operations/mixins/validate_user_spec.cr
index ffdb901..5684fbe 100644
--- a/spec/app/operations/mixins/save_user_name_spec.cr
+++ b/spec/app/operations/mixins/validate_user_spec.cr
@@ -15,27 +15,10 @@ private class SaveUser < User::SaveOperation
     }.to_json)
   end
 
-  include Mixins::SaveUserName
+  include Mixins::ValidateUser
 end
 
-describe Mixins::SaveUserName do
-  it "saves first and last names" do
-    first_name = "Kofi"
-    last_name = "Amoako"
-
-    SaveUser.create(params(
-      first_name: first_name,
-      last_name: last_name
-    )) do |_, user|
-      user.should be_a(User)
-
-      user.try do |user| # ameba:disable Lint/ShadowingOuterLocalVar
-        user.first_name.should eq(first_name)
-        user.last_name.should eq(last_name)
-      end
-    end
-  end
-
+describe Mixins::ValidateUser do
   it "requires first name" do
     SaveUser.create(params(last_name: "Nkrumah")) do |operation, _|
       operation.saved?.should be_false
diff --git a/src/operations/mixins/save_user_name.cr b/src/operations/mixins/validate_user.cr
similarity index 96%
rename from src/operations/mixins/save_user_name.cr
rename to src/operations/mixins/validate_user.cr
index b015a3f..975ae8e 100644
--- a/src/operations/mixins/save_user_name.cr
+++ b/src/operations/mixins/validate_user.cr
@@ -1,4 +1,4 @@
-module Mixins::SaveUserName
+module Mixins::ValidateUser
   macro included
     before_save do
       validate_first_name_required
diff --git a/src/operations/register_current_user.cr b/src/operations/register_current_user.cr
index afd77fb..562bebb 100644
--- a/src/operations/register_current_user.cr
+++ b/src/operations/register_current_user.cr
@@ -5,7 +5,7 @@ class RegisterCurrentUser < User::SaveOperation
     set_level
   end
 
-  include Mixins::SaveUserName
+  include Mixins::ValidateUser
   include Mixins::ValidateNotPwned
   include Shield::SendWelcomeEmail
 
diff --git a/src/operations/register_user.cr b/src/operations/register_user.cr
index 8dacc2d..6bb82a6 100644
--- a/src/operations/register_user.cr
+++ b/src/operations/register_user.cr
@@ -5,6 +5,6 @@ class RegisterUser < User::SaveOperation
     validate_required level
   end
 
+  include Mixins::ValidateUser
   include Mixins::ValidateNotPwned
-  include Mixins::SaveUserName
 end
diff --git a/src/operations/update_current_user.cr b/src/operations/update_current_user.cr
index b987997..1d97f16 100644
--- a/src/operations/update_current_user.cr
+++ b/src/operations/update_current_user.cr
@@ -1,6 +1,6 @@
 class UpdateCurrentUser < User::SaveOperation
   permit_columns :first_name, :last_name
 
+  include Mixins::ValidateUser
   include Mixins::ValidateNotPwned
-  include Mixins::SaveUserName
 end
diff --git a/src/operations/update_user.cr b/src/operations/update_user.cr
index cf6064c..c23b95b 100644
--- a/src/operations/update_user.cr
+++ b/src/operations/update_user.cr
@@ -7,8 +7,8 @@ class UpdateUser < User::SaveOperation
     reset_level
   end
 
+  include Mixins::ValidateUser
   include Mixins::ValidateNotPwned
-  include Mixins::SaveUserName
 
   # Ensure current admin cannot change their own level,
   # lest they get locked out