From 029a10f1bcd028415c00c0a710b239e45af7ad98 Mon Sep 17 00:00:00 2001
From: EntireTwix <willkatz.dev@gmail.com>
Date: Sat, 3 Jul 2021 18:48:42 -0700
Subject: [PATCH] :art: simplified

---
 include/bank.h   |  3 +--
 src/bank.cpp     | 26 +-------------------------
 src/bank_api.cpp |  4 ++--
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/include/bank.h b/include/bank.h
index 1d2f814..295161f 100644
--- a/include/bank.h
+++ b/include/bank.h
@@ -65,8 +65,7 @@ public:
     bool Contains(const std::string &name) const noexcept;
     bool AdminVerifyAccount(std::string_view name) noexcept;
 
-    BankResponse AddUser(std::string &&name, std::string &&init_pass) noexcept;
-    BankResponse AdminAddUser(std::string &&name, uint32_t init_bal, std::string &&init_pass) noexcept;
+    BankResponse AddUser(std::string &&name, uint32_t init_bal, std::string &&init_pass) noexcept;
     BankResponse DelUser(const std::string &name) noexcept;
 
     void Save();
diff --git a/src/bank.cpp b/src/bank.cpp
index 73e269b..827e3f7 100644
--- a/src/bank.cpp
+++ b/src/bank.cpp
@@ -158,31 +158,7 @@ bool Bank::AdminVerifyAccount(std::string_view name) noexcept
     return (name == admin_account);
 }
 
-BankResponse Bank::AddUser(std::string &&name, std::string &&init_pass) noexcept
-{
-    if (!ValidUsrname(name))
-    {
-        return {k400BadRequest, "Invalid Name, breaks size and/or character restrictions"};
-    }
-    std::shared_lock<std::shared_mutex> lock{size_l};
-    if (users.try_emplace_l(
-            std::move(name), [](User &) {}, std::move(init_pass)))
-    {
-#if CONSERVATIVE_DISK_SAVE
-#if MULTI_THREADED
-        save_flag.SetChangesOn();
-#else
-        save_flag = true;
-#endif
-#endif
-        return {k200OK, "User added!"};
-    }
-    else
-    {
-        return {k409Conflict, "User already exists"};
-    }
-}
-BankResponse Bank::AdminAddUser(std::string &&name, uint32_t init_bal, std::string &&init_pass) noexcept
+BankResponse Bank::AddUser(std::string &&name, uint32_t init_bal, std::string &&init_pass) noexcept
 {
     if (!ValidUsrname(name))
     {
diff --git a/src/bank_api.cpp b/src/bank_api.cpp
index 362dc80..784f741 100644
--- a/src/bank_api.cpp
+++ b/src/bank_api.cpp
@@ -140,12 +140,12 @@ void api::ApiVersion(req_args) const
 void api::AddUser(req_args) const
 {
     GEN_BODY
-    RESPONSE_PARSE(bank.AddUser(body["name"].asCString(), body["pass"].asCString()))
+    RESPONSE_PARSE(bank.AddUser(body["name"].asCString(), 0, body["pass"].asCString()))
 }
 void api::AdminAddUser(req_args) const
 {
     GEN_BODY
-    RESPONSE_PARSE(bank.AdminAddUser(body["name"].asCString(), body["balance"].asUInt(), body["pass"].asCString()))
+    RESPONSE_PARSE(bank.AddUser(body["name"].asCString(), body["balance"].asUInt(), body["pass"].asCString()))
 }
 void api::DelUser(req_args) const
 {