База для ручки PostUserMedicationsExecutor.h

src/DAO/MySQLUserDAO.cpp

@@ -14,7 +14,7 @@ MySQLUserDAO::MySQLUserDAO(mysqlx::Session& session) :
 {
 }
 
-string MySQLUserDAO::Create(const user& created_user)
+string MySQLUserDAO::Create(const user_dto& created_user)
 {
   boost::uuids::random_generator generator;
   boost::uuids::uuid uuid = generator();
@@ -31,7 +31,7 @@ string MySQLUserDAO::Create(const user& created_user)
   return uuid_str;
 }
 
-optional<user> MySQLUserDAO::GetByUUID(const string& uuid)
+optional<user_dto> MySQLUserDAO::GetByUUID(const string& uuid)
 {
   static const string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (uuid = ?) LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
@@ -42,7 +42,7 @@ optional<user> MySQLUserDAO::GetByUUID(const string& uuid)
   return GetSingleUserBySQLResult(std::move(sql_result));
 }
 
-optional<user> MySQLUserDAO::GetByLogin(const string& login)
+optional<user_dto> MySQLUserDAO::GetByLogin(const string& login)
 {
   static const std::string sql_script = "SELECT * FROM `up_and_down`.`users` WHERE (login = ?) LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
@@ -53,7 +53,7 @@ optional<user> MySQLUserDAO::GetByLogin(const string& login)
   return GetSingleUserBySQLResult(std::move(sql_result));
 }
 
-pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
+pair<bool, vector<user_dto>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
 {
   static const string sql_script = "SELECT * FROM `up_and_down`.`users` LIMIT ? OFFSET ?;"s;
 
@@ -62,18 +62,18 @@ pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
                                  .bind(limit, offset)
                                  .execute();
   list<mysqlx::Row> rows = sql_result.fetchAll();
-  pair<bool, vector<user>> ret;
+  pair<bool, vector<user_dto>> ret;
 
   if (!rows.size())
   {
     ret.first = true;
-    ret.second = vector<user>{};
+    ret.second = vector<user_dto>{};
 
     return ret;
   }
 
   ret.first = rows.size() < limit + 1;
-  ret.second = vector<user>{};
+  ret.second = vector<user_dto>{};
 
   ret.second.reserve(limit);
 
@@ -84,7 +84,7 @@ pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
       break;
     }
 
-    user user;
+    user_dto user;
 
     const string user_uuid = row[0].get<string>();
     const string user_login = row[1].get<string>();
@@ -96,7 +96,7 @@ pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
   return ret;
 }
 
-bool MySQLUserDAO::Update(const user& u)
+bool MySQLUserDAO::Update(const user_dto& u)
 {
   static const string sql_script = "UPDATE `up_and_down`.`users` SET `login` = ? WHERE `uuid` = ?;"s;
 
@@ -118,7 +118,7 @@ bool MySQLUserDAO::Delete(const string& uuid)
   return !!schema.getAffectedItemsCount();
 }
 
-std::optional<user> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result)
+std::optional<user_dto> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& sql_result)
 {
   list<mysqlx::Row> rows = sql_result.fetchAll();
 
@@ -133,7 +133,7 @@ std::optional<user> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& s
   const string user_login = row_data[1].get<string>();
   const string user_hashed_password = row_data[2].get<string>();
 
-  return optional<user>({
+  return optional<user_dto>({
       .uuid = user_uuid,
       .login = user_login,
       .hashed_password = user_hashed_password