Compare commits
2 Commits
3b1f3301d6
...
74dbbd9e82
| Author | SHA1 | Date | |
|---|---|---|---|
| 74dbbd9e82 | |||
| 6dea303b92 |
+1
@@ -157,6 +157,7 @@
|
||||
<ClInclude Include="core\patterns\Observer.h" />
|
||||
<ClInclude Include="core\patterns\Subject.h" />
|
||||
<ClInclude Include="datastores\DataStore.h" />
|
||||
<ClInclude Include="datastores\DataStoreLockGuard.h" />
|
||||
<ClInclude Include="datastores\sharedmemory\FileHeader.h" />
|
||||
<ClInclude Include="datastores\sharedmemory\MappingInfo.h" />
|
||||
<ClInclude Include="datastores\sharedmemory\RecordState.h" />
|
||||
|
||||
+3
@@ -278,5 +278,8 @@
|
||||
<ClInclude Include="datastores\sharedmemory\SharedMemory.h">
|
||||
<Filter>Header Files\DataStores\SharedMemory</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="datastores\DataStoreLockGuard.h">
|
||||
<Filter>Header Files\DataStores</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -228,6 +228,22 @@ Returns:
|
||||
*/
|
||||
util::Map<std::string, TrackedRecord<User>>& DataStore::getUsers()
|
||||
{
|
||||
auto users = loadRecords<User, SerializedUser>(m_users);
|
||||
refreshCache(m_userCache, users);
|
||||
auto& notifications = getNotifications();
|
||||
int numberOfNotifications = m_notificationCache.getSize();
|
||||
for (int index = 0; index < numberOfNotifications; index++)
|
||||
{
|
||||
Notification* notification = notifications.getValueAt(index).data;
|
||||
const std::string& recipientUserId = notification->getRecipientUserId();
|
||||
int userIndex = m_userCache.find(recipientUserId);
|
||||
if (userIndex == -1)
|
||||
{
|
||||
throw std::runtime_error("Invalid recipient user ID");
|
||||
}
|
||||
User* user = m_userCache.getValueAt(userIndex).data;
|
||||
user->addNotification(notification);
|
||||
}
|
||||
return m_userCache;
|
||||
}
|
||||
|
||||
@@ -371,6 +387,8 @@ Returns:
|
||||
*/
|
||||
void DataStore::saveUsers()
|
||||
{
|
||||
saveRecords<User, SerializedUser>(m_users, m_userCache);
|
||||
saveNotifications();
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
File: DataStoreLockGuard.h
|
||||
Description: Defines the DataStoreLockGuard class used to manage DataStore
|
||||
locking and unlocking automatically within a scope.
|
||||
Author: Trenser
|
||||
Date: 12-June-2026
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "DataStore.h"
|
||||
|
||||
class DataStoreLockGuard
|
||||
{
|
||||
public:
|
||||
explicit DataStoreLockGuard(DataStore& dataStore)
|
||||
: m_dataStore(dataStore)
|
||||
{
|
||||
m_dataStore.lockDataStore();
|
||||
}
|
||||
~DataStoreLockGuard()
|
||||
{
|
||||
m_dataStore.unlockDataStore();
|
||||
}
|
||||
DataStoreLockGuard(const DataStoreLockGuard&) = delete;
|
||||
DataStoreLockGuard& operator=(const DataStoreLockGuard&) = delete;
|
||||
private:
|
||||
DataStore& m_dataStore;
|
||||
};
|
||||
@@ -8,6 +8,7 @@ Date: 19-May-2026
|
||||
*/
|
||||
|
||||
#include <sstream>
|
||||
#include "SerializedRecords.h"
|
||||
#include "User.h"
|
||||
#include "Notification.h"
|
||||
#include "Enums.h"
|
||||
@@ -28,7 +29,8 @@ Returns:
|
||||
User::User()
|
||||
: m_id("USR" + std::to_string(++m_uid)),
|
||||
m_type(util::UserType::CUSTOMER),
|
||||
m_status(util::State::ACTIVE) {}
|
||||
m_status(util::State::ACTIVE) {
|
||||
}
|
||||
|
||||
/*
|
||||
Function: User
|
||||
@@ -51,7 +53,8 @@ User::User(const std::string& userName, const std::string& password, const std::
|
||||
m_phone(phone),
|
||||
m_email(email),
|
||||
m_type(role),
|
||||
m_status(util::State::ACTIVE) {}
|
||||
m_status(util::State::ACTIVE) {
|
||||
}
|
||||
|
||||
/*
|
||||
Function: User (parameterized constructor with ID)
|
||||
@@ -324,68 +327,43 @@ void User::setState(util::State status)
|
||||
|
||||
/*
|
||||
Function: serialize
|
||||
Description: Serializes the user into a CSV-formatted string.
|
||||
Description: Serializes the User object into a SerializedUser record.
|
||||
Parameters:
|
||||
- None
|
||||
Returns:
|
||||
- std::string: Serialized user record
|
||||
- SerializedUser: Serialized representation of the user
|
||||
*/
|
||||
std::string User::serialize() const
|
||||
SerializedUser User::serialize() const
|
||||
{
|
||||
std::ostringstream serializedUser;
|
||||
serializedUser << m_id << ','
|
||||
<< m_userName << ','
|
||||
<< m_password << ','
|
||||
<< m_name << ','
|
||||
<< m_phone << ','
|
||||
<< m_email << ','
|
||||
<< util::getUserTypeString(m_type) << ','
|
||||
<< util::getStateString(m_status);
|
||||
return serializedUser.str();
|
||||
SerializedUser serialized = {};
|
||||
strcpy_s(serialized.id, sizeof(serialized.id), m_id.c_str());
|
||||
strcpy_s(serialized.username, sizeof(serialized.username), m_userName.c_str());
|
||||
strcpy_s(serialized.password, sizeof(serialized.password), m_password.c_str());
|
||||
strcpy_s(serialized.name, sizeof(serialized.name), m_name.c_str());
|
||||
strcpy_s(serialized.phone, sizeof(serialized.phone), m_phone.c_str());
|
||||
strcpy_s(serialized.email, sizeof(serialized.email), m_email.c_str());
|
||||
serialized.userType = m_type;
|
||||
serialized.status = m_status;
|
||||
return serialized;
|
||||
}
|
||||
|
||||
/*
|
||||
Function: deserialize
|
||||
Description: Deserializes a CSV-formatted string into a User object.
|
||||
Description: Deserializes a SerializedUser record into a User object.
|
||||
Parameters:
|
||||
- record: const std::string&, serialized user record
|
||||
- serializedUser: const SerializedUser&, serialized user record
|
||||
Returns:
|
||||
- User*: Pointer to the deserialized User object
|
||||
*/
|
||||
User* User::deserialize(const std::string& record)
|
||||
User* User::deserialize(const SerializedUser& serializedUser)
|
||||
{
|
||||
std::string id, name, username, phone, password, email;
|
||||
std::string userTypeString, stateString;
|
||||
std::istringstream serializedUser(record);
|
||||
getline(serializedUser, id, ',');
|
||||
getline(serializedUser, username, ',');
|
||||
getline(serializedUser, password, ',');
|
||||
getline(serializedUser, name, ',');
|
||||
getline(serializedUser, phone, ',');
|
||||
getline(serializedUser, email, ',');
|
||||
getline(serializedUser, userTypeString, ',');
|
||||
getline(serializedUser, stateString);
|
||||
util::UserType userType = util::getUserType(userTypeString);
|
||||
util::State status = util::getState(stateString);
|
||||
return Factory::getObject<User>(id,
|
||||
username,
|
||||
password,
|
||||
name,
|
||||
phone,
|
||||
email,
|
||||
userType,
|
||||
status);
|
||||
}
|
||||
|
||||
/*
|
||||
Function: getHeaders
|
||||
Description: Retrieves the CSV headers for user serialization.
|
||||
Parameters:
|
||||
- None
|
||||
Returns:
|
||||
- std::string: Header string ("ID,Username,Password,Name,Phone,Email,UserType,UserStatus")
|
||||
*/
|
||||
std::string User::getHeaders()
|
||||
{
|
||||
return "ID,Username,Password,Name,Phone,Email,UserType,UserStatus";
|
||||
return Factory::getObject<User>(
|
||||
serializedUser.id,
|
||||
serializedUser.username,
|
||||
serializedUser.password,
|
||||
serializedUser.name,
|
||||
serializedUser.phone,
|
||||
serializedUser.email,
|
||||
serializedUser.userType,
|
||||
serializedUser.status);
|
||||
}
|
||||
@@ -14,6 +14,7 @@ Date: 19-May-2026
|
||||
#include "Enums.h"
|
||||
|
||||
class Notification;
|
||||
struct SerializedUser;
|
||||
|
||||
class User : public Observer
|
||||
{
|
||||
@@ -51,7 +52,6 @@ public:
|
||||
void addNotification(Notification* notification) override;
|
||||
void setRole(util::UserType role);
|
||||
void setState(util::State status);
|
||||
std::string serialize() const;
|
||||
static User* deserialize(const std::string&);
|
||||
static std::string getHeaders();
|
||||
SerializedUser serialize() const;
|
||||
static User* deserialize(const SerializedUser& serializedUser);
|
||||
};
|
||||
|
||||
+16
-4
@@ -10,6 +10,8 @@ Date:19-May-2026
|
||||
#include <stdexcept>
|
||||
#include "AuthenticationManagementService.h"
|
||||
#include "User.h"
|
||||
#include "Utility.h"
|
||||
#include "DataStoreLockGuard.h"
|
||||
|
||||
User* AuthenticationManagementService::m_authenticatedUser = nullptr;
|
||||
|
||||
@@ -24,11 +26,12 @@ Return type: bool - true if login successful, false otherwise
|
||||
*/
|
||||
bool AuthenticationManagementService::login(const std::string& username, const std::string& password)
|
||||
{
|
||||
util::Map<std::string, User*> users = m_dataStore.getUsers();
|
||||
int usersMapSize = users.getSize();
|
||||
for (int index = 0; index < usersMapSize; index++)
|
||||
DataStoreLockGuard lock(m_dataStore);
|
||||
auto& trackedUserMap = m_dataStore.getUsers();
|
||||
int trackedUserMapSize = trackedUserMap.getSize();
|
||||
for (int index = 0; index < trackedUserMapSize; index++)
|
||||
{
|
||||
User* user = users.getValueAt(index);
|
||||
User* user = trackedUserMap.getValueAt(index).data;
|
||||
if (username == user->getUserName())
|
||||
{
|
||||
if (password == user->getPassword())
|
||||
@@ -74,9 +77,18 @@ Return type: void
|
||||
*/
|
||||
void AuthenticationManagementService::changePassword(const std::string& newPassword)
|
||||
{
|
||||
DataStoreLockGuard lock(m_dataStore);
|
||||
auto& trackedUsersMap = m_dataStore.getUsers();
|
||||
int index = trackedUsersMap.find(m_authenticatedUser->getId());
|
||||
if (index == -1)
|
||||
{
|
||||
throw std::runtime_error("User does not exist!\n");
|
||||
}
|
||||
if (m_authenticatedUser == nullptr)
|
||||
{
|
||||
throw std::runtime_error("There is no user currently logged in!");
|
||||
}
|
||||
m_authenticatedUser->setPassword(newPassword);
|
||||
trackedUsersMap.getValueAt(index).state = RecordState::MODIFIED;
|
||||
m_dataStore.saveUsers();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user