Merged PR 1194: Fix shared memory notification and authorization handling issues
Changes: - Fixed DataStore cache refresh from overwriting records with pending local modifications. - Fixed notification ID collisions by refreshing the notification cache before creating new notifications. - Added authorization state tracking to authenticated sessions. - Revoked authorization immediately when account-disabled events are received. - Added authorization validation for protected service operations. - Cleared authorization state during logout. - Added admin notifications for newly created service bookings. - Added admin notifications for newly created combo package bookings. - Included Service Booking IDs in admin notification messages. #2077 #2078 #2078 #2100 Related work items: #2077, #2078, #2079, #2100
This commit is contained in:
@@ -220,6 +220,12 @@ void DataStore::refreshCache(util::Map<std::string, TrackedRecord<TObject>>& cac
|
|||||||
if (oldIndex != -1)
|
if (oldIndex != -1)
|
||||||
{
|
{
|
||||||
TrackedRecord<TObject>& oldRecord = oldCache.getValueAt(oldIndex);
|
TrackedRecord<TObject>& oldRecord = oldCache.getValueAt(oldIndex);
|
||||||
|
if (oldRecord.state == RecordState::MODIFIED)
|
||||||
|
{
|
||||||
|
delete refreshedRecord.data;
|
||||||
|
cache.insert(id, oldRecord);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
*oldRecord.data = *refreshedRecord.data;
|
*oldRecord.data = *refreshedRecord.data;
|
||||||
oldRecord.slotIndex = refreshedRecord.slotIndex;
|
oldRecord.slotIndex = refreshedRecord.slotIndex;
|
||||||
oldRecord.state = refreshedRecord.state;
|
oldRecord.state = refreshedRecord.state;
|
||||||
|
|||||||
+23
@@ -14,10 +14,29 @@ Date:19-May-2026
|
|||||||
#include "DataStoreLockGuard.h"
|
#include "DataStoreLockGuard.h"
|
||||||
|
|
||||||
User* AuthenticationManagementService::m_authenticatedUser = nullptr;
|
User* AuthenticationManagementService::m_authenticatedUser = nullptr;
|
||||||
|
bool AuthenticationManagementService::m_isAuthorized = false;
|
||||||
EventManager AuthenticationManagementService::m_eventManager;
|
EventManager AuthenticationManagementService::m_eventManager;
|
||||||
HANDLE AuthenticationManagementService::m_accountDisabledEvent = NULL;
|
HANDLE AuthenticationManagementService::m_accountDisabledEvent = NULL;
|
||||||
HANDLE AuthenticationManagementService::m_notificationsAvailableEvent = NULL;
|
HANDLE AuthenticationManagementService::m_notificationsAvailableEvent = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
Function: ensureAuthorization
|
||||||
|
Description: Verifies that a user is currently authenticated before allowing
|
||||||
|
access to a protected operation. Throws an exception if no
|
||||||
|
authorized user session exists.
|
||||||
|
Parameter: None
|
||||||
|
Return type: void
|
||||||
|
Throws: std::runtime_error - if the user is not authorized
|
||||||
|
*/
|
||||||
|
void AuthenticationManagementService::ensureAuthorization()
|
||||||
|
{
|
||||||
|
if (!m_authenticatedUser || !m_isAuthorized)
|
||||||
|
{
|
||||||
|
throw std::runtime_error("You are not authorized to do this operation!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Function: login
|
Function: login
|
||||||
Description: Authenticates a user by checking the provided username and password
|
Description: Authenticates a user by checking the provided username and password
|
||||||
@@ -40,12 +59,14 @@ bool AuthenticationManagementService::login(const std::string& username, const s
|
|||||||
if (password == user->getPassword())
|
if (password == user->getPassword())
|
||||||
{
|
{
|
||||||
m_authenticatedUser = user;
|
m_authenticatedUser = user;
|
||||||
|
m_isAuthorized = true;
|
||||||
m_eventManager.initialize(
|
m_eventManager.initialize(
|
||||||
user->getId(),
|
user->getId(),
|
||||||
[]()
|
[]()
|
||||||
{
|
{
|
||||||
if (m_accountDisabledEvent)
|
if (m_accountDisabledEvent)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::m_isAuthorized = false;
|
||||||
SetEvent(m_accountDisabledEvent);
|
SetEvent(m_accountDisabledEvent);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -86,6 +107,7 @@ void AuthenticationManagementService::logout()
|
|||||||
{
|
{
|
||||||
m_eventManager.shutdown();
|
m_eventManager.shutdown();
|
||||||
m_authenticatedUser = nullptr;
|
m_authenticatedUser = nullptr;
|
||||||
|
m_isAuthorized = false;
|
||||||
m_accountDisabledEvent = NULL;
|
m_accountDisabledEvent = NULL;
|
||||||
m_notificationsAvailableEvent = NULL;
|
m_notificationsAvailableEvent = NULL;
|
||||||
}
|
}
|
||||||
@@ -99,6 +121,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void AuthenticationManagementService::changePassword(const std::string& newPassword)
|
void AuthenticationManagementService::changePassword(const std::string& newPassword)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedUsersMap = m_dataStore.getUsers();
|
auto& trackedUsersMap = m_dataStore.getUsers();
|
||||||
if (m_authenticatedUser == nullptr)
|
if (m_authenticatedUser == nullptr)
|
||||||
|
|||||||
+2
@@ -19,12 +19,14 @@ class AuthenticationManagementService
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static User* m_authenticatedUser;
|
static User* m_authenticatedUser;
|
||||||
|
static bool m_isAuthorized;
|
||||||
static EventManager m_eventManager;
|
static EventManager m_eventManager;
|
||||||
static HANDLE m_accountDisabledEvent;
|
static HANDLE m_accountDisabledEvent;
|
||||||
static HANDLE m_notificationsAvailableEvent;
|
static HANDLE m_notificationsAvailableEvent;
|
||||||
DataStore& m_dataStore;
|
DataStore& m_dataStore;
|
||||||
public:
|
public:
|
||||||
AuthenticationManagementService() : m_dataStore(DataStore::getInstance()) {}
|
AuthenticationManagementService() : m_dataStore(DataStore::getInstance()) {}
|
||||||
|
static void ensureAuthorization();
|
||||||
bool login(const std::string& username, const std::string& password);
|
bool login(const std::string& username, const std::string& password);
|
||||||
void logout();
|
void logout();
|
||||||
void changePassword(const std::string& newPassword);
|
void changePassword(const std::string& newPassword);
|
||||||
|
|||||||
+7
-1
@@ -14,6 +14,7 @@ Date: 22-May-2026
|
|||||||
#include "Factory.h"
|
#include "Factory.h"
|
||||||
#include "InventoryItem.h"
|
#include "InventoryItem.h"
|
||||||
#include "InventoryManagementService.h"
|
#include "InventoryManagementService.h"
|
||||||
|
#include "AuthenticationManagementService.h"
|
||||||
#include "Timestamp.h"
|
#include "Timestamp.h"
|
||||||
#include "User.h"
|
#include "User.h"
|
||||||
#include "Utility.h"
|
#include "Utility.h"
|
||||||
@@ -102,6 +103,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void InventoryManagementService::addInventoryItem(const std::string& partName, int quantity, double price)
|
void InventoryManagementService::addInventoryItem(const std::string& partName, int quantity, double price)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
||||||
InventoryItem* newItem = Factory::getObject<InventoryItem>(partName, quantity, price);
|
InventoryItem* newItem = Factory::getObject<InventoryItem>(partName, quantity, price);
|
||||||
@@ -118,6 +120,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void InventoryManagementService::addInventoryItemStock(const std::string& selectedItemId, int quantity)
|
void InventoryManagementService::addInventoryItemStock(const std::string& selectedItemId, int quantity)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
||||||
int index = trackedInventoryItemMap.find(selectedItemId);
|
int index = trackedInventoryItemMap.find(selectedItemId);
|
||||||
@@ -144,6 +147,7 @@ Return type: util::Map<std::string, InventoryItem*>
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, InventoryItem*> InventoryManagementService::getInventoryItems()
|
util::Map<std::string, InventoryItem*> InventoryManagementService::getInventoryItems()
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
||||||
auto inventoryMap = util::getObjects(trackedInventoryItemMap);
|
auto inventoryMap = util::getObjects(trackedInventoryItemMap);
|
||||||
@@ -158,6 +162,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void InventoryManagementService::removeInventoryItem(const std::string& inventoryItemID)
|
void InventoryManagementService::removeInventoryItem(const std::string& inventoryItemID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
||||||
int index = trackedInventoryItemMap.find(inventoryItemID);
|
int index = trackedInventoryItemMap.find(inventoryItemID);
|
||||||
@@ -183,6 +188,7 @@ Return type: InventoryItem*
|
|||||||
*/
|
*/
|
||||||
InventoryItem* InventoryManagementService::getInventoryItem(const std::string& inventoryItemID)
|
InventoryItem* InventoryManagementService::getInventoryItem(const std::string& inventoryItemID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
|
||||||
int index = trackedInventoryItemMap.find(inventoryItemID);
|
int index = trackedInventoryItemMap.find(inventoryItemID);
|
||||||
@@ -270,6 +276,7 @@ void InventoryManagementService::sendNotification(User* user, const std::string&
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
||||||
Notification* notification = Factory::getObject<Notification>(
|
Notification* notification = Factory::getObject<Notification>(
|
||||||
user->getId(),
|
user->getId(),
|
||||||
title,
|
title,
|
||||||
@@ -279,7 +286,6 @@ void InventoryManagementService::sendNotification(User* user, const std::string&
|
|||||||
{
|
{
|
||||||
throw std::runtime_error("Failed to create notification");
|
throw std::runtime_error("Failed to create notification");
|
||||||
}
|
}
|
||||||
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
|
||||||
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
||||||
m_dataStore.saveNotifications();
|
m_dataStore.saveNotifications();
|
||||||
EventManager::sendNotificationAvailableEvent(user->getId());
|
EventManager::sendNotificationAvailableEvent(user->getId());
|
||||||
|
|||||||
+7
-2
@@ -15,6 +15,7 @@ Date: 20-May-2026
|
|||||||
#include "Invoice.h"
|
#include "Invoice.h"
|
||||||
#include "JobCard.h"
|
#include "JobCard.h"
|
||||||
#include "PaymentManagementService.h"
|
#include "PaymentManagementService.h"
|
||||||
|
#include "AuthenticationManagementService.h"
|
||||||
#include "DataStoreLockGuard.h"
|
#include "DataStoreLockGuard.h"
|
||||||
#include "Service.h"
|
#include "Service.h"
|
||||||
#include "ServiceBooking.h"
|
#include "ServiceBooking.h"
|
||||||
@@ -98,6 +99,7 @@ void PaymentManagementService::sendNotification(User* user, const std::string& t
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
||||||
Notification* notification = Factory::getObject<Notification>(
|
Notification* notification = Factory::getObject<Notification>(
|
||||||
user->getId(),
|
user->getId(),
|
||||||
title,
|
title,
|
||||||
@@ -107,7 +109,6 @@ void PaymentManagementService::sendNotification(User* user, const std::string& t
|
|||||||
{
|
{
|
||||||
throw std::runtime_error("Failed to create notification");
|
throw std::runtime_error("Failed to create notification");
|
||||||
}
|
}
|
||||||
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
|
||||||
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
||||||
m_dataStore.saveNotifications();
|
m_dataStore.saveNotifications();
|
||||||
EventManager::sendNotificationAvailableEvent(user->getId());
|
EventManager::sendNotificationAvailableEvent(user->getId());
|
||||||
@@ -233,6 +234,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, Invoice*> PaymentManagementService::getInvoices(const std::string& customerID)
|
util::Map<std::string, Invoice*> PaymentManagementService::getInvoices(const std::string& customerID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
||||||
util::Map<std::string, Invoice*> currentUserInvoices;
|
util::Map<std::string, Invoice*> currentUserInvoices;
|
||||||
@@ -261,6 +263,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void PaymentManagementService::completePayment(const std::string& invoiceID, util::PaymentMode paymentMode)
|
void PaymentManagementService::completePayment(const std::string& invoiceID, util::PaymentMode paymentMode)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
||||||
int invoiceIndex = currentTrackedInvoices.find(invoiceID);
|
int invoiceIndex = currentTrackedInvoices.find(invoiceID);
|
||||||
@@ -289,7 +292,7 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Function: getAllInvoice
|
Function: getAllInvoices
|
||||||
Description: Provides access to all invoices stored in the data store.
|
Description: Provides access to all invoices stored in the data store.
|
||||||
Parameters:
|
Parameters:
|
||||||
- none
|
- none
|
||||||
@@ -298,6 +301,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, Invoice*> PaymentManagementService::getAllInvoices()
|
util::Map<std::string, Invoice*> PaymentManagementService::getAllInvoices()
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
util::Map<std::string, Invoice*> invoices;
|
util::Map<std::string, Invoice*> invoices;
|
||||||
invoices = util::getObjects(m_dataStore.getInvoices());
|
invoices = util::getObjects(m_dataStore.getInvoices());
|
||||||
@@ -317,6 +321,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void PaymentManagementService::confirmPayment(const std::string& invoiceID)
|
void PaymentManagementService::confirmPayment(const std::string& invoiceID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
auto& currentTrackedInvoices = m_dataStore.getInvoices();
|
||||||
int invoiceIndex = currentTrackedInvoices.find(invoiceID);
|
int invoiceIndex = currentTrackedInvoices.find(invoiceID);
|
||||||
|
|||||||
+42
-1
@@ -29,6 +29,31 @@ Date:19-May-2026
|
|||||||
#include "DataStoreLockGuard.h"
|
#include "DataStoreLockGuard.h"
|
||||||
#include "EventManager.h"
|
#include "EventManager.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
Function: notifyAllAdmins
|
||||||
|
Description: Sends a notification to all users with the ADMIN role.
|
||||||
|
Iterates through the provided user collection and delivers
|
||||||
|
the specified notification to each administrator using the
|
||||||
|
ServiceManagementService notification mechanism.
|
||||||
|
Parameter: const std::string& title - notification title
|
||||||
|
Parameter: const std::string& message - notification message
|
||||||
|
Parameter: const util::Map<std::string, TrackedRecord<User>>& users - collection of tracked users
|
||||||
|
Parameter: ServiceManagementService* serviceManagementService - service used to dispatch notifications
|
||||||
|
Return type: void
|
||||||
|
*/
|
||||||
|
static void notifyAllAdmins(const std::string& title, const std::string& message, const util::Map<std::string, TrackedRecord<User>>& users, ServiceManagementService* serviceManagementService)
|
||||||
|
{
|
||||||
|
int numberOfUsers = users.getSize();
|
||||||
|
for (int index = 0; index < numberOfUsers; index++)
|
||||||
|
{
|
||||||
|
User* user = users.getValueAt(index).data;
|
||||||
|
if (user->getUserType() == util::UserType::ADMIN)
|
||||||
|
{
|
||||||
|
serviceManagementService->sendNotification(user, title, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Function: purchaseService
|
Function: purchaseService
|
||||||
Description: Creates a new service booking for the authenticated user. Validates
|
Description: Creates a new service booking for the authenticated user. Validates
|
||||||
@@ -42,6 +67,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::purchaseService(const util::Vector<std::string>& serviceIDs, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
|
void ServiceManagementService::purchaseService(const util::Vector<std::string>& serviceIDs, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
AuthenticationManagementService m_authenticationManagementService;
|
AuthenticationManagementService m_authenticationManagementService;
|
||||||
auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
|
auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
|
||||||
if (authenticatedUser == nullptr)
|
if (authenticatedUser == nullptr)
|
||||||
@@ -72,6 +98,7 @@ void ServiceManagementService::purchaseService(const util::Vector<std::string>&
|
|||||||
std::string title = "Service Booking succeeded";
|
std::string title = "Service Booking succeeded";
|
||||||
std::string message = "Your service booking has been successfully placed with ID " + serviceBooking->getId();
|
std::string message = "Your service booking has been successfully placed with ID " + serviceBooking->getId();
|
||||||
sendNotification(authenticatedUser, title, message);
|
sendNotification(authenticatedUser, title, message);
|
||||||
|
notifyAllAdmins("New Service Order Available", "A new service order has been placed with Service Booking ID " + serviceBooking->getId(), m_dataStore.getUsers(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -87,6 +114,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::purchaseComboPackage(const std::string& comboPackageID, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
|
void ServiceManagementService::purchaseComboPackage(const std::string& comboPackageID, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
AuthenticationManagementService m_authenticationManagementService;
|
AuthenticationManagementService m_authenticationManagementService;
|
||||||
auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
|
auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
|
||||||
if (authenticatedUser == nullptr)
|
if (authenticatedUser == nullptr)
|
||||||
@@ -112,6 +140,7 @@ void ServiceManagementService::purchaseComboPackage(const std::string& comboPack
|
|||||||
std::string title = "Combo Package Service Booking succeeded";
|
std::string title = "Combo Package Service Booking succeeded";
|
||||||
std::string message = "Your service booking for the combo package has been successfully placed with ID " + serviceBooking->getId();
|
std::string message = "Your service booking for the combo package has been successfully placed with ID " + serviceBooking->getId();
|
||||||
sendNotification(authenticatedUser, title, message);
|
sendNotification(authenticatedUser, title, message);
|
||||||
|
notifyAllAdmins("New Combo Package Order Available", "A new combo package order has been placed with Service Booking ID " + serviceBooking->getId(), m_dataStore.getUsers(), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
util::Map<std::string, User*> ServiceManagementService::m_observers{};
|
util::Map<std::string, User*> ServiceManagementService::m_observers{};
|
||||||
@@ -188,6 +217,7 @@ void ServiceManagementService::sendNotification(User* user, const std::string& t
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
||||||
Notification* notification = Factory::getObject<Notification>(
|
Notification* notification = Factory::getObject<Notification>(
|
||||||
user->getId(),
|
user->getId(),
|
||||||
title,
|
title,
|
||||||
@@ -197,7 +227,6 @@ void ServiceManagementService::sendNotification(User* user, const std::string& t
|
|||||||
{
|
{
|
||||||
throw std::runtime_error("Failed to create notification");
|
throw std::runtime_error("Failed to create notification");
|
||||||
}
|
}
|
||||||
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
|
||||||
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
|
||||||
m_dataStore.saveNotifications();
|
m_dataStore.saveNotifications();
|
||||||
EventManager::sendNotificationAvailableEvent(user->getId());
|
EventManager::sendNotificationAvailableEvent(user->getId());
|
||||||
@@ -433,6 +462,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDsInNewCombo, double discountPercentage)
|
void ServiceManagementService::createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDsInNewCombo, double discountPercentage)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
if (packageName.empty())
|
if (packageName.empty())
|
||||||
{
|
{
|
||||||
@@ -502,6 +532,7 @@ Return type: util::Map<std::string, ComboPackage*>
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, ComboPackage*> ServiceManagementService::getComboPackages()
|
util::Map<std::string, ComboPackage*> ServiceManagementService::getComboPackages()
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
util::Map<std::string, ComboPackage*> comboPackages;
|
util::Map<std::string, ComboPackage*> comboPackages;
|
||||||
comboPackages = util::getObjects(m_dataStore.getComboPackages());
|
comboPackages = util::getObjects(m_dataStore.getComboPackages());
|
||||||
@@ -516,6 +547,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::removeComboPackage(const std::string& comboPackageID)
|
void ServiceManagementService::removeComboPackage(const std::string& comboPackageID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
bool removed = false;
|
bool removed = false;
|
||||||
auto& trackedComboPackages = m_dataStore.getComboPackages();
|
auto& trackedComboPackages = m_dataStore.getComboPackages();
|
||||||
@@ -548,6 +580,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings()
|
util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings()
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
util::Map<std::string, ServiceBooking*> serviceBookings;
|
util::Map<std::string, ServiceBooking*> serviceBookings;
|
||||||
serviceBookings = util::getObjects(m_dataStore.getServiceBookings());
|
serviceBookings = util::getObjects(m_dataStore.getServiceBookings());
|
||||||
@@ -564,6 +597,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
ServiceBooking* ServiceManagementService::getServiceBooking(const std::string& serviceID)
|
ServiceBooking* ServiceManagementService::getServiceBooking(const std::string& serviceID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
auto currentServiceBookings = getServiceBookings();
|
auto currentServiceBookings = getServiceBookings();
|
||||||
for (int iterator = 0; iterator < currentServiceBookings.getSize(); iterator++)
|
for (int iterator = 0; iterator < currentServiceBookings.getSize(); iterator++)
|
||||||
{
|
{
|
||||||
@@ -590,6 +624,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID)
|
void ServiceManagementService::createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
UserManagementService m_userManagementService;
|
UserManagementService m_userManagementService;
|
||||||
ServiceBooking* currentBooking = getServiceBooking(bookingID);
|
ServiceBooking* currentBooking = getServiceBooking(bookingID);
|
||||||
@@ -667,6 +702,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost)
|
void ServiceManagementService::createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
util::Map<std::string, InventoryItem*> currentServiceInventoryItems;
|
util::Map<std::string, InventoryItem*> currentServiceInventoryItems;
|
||||||
auto& trackedInventoryItems = m_dataStore.getInventoryItems();
|
auto& trackedInventoryItems = m_dataStore.getInventoryItems();
|
||||||
@@ -713,6 +749,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, Service*> ServiceManagementService::getServices()
|
util::Map<std::string, Service*> ServiceManagementService::getServices()
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
util::Map<std::string, Service*> services;
|
util::Map<std::string, Service*> services;
|
||||||
services = util::getObjects(m_dataStore.getServices());
|
services = util::getObjects(m_dataStore.getServices());
|
||||||
@@ -731,6 +768,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::removeService(const std::string& serviceID)
|
void ServiceManagementService::removeService(const std::string& serviceID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& currentTrackedServices = m_dataStore.getServices();
|
auto& currentTrackedServices = m_dataStore.getServices();
|
||||||
auto& currentTrackedComboPackages = m_dataStore.getComboPackages();
|
auto& currentTrackedComboPackages = m_dataStore.getComboPackages();
|
||||||
@@ -778,6 +816,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings(const std::string& customerID)
|
util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings(const std::string& customerID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
util::Map<std::string, ServiceBooking*> currentServiceBookings = getServiceBookings();
|
util::Map<std::string, ServiceBooking*> currentServiceBookings = getServiceBookings();
|
||||||
util::Map<std::string, ServiceBooking*> currentUserServiceBookings;
|
util::Map<std::string, ServiceBooking*> currentUserServiceBookings;
|
||||||
if (currentServiceBookings.getSize() != 0)
|
if (currentServiceBookings.getSize() != 0)
|
||||||
@@ -804,6 +843,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
util::Map<std::string, JobCard*> ServiceManagementService::getJobCards(const std::string& technicianID)
|
util::Map<std::string, JobCard*> ServiceManagementService::getJobCards(const std::string& technicianID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedJobCards = m_dataStore.getJobCards();
|
auto& trackedJobCards = m_dataStore.getJobCards();
|
||||||
util::Map<std::string, JobCard*> technicianJobCards;
|
util::Map<std::string, JobCard*> technicianJobCards;
|
||||||
@@ -858,6 +898,7 @@ Returns:
|
|||||||
*/
|
*/
|
||||||
void ServiceManagementService::updateJobStatus(const std::string& jobID)
|
void ServiceManagementService::updateJobStatus(const std::string& jobID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
AuthenticationManagementService authenticationManagementService;
|
AuthenticationManagementService authenticationManagementService;
|
||||||
PaymentManagementService paymentManagementService;
|
PaymentManagementService paymentManagementService;
|
||||||
|
|||||||
+5
@@ -15,6 +15,7 @@ Date:19-May-2026
|
|||||||
#include "Notification.h"
|
#include "Notification.h"
|
||||||
#include "PaymentManagementService.h"
|
#include "PaymentManagementService.h"
|
||||||
#include "ServiceManagementService.h"
|
#include "ServiceManagementService.h"
|
||||||
|
#include "AuthenticationManagementService.h"
|
||||||
#include "User.h"
|
#include "User.h"
|
||||||
#include "UserManagementService.h"
|
#include "UserManagementService.h"
|
||||||
#include "Vector.h"
|
#include "Vector.h"
|
||||||
@@ -114,6 +115,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void UserManagementService::updateUserDetails(const std::string& userID, const std::string& email, const std::string& phone)
|
void UserManagementService::updateUserDetails(const std::string& userID, const std::string& email, const std::string& phone)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedUsersMap = m_dataStore.getUsers();
|
auto& trackedUsersMap = m_dataStore.getUsers();
|
||||||
auto usersMap = util::getObjects(trackedUsersMap);
|
auto usersMap = util::getObjects(trackedUsersMap);
|
||||||
@@ -161,6 +163,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
util::Vector<Notification*> UserManagementService::getUserNotifications(const std::string& userID)
|
util::Vector<Notification*> UserManagementService::getUserNotifications(const std::string& userID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedUsersMap = m_dataStore.getUsers();
|
auto& trackedUsersMap = m_dataStore.getUsers();
|
||||||
if (trackedUsersMap.find(userID) == -1)
|
if (trackedUsersMap.find(userID) == -1)
|
||||||
@@ -204,6 +207,7 @@ Throws:
|
|||||||
*/
|
*/
|
||||||
void UserManagementService::deleteNotification(const std::string& notificationID, const std::string& userID)
|
void UserManagementService::deleteNotification(const std::string& notificationID, const std::string& userID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
DataStoreLockGuard lock(m_dataStore);
|
DataStoreLockGuard lock(m_dataStore);
|
||||||
auto& trackedUsersMap = m_dataStore.getUsers();
|
auto& trackedUsersMap = m_dataStore.getUsers();
|
||||||
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
auto& trackedNotificationsMap = m_dataStore.getNotifications();
|
||||||
@@ -265,6 +269,7 @@ Return type: void
|
|||||||
*/
|
*/
|
||||||
void UserManagementService::removeUser(const std::string& userID)
|
void UserManagementService::removeUser(const std::string& userID)
|
||||||
{
|
{
|
||||||
|
AuthenticationManagementService::ensureAuthorization();
|
||||||
InventoryManagementService inventoryManagementService;
|
InventoryManagementService inventoryManagementService;
|
||||||
PaymentManagementService paymentManagementService;
|
PaymentManagementService paymentManagementService;
|
||||||
ServiceManagementService serviceManagementService;
|
ServiceManagementService serviceManagementService;
|
||||||
|
|||||||
Reference in New Issue
Block a user