Refactored by improving names and extracting sub functions

Author: DavidLazarescu

src/application/services/authentication_service.cpp

@@ -91,7 +91,7 @@ void AuthenticationService::processAuthenticationResult(const QString& token)
         {
             utility::AutomaticLoginHelper autoLoginHelper;
             utility::AuthenticationData authData { m_tempEmail, token };
-            autoLoginHelper.addAuthenticationData(authData);
+            autoLoginHelper.saveAuthenticationData(authData);
         }
 
         emit loggedIn(token, m_tempEmail);

src/application/services/user_service.cpp

@@ -31,7 +31,9 @@ UserService::UserService(IUserStorageGateway* userStorageGateway) :
     // Tag changed
     connect(&m_user, &User::tagsChanged, this, &UserService::tagsChanged);
 
-    // Fetch changes timer
+
+    // The timer which controls in which intervall we will check for new changes
+    // to the user data on the server.
     m_fetchChangesTimer.setInterval(m_fetchChangesInverval);
     connect(&m_fetchChangesTimer, &QTimer::timeout, this,
             [this]()
@@ -42,19 +44,9 @@ UserService::UserService(IUserStorageGateway* userStorageGateway) :
 
 void UserService::loadUser(bool rememberUser)
 {
-    utility::AutomaticLoginHelper autoLoginHelper;
-    auto result = autoLoginHelper.tryAutomaticUserLoading();
-    if(result.has_value())
-    {
-        utility::UserData userData = result.value();
-        User user(userData.firstName, userData.lastName, userData.email);
-
-        for(auto& tag : userData.tags)
-            user.addTag(tag);
-
-        proccessUserInformation(user, true);
+    auto success = tryLoadingUserFromFile();
+    if(success)
         return;
-    }
 
     m_rememberUser = rememberUser;
     m_userStorageGateway->getUser(m_authenticationToken);
@@ -168,26 +160,14 @@ void UserService::proccessUserInformation(const domain::entities::User& user,
     m_user.setFirstName(user.getFirstName());
     m_user.setLastName(user.getLastName());
     m_user.setEmail(user.getEmail());
-
     for(const auto& tag : user.getTags())
-    {
         m_user.addTag(tag);
-    }
 
     emit finishedLoadingUser(true);
 
     if(m_rememberUser)
-    {
-        utility::AutomaticLoginHelper autoLoginHelper;
-        utility::UserData userData {
-            user.getFirstName(),
-            user.getLastName(),
-            user.getEmail(),
-            user.getTags(),
-        };
-
-        autoLoginHelper.addUserData(userData);
-    }
+        saveUserToFile(user);
+
     clearRememberUser();
 }
 
@@ -198,9 +178,42 @@ bool UserService::userIsLoggedIn()
 
 void UserService::clearRememberUser()
 {
+    // This needs to be reset after every 'loadUser' request, else we might
+    // save the data for the next user, even though they don't want it
     m_rememberUser = false;
 }
 
+bool UserService::tryLoadingUserFromFile()
+{
+    utility::AutomaticLoginHelper autoLoginHelper;
+    auto result = autoLoginHelper.tryAutomaticUserLoading();
+    if(result.has_value())
+    {
+        utility::UserData userData = result.value();
+        User user(userData.firstName, userData.lastName, userData.email);
+        for(auto& tag : userData.tags)
+            user.addTag(tag);
+
+        proccessUserInformation(user, true);
+        return true;
+    }
+
+    return false;
+}
+
+void UserService::saveUserToFile(const domain::entities::User& user)
+{
+    utility::AutomaticLoginHelper autoLoginHelper;
+    utility::UserData userData {
+        user.getFirstName(),
+        user.getLastName(),
+        user.getEmail(),
+        user.getTags(),
+    };
+
+    autoLoginHelper.saveUserData(userData);
+}
+
 void UserService::setupUserData(const QString& token, const QString& email)
 {
     Q_UNUSED(email);

src/application/services/user_service.hpp

@@ -47,6 +47,8 @@ private slots:
 private:
     bool userIsLoggedIn();
     void clearRememberUser();
+    bool tryLoadingUserFromFile();
+    void saveUserToFile(const domain::entities::User& user);
 
     IUserStorageGateway* m_userStorageGateway;
     domain::entities::User m_user;

src/application/utility/automatic_login_helper.cpp

@@ -59,7 +59,7 @@ std::optional<UserData> AutomaticLoginHelper::tryAutomaticUserLoading()
     return user;
 }
 
-void AutomaticLoginHelper::addAuthenticationData(
+void AutomaticLoginHelper::saveAuthenticationData(
     const AuthenticationData& authData)
 {
     auto currentFolder = QDir::current();
@@ -82,7 +82,7 @@ void AutomaticLoginHelper::addAuthenticationData(
     file.write(jsonDoc.toJson((QJsonDocument::Indented)));
 }
 
-void AutomaticLoginHelper::addUserData(const UserData& userData)
+void AutomaticLoginHelper::saveUserData(const UserData& userData)
 {
     // User data can only be appended to the file, if the auth data already
     // exists. They would make no sense without each other.

src/application/utility/automatic_login_helper.hpp

@@ -38,8 +38,8 @@ class AutomaticLoginHelper
 public:
     std::optional<AuthenticationData> tryAutomaticAuthentication();
     std::optional<UserData> tryAutomaticUserLoading();
-    void addAuthenticationData(const AuthenticationData& authData);
-    void addUserData(const UserData& userData);
+    void saveAuthenticationData(const AuthenticationData& authData);
+    void saveUserData(const UserData& userData);
     void clearAutomaticLoginData();
 
 private: