Merged PR 1196: Fix Service Booking Cancellation, Job Completion Exception, and Inventory Quantity Handling

Changes

- Added Controller::removeServiceBooking() with documentation and delegation to ServiceManagementService.

- Implemented ServiceManagementService::removeServiceBooking() to handle cancellation of pending bookings, enforce status validation, send notifications, and persist changes safely.

- Updated CustomerMenu to include a "Cancel Service Booking" option, wired into handleOperation, and implemented CustomerMenu::cancelServiceBooking() for user interaction.

- Ensured consistent declarations in Controller.h, ServiceManagementService.h, and CustomerMenu.h.

- Refactored ServiceManagementService::updateJobStatus() to use tracked job card references instead of raw pointers, ensuring consistent state updates.

- Added proper null checks and error handling for current job retrieval to prevent unexpected termination.

- Updated logic to mark tracked job records as MODIFIED when status transitions occur (`STARTED` → `IN_PROGRESS`, `IN_PROGRESS` → `COMPLETED`).

- Simplified control flow and indentation for better readability and maintainability.

- Added retrieval of tracked service bookings and inventory items in ServiceManagementService::createJobCard().

- Validated service booking ID and inventory item indices before proceeding with job card creation.

- Decremented inventory item quantities when job cards are created and marked corresponding tracked inventory records as `MODIFIED`.

- Updated tracked service booking state to `MODIFIED` when technician is assigned and job status changes.

- Persisted changes by saving job cards, service bookings, and inventory items to the datastore.

Fixes

#2105
#2076
#2075
#2074

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.cpp

@@ -234,6 +234,17 @@ void Controller::removeInventoryItem(const std::string& inventoryItemID)
     m_inventoryManagementService.removeInventoryItem(inventoryItemID);
 }
 
+/*
+Function: removeServiceBooking
+Description: Removes a service booking from the service management system by its booking ID.
+Parameter: const std::string& bookingID - ID of the service booking
+Return type: void
+*/
+void Controller::removeServiceBooking(const std::string& bookingID)
+{
+    m_serviceManagementService.removeServiceBooking(bookingID);
+}
+
 /*
 Function: addInventoryItemStock
 Description: Adds stock to an existing inventory item in the inventory management service.
@@ -265,6 +276,7 @@ util::Map<std::string, const ServiceBooking*> Controller::getServiceBookings()
     return readOnlyServiceBookings;
 }
 
+
 /*
 Function: getServiceBookingsByUser
 Description: Retrieves all service bookings for a specific user.

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/controllers/Controller.h

@@ -58,6 +58,7 @@ public:
     util::Map<std::string, const User*> getUsers(util::UserType userType);
     void createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID);
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
+    void removeServiceBooking(const std::string& bookingID);
     void removeService(const std::string& serviceID);
     util::Map<std::string, const JobCard*> getJobCardsByUser();
     void updateJobStatus(const std::string& jobID);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/DataStore.cpp

@@ -415,7 +415,7 @@ util::Map<std::string, TrackedRecord<JobCard>>& DataStore::getJobCards()
         {
             throw std::runtime_error("Invalid booking ID: " + bookingId);
         }
-        auto trackedBooking = serviceBookings.getValueAt(bookingIndex);
+        auto& trackedBooking = serviceBookings.getValueAt(bookingIndex);
         jobCard->setBooking(trackedBooking.data);
         const std::string& serviceId = jobCard->getServiceId();
         int serviceIndex = services.find(serviceId);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/DataStore.h

@@ -220,6 +220,12 @@ void DataStore::refreshCache(util::Map<std::string, TrackedRecord<TObject>>& cac
         if (oldIndex != -1)
         {
             TrackedRecord<TObject>& oldRecord = oldCache.getValueAt(oldIndex);
+            if (oldRecord.state == RecordState::MODIFIED)
+            {
+                delete refreshedRecord.data;
+                cache.insert(id, oldRecord);
+                continue;
+            }
             *oldRecord.data = *refreshedRecord.data;
             oldRecord.slotIndex = refreshedRecord.slotIndex;
             oldRecord.state = refreshedRecord.state;

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.cpp

@@ -14,10 +14,29 @@ Date:19-May-2026
 #include "DataStoreLockGuard.h"
 
 User* AuthenticationManagementService::m_authenticatedUser = nullptr;
+bool AuthenticationManagementService::m_isAuthorized = false;
 EventManager AuthenticationManagementService::m_eventManager;
 HANDLE AuthenticationManagementService::m_accountDisabledEvent = 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
 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())
 			{
 				m_authenticatedUser = user;
+				m_isAuthorized = true;
 				m_eventManager.initialize(
 					user->getId(),
 					[]()
 					{
 						if (m_accountDisabledEvent)
 						{
+							AuthenticationManagementService::m_isAuthorized = false;
 							SetEvent(m_accountDisabledEvent);
 						}
 					},
@@ -86,6 +107,7 @@ void AuthenticationManagementService::logout()
 {
 	m_eventManager.shutdown();
 	m_authenticatedUser = nullptr;
+	m_isAuthorized = false;
 	m_accountDisabledEvent = NULL;
 	m_notificationsAvailableEvent = NULL;
 }
@@ -99,6 +121,7 @@ Return type: void
 */
 void AuthenticationManagementService::changePassword(const std::string& newPassword)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedUsersMap = m_dataStore.getUsers();
 	if (m_authenticatedUser == nullptr)

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/AuthenticationManagementService.h

@@ -19,12 +19,14 @@ class AuthenticationManagementService
 {
 private:
     static User* m_authenticatedUser;
+    static bool m_isAuthorized;
     static EventManager m_eventManager;
     static HANDLE m_accountDisabledEvent;
     static HANDLE m_notificationsAvailableEvent;
     DataStore& m_dataStore;
 public:
     AuthenticationManagementService() : m_dataStore(DataStore::getInstance()) {}
+    static void ensureAuthorization();
     bool login(const std::string& username, const std::string& password);
     void logout();
     void changePassword(const std::string& newPassword);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/InventoryManagementService.cpp

@@ -14,6 +14,7 @@ Date: 22-May-2026
 #include "Factory.h"
 #include "InventoryItem.h"
 #include "InventoryManagementService.h"
+#include "AuthenticationManagementService.h"
 #include "Timestamp.h"
 #include "User.h"
 #include "Utility.h"
@@ -102,6 +103,7 @@ Return type: void
 */
 void InventoryManagementService::addInventoryItem(const std::string& partName, int quantity, double price)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
     InventoryItem* newItem = Factory::getObject<InventoryItem>(partName, quantity, price);
@@ -118,6 +120,7 @@ Return type: void
 */
 void InventoryManagementService::addInventoryItemStock(const std::string& selectedItemId, int quantity)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
 	int index = trackedInventoryItemMap.find(selectedItemId);
@@ -144,6 +147,7 @@ Return type: util::Map<std::string, InventoryItem*>
 */
 util::Map<std::string, InventoryItem*> InventoryManagementService::getInventoryItems()
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
 	auto inventoryMap = util::getObjects(trackedInventoryItemMap);
@@ -158,6 +162,7 @@ Return type: void
 */
 void InventoryManagementService::removeInventoryItem(const std::string& inventoryItemID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
 	int index = trackedInventoryItemMap.find(inventoryItemID);
@@ -183,6 +188,7 @@ Return type: InventoryItem*
 */
 InventoryItem* InventoryManagementService::getInventoryItem(const std::string& inventoryItemID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedInventoryItemMap = m_dataStore.getInventoryItems();
     int index = trackedInventoryItemMap.find(inventoryItemID);
@@ -270,6 +276,7 @@ void InventoryManagementService::sendNotification(User* user, const std::string&
 	{
 		return;
 	}
+	auto& trackedNotificationsMap = m_dataStore.getNotifications();
 	Notification* notification = Factory::getObject<Notification>(
 		user->getId(),
 		title,
@@ -279,7 +286,6 @@ void InventoryManagementService::sendNotification(User* user, const std::string&
 	{
 		throw std::runtime_error("Failed to create notification");
 	}
-	auto& trackedNotificationsMap = m_dataStore.getNotifications();
 	trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
 	m_dataStore.saveNotifications();
 	EventManager::sendNotificationAvailableEvent(user->getId());

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/PaymentManagementService.cpp

@@ -15,6 +15,7 @@ Date: 20-May-2026
 #include "Invoice.h"
 #include "JobCard.h"
 #include "PaymentManagementService.h"
+#include "AuthenticationManagementService.h"
 #include "DataStoreLockGuard.h"
 #include "Service.h"
 #include "ServiceBooking.h"
@@ -98,6 +99,7 @@ void PaymentManagementService::sendNotification(User* user, const std::string& t
 	{
 		return;
 	}
+	auto& trackedNotificationsMap = m_dataStore.getNotifications();
 	Notification* notification = Factory::getObject<Notification>(
 		user->getId(),
 		title,
@@ -107,7 +109,6 @@ void PaymentManagementService::sendNotification(User* user, const std::string& t
 	{
 		throw std::runtime_error("Failed to create notification");
 	}
-	auto& trackedNotificationsMap = m_dataStore.getNotifications();
 	trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
 	m_dataStore.saveNotifications();
 	EventManager::sendNotificationAvailableEvent(user->getId());
@@ -233,6 +234,7 @@ Returns:
 */
 util::Map<std::string, Invoice*> PaymentManagementService::getInvoices(const std::string& customerID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& currentTrackedInvoices = m_dataStore.getInvoices();
 	util::Map<std::string, Invoice*> currentUserInvoices;
@@ -261,6 +263,7 @@ Throws:
 */
 void PaymentManagementService::completePayment(const std::string& invoiceID, util::PaymentMode paymentMode)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& currentTrackedInvoices = m_dataStore.getInvoices();
 	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.
 Parameters:
 	- none
@@ -298,6 +301,7 @@ Returns:
 */
 util::Map<std::string, Invoice*> PaymentManagementService::getAllInvoices()
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	util::Map<std::string, Invoice*> invoices;
 	invoices = util::getObjects(m_dataStore.getInvoices());
@@ -317,6 +321,7 @@ Throws:
 */
 void PaymentManagementService::confirmPayment(const std::string& invoiceID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& currentTrackedInvoices = m_dataStore.getInvoices();
 	int invoiceIndex = currentTrackedInvoices.find(invoiceID);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp

@@ -26,9 +26,33 @@ Date:19-May-2026
 #include "UserManagementService.h"
 #include "DataStoreLockGuard.h"
 #include "Utility.h"
-#include "DataStoreLockGuard.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
 Description: Creates a new service booking for the authenticated user. Validates
@@ -42,6 +66,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)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	AuthenticationManagementService m_authenticationManagementService;
 	auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
 	if (authenticatedUser == nullptr)
@@ -72,6 +97,8 @@ void ServiceManagementService::purchaseService(const util::Vector<std::string>&
     std::string title = "Service Booking succeeded";
     std::string message = "Your service booking has been successfully placed with ID " + serviceBooking->getId();
     sendNotification(authenticatedUser, title, message);
+    m_dataStore.saveServiceBookings();
+    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)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	AuthenticationManagementService m_authenticationManagementService;
 	auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
 	if (authenticatedUser == nullptr)
@@ -112,6 +140,8 @@ void ServiceManagementService::purchaseComboPackage(const std::string& comboPack
     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();
     sendNotification(authenticatedUser, title, message);
+    m_dataStore.saveServiceBookings();
+    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{};
@@ -188,6 +218,7 @@ void ServiceManagementService::sendNotification(User* user, const std::string& t
     {
         return;
     }
+    auto& trackedNotificationsMap = m_dataStore.getNotifications();
     Notification* notification = Factory::getObject<Notification>(
         user->getId(),
         title,
@@ -197,7 +228,6 @@ void ServiceManagementService::sendNotification(User* user, const std::string& t
     {
         throw std::runtime_error("Failed to create notification");
     }
-    auto& trackedNotificationsMap = m_dataStore.getNotifications();
     trackedNotificationsMap.insert(notification->getId(), util::createNewRecord(notification));
     m_dataStore.saveNotifications();
     EventManager::sendNotificationAvailableEvent(user->getId());
@@ -433,6 +463,7 @@ Return type: void
 */
 void ServiceManagementService::createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDsInNewCombo, double discountPercentage)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
     if (packageName.empty())
     {
@@ -502,6 +533,7 @@ Return type: util::Map<std::string, ComboPackage*>
 */
 util::Map<std::string, ComboPackage*> ServiceManagementService::getComboPackages()
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
     util::Map<std::string, ComboPackage*> comboPackages;
     comboPackages = util::getObjects(m_dataStore.getComboPackages());
@@ -516,6 +548,7 @@ Return type: void
 */
 void ServiceManagementService::removeComboPackage(const std::string& comboPackageID)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
     bool removed = false;
     auto& trackedComboPackages = m_dataStore.getComboPackages();
@@ -548,6 +581,7 @@ Returns:
 */
 util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings()
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
     util::Map<std::string, ServiceBooking*> serviceBookings;
     serviceBookings = util::getObjects(m_dataStore.getServiceBookings());
@@ -564,6 +598,7 @@ Returns:
 */
 ServiceBooking* ServiceManagementService::getServiceBooking(const std::string& serviceID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	auto currentServiceBookings = getServiceBookings();
 	for (int iterator = 0; iterator < currentServiceBookings.getSize(); iterator++)
 	{
@@ -590,14 +625,27 @@ Throws:
 */
 void ServiceManagementService::createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
 	UserManagementService m_userManagementService;
 	ServiceBooking* currentBooking = getServiceBooking(bookingID);
+    if (currentBooking == nullptr)
+    {
+        throw std::runtime_error("Service Booking not available");
+    }
+    if (currentBooking->getStatus() == util::ServiceJobStatus::CANCELLED)
+    {
+        throw std::runtime_error("Cannot create job card. Service Booking was cancelled!");
+    }
 	auto& currentTrackedJobCards = m_dataStore.getJobCards();
-	if (currentBooking == nullptr)
-	{
-		throw std::runtime_error("Service Booking not available");
-	}
+    auto& currentTrackedInventoryItems = m_dataStore.getInventoryItems();
+    auto& currentTrackedServiceBookings = m_dataStore.getServiceBookings();
+    int currentTrackedServiceBookingIndex = currentTrackedServiceBookings.find(bookingID);
+    if (currentTrackedServiceBookingIndex == -1)
+    {
+        throw std::runtime_error("Invalid service booking id.");
+    }
+    auto& currentTrackedServiceBooking = currentTrackedServiceBookings.getValueAt(currentTrackedServiceBookingIndex);
 	auto& currentServices = currentBooking->getServices();
 	if (currentServices.find(serviceID) == -1)
 	{
@@ -622,10 +670,18 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
 	for (int iterator = 0; iterator < inventoryItems.getSize(); iterator++)
 	{
 		InventoryItem* currentInventoryItem = inventoryItems.getValueAt(iterator);
+        const std::string& currentInventoryItemId = inventoryItems.getKeyAt(iterator);
 		if (currentInventoryItem)
 		{
+            int trackedCurrentInventoryItemIndex = currentTrackedInventoryItems.find(currentInventoryItemId);
+            if (trackedCurrentInventoryItemIndex == -1)
+            {
+                throw std::runtime_error("Invalid inventory item index.");
+            }
+            auto& trackedCurrentInventoryItem = currentTrackedInventoryItems.getValueAt(trackedCurrentInventoryItemIndex);
 			int currentStockQuantity = currentInventoryItem->getQuantity();
 			currentInventoryItem->setQuantity(currentStockQuantity - 1);
+            trackedCurrentInventoryItem.state = RecordState::MODIFIED;
 		}
 	}
 	currentBooking->setAssignedTechnician(selectedTechnician);
@@ -634,6 +690,7 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
     {
         currentBooking->setStatus(util::ServiceJobStatus::STARTED);
     }
+    currentTrackedServiceBooking.state = RecordState::MODIFIED;
 	std::string title = "Job card created";
 	std::string message = "Job card created for the service and you are assigned for that.";
 	JobCard* jobCard = Factory::getObject<JobCard>(bookingID, currentBooking, currentService, serviceID, technicianID, selectedTechnician, util::Timestamp(), util::ServiceJobStatus::STARTED, util::Timestamp());
@@ -650,6 +707,8 @@ void ServiceManagementService::createJobCard(const std::string& bookingID, const
     message = "A technician has been assigned to your Service Booking with ID " + bookingID;
     sendNotification(currentBooking->getCustomer(), title, message);
     m_dataStore.saveJobCards();
+    m_dataStore.saveServiceBookings();
+    m_dataStore.saveInventoryItems();
 }
 
 /*
@@ -667,6 +726,7 @@ Throws:
 */
 void ServiceManagementService::createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
 	util::Map<std::string, InventoryItem*> currentServiceInventoryItems;
 	auto& trackedInventoryItems = m_dataStore.getInventoryItems();
@@ -713,6 +773,7 @@ Returns:
 */
 util::Map<std::string, Service*> ServiceManagementService::getServices()
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
     util::Map<std::string, Service*> services;
     services = util::getObjects(m_dataStore.getServices());
@@ -731,6 +792,7 @@ Throws:
 */
 void ServiceManagementService::removeService(const std::string& serviceID)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
 	auto& currentTrackedServices = m_dataStore.getServices();
     auto& currentTrackedComboPackages =  m_dataStore.getComboPackages();
@@ -768,6 +830,61 @@ void ServiceManagementService::removeService(const std::string& serviceID)
     m_dataStore.saveComboPackages();
 }
 
+/*
+Function: removeServiceBooking
+Description: Removes a pending service booking by its ID.
+             Cancels only if status is PENDING, otherwise throws exceptions
+             for invalid states. Sends notification to the customer and
+             persists changes.
+Parameter: const std::string& bookingID - ID of the service booking
+Return type: void
+*/
+void ServiceManagementService::removeServiceBooking(const std::string& bookingID)
+{
+    DataStoreLockGuard lock(m_dataStore);
+    auto& trackedServiceBookings = m_dataStore.getServiceBookings();
+    bool serviceBookingRemoved = false;
+    for (int iterator = 0; iterator < trackedServiceBookings.getSize(); iterator++)
+    {
+        auto& currentTrackedServiceBooking = trackedServiceBookings.getValueAt(iterator);
+        ServiceBooking* currentServiceBooking = currentTrackedServiceBooking.data;
+        if (currentServiceBooking && currentServiceBooking->getId() == bookingID)
+        {
+            if (currentServiceBooking->getStatus() == util::ServiceJobStatus::PENDING)
+            {
+                const std::string title = "Service Booking cancelled.";
+                const std::string message = "Service Booking of id " + bookingID + " successfully cancelled.";
+                currentServiceBooking->setStatus(util::ServiceJobStatus::CANCELLED);
+                currentTrackedServiceBooking.state = RecordState::MODIFIED;
+                serviceBookingRemoved = true;
+                sendNotification(currentServiceBooking->getCustomer(), title, message);
+                break;
+            }
+            else if(currentServiceBooking->getStatus() == util::ServiceJobStatus::COMPLETED)
+            {
+                throw std::runtime_error("Unable to cancel completed service booking.");
+            }
+            else if (currentServiceBooking->getStatus() == util::ServiceJobStatus::STARTED)
+            {
+                throw std::runtime_error("Unable to cancel started service booking.");
+            }
+            else if (currentServiceBooking->getStatus() == util::ServiceJobStatus::IN_PROGRESS)
+            {
+                throw std::runtime_error("Unable to cancel currently Inprogress service booking.");
+            }
+            else
+            {
+                throw std::runtime_error("Service Booking already cancelled.");
+            }
+        }
+    }
+    if (!serviceBookingRemoved)
+    {
+        throw std::runtime_error("Unable to cancel service booking.");
+    }
+    m_dataStore.saveServiceBookings();
+}
+
 /*
 Function: getServiceBookings (overloaded)
 Description: Retrieves all service bookings for a specific customer.
@@ -778,6 +895,7 @@ Returns:
 */
 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*> currentUserServiceBookings;
 	if (currentServiceBookings.getSize() != 0)
@@ -804,6 +922,7 @@ Returns:
 */
 util::Map<std::string, JobCard*> ServiceManagementService::getJobCards(const std::string& technicianID)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
 	auto& trackedJobCards = m_dataStore.getJobCards();
 	util::Map<std::string, JobCard*> technicianJobCards;
@@ -858,45 +977,46 @@ Returns:
 */
 void ServiceManagementService::updateJobStatus(const std::string& jobID)
 {
+    AuthenticationManagementService::ensureAuthorization();
     DataStoreLockGuard lock(m_dataStore);
-	AuthenticationManagementService authenticationManagementService;
-	PaymentManagementService paymentManagementService;
-	bool jobStatusUpdated = false, serviceBookingCompleted;
-	JobCard* currentJob;
-	User* currentTechnician = authenticationManagementService.getAuthenticatedUser();
-	if (currentTechnician == nullptr)
-	{
-		throw std::runtime_error("Unable to fetch current technician.");
-	}
-	util::Map<std::string, JobCard*> currentAssignedJobs = getJobCards(currentTechnician->getId());
-	if (currentAssignedJobs.getSize() == 0)
-	{
-		throw std::runtime_error("No job cards assigned to the technician.");
-	}
+    AuthenticationManagementService authenticationManagementService;
+    PaymentManagementService paymentManagementService;
+    bool jobStatusUpdated = false, serviceBookingCompleted;
+    User* currentTechnician = authenticationManagementService.getAuthenticatedUser();
+    if (currentTechnician == nullptr)
+    {
+        throw std::runtime_error("Unable to fetch current technician.");
+    }
+    util::Map<std::string, JobCard*> currentAssignedJobs = getJobCards(currentTechnician->getId());
+    if (currentAssignedJobs.getSize() == 0)
+    {
+        throw std::runtime_error("No job cards assigned to the technician.");
+    }
     auto& trackedJobCards = m_dataStore.getJobCards();
     auto& trackedServiceBookings = m_dataStore.getServiceBookings();
-	if (currentAssignedJobs.find(jobID) != -1)
-	{
+    if (currentAssignedJobs.find(jobID) != -1)
+    {
         int jobIndex = trackedJobCards.find(jobID);
         if (jobIndex == -1)
         {
             throw std::runtime_error("Unable to fetch current job.");
         }
-		currentJob = currentAssignedJobs.getValueAt(currentAssignedJobs.find(jobID));
-		if (currentJob == nullptr)
-		{
-			throw std::runtime_error("Unable to fetch current job.");
-		}
-		if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
-		{
-			currentJob->setStatus(util::ServiceJobStatus::IN_PROGRESS);
-            trackedJobCards.getValueAt(jobIndex).state = RecordState::MODIFIED;
-			jobStatusUpdated = true;
-		}
+        auto& trackedCurrentJob = trackedJobCards.getValueAt(jobIndex);
+        JobCard* currentJob = trackedCurrentJob.data;
+        if (currentJob == nullptr)
+        {
+            throw std::runtime_error("Unable to fetch current job.");
+        }
+        if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
+        {
+            currentJob->setStatus(util::ServiceJobStatus::IN_PROGRESS);
+            trackedCurrentJob.state = RecordState::MODIFIED;
+            jobStatusUpdated = true;
+        }
         else if (currentJob->getStatus() == util::ServiceJobStatus::IN_PROGRESS)
         {
             currentJob->setStatus(util::ServiceJobStatus::COMPLETED);
-            trackedJobCards.getValueAt(jobIndex).state = RecordState::MODIFIED;
+            trackedCurrentJob.state = RecordState::MODIFIED;
             jobStatusUpdated = true;
             serviceBookingCompleted = hasCompletedAllJobs(currentJob->getBookingId(), currentAssignedJobs);
             if (serviceBookingCompleted)
@@ -910,15 +1030,15 @@ void ServiceManagementService::updateJobStatus(const std::string& jobID)
                 sendNotification(currentJob->getBooking()->getCustomer(), title, message);
             }
         }
-	}
-	else
-	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
-	}
-	if (!jobStatusUpdated)
-	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
-	}
+    }
+    else
+    {
+        throw std::runtime_error("Failed to update job status. Job may already be completed.");
+    }
+    if (!jobStatusUpdated)
+    {
+        throw std::runtime_error("Failed to update job status. Job may already be completed.");
+    }
     m_dataStore.saveJobCards();
     m_dataStore.saveServiceBookings();
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.h

@@ -35,6 +35,7 @@ public:
     void createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID);
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
     void removeService(const std::string& serviceID);
+    void removeServiceBooking(const std::string& bookingID);
     util::Map<std::string, JobCard*> getJobCards(const std::string& technicianID);
     void updateJobStatus(const std::string& jobID);
     void cancelCustomerServiceBookings(const std::string& customerID);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/UserManagementService.cpp

@@ -15,6 +15,7 @@ Date:19-May-2026
 #include "Notification.h"
 #include "PaymentManagementService.h"
 #include "ServiceManagementService.h"
+#include "AuthenticationManagementService.h"
 #include "User.h"
 #include "UserManagementService.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)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedUsersMap = m_dataStore.getUsers();
 	auto usersMap = util::getObjects(trackedUsersMap);
@@ -161,6 +163,7 @@ Throws:
 */
 util::Vector<Notification*> UserManagementService::getUserNotifications(const std::string& userID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedUsersMap = m_dataStore.getUsers(); 
 	if (trackedUsersMap.find(userID) == -1)
@@ -204,6 +207,7 @@ Throws:
 */
 void UserManagementService::deleteNotification(const std::string& notificationID, const std::string& userID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	DataStoreLockGuard lock(m_dataStore);
 	auto& trackedUsersMap = m_dataStore.getUsers();
 	auto& trackedNotificationsMap = m_dataStore.getNotifications();
@@ -265,6 +269,7 @@ Return type: void
 */
 void UserManagementService::removeUser(const std::string& userID)
 {
+    AuthenticationManagementService::ensureAuthorization();
 	InventoryManagementService inventoryManagementService;
 	PaymentManagementService paymentManagementService;
 	ServiceManagementService serviceManagementService;

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.cpp

@@ -163,7 +163,13 @@ Return type: void
 void AdminMenu::handleNotificationEvent()
 {
 	auto notifications = m_controller.getNotifications();
-	displayNewNotification(notifications);
+	const User* authenticatedUser = m_controller.getAuthenticatedUser();
+	std::string name;
+	if (authenticatedUser)
+	{
+		name = authenticatedUser->getName();
+	}
+	displayNewNotification(notifications, name);
 }
 
 /*
@@ -332,6 +338,23 @@ void AdminMenu::removeInventoryItem()
             std::string selectedItemId = selectedItem->getId();
             m_controller.removeInventoryItem(selectedItemId);
             std::cout << "Item " << selectedItem->getPartName() << " removed successfully." << std::endl;
+			const util::Map<std::string, const Service*>& listOfService = m_controller.getServices();
+			for (int serviceIndex = 0; serviceIndex < listOfService.getSize(); serviceIndex++)
+			{
+				const Service* service = listOfService.getValueAt(serviceIndex);
+				if (!service)
+				{
+					continue;
+				}
+				const util::Map<std::string, InventoryItem*>& requiredItems = service->getRequiredInventoryItems();
+				if (requiredItems.find(selectedItemId) != -1) 
+				{
+					m_controller.removeService(service->getId()); 
+					std::cout << "Service " << service->getName()
+						<< " removed as the item "
+						<< selectedItem->getPartName() << " required for the service has been removed." << std::endl;
+				}
+			}
         }
     }
     util::pressEnter();

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.cpp

@@ -51,11 +51,12 @@ void CustomerMenu::showMenu()
                 << "\n3. Update Profile"
                 << "\n4. Change Password"
                 << "\n5. View Service History"
-                << "\n6. Complete Payments"
-                << "\n7. View Invoices"
-                << "\n8. View Notifications"
-                << "\n9. Configure Notifications"
-                << "\n10. Logout"
+                << "\n6. Cancel Service Booking"
+                << "\n7. Complete Payments"
+                << "\n8. View Invoices"
+                << "\n9. View Notifications"
+                << "\n10. Configure Notifications"
+                << "\n11. Logout"
                 << "\nEnter a choice: ";
             util::read(choice);
             if (!handleOperation(choice))
@@ -103,18 +104,21 @@ bool CustomerMenu::handleOperation(int choice)
         viewServiceHistory();
         break;
     case 6:
-        completePayments();
+        cancelServiceBooking();
         break;
     case 7:
-        viewInvoices();
+        completePayments();
         break;
     case 8:
-        viewNotifications();
+        viewInvoices();
         break;
     case 9:
-        configureNotifications();
+        viewNotifications();
         break;
     case 10:
+        configureNotifications();
+        break;
+    case 11:
         logout();
         return false;
     default:
@@ -134,7 +138,13 @@ Return type: void
 void CustomerMenu::handleNotificationEvent()
 {
     auto notifications = m_controller.getNotifications();
-    displayNewNotification(notifications);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string name;
+    if (authenticatedUser)
+    {
+        name = authenticatedUser->getName();
+    }
+    displayNewNotification(notifications, name);
 }
 
 /*
@@ -327,6 +337,46 @@ void CustomerMenu::viewServiceHistory()
     util::pressEnter();
 }
 
+/*
+Function: cancelServiceBooking
+Description: Allows the customer to cancel a pending service booking.
+             Displays the list of active bookings, lets the user select one,
+             and removes it from the system. If no bookings are available,
+             an appropriate message is shown.
+Parameter: None
+Return type: void
+*/
+void CustomerMenu::cancelServiceBooking()
+{
+    util::clear();
+    std::cout << "Cancel Service Booking\n";
+    const User* currentUser = m_controller.getAuthenticatedUser();
+    std::string currentUserID = currentUser->getId();
+    util::Map<std::string, const ServiceBooking*> serviceBookingsByCurrentUser = m_controller.getServiceBookingsByUser(currentUserID);
+    util::Map<int, const ServiceBooking*> serviceBookingsMap;
+    auto currentPendingServiceBookings = filterActiveServiceBookings(serviceBookingsByCurrentUser);
+    int bookingsSize = currentPendingServiceBookings.getSize();
+    if (listServiceBookings(currentPendingServiceBookings, bookingsSize, serviceBookingsMap))
+    {
+        const ServiceBooking* selectedService = selectPendingServiceBookings(serviceBookingsMap);
+        if (selectedService)
+        {
+            m_controller.removeServiceBooking(selectedService->getId());
+            std::cout << "Cancelled Service booking of id " + selectedService->getId() << std::endl << std::endl;
+        }
+        else
+        {
+            std::cout << "Invalid service booking index.\n\n";
+            return;
+        }
+    }
+    else
+    {
+        std::cout << "No pending service bookings available.\n\n";
+    }
+    util::pressEnter();
+}
+
 /*
 Function: completePayments
 Description: Allows the customer to complete pending payments for invoices.

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/CustomerMenu.h

@@ -28,5 +28,6 @@ public:
     void completePayments();
     void viewInvoices();
     void viewNotifications();
+    void cancelServiceBooking();
     void configureNotifications();
-};
+};

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/Menu.cpp

@@ -133,10 +133,16 @@ Return type: void
 void Menu::handleAccountDisabledEvent()
 {
     m_isMenuActive.store(false);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string messageTitle = "Account Disabled";
+    if (authenticatedUser)
+    {
+        messageTitle += " - " + authenticatedUser->getName();
+    }
     MessageBoxA(
         GetConsoleWindow(),
         "Your account has been disabled.",
-        "Account Disabled",
+        messageTitle.c_str(),
         MB_OK |
         MB_ICONWARNING |
         MB_SETFOREGROUND |

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h

@@ -28,6 +28,7 @@ Date: 21-May-2026
 #include "Utility.h"
 #include "Validator.h"
 #include "Vector.h"
+#include "StringHelper.h"
 
 /*
 Function: displayAllServices
@@ -1056,6 +1057,21 @@ inline const Service* selectServiceFromServices(const util::Map<std::string, con
         {
             continue;
         }
+        bool hasDepletedItem = false;
+        const util::Map<std::string, InventoryItem*>& requiredItems = currentService->getRequiredInventoryItems();
+        for (int itemIndex = 0; itemIndex < requiredItems.getSize(); itemIndex++)
+        {
+            const InventoryItem* item = requiredItems.getValueAt(itemIndex);
+            if (!item || item->getQuantity() < 1)
+            {
+                hasDepletedItem = true;
+                break;
+            }
+        }
+        if (hasDepletedItem)
+        {
+            continue; 
+        }
         activeServicesMap.insert(currentIndex, currentService);
         double partsCost = util::calculatePartsCost(currentService);
         std::cout << std::left
@@ -1415,9 +1431,10 @@ Description: Displays the most recent notification from the supplied
              notification collection.
 Parameter: util::Vector<const Notification*> notifications -
            collection of notifications
+           const std::string& - The name of the user currently authenticated with the system
 Return type: void
 */
-inline void displayNewNotification(util::Vector<const Notification*> notifications)
+inline void displayNewNotification(util::Vector<const Notification*> notifications, const std::string& name)
 {
     const Notification* notification = nullptr;
 	size_t numberOfNotifications = notifications.getSize();
@@ -1429,16 +1446,24 @@ inline void displayNewNotification(util::Vector<const Notification*> notificatio
 		}
 		else
 		{
-			if (notification->getId() < notifications[index]->getId())
+            if (util::extractNumber(notification->getId()) < util::extractNumber(notifications[index]->getId()))
 			{
 				notification = notifications[index];
 			}
 		}
 	}
-    MessageBoxA(
-        GetConsoleWindow(),
-        notification->getMessage().c_str(),
-        notification->getTitle().c_str(),
-        MB_OK |
-        MB_ICONINFORMATION);
-}
+    if (notification)
+    {
+        std::string messageTitle = notification->getTitle();
+        if (!name.empty())
+        {
+            messageTitle += " - " + name;
+        }
+        MessageBoxA(
+            GetConsoleWindow(),
+            notification->getMessage().c_str(),
+            messageTitle.c_str(),
+            MB_OK |
+            MB_ICONINFORMATION);
+    }
+}

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/TechnicianMenu.cpp

@@ -108,7 +108,13 @@ Return type: void
 void TechnicianMenu::handleNotificationEvent()
 {
     auto notifications = m_controller.getNotifications();
-    displayNewNotification(notifications);
+    const User* authenticatedUser = m_controller.getAuthenticatedUser();
+    std::string name;
+    if (authenticatedUser)
+    {
+        name = authenticatedUser->getName();
+    }
+    displayNewNotification(notifications, name);
 }
 
 /*