Small fixes and refactoring

src/Accounts/Account.h

@@ -1,7 +1,7 @@
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
 #include <string>
-#include <AccountType.cpp>
+#include <AccountType.h>
 
 class Account {
 protected:

src/Accounts/AccountFactory.cpp

@@ -1,4 +1,5 @@
 #include <AccountFactory.h>
+#include <AccountType.h>
 
 #include <BankAccount.h>
 #include <EmailAccount.h>

src/Accounts/AccountFactory.h

@@ -5,6 +5,7 @@
 #include <memory>
 
 #include <Account.h>
+#include <AccountType.h>
 
 class AccountFactory {
 public:

src/Accounts/BankAccount.cpp

@@ -1,3 +1,4 @@
+#include <AccountType.h>
 #include <BankAccount.h>
 
 #include <Database.h>

src/Accounts/BankAccount.h

@@ -1,7 +1,7 @@
 #ifndef BANKACCOUNT_H
 #define BANKACCOUNT_H
 #include <Account.h>
-
+#include <AccountType.h>
 
 class BankAccount final : public Account {
     std::string IBAN;

src/Accounts/EmailAccount.cpp

@@ -1,3 +1,4 @@
+#include <AccountType.h>
 #include <EmailAccount.h>
 
 #include <Database.h>

src/Accounts/EmailAccount.h

@@ -1,7 +1,7 @@
 #ifndef EMAILACCOUNT_H
 #define EMAILACCOUNT_H
 #include <Account.h>
-
+#include <AccountType.h>
 
 class EmailAccount final : public Account {
     std::string emailAddress;

src/Accounts/SocialMediaAccount.cpp

@@ -1,3 +1,4 @@
+#include <AccountType.h>
 #include <SocialMediaAccount.h>
 
 #include <Database.h>

src/Accounts/SocialMediaAccount.h

@@ -1,7 +1,7 @@
 #ifndef SOCIALMEDIAACCOUNT_H
 #define SOCIALMEDIAACCOUNT_H
 #include <Account.h>
-
+#include <AccountType.h>
 class SocialMediaAccount final : public Account {
     std::string platform;
     std::string profileUrl;

src/CMakeLists.txt

@@ -19,10 +19,7 @@ add_library(${PROJECT_NAME}_lib
         Accounts/SocialMediaAccount.cpp
         Accounts/AccountFactory.cpp
         Accounts/AccountFactory.h
-        Utils/VectorPlusTemplate.cpp
-        Utils/AccountType.cpp
         Utils/AddAccountCommandTemplate.cpp
-        Utils/ShowAccountsCommand.cpp
 )
 
 target_include_directories(${PROJECT_NAME}_lib SYSTEM PRIVATE

src/Database/Database.cpp

@@ -1,13 +1,14 @@
-#include "Database.h"
+#include <Database.h>
 #include <iostream>
 
-#include <DatabaseExceptions.h>
 #include <AccountExceptions.h>
 #include <AccountFactory.h>
+#include <AccountType.h>
 #include <BankAccount.h>
+#include <DatabaseExceptions.h>
 #include <EmailAccount.h>
 #include <SocialMediaAccount.h>
-#include "../Utils/VectorPlusTemplate.cpp"
+#include <VectorUtils.h>
 
 std::string Database::connString;
 

src/Utils/AccountType.cpp → src/Utils/AccountType.h

@@ -1,12 +1,15 @@
-#include <string>
+#ifndef ACCOUNTTYPE_H
+#define ACCOUNTTYPE_H
+
+#include <string_view>
 
 enum class AccountType {
     BankAccountType,
     EmailAccountType,
     SocialMediaAccountType
 };
 
-constexpr std::string getAccountTypeString(const AccountType &accountType) {
+constexpr std::string_view getAccountTypeString(const AccountType& accountType) {
     switch (accountType) {
         case AccountType::BankAccountType:
             return "Bank Account";
@@ -18,3 +21,5 @@ constexpr std::string getAccountTypeString(const AccountType &accountType) {
             return "Unknown Account Type";
     }
 }
+
+#endif //ACCOUNTTYPE_H

src/Utils/ShowAccountsCommand.cpp → src/Utils/ShowAccountsCommand.h

@@ -1,19 +1,24 @@
+#ifndef SHOWACCOUNTSCOMMAND_H
+#define SHOWACCOUNTSCOMMAND_H
+
+#include <AccountType.h>
 #include <Database.h>
 #include <iostream>
-
 namespace ShowAccountsCommands {
     template<AccountType T>
     void showAccountsCommand() {
         for (const auto &database = Database::getDatabaseInstance();
              const auto &account: database.getAccountsByType(T)) {
             account->show();
-        }
+             }
         std::cout << "---------------------------------\n";
-    }
+    } ;
 
-    void showAllAccounts() {
+    inline void showAllAccounts() {
         showAccountsCommand<AccountType::BankAccountType>();
         showAccountsCommand<AccountType::EmailAccountType>();
         showAccountsCommand<AccountType::SocialMediaAccountType>();
     }
 }
+
+#endif //SHOWACCOUNTSCOMMAND_H

src/Utils/VectorPlusTemplate.cpp → src/Utils/VectorUtils.h

@@ -1,10 +1,15 @@
+#ifndef VECTORUTILS_H
+#define VECTORUTILS_H
+
 #include <vector>
 
 template<typename T>
-std::vector<T> operator+(const std::vector<T> &lhs, const std::vector<T> &rhs) {
+std::vector<T> operator+(const std::vector<T> &lhs, const std::vector<T> &rhs){
     std::vector<T> result;
     result.reserve(lhs.size() + rhs.size());
     result.insert(result.end(), lhs.begin(), lhs.end());
     result.insert(result.end(), rhs.begin(), rhs.end());
     return result;
 }
+
+#endif //VECTORUTILS_H

src/main.cpp

@@ -2,13 +2,13 @@
 #include <iostream>
 
 #include <AccountExceptions.h>
-#include "AddAccountCommandTemplate.h"
-#include "ShowAccountsCommand.cpp"
-#include "Database/Database.h"
+#include <AddAccountCommandTemplate.h>
+#include <ShowAccountsCommand.h>
+#include <Database.h>
 
-#include "Database/Auth.h"
-#include "EnvironmentReader/EnvironmentReader.h"
-#include "Logger/Logger.h"
+#include <Auth.h>
+#include <EnvironmentReader.h>
+#include <Logger.h>
 
 void initializeDatabase() {
     auto &logger = Logger::getInstance();

tests/AccountTestNotLoggedIn.cpp

@@ -1,7 +1,16 @@
 #include <gtest/gtest.h>
 #include <AccountFactory.h>
+#include <AccountType.h>
+#include <User.h>
 
-TEST(AccountTest, noBankAccountCreatedWhenNotLoggedIn) {
+class AccountTestNotLoggedIn : public ::testing::Test {
+protected:
+    static void SetUpTestSuite() {
+        User::setCurrentUserId(-1);
+    }
+};
+
+TEST_F(AccountTestNotLoggedIn, noBankAccountCreatedWhenNotLoggedIn) {
     const auto bankAccountFactory =
         AccountFactory::accountFactory(AccountType::BankAccountType,
                                    {
@@ -11,15 +20,15 @@ TEST(AccountTest, noBankAccountCreatedWhenNotLoggedIn) {
     ASSERT_THROW(bankAccountFactory->addAccount(), std::exception);
 }
 
-TEST(AccountTest, noEmailAccountCreatedWhenNotLoggedIn) {
+TEST_F(AccountTestNotLoggedIn, noEmailAccountCreatedWhenNotLoggedIn) {
     const auto emailAccountFactory = AccountFactory::accountFactory(AccountType::EmailAccountType,
                                     {{"username", "sebi1"},{"password","1234"},
                                     {"emailAddress", "123412412"}, {"mailProvider", "bt"}
                                     });
     ASSERT_THROW(emailAccountFactory->addAccount(), std::exception);
 }
 
-TEST(AccountTest, noSocialMediaAccountCreatedWhenNotLoggedIn) {
+TEST_F(AccountTestNotLoggedIn, noSocialMediaAccountCreatedWhenNotLoggedIn) {
     const auto socialMediaAccountFactory =
         AccountFactory::accountFactory(AccountType::SocialMediaAccountType,
     {{"username", "sebi1"},{"password","1234"},

tests/VectorPlusTest.cpp

@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
-#include <VectorPlusTemplate.cpp>
-#include <Account.h>
+#include <VectorUtils.h>
 #include <memory>
 
-#include "AccountFactory.h"
+#include <AccountFactory.h>
+#include <AccountType.h>
 
 TEST(VectorPlusTest, IntTest) {
     const std::vector v = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};