Align enum string values with actual State names

- Add serialize/deserialize support for core models
- Add file-based load/save functions in management services
- Introduce FileManager, Config, Utility and helper utilities
- Persist observer IDs for notification services
- Resolve object relationships during load (services, bookings, invoices, job cards)
- Add controller-level loadSystemData/saveSystemData
- Load data at app startup and save on shutdown

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.cpp

@@ -1,22 +1,5 @@
-/*
-File: Trenser.VehicleServiceSystem.cpp
-Description: Entry point for the Vehicle Service Management System.
-			 Initializes the UserInterface and starts the application loop.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include "UserInterface.h"
 
-/*
-Function: main
-Description: The main entry point of the application.
-			 Creates a UserInterface object and invokes the run method to start the system.
-Parameters:
-	- None
-Returns:
-	- int: Exit status code (0 for successful execution).
-*/
 int main()
 {
 	UserInterface userInterface;

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj

@@ -185,7 +185,6 @@
     <ClInclude Include="utilities\Vector.h" />
     <ClInclude Include="views\AdminMenu.h" />
     <ClInclude Include="views\CustomerMenu.h" />
-    <ClInclude Include="views\MenuHelper.h" />
     <ClInclude Include="views\TechnicianMenu.h" />
     <ClInclude Include="views\UserInterface.h" />
   </ItemGroup>

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem.vcxproj.filters

@@ -233,12 +233,6 @@
     <ClInclude Include="models\ComboPackage.h">
       <Filter>Header Files\Models</Filter>
     </ClInclude>
-    <ClInclude Include="views\MenuHelper.h">
-      <Filter>Header Files\Views</Filter>
-    </ClInclude>
-    <ClInclude Include="utilities\Utility.h">
-      <Filter>Header Files\Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="utilities\Config.h">
       <Filter>Header Files\Utilities</Filter>
     </ClInclude>
@@ -251,5 +245,8 @@
     <ClInclude Include="utilities\FileHelper.h">
       <Filter>Header Files\Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="utilities\Utility.h">
+      <Filter>Header Files\Utilities</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

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

@@ -1,428 +1,156 @@
-/*
-File: Controller.cpp
-Description: Implementation file containing the method definitions
-             of the Controller class, which manages user authentication,
-             inventory, services, bookings, and notifications.
-Author: Trenser
-Date:19-May-2026
-*/
 #include "Controller.h"
-#include "ComboPackage.h"
-#include "Enums.h"
-#include "InventoryItem.h"
-#include "Invoice.h"
-#include "JobCard.h"
-#include "Service.h"
-#include "ServiceBooking.h"
-#include "User.h"
-#include "User.h"
-#include <stdexcept>
 
-/*
-Function: login
-Description: Authenticates a user based on provided credentials.
-Parameter: const std::string& username - the username of the user
-           const std::string& password - the password of the user
-Return type: bool
-*/
 bool Controller::login(const std::string& username, const std::string& password)
 {
-    return m_authenticationManagementService.login(username, password);
+    return false;
 }
 
-/*
-Function: logout
-Description: Logs out the currently authenticated user by delegating
-             to the authentication management service.
-Parameter: None
-Return type: void
-*/
 void Controller::logout()
 {
-    m_authenticationManagementService.logout();
 }
 
-/*
-Function: changePassword
-Description: Updates the password of the authenticated user by delegating
-             to the authentication management service.
-Parameter: const std::string& newPassword - the new password to set
-Return type: void
-*/
 void Controller::changePassword(const std::string& newPassword)
 {
-    m_authenticationManagementService.changePassword(newPassword);
 }
 
-void Controller::createCustomer(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phone)
+void Controller::createCustomer(const std::string& username, const std::string& password, const std::string& email, const std::string& phone)
 {
-    m_userManagementService.createUser(username, name, password, email, phone, util::UserType::CUSTOMER);
 }
 
 const User* Controller::getAuthenticatedUser()
 {
-    return m_authenticationManagementService.getAuthenticatedUser();
+    return nullptr;
 }
 
-/*
+void Controller::createTechnician(const std::string& username, const std::string& password, const std::string& email, const std::string& phone)
-Function: createTechnician
-Description: Creates a new technician account with provided details by
-             delegating to the user management service.
-Parameter: const std::string& username - technician's username
-           const std::string& password - technician's password
-           const std::string& email - technician's email address
-           const std::string& phoneNumber - technician's phone number
-Return type: void
-*/
-void Controller::createTechnician(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phoneNumber)
 {
-    m_userManagementService.createUser(username, name, password, email, phoneNumber, util::UserType::TECHNICIAN);
 }
 
 void Controller::updateUserDetails(const std::string& email, const std::string& phone)
 {
-    User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-    if (authenticatedUser == nullptr)
-    {
-        throw std::runtime_error("No user currently logged in!");
-    }
-    m_userManagementService.updateUserDetails(authenticatedUser->getId(), email, phone);
 }
 
 util::Map<std::string, const Service*> Controller::getServices()
 {
-    util::Map<std::string, Service*> currentServices = m_serviceManagementService.getServices();
+    return util::Map<std::string, const Service*>();
-    util::Map<std::string, const Service*> readOnlyServices;
-    for (int iterator = 0; iterator < currentServices.getSize(); iterator++)
-    {
-        readOnlyServices.insert(currentServices.getValueAt(iterator)->getId(), currentServices.getValueAt(iterator));
-    }
-    return readOnlyServices;
 }
 
-/*
-Function: getComboPackages
-Description: Retrieves all available combo packages from the service
-             management service and constructs a read-only map.
-Parameter: None
-Return type: util::Map<std::string, const ComboPackage*>
-*/
 util::Map<std::string, const ComboPackage*> Controller::getComboPackages()
 {
-    util::Map<std::string, ComboPackage*> currentAvailableComboPackages = m_serviceManagementService.getComboPackages();
+    return util::Map<std::string, const ComboPackage*>();
-    util::Map<std::string, const ComboPackage*> readOnlyComboPackages;
-    for (int iterator = 0; iterator < currentAvailableComboPackages.getSize(); iterator++)
-    {
-        ComboPackage* currentComboPackage = currentAvailableComboPackages.getValueAt(iterator);
-        if (currentComboPackage)
-        {
-            readOnlyComboPackages.insert(currentComboPackage->getId(), currentComboPackage);
-        }
-    }
-    return readOnlyComboPackages;
 }
 
 void Controller::purchaseService(const util::Vector<std::string>& serviceIDs, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
 {
-    m_serviceManagementService.purchaseService(serviceIDs, vehicleNumber, vehicleBrand, vehicleModel);
 }
 
 void Controller::purchaseComboPackage(const std::string& comboPackageID, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
 {
-    m_serviceManagementService.purchaseComboPackage(comboPackageID, vehicleNumber, vehicleBrand, vehicleModel);
 }
 
-/*
-Function: getInventoryItems
-Description: Retrieves all inventory items from the inventory management service
-             and constructs a read-only map for external use.
-Parameter: None
-Return type: util::Map<std::string, const InventoryItem*>
-*/
 util::Map<std::string, const InventoryItem*> Controller::getInventoryItems()
 {
-    auto inventoryIems = m_inventoryManagementService.getInventoryItems();
+    return util::Map<std::string, const InventoryItem*>();
-    util::Map<std::string, const InventoryItem*> readOnlyInventoryItems;
-    int inventoryItemsMapSize = inventoryIems.getSize();
-    for (int index = 0; index < inventoryItemsMapSize; index++)
-    {
-        readOnlyInventoryItems.insert(inventoryIems.getKeyAt(index), inventoryIems.getValueAt(index));
-    }
-    return readOnlyInventoryItems;
 }
 
-/*
-Function: getInventoryItem
-Description: Retrieves a specific inventory item by its ID from the inventory management service.
-Parameter: const std::string& inventoryItemID - ID of the inventory item
-Return type: const InventoryItem*
-*/
 const InventoryItem* Controller::getInventoryItem(const std::string& inventoryItemID)
 {
-    return m_inventoryManagementService.getInventoryItem(inventoryItemID);
+    return nullptr;
 }
 
-/*
-Function: addInventoryItem
-Description: Adds a new inventory item with specified details to the inventory management service.
-Parameter: const std::string& partName - name of the part
-           int quantity - quantity of the part
-           double price - price of the part
-Return type: void
-*/
 void Controller::addInventoryItem(const std::string& partName, int quantity, double price)
 {
-    m_inventoryManagementService.addInventoryItem(partName, quantity, price);
 }
 
-/*
-Function: removeInventoryItem
-Description: Removes an inventory item from the inventory management service by its ID.
-Parameter: const std::string& inventoryItemID - ID of the inventory item
-Return type: void
-*/
 void Controller::removeInventoryItem(const std::string& inventoryItemID)
 {
-    m_inventoryManagementService.removeInventoryItem(inventoryItemID);
-}
-
-/*
-Function: addInventoryItemStock
-Description: Adds stock to an existing inventory item in the inventory management service.
-Parameter: const std::string& selectedItemId - ID of the inventory item
-           int quantity - quantity to add
-Return type: void
-*/
-void Controller::addInventoryItemStock(const std::string& selectedItemId, int quantity)
-{
-    m_inventoryManagementService.addInventoryItemStock(selectedItemId, quantity);
 }
 
 util::Map<std::string, const ServiceBooking*> Controller::getServiceBookings()
 {
-    auto serviceBookings = m_serviceManagementService.getServiceBookings();
+    return util::Map<std::string, const ServiceBooking*>();
-    util::Map<std::string, const ServiceBooking*> readOnlyServiceBookings;
-    for (int iterator = 0; iterator < serviceBookings.getSize(); iterator++)
-    {
-        readOnlyServiceBookings.insert(serviceBookings.getKeyAt(iterator), serviceBookings.getValueAt(iterator));
-    }
-    return readOnlyServiceBookings;
 }
 
 util::Map<std::string, const ServiceBooking*> Controller::getServiceBookingsByUser(const std::string userID)
 {
-    util::Map<std::string, const ServiceBooking*> readOnlyServiceBookingsByUserMap;
+    return util::Map<std::string, const ServiceBooking*>();
-    util::Map<std::string, ServiceBooking*> currentServiceBookingsByUser = m_serviceManagementService.getServiceBookings(userID);
-    for (int iterator = 0; iterator < currentServiceBookingsByUser.getSize(); iterator++)
-    {
-        readOnlyServiceBookingsByUserMap.insert(currentServiceBookingsByUser.getValueAt(iterator)->getId(), currentServiceBookingsByUser.getValueAt(iterator));
-    }
-    return readOnlyServiceBookingsByUserMap;
 }
 
-/*
-Function: getUsers
-Description: Retrieves all users from the user management service and
-             constructs a read-only map.
-Parameter: None
-Return type: util::Map<std::string, const User*>
-*/
 util::Map<std::string, const User*> Controller::getUsers()
 {
-    auto listOfUsers = m_userManagementService.getUsers();
+    return util::Map<std::string, const User*>();
-    util::Map<std::string, const User*> readOnlyUserList;
-    for (int iterator = 0; iterator < listOfUsers.getSize(); iterator++)
-    {
-        readOnlyUserList.insert(listOfUsers.getKeyAt(iterator), listOfUsers.getValueAt(iterator));
-    }
-    return readOnlyUserList;
 }
 
 util::Map<std::string, const User*> Controller::getUsers(util::UserType userType)
 {
-    auto userMap = m_userManagementService.getUsers(userType);
+    return util::Map<std::string, const User*>();
-    util::Map<std::string, const User*> readOnlyUserMap;
-    for (int iterator = 0; iterator < userMap.getSize(); iterator++)
-    {
-        readOnlyUserMap.insert(userMap.getKeyAt(iterator), userMap.getValueAt(iterator));
-    }
-    return readOnlyUserMap;
 }
 
 void Controller::createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID)
 {
-    m_serviceManagementService.createJobCard(bookingID, technicianID, serviceID);
 }
 
 void Controller::createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost)
 {
-    m_serviceManagementService.createService(name, inventoryItemIDs, laborCost);
 }
 
 void Controller::removeService(const std::string& serviceID)
 {
-    m_serviceManagementService.removeService(serviceID);
 }
 
 util::Map<std::string, const JobCard*> Controller::getJobCardsByUser()
 {
-    const User* currentUser = getAuthenticatedUser();
+    return util::Map<std::string, const JobCard*>();
-    auto jobCardsAssignedToTechnician = m_serviceManagementService.getJobCards(currentUser->getId());
-    util::Map<std::string, const JobCard*> readOnlyJobCardMap;
-    for (int iterator = 0; iterator < jobCardsAssignedToTechnician.getSize(); iterator++)
-    {
-        JobCard* currentJobCard = jobCardsAssignedToTechnician.getValueAt(iterator);
-        readOnlyJobCardMap.insert(currentJobCard->getId(), currentJobCard);
-    }
-    return readOnlyJobCardMap;
 }
 
 void Controller::completeJob(const std::string& jobID)
 {
-    m_serviceManagementService.completeJob(jobID);
 }
 
-/*
-Function: removeUser
-Description: Removes a user by ID. Cancels associated service bookings
-             and technician jobs before removing the user from the system.
-Parameter: const std::string& userID - ID of the user to remove
-Return type: void
-*/
 void Controller::removeUser(const std::string& userID)
 {
-    User* user = m_userManagementService.getUser(userID);
-    if (!user)
-    {
-        throw std::runtime_error("Error User not Found.\n");
-    }
-    m_serviceManagementService.cancelCustomerServiceBookings(userID);
-    m_serviceManagementService.cancelTechnicianJobs(userID);
-    m_userManagementService.removeUser(userID);
 }
 
-/*
-Function: createComboPackage
-Description: Creates a new combo package with specified services and discount
-             percentage by delegating to the service management service.
-Parameter: const std::string& name - name of the combo package
-           const util::Vector<std::string>& serviceIDs - list of service IDs
-           double discountPercentage - discount percentage for the package
-Return type: void
-*/
 void Controller::createComboPackage(const std::string& name, const util::Vector<std::string>& serviceIDs, double discountPercentage)
 {
-    m_serviceManagementService.createComboPackage(name, serviceIDs, discountPercentage);
 }
 
-/*
-Function: removeComboPackage
-Description: Removes a combo package by ID by delegating to the service
-             management service.
-Parameter: const std::string& comboPackageID - ID of the combo package
-Return type: void
-*/
 void Controller::removeComboPackage(const std::string& comboPackageID)
 {
-    m_serviceManagementService.removeComboPackage(comboPackageID);
 }
 
 util::Map<std::string, const Invoice*> Controller::getInvoicesByUser()
 {
-    User* currentUser = m_authenticationManagementService.getAuthenticatedUser();
+    return util::Map<std::string, const Invoice*>();
-    util::Map<std::string, Invoice*> currentUserInvoices =  m_paymentManagementService.getInvoices(currentUser->getId());
-    util::Map<std::string, const Invoice*> userInvoicesReadOnly;
-    for (int iterator = 0; iterator < currentUserInvoices.getSize(); iterator++)
-    {
-        Invoice* currentInvoice = currentUserInvoices.getValueAt(iterator);
-        userInvoicesReadOnly.insert(currentInvoice->getId(), currentInvoice);
-    }
-    return userInvoicesReadOnly;
 }
 
 void Controller::completePayment(const std::string& invoiceID, util::PaymentMode paymentMode)
 {
-    m_paymentManagementService.completePayment(invoiceID, paymentMode);
 }
 
-/*
-Function: getNotifications
-Description: Retrieves all notifications for the currently authenticated user.
-             Converts them into a read-only vector before returning.
-Parameters: None
-Return type: util::Vector<const Notification*>
-*/
 util::Vector<const Notification*> Controller::getNotifications()
 {
-    const User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
+    return util::Vector<const Notification*>();
-    if (!authenticatedUser)
-    {
-        throw std::runtime_error("No user is currently logged in!");
-    }
-    auto notifications = m_userManagementService.getUserNotifications(authenticatedUser->getId());
-    int numberOfNotifications = notifications.getSize();
-    util::Vector<const Notification*> readOnlyNotifications;
-    for (int index = 0; index < numberOfNotifications; index++)
-    {
-        readOnlyNotifications.push_back(notifications[index]);
-    }
-    return readOnlyNotifications;
 }
 
-/*
-Function: deleteNotification
-Description: Deletes a specific notification for the currently authenticated user.
-Parameters:
-    - notificationID: std::string, the unique identifier of the notification
-Return type: void
-*/
 void Controller::deleteNotification(const std::string& notificationID)
 {
-    const User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-    if (!authenticatedUser)
-    {
-        throw std::runtime_error("No user is currently logged in!");
 }
-    m_userManagementService.deleteNotification(notificationID, authenticatedUser->getId());
+
+void Controller::configureNotifications(const std::string& userID, bool paymentNotifications, bool serviceNotifications)
+{
 }
 
 /*
-Function: configureNotifications
+Function: loadSystemData
-Description: Configures notification preferences for the authenticated user.
+Description: Loads all system data from persistent storage into memory.
-             Attaches or detaches the user from payment and service notifications.
+             Invokes the respective management services to load users, inventory items, services,
+             combo packages, service bookings, job cards, invoices, and observers.
 Parameters:
-    - paymentNotifications: bool, enable/disable payment notifications
+    - None
-    - serviceNotifications: bool, enable/disable service notifications
+Returns:
-Return type: void
+    - void
 */
-void Controller::configureNotifications(bool paymentNotifications, bool serviceNotifications)
-{
-    User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-    if (authenticatedUser)
-    {
-        if (paymentNotifications)
-        {
-            m_paymentManagementService.attach(authenticatedUser);
-        }
-        else
-        {
-            m_paymentManagementService.detach(authenticatedUser);
-        }
-        if (serviceNotifications)
-        {
-            m_serviceManagementService.attach(authenticatedUser);
-        }
-        else
-        {
-            m_serviceManagementService.detach(authenticatedUser);
-        }
-    }
-    else
-    {
-        throw std::runtime_error("No user is currently logged in!");
-    }
-}
-
 void Controller::loadSystemData()
 {
     m_userManagementService.loadUsers();
@@ -437,6 +165,16 @@ void Controller::loadSystemData()
     m_inventoryManagementService.loadObservers();
 }
 
+/*
+Function: saveSystemData
+Description: Saves all system data from memory back to persistent storage.
+             Invokes the respective management services to save users, inventory items, services,
+             combo packages, service bookings, job cards, invoices, and observers.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void Controller::saveSystemData()
 {
     m_userManagementService.saveUsers();
@@ -451,17 +189,7 @@ void Controller::saveSystemData()
     m_inventoryManagementService.saveObservers();
 }
 
-/*
-Function: runSystemChecks
-Description: Executes system checks including sending low stock alerts
-             and payment reminders.
-Parameters: None
-Return type: void
-*/
 void Controller::runSystemChecks()
 {
-    m_userManagementService.ensureAdminExists();
-    m_inventoryManagementService.sendLowStockAlerts();
-    m_paymentManagementService.sendPaymentReminders();
 }
 

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

@@ -1,20 +1,11 @@
-/*
-File: Controller.h
-Description: Header file declaring the Controller class, which manages
-             user authentication, inventory, services, bookings, job cards,
-             invoices, and notifications in the system.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
+#include "Map.h"
 #include <string>
-#include "AuthenticationManagementService.h"
 #include "Enums.h"
 #include "InventoryManagementService.h"
-#include "Map.h"
-#include "PaymentManagementService.h"
-#include "ServiceManagementService.h"
 #include "UserManagementService.h"
+#include "ServiceManagementService.h"
+#include "PaymentManagementService.h"
 
 class Service;
 class ComboPackage;
@@ -28,18 +19,17 @@ class Notification;
 class Controller
 {
 private:
-    AuthenticationManagementService m_authenticationManagementService;
     UserManagementService m_userManagementService;
-    ServiceManagementService m_serviceManagementService;
     InventoryManagementService m_inventoryManagementService;
+    ServiceManagementService m_serviceManagementService;
     PaymentManagementService m_paymentManagementService;
 public:
     bool login(const std::string& username, const std::string& password);
     void logout();
     void changePassword(const std::string& newPassword);
-    void createCustomer(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phone);
+    void createCustomer(const std::string& username, const std::string& password, const std::string& email, const std::string& phone);
     const User* getAuthenticatedUser();
-    void createTechnician(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phoneNumber);
+    void createTechnician(const std::string& username, const std::string& password, const std::string& email, const std::string& phone);
     void updateUserDetails(const std::string& email, const std::string& phone);
     util::Map<std::string, const Service*> getServices();
     util::Map<std::string, const ComboPackage*> getComboPackages();
@@ -48,7 +38,6 @@ public:
     util::Map<std::string, const InventoryItem*> getInventoryItems();
     const InventoryItem* getInventoryItem(const std::string& inventoryItemID);
     void addInventoryItem(const std::string& partName, int quantity, double price);
-    void addInventoryItemStock(const std::string& selectedItemId, int quantity);
     void removeInventoryItem(const std::string& inventoryItemID);
     util::Map<std::string, const ServiceBooking*> getServiceBookings();
     util::Map<std::string, const ServiceBooking*> getServiceBookingsByUser(const std::string userID);
@@ -66,7 +55,7 @@ public:
     void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
     util::Vector<const Notification*> getNotifications();
     void deleteNotification(const std::string& notificationID);
-    void configureNotifications(bool paymentNotifications, bool serviceNotifications);
+    void configureNotifications(const std::string& userID, bool paymentNotifications, bool serviceNotifications);
     void loadSystemData();
     void saveSystemData();
     void runSystemChecks();

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/patterns/Observer.h

@@ -1,10 +1,3 @@
-/*
-File: Observer.h
-Description: Declares the Observer interface for handling notifications in the Vehicle Service Management System.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 
 class Notification;
@@ -13,5 +6,5 @@ class Observer
 {
 public:
     virtual ~Observer() = default;
-    virtual void addNotification(Notification* notification) = 0;
+    virtual void update(Notification* notification) = 0;
 };

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/core/patterns/Subject.h

@@ -1,10 +1,3 @@
-/*
-File: Subject.h
-Description: Declares the Subject interface for managing user attachments and detachments in the Observer design pattern within the Vehicle Service Management System.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Map.h"

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

@@ -1,128 +1,46 @@
-/*
-File: DataStore.cpp
-Description: Implements the DataStore class which provides a centralized singleton repository
-             for managing system data in the Vehicle Service Management System.
-             Includes accessors for users, services, combo packages, service bookings,
-             job cards, inventory items, invoices, and payments.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include "DataStore.h"
 
-/*
-Function: getInstance
-Description: Provides a singleton instance of the DataStore class.
-Parameters:
-    - None
-Returns:
-    - Reference to the single DataStore instance.
-*/
 DataStore& DataStore::getInstance()
 {
     static DataStore dataStore;
     return dataStore;
 }
 
-/*
-Function: getUsers
-Description: Retrieves the internal map of users.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, User*> containing all users.
-*/
 util::Map<std::string, User*>& DataStore::getUsers()
 {
     return m_users;
 }
 
-/*
-Function: getServices
-Description: Retrieves the internal map of services.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, Service*> containing all services.
-*/
 util::Map<std::string, Service*>& DataStore::getServices()
 {
     return m_services;
 }
 
-/*
-Function: getComboPackages
-Description: Retrieves the internal map of combo packages.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, ComboPackage*> containing all combo packages.
-*/
 util::Map<std::string, ComboPackage*>& DataStore::getComboPackages()
 {
     return m_comboPackages;
 }
 
-/*
-Function: getServiceBookings
-Description: Retrieves the internal map of service bookings.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, ServiceBooking*> containing all service bookings.
-*/
 util::Map<std::string, ServiceBooking*>& DataStore::getServiceBookings()
 {
     return m_serviceBookings;
 }
 
-/*
-Function: getJobCards
-Description: Retrieves the internal map of job cards.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, JobCard*> containing all job cards.
-*/
 util::Map<std::string, JobCard*>& DataStore::getJobCards()
 {
     return m_jobCards;
 }
 
-/*
-Function: getInventoryItems
-Description: Retrieves the internal map of inventory items.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, InventoryItem*> containing all inventory items.
-*/
 util::Map<std::string, InventoryItem*>& DataStore::getInventoryItems()
 {
     return m_inventoryItems;
 }
 
-/*
-Function: getInvoices
-Description: Retrieves the internal map of invoices.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, Invoice*> containing all invoices.
-*/
 util::Map<std::string, Invoice*>& DataStore::getInvoices()
 {
     return m_invoices;
 }
 
-/*
-Function: getPayments
-Description: Retrieves the internal map of payments.
-Parameters:
-    - None
-Returns:
-    - Reference to util::Map<std::string, Payment*> containing all payments.
-*/
 util::Map<std::string, Payment*>& DataStore::getPayments()
 {
     return m_payments;

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

@@ -1,11 +1,5 @@
-/*
-File: DataStore.h
-Description: Declares the DataStore singleton class responsible for managing collections of users, services, combo packages, service bookings, job cards, inventory items, invoices, and payments in the Vehicle Service Management System.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
+
 #include <string>
 #include "Map.h"
 

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/ComboPackage.cpp

@@ -1,12 +1,3 @@
-/*
-File: ComboPackage.cpp
-Description: Implements the ComboPackage class which represents a bundled set of services in the Vehicle Service Management System.
-             Provides constructors, accessors, and mutators for package details such as ID, name, discount percentage, state,
-             and associated services.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include <stdexcept>
 #include "ComboPackage.h"
@@ -16,31 +7,11 @@ Date: 19-May-2026
 
 int ComboPackage::m_uid = 0;
 
-/*
-Function: ComboPackage
-Description: Default constructor that initializes a new combo package with a unique ID,
-             active state, and zero discount percentage.
-Parameters:
-    - None
-Returns:
-    - A new ComboPackage object.
-*/
 ComboPackage::ComboPackage()
     : m_id("CMP" + std::to_string(++m_uid)),
     m_status(util::State::ACTIVE),
     m_discountPercentage(0.0) {}
 
-/*
-Function: ComboPackage
-Description: Parameterized constructor that initializes a new combo package with a unique ID,
-             specified package name, discount percentage, active state, and associated services.
-Parameters:
-    - packageName: Name of the combo package.
-    - discountPercentage: Discount percentage applied to the package.
-    - services: Map of services included in the package.
-Returns:
-    - A new ComboPackage object.
-*/
 ComboPackage::ComboPackage(const std::string& packageName, double discountPercentage, const util::Map<std::string, Service*>& services)
     : m_id("CMP" + std::to_string(++m_uid)),
     m_packageName(packageName),
@@ -56,6 +27,19 @@ ComboPackage::ComboPackage(const std::string& packageName, double discountPercen
     }
 }
 
+/*
+Function: ComboPackage (parameterized constructor with ID)
+Description: Initializes a combo package with an existing ID, name, discount percentage,
+             service IDs, and state. Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique ID of the package
+    - packageName: const std::string&, name of the package
+    - discountPercentage: double, discount percentage applied
+    - serviceIDs: const util::Vector<std::string>&, IDs of services included
+    - status: util::State, state of the package (ACTIVE/INACTIVE)
+Returns:
+    - A new ComboPackage object
+*/
 ComboPackage::ComboPackage(const std::string& id, const std::string& packageName, double discountPercentage, const util::Vector<std::string>& serviceIDs, util::State status)
     : m_id(id),
     m_packageName(packageName),
@@ -70,53 +54,21 @@ ComboPackage::ComboPackage(const std::string& id, const std::string& packageName
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the combo package.
-Parameters:
-    - None
-Returns:
-    - const std::string& representing the package ID.
-*/
 const std::string& ComboPackage::getId() const
 {
     return m_id;
 }
 
-/*
-Function: getPackageName
-Description: Retrieves the name of the combo package.
-Parameters:
-    - None
-Returns:
-    - const std::string& representing the package name.
-*/
 const std::string& ComboPackage::getPackageName() const
 {
     return m_packageName;
 }
 
-/*
-Function: getDiscountPercentage
-Description: Retrieves the discount percentage applied to the combo package.
-Parameters:
-    - None
-Returns:
-    - double representing the discount percentage.
-*/
 double ComboPackage::getDiscountPercentage() const
 {
     return m_discountPercentage;
 }
 
-/*
-Function: getState
-Description: Retrieves the current state (ACTIVE/INACTIVE) of the combo package.
-Parameters:
-    - None
-Returns:
-    - util::State representing the package state.
-*/
 util::State ComboPackage::getState() const
 {
     return m_status;
@@ -127,66 +79,26 @@ const util::Vector<std::string>& ComboPackage::getServiceIDs() const
     return m_serviceIDs;
 }
 
-/*
-Function: getServices
-Description: Retrieves the map of services included in the combo package.
-Parameters:
-    - None
-Returns:
-    - const util::Map<std::string, Service*>& representing the services.
-*/
 const util::Map<std::string, Service*>& ComboPackage::getServices() const
 {
     return m_services;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the combo package.
-Parameters:
-    - id: New ID string.
-Returns:
-    - void
-*/
 void ComboPackage::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setPackageName
-Description: Sets the name of the combo package.
-Parameters:
-    - packageName: New package name string.
-Returns:
-    - void
-*/
 void ComboPackage::setPackageName(const std::string& packageName)
 {
     m_packageName = packageName;
 }
 
-/*
-Function: setDiscountPercentage
-Description: Sets the discount percentage for the combo package.
-Parameters:
-    - discountPercentage: New discount percentage value.
-Returns:
-    - void
-*/
 void ComboPackage::setDiscountPercentage(double discountPercentage)
 {
     m_discountPercentage = discountPercentage;
 }
 
-/*
-Function: setServices
-Description: Sets the services included in the combo package.
-Parameters:
-    - services: Map of services to be associated with the package.
-Returns:
-    - void
-*/
 void ComboPackage::setServices(const util::Map<std::string, Service*>& services)
 {
     m_services = services;
@@ -199,19 +111,19 @@ void ComboPackage::setServices(const util::Map<std::string, Service*>& services)
     }
 }
 
-/*
-Function: setState
-Description: Sets the state (ACTIVE/INACTIVE) of the combo package.
-Parameters:
-    - status: New state value.
-Returns:
-    - void
-*/
 void ComboPackage::setState(util::State status)
 {
     m_status = status;
 }
 
+/*
+Function: getServiceIDsAsString (static helper)
+Description: Converts a vector of service IDs into a single string separated by '|'.
+Parameters:
+    - serviceIDs: const util::Vector<std::string>&, vector of service IDs
+Returns:
+    - std::string: Concatenated service IDs string
+*/
 static std::string getServiceIDsAsString(const util::Vector<std::string>& serviceIDs)
 {
     int numberOfServices = serviceIDs.getSize();
@@ -227,6 +139,14 @@ static std::string getServiceIDsAsString(const util::Vector<std::string>& servic
     return serviceIDsString;
 }
 
+/*
+Function: getServiceIDsAsVector (static helper)
+Description: Converts a string of service IDs separated by '|' into a vector.
+Parameters:
+    - serviceIDsString: const std::string&, concatenated service IDs string
+Returns:
+    - util::Vector<std::string>: Vector of service IDs
+*/
 static util::Vector<std::string> getServiceIDsAsVector(const std::string& serviceIDsString)
 {
     util::Vector<std::string> serviceIDs;
@@ -239,6 +159,14 @@ static util::Vector<std::string> getServiceIDsAsVector(const std::string& servic
     return serviceIDs;
 }
 
+/*
+Function: serialize
+Description: Serializes the combo package into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized combo package record
+*/
 std::string ComboPackage::serialize() const
 {
     std::ostringstream serializedComboPackage;
@@ -250,6 +178,16 @@ std::string ComboPackage::serialize() const
     return serializedComboPackage.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a ComboPackage object.
+Parameters:
+    - record: const std::string&, serialized combo package record
+Returns:
+    - ComboPackage*: Pointer to the deserialized ComboPackage object
+Throws:
+    - std::runtime_error if data is invalid
+*/
 ComboPackage* ComboPackage::deserialize(const std::string& record)
 {
     std::string id, packageName;
@@ -280,6 +218,14 @@ ComboPackage* ComboPackage::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for combo package serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,PackageName,DiscountPercentage,ServiceIDs,Status")
+*/
 std::string ComboPackage::getHeaders()
 {
     return "ID,PackageName,DiscountPercentage,ServiceIDs,Status";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/ComboPackage.h

@@ -1,10 +1,3 @@
-/*
-File: ComboPackage.h
-Description: Declares the ComboPackage class which represents a service package with a unique ID, package name, discount percentage, associated services, and status in the Vehicle Service Management System.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Map.h"

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/InventoryItem.cpp

@@ -1,45 +1,17 @@
-/*
-File: InventoryItem.cpp
-Description: Implements the InventoryItem class which represents an inventory item in the Vehicle Service Management System.
-             Provides constructors, accessors, and mutators for item details such as ID, part name, quantity, price, and state.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include <stdexcept>
-#include "InventoryItem.h"
 #include "Factory.h"
 #include "StringHelper.h"
+#include "InventoryItem.h"
 
 int InventoryItem::m_uid = 0;
 
-/*
-Function: InventoryItem
-Description: Default constructor that initializes a new inventory item with a unique ID,
-             active state, zero quantity, and zero price.
-Parameters:
-    - None
-Returns:
-    - A new InventoryItem object.
-*/
 InventoryItem::InventoryItem()
     : m_id("IIM" + std::to_string(++m_uid)),
     m_quantity(0),
     m_status(util::State::ACTIVE),
     m_price(0.0) {}
 
-/*
-Function: InventoryItem
-Description: Parameterized constructor that initializes a new inventory item with a unique ID,
-             specified part name, quantity, price, and active state.
-Parameters:
-    - partName: Name of the inventory item.
-    - quantity: Initial quantity of the item.
-    - price: Price of the item.
-Returns:
-    - A new InventoryItem object.
-*/
 InventoryItem::InventoryItem(const std::string& partName, int quantity, double price)
     : m_id("IIM" + std::to_string(++m_uid)),
     m_partName(partName),
@@ -47,6 +19,19 @@ InventoryItem::InventoryItem(const std::string& partName, int quantity, double p
     m_status(util::State::ACTIVE),
     m_price(price) {}
 
+/*
+Function: InventoryItem (parameterized constructor with ID)
+Description: Initializes an inventory item with an existing ID, part name, quantity,
+             price, and state. Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique ID of the item
+    - partName: const std::string&, name of the part
+    - quantity: int, quantity of the part
+    - price: double, price of the part
+    - status: util::State, state of the item (ACTIVE/INACTIVE)
+Returns:
+    - A new InventoryItem object
+*/
 InventoryItem::InventoryItem(const std::string& id, const std::string& partName, int quantity, double price, util::State status)
     : m_id(id),
     m_partName(partName),
@@ -61,136 +46,64 @@ InventoryItem::InventoryItem(const std::string& id, const std::string& partName,
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the inventory item.
-Parameters:
-    - None
-Returns:
-    - const std::string& representing the item ID.
-*/
 const std::string& InventoryItem::getId() const
 {
     return m_id;
 }
 
-/*
-Function: getPartName
-Description: Retrieves the part name of the inventory item.
-Parameters:
-    - None
-Returns:
-    - const std::string& representing the part name.
-*/
 const std::string& InventoryItem::getPartName() const
 {
     return m_partName;
 }
 
-/*
-Function: getQuantity
-Description: Retrieves the current quantity of the inventory item.
-Parameters:
-    - None
-Returns:
-    - int representing the quantity.
-*/
 int InventoryItem::getQuantity() const
 {
     return m_quantity;
 }
 
-/*
-Function: getPrice
-Description: Retrieves the price of the inventory item.
-Parameters:
-    - None
-Returns:
-    - double representing the price.
-*/
 double InventoryItem::getPrice() const
 {
     return m_price;
 }
 
-/*
-Function: getState
-Description: Retrieves the current state (ACTIVE/INACTIVE) of the inventory item.
-Parameters:
-    - None
-Returns:
-    - util::State representing the item state.
-*/
 util::State InventoryItem::getState() const
 {
     return m_status;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the inventory item.
-Parameters:
-    - id: New ID string.
-Returns:
-    - void
-*/
 void InventoryItem::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setPartName
-Description: Sets the part name of the inventory item.
-Parameters:
-    - partName: New part name string.
-Returns:
-    - void
-*/
 void InventoryItem::setPartName(const std::string& partName)
 {
     m_partName = partName;
 }
 
-/*
-Function: setQuantity
-Description: Sets the quantity of the inventory item.
-Parameters:
-    - quantity: New quantity value.
-Returns:
-    - void
-*/
 void InventoryItem::setQuantity(int quantity)
 {
     m_quantity = quantity;
 }
 
-/*
-Function: setPrice
-Description: Sets the price of the inventory item.
-Parameters:
-    - price: New price value.
-Returns:
-    - void
-*/
 void InventoryItem::setPrice(double price)
 {
     m_price = price;
 }
 
-/*
-Function: setState
-Description: Sets the state (ACTIVE/INACTIVE) of the inventory item.
-Parameters:
-    - status: New state value.
-Returns:
-    - void
-*/
 void InventoryItem::setState(util::State status)
 {
     m_status = status;
 }
 
+/*
+Function: serialize
+Description: Serializes the inventory item into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized inventory item record
+*/
 std::string InventoryItem::serialize() const
 {
     std::ostringstream serializedInventoryItem;
@@ -202,6 +115,16 @@ std::string InventoryItem::serialize() const
     return serializedInventoryItem.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into an InventoryItem object.
+Parameters:
+    - record: const std::string&, serialized inventory item record
+Returns:
+    - InventoryItem*: Pointer to the deserialized InventoryItem object
+Throws:
+    - std::runtime_error if data is invalid
+*/
 InventoryItem* InventoryItem::deserialize(const std::string& record)
 {
     std::string id, partName;
@@ -233,6 +156,14 @@ InventoryItem* InventoryItem::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for inventory item serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,PartName,Quantity,Price,Status")
+*/
 std::string InventoryItem::getHeaders()
 {
     return "ID,PartName,Quantity,Price,Status";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/InventoryItem.h

@@ -1,12 +1,3 @@
-/*
-File: InventoryItem.h
-Description: Declares the InventoryItem class which represents parts in the Vehicle Service Management System.
-             Each item has a unique ID, part name, quantity, price, and status.
-Author: Trenser
-Date: 19-May-2026
-*/
-
-
 #pragma once
 #include <string>
 #include "Enums.h"

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Invoice.cpp

@@ -1,12 +1,3 @@
-/*
-File: Invoice.cpp
-Description: Implements the Invoice class which represents an invoice in the Vehicle Service Management System.
-             Provides constructors, accessors, and mutators for invoice details such as ID, booking, costs,
-             discount percentage, total amount, payment details, and status.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include <stdexcept>
 #include "Invoice.h"
@@ -16,16 +7,6 @@ Date: 19-May-2026
 
 int Invoice::m_uid = 0;
 
-/*
-Function: Invoice
-Description: Default constructor that initializes a new invoice with a unique ID,
-             null booking, zero costs, zero discount, zero total amount,
-             and default payment method and status.
-Parameters:
-    - None
-Returns:
-    - A new Invoice object.
-*/
 Invoice::Invoice()
     : m_id("INV" + std::to_string(++m_uid)),
     m_booking(nullptr),
@@ -36,30 +17,11 @@ Invoice::Invoice()
     m_paymentMethod(util::PaymentMode()),
     m_status(util::PaymentStatus()) {}
 
-/*
-Function: Invoice
-Description: Parameterized constructor that initializes a new invoice with a unique ID and specified details.
-Parameters:
-    - bookingId: ID of the associated service booking.
-    - booking: Pointer to the ServiceBooking object.
-    - invoiceDate: Timestamp of when the invoice was created.
-    - laborCost: Cost of labor for the service.
-    - parts: Map of inventory items used in the service.
-    - partsCost: Total cost of parts.
-    - discountPercentage: Discount applied to the invoice.
-    - totalAmount: Final total amount after discount.
-    - paymentDate: Timestamp of when payment was made.
-    - paymentMethod: Payment mode (ONLINE/OFFLINE).
-    - status: Payment status (PENDING/COMPLETED).
-Returns:
-    - A new Invoice object.
-*/
 Invoice::Invoice(
     const std::string& bookingId,
     ServiceBooking* booking,
     const util::Timestamp& invoiceDate, 
-    double laborCost, 
+    double laborCost, const util::Map<std::string,
-    const util::Map<std::string,
     InventoryItem*>& parts,
     double partsCost,
     double discountPercentage, 
@@ -127,205 +89,99 @@ const std::string& Invoice::getId() const
     return m_id;
 }
 
-/*
-Function: getBookingId
-Description: Retrieves the booking ID associated with the invoice.
-Returns:
-    - const std::string& representing the booking ID.
-*/
 const std::string& Invoice::getBookingId() const
 {
     return m_bookingId;
 }
 
-/*
-Function: getBooking
-Description: Retrieves the pointer to the associated ServiceBooking.
-Returns:
-    - ServiceBooking* representing the booking.
-*/
 ServiceBooking* Invoice::getBooking() const
 {
     return m_booking;
 }
 
-/*
-Function: getInvoiceDate
-Description: Retrieves the timestamp of the invoice creation date.
-Returns:
-    - const util::Timestamp& representing the invoice date.
-*/
 const util::Timestamp& Invoice::getInvoiceDate() const
 {
     return m_invoiceDate;
 }
 
-/*
-Function: getLaborCost
-Description: Retrieves the labor cost associated with the invoice.
-Returns:
-    - double representing the labor cost.
-*/
 double Invoice::getLaborCost() const
 {
     return m_laborCost;
 }
 
+/*
+Function: getPartIDs
+Description: Retrieves the IDs of parts used in the invoice.
+Parameters:
+    - None
+Returns:
+    - const util::Vector<std::string>&: Part IDs
+*/
 const util::Vector<std::string>& Invoice::getPartIDs() const
 {
     return m_partIDs;
 }
 
-/*
-Function: getParts
-Description: Retrieves the map of inventory items used in the service.
-Returns:
-    - const util::Map<std::string, InventoryItem*>& representing the parts.
-*/
 const util::Map<std::string, InventoryItem*>& Invoice::getParts() const
 {
     return m_parts;
 }
 
-/*
-Function: getPartsCost
-Description: Retrieves the total cost of parts used in the service.
-Returns:
-    - double representing the parts cost.
-*/
 double Invoice::getPartsCost() const
 {
     return m_partsCost;
 }
 
-/*
-Function: getDiscountPercentage
-Description: Retrieves the discount percentage applied to the invoice.
-Returns:
-    - double representing the discount percentage.
-*/
 double Invoice::getDiscountPercentage() const
 {
     return m_discountPercentage;
 }
 
-/*
-Function: getTotalAmount
-Description: Retrieves the total amount of the invoice after discount.
-Returns:
-    - double representing the total amount.
-*/
 double Invoice::getTotalAmount() const
 {
     return m_totalAmount;
 }
 
-/*
-Function: getPaymentDate
-Description: Retrieves the timestamp of the payment date.
-Returns:
-    - const util::Timestamp& representing the payment date.
-*/
 const util::Timestamp& Invoice::getPaymentDate() const
 {
     return m_paymentDate;
 }
 
-/*
-Function: getPaymentMethod
-Description: Retrieves the payment mode used for the invoice.
-Returns:
-    - util::PaymentMode representing the payment method.
-*/
 util::PaymentMode Invoice::getPaymentMethod() const
 {
     return m_paymentMethod;
 }
 
-/*
-Function: getStatus
-Description: Retrieves the payment status of the invoice.
-Returns:
-    - util::PaymentStatus representing the payment status.
-*/
 util::PaymentStatus Invoice::getStatus() const
 {
     return m_status;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the invoice.
-Parameters:
-    - id: New invoice ID string.
-Returns:
-    - void
-*/
 void Invoice::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setBookingId
-Description: Sets the booking ID associated with the invoice.
-Parameters:
-    - bookingId: New booking ID string.
-Returns:
-    - void
-*/
 void Invoice::setBookingId(const std::string& bookingId)
 {
     m_bookingId = bookingId;
 }
 
-/*
-Function: setBooking
-Description: Sets the associated ServiceBooking pointer.
-Parameters:
-    - booking: Pointer to the ServiceBooking object.
-Returns:
-    - void
-*/
 void Invoice::setBooking(ServiceBooking* booking)
 {
     m_booking = booking;
 }
 
-/*
-Function: setInvoiceDate
-Description: Sets the invoice creation date.
-Parameters:
-    - invoiceDate: New timestamp for the invoice date.
-Returns:
-    - void
-*/
 void Invoice::setInvoiceDate(const util::Timestamp& invoiceDate)
 {
     m_invoiceDate = invoiceDate;
 }
 
-/*
-Function: setLaborCost
-Description: Sets the labor cost for the invoice.
-Parameters:
-    - laborCost: New labor cost value.
-Returns:
-    - void
-*/
 void Invoice::setLaborCost(double laborCost)
 {
     m_laborCost = laborCost;
 }
 
-/*
-Function: setParts
-Description: Sets the inventory items used in the service.
-Parameters:
-    - parts: Map of inventory items.
-Returns:
-    - void
-*/
 void Invoice::setParts(const util::Map<std::string, InventoryItem*>& parts)
 {
     m_parts = parts;
@@ -338,84 +194,44 @@ void Invoice::setParts(const util::Map<std::string, InventoryItem*>& parts)
     }
 }
 
-/*
-Function: setPartsCost
-Description: Sets the total cost of parts used in the service.
-Parameters:
-    - partsCost: New parts cost value.
-Returns:
-    - void
-*/
 void Invoice::setPartsCost(double partsCost)
 {
     m_partsCost = partsCost;
 }
 
-/*
-Function: setDiscountPercentage
-Description: Sets the discount percentage applied to the invoice.
-Parameters:
-    - discountPercentage: New discount percentage value.
-Returns:
-    - void
-*/
 void Invoice::setDiscountPercentage(double discountPercentage)
 {
     m_discountPercentage = discountPercentage;
 }
 
-/*
-Function: setTotalAmount
-Description: Sets the total amount of the invoice.
-Parameters:
-    - totalAmount: New total amount value.
-Returns:
-    - void
-*/
 void Invoice::setTotalAmount(double totalAmount)
 {
     m_totalAmount = totalAmount;
 }
 
-/*
-Function: setPaymentDate
-Description: Sets the payment date for the invoice.
-Parameters:
-    - paymentDate: New timestamp for the payment date.
-Returns:
-    - void
-*/
 void Invoice::setPaymentDate(const util::Timestamp& paymentDate)
 {
     m_paymentDate = paymentDate;
 }
 
-/*
-Function: setPaymentMethod
-Description: Sets the payment mode for the invoice.
-Parameters:
-    - paymentMethod: New payment mode value.
-Returns:
-    - void
-*/
 void Invoice::setPaymentMethod(util::PaymentMode paymentMethod)
 {
     m_paymentMethod = paymentMethod;
 }
 
-/*
-Function: setStatus
-Description: Sets the payment status of the invoice.
-Parameters:
-    - status: New payment status value.
-Returns:
-    - void
-*/
 void Invoice::setStatus(util::PaymentStatus status)
 {
     m_status = status;
 }
 
+/*
+Function: getPartIDsAsString (static helper)
+Description: Converts a vector of part IDs into a single string separated by '|'.
+Parameters:
+    - partIDs: const util::Vector<std::string>&, vector of part IDs
+Returns:
+    - std::string: Concatenated part IDs string
+*/
 static std::string getPartIDsAsString(const util::Vector<std::string>& partIDs)
 {
     int numberOfParts = partIDs.getSize();
@@ -431,6 +247,14 @@ static std::string getPartIDsAsString(const util::Vector<std::string>& partIDs)
     return partIDsString;
 }
 
+/*
+Function: getPartIDsAsVector (static helper)
+Description: Converts a string of part IDs separated by '|' into a vector.
+Parameters:
+    - partIDsString: const std::string&, concatenated part IDs string
+Returns:
+    - util::Vector<std::string>: Vector of part IDs
+*/
 static util::Vector<std::string> getPartIDsAsVector(const std::string& partIDsString)
 {
     util::Vector<std::string> partIDs;
@@ -443,6 +267,14 @@ static util::Vector<std::string> getPartIDsAsVector(const std::string& partIDsSt
     return partIDs;
 }
 
+/*
+Function: serialize
+Description: Serializes the invoice into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized invoice record
+*/
 std::string Invoice::serialize() const
 {
     std::ostringstream serializedInvoice;
@@ -460,6 +292,16 @@ std::string Invoice::serialize() const
     return serializedInvoice.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into an Invoice object.
+Parameters:
+    - record: const std::string&, serialized invoice record
+Returns:
+    - Invoice*: Pointer to the deserialized Invoice object
+Throws:
+    - std::runtime_error if data is invalid
+*/
 Invoice* Invoice::deserialize(const std::string& record)
 {
     std::string id, bookingId;
@@ -512,6 +354,14 @@ Invoice* Invoice::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for invoice serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,BookingID,InvoiceDate,LaborCost,PartIDs,PartsCost,DiscountPercentage,TotalAmount,PaymentDate,PaymentMethod,Status")
+*/
 std::string Invoice::getHeaders()
 {
     return "ID,BookingID,InvoiceDate,LaborCost,PartIDs,PartsCost,DiscountPercentage,TotalAmount,PaymentDate,PaymentMethod,Status";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Invoice.h

@@ -1,12 +1,3 @@
-/*
-File: Invoice.h
-Description: Declares the Invoice class which represents billing details for a service booking in the Vehicle Service Management System.
-             Each invoice includes booking information, labor cost, parts used, discount percentage, total amount, payment details, and status.
-Author: Trenser
-Date: 19-May-2026
-*/
-
-
 #pragma once
 #include <string>
 #include "Map.h"
@@ -40,8 +31,8 @@ public:
         const std::string& bookingId,
         ServiceBooking* booking,
         const util::Timestamp& invoiceDate, 
-        double laborCost, 
+        double laborCost, const util::Map<std::string,
-        const util::Map<std::string,InventoryItem*>& parts,
+        InventoryItem*>& parts,
         double partsCost,
         double discountPercentage, 
         double totalAmount, 

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/JobCard.cpp

@@ -1,11 +1,3 @@
-/*
-File: JobCard.cpp
-Description: Implementation file containing the method definitions of the
-             JobCard class, including constructors, getters, and setters
-             for job card attributes.
-Author: Trenser
-Date:19-May-2026
-*/
 #include <sstream>
 #include <stdexcept>
 #include "JobCard.h"
@@ -15,15 +7,6 @@ Date:19-May-2026
 
 int JobCard::m_uid = 0;
 
-/*
-Function: JobCard
-Description: Default constructor that initializes a new job card with a unique ID,
-             null booking, null service, null technician, and default job status.
-Parameters:
-    - None
-Returns:
-    - A new JobCard object.
-*/
 JobCard::JobCard()
     : m_id("JC" + std::to_string(++m_uid)),
     m_booking(nullptr),
@@ -31,21 +14,6 @@ JobCard::JobCard()
     m_technician(nullptr),
     m_status(util::ServiceJobStatus()) {}
 
-/*
-Function: JobCard
-Description: Parameterized constructor that initializes a job card with
-             booking, service, technician, and status details.
-Parameter: const std::string& bookingId - ID of the booking
-           ServiceBooking* booking - pointer to the booking object
-           Service* service - pointer to the service object
-           const std::string& serviceId - ID of the service
-           const std::string& technicianId - ID of the technician
-           User* technician - pointer to the technician object
-           const util::Timestamp& assignedDate - date when job was assigned
-           util::ServiceJobStatus status - current status of the job
-           const util::Timestamp& completionDate - date when job was completed
-Return type: Constructor
-*/
 JobCard::JobCard(const std::string& bookingId,
     ServiceBooking* booking,
     Service* service,
@@ -67,6 +35,22 @@ JobCard::JobCard(const std::string& bookingId,
     m_status(status),
     m_completionDate(completionDate) {}
 
+/*
+Function: JobCard (parameterized constructor with ID)
+Description: Initializes a job card with an existing ID, booking ID, service ID,
+             technician ID, assignment date, completion date, and status.
+             Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique job card ID
+    - bookingId: const std::string&, ID of the booking
+    - serviceId: const std::string&, ID of the service
+    - technicianId: const std::string&, ID of the technician
+    - assignedDate: const util::Timestamp&, date of assignment
+    - status: util::ServiceJobStatus, job status
+    - completionDate: const util::Timestamp&, date of completion
+Returns:
+    - A new JobCard object
+*/
 JobCard::JobCard(const std::string& id,
     const std::string& bookingId,
     const std::string& serviceId,
@@ -93,244 +77,114 @@ JobCard::JobCard(const std::string& id,
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the job card.
-Returns:
-    - const std::string& representing the job card ID.
-*/
 const std::string& JobCard::getId() const
 {
     return m_id;
 }
 
-/*
-Function: getBookingId
-Description: Retrieves the booking ID associated with the job card.
-Returns:
-    - const std::string& representing the booking ID.
-*/
 const std::string& JobCard::getBookingId() const
 {
     return m_bookingId;
 }
 
-/*
-Function: getBooking
-Description: Retrieves the pointer to the associated ServiceBooking.
-Returns:
-    - ServiceBooking* representing the booking.
-*/
 ServiceBooking* JobCard::getBooking() const
 {
     return m_booking;
 }
 
-/*
-Function: getService
-Description: Retrieves the pointer to the associated Service.
-Returns:
-    - Service* representing the service.
-*/
 Service* JobCard::getService() const
 {
     return m_service;
 }
 
-/*
-Function: getServiceId
-Description: Retrieves the service ID associated with the job card.
-Returns:
-    - const std::string& representing the service ID.
-*/
 const std::string& JobCard::getServiceId() const
 {
     return m_serviceId;
 }
 
-/*
-Function: getTechnicianId
-Description: Retrieves the technician ID associated with the job card.
-Returns:
-    - const std::string& representing the technician ID.
-*/
 const std::string& JobCard::getTechnicianId() const
 {
     return m_technicianId;
 }
 
-/*
-Function: getTechnician
-Description: Retrieves the pointer to the assigned technician.
-Returns:
-    - User* representing the technician.
-*/
 User* JobCard::getTechnician() const
 {
     return m_technician;
 }
 
-/*
-Function: getAssignedDate
-Description: Retrieves the timestamp of when the job was assigned.
-Returns:
-    - const util::Timestamp& representing the assigned date.
-*/
 const util::Timestamp& JobCard::getAssignedDate() const
 {
     return m_assignedDate;
 }
 
-/*
-Function: getStatus
-Description: Retrieves the current status of the job card.
-Parameter: None
-Return type: util::ServiceJobStatus
-*/
 util::ServiceJobStatus JobCard::getStatus() const
 {
     return m_status;
 }
 
-/*
-Function: getCompletionDate
-Description: Retrieves the timestamp of when the job was completed.
-Returns:
-    - const util::Timestamp& representing the completion date.
-*/
 const util::Timestamp& JobCard::getCompletionDate() const
 {
     return m_completionDate;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the job card.
-Parameters:
-    - id: New job card ID string.
-Returns:
-    - void
-*/
 void JobCard::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setBookingId
-Description: Sets the booking ID associated with the job card.
-Parameters:
-    - bookingId: New booking ID string.
-Returns:
-    - void
-*/
 void JobCard::setBookingId(const std::string& bookingId)
 {
     m_bookingId = bookingId;
 }
 
-/*
-Function: setBooking
-Description: Sets the associated ServiceBooking pointer.
-Parameters:
-    - booking: Pointer to the ServiceBooking object.
-Returns:
-    - void
-*/
 void JobCard::setBooking(ServiceBooking* booking)
 {
     m_booking = booking;
 }
 
-/*
-Function: setService
-Description: Sets the associated Service pointer.
-Parameters:
-    - service: Pointer to the Service object.
-Returns:
-    - void
-*/
 void JobCard::setService(Service* service)
 {
     m_service = service;
 }
 
-/*
-Function: setServiceId
-Description: Sets the service ID associated with the job card.
-Parameters:
-    - serviceId: New service ID string.
-Returns:
-    - void
-*/
 void JobCard::setServiceId(const std::string& serviceId)
 {
     m_serviceId = serviceId;
 }
 
-/*
-Function: setTechnicianId
-Description: Sets the technician ID associated with the job card.
-Parameters:
-    - technicianId: New technician ID string.
-Returns:
-    - void
-*/
 void JobCard::setTechnicianId(const std::string& technicianId)
 {
     m_technicianId = technicianId;
 }
 
-/*
-Function: setTechnician
-Description: Sets the pointer to the assigned technician.
-Parameters:
-    - technician: Pointer to the User object.
-Returns:
-    - void
-*/
 void JobCard::setTechnician(User* technician)
 {
     m_technician = technician;
 }
 
-/*
-Function: setAssignedDate
-Description: Sets the timestamp of when the job was assigned.
-Parameters:
-    - assignedDate: New timestamp for the assigned date.
-Returns:
-    - void
-*/
 void JobCard::setAssignedDate(const util::Timestamp& assignedDate)
 {
     m_assignedDate = assignedDate;
 }
 
-/*
-Function: setStatus
-Description: Sets the status of the job card.
-Parameter: util::ServiceJobStatus status - new job status
-Return type: void
-*/
 void JobCard::setStatus(util::ServiceJobStatus status)
 {
     m_status = status;
 }
 
-/*
-Function: setCompletionDate
-Description: Sets the timestamp of when the job was completed.
-Parameters:
-    - completionDate: New timestamp for the completion date.
-Returns:
-    - void
-*/
 void JobCard::setCompletionDate(const util::Timestamp& completionDate)
 {
     m_completionDate = completionDate;
 }
 
+/*
+Function: serialize
+Description: Serializes the job card into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized job card record
+*/
 std::string JobCard::serialize() const
 {
     std::ostringstream serializedJobCard;
@@ -344,6 +198,16 @@ std::string JobCard::serialize() const
     return serializedJobCard.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a JobCard object.
+Parameters:
+    - record: const std::string&, serialized job card record
+Returns:
+    - JobCard*: Pointer to the deserialized JobCard object
+Throws:
+    - std::runtime_error if timestamp parsing fails
+*/
 JobCard* JobCard::deserialize(const std::string& record)
 {
     std::string id, bookingId, serviceId, technicianId;
@@ -379,6 +243,14 @@ JobCard* JobCard::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for job card serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,BookingID,ServiceID,TechnicianID,AssignedDate,Status,CompletionDate")
+*/
 std::string JobCard::getHeaders()
 {
     return "ID,BookingID,ServiceID,TechnicianID,AssignedDate,Status,CompletionDate";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/JobCard.h

@@ -1,14 +1,5 @@
-/*
-File: JobCard.h
-Description: Header file declaring the JobCard class, which represents
-             a service job card containing booking, service, technician,
-             and status details.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
-#include "Enums.h"
 #include "Timestamp.h"
 #include "Enums.h"
 
@@ -30,6 +21,7 @@ private:
     util::Timestamp m_assignedDate;
     util::ServiceJobStatus m_status;
     util::Timestamp m_completionDate;
+
 public:
     JobCard();
     JobCard(const std::string& bookingId,

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Notification.cpp

@@ -1,11 +1,3 @@
-/*
-File: Notification.cpp
-Description: Implements the Notification class which represents system notifications in the Vehicle Service Management System.
-             Provides constructors, accessors, and mutators for notification details such as ID, recipient, title, message, and timestamp.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include "Notification.h"
 #include "StringHelper.h"
@@ -13,30 +5,10 @@ Date: 19-May-2026
 
 int Notification::m_uid = 0;
 
-/*
-Function: Notification
-Description: Default constructor that initializes a new notification with a unique ID and null recipient.
-Parameters:
-    - None
-Returns:
-    - A new Notification object.
-*/
 Notification::Notification()
     : m_id("NOT" + std::to_string(++m_uid)),
     m_recipient(nullptr) {}
 
-/*
-Function: Notification
-Description: Parameterized constructor that initializes a new notification with a unique ID and specified details.
-Parameters:
-    - recipientUserId: ID of the recipient user.
-    - recipient: Pointer to the User object representing the recipient.
-    - title: Title of the notification.
-    - message: Message content of the notification.
-    - createdAt: Timestamp of when the notification was created.
-Returns:
-    - A new Notification object.
-*/
 Notification::Notification(const std::string& recipientUserId, User* recipient, const std::string& title, const std::string& message, const util::Timestamp& createdAt)
     : m_id("NOT" + std::to_string(++m_uid)),
     m_recipientUserId(recipientUserId),
@@ -45,6 +17,19 @@ Notification::Notification(const std::string& recipientUserId, User* recipient,
     m_message(message),
     m_createdAt(createdAt) {}
 
+/*
+Function: Notification (parameterized constructor with ID)
+Description: Initializes a notification with an existing ID, recipient details,
+             title, message, and creation timestamp. Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique notification ID
+    - recipientUserId: const std::string&, ID of the recipient user
+    - title: const std::string&, notification title
+    - message: const std::string&, notification message
+    - createdAt: const util::Timestamp&, timestamp of creation
+Returns:
+    - A new Notification object
+*/
 Notification::Notification(const std::string& id, const std::string& recipientUserId, const std::string& title, const std::string& message, const util::Timestamp& createdAt)
     : m_id(id),
     m_recipientUserId(recipientUserId),
@@ -60,150 +45,74 @@ Notification::Notification(const std::string& id, const std::string& recipientUs
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the notification.
-Returns:
-    - const std::string& representing the notification ID.
-*/
 const std::string& Notification::getId() const 
 {
     return m_id;
 }
 
-/*
-Function: getRecipientUserId
-Description: Retrieves the recipient user ID associated with the notification.
-Returns:
-    - const std::string& representing the recipient user ID.
-*/
 const std::string& Notification::getRecipientUserId() const
 {
     return m_recipientUserId;
 }
 
-/*
-Function: getRecipient
-Description: Retrieves the pointer to the recipient user.
-Returns:
-    - User* representing the recipient.
-*/
 User* Notification::getRecipient() const
 {
     return m_recipient;
 }
 
-/*
-Function: getTitle
-Description: Retrieves the title of the notification.
-Returns:
-    - const std::string& representing the notification title.
-*/
 const std::string& Notification::getTitle() const
 {
     return m_title;
 }
 
-/*
-Function: getMessage
-Description: Retrieves the message content of the notification.
-Returns:
-    - const std::string& representing the notification message.
-*/
 const std::string& Notification::getMessage() const
 {
     return m_message;
 }
 
-/*
-Function: getCreatedAt
-Description: Retrieves the timestamp of when the notification was created.
-Returns:
-    - const util::Timestamp& representing the creation timestamp.
-*/
 const util::Timestamp& Notification::getCreatedAt() const
 {
     return m_createdAt;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the notification.
-Parameters:
-    - id: New notification ID string.
-Returns:
-    - void
-*/
 void Notification::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setRecipientUserId
-Description: Sets the recipient user ID for the notification.
-Parameters:
-    - recipientUserId: New recipient user ID string.
-Returns:
-    - void
-*/
 void Notification::setRecipientUserId(const std::string& recipientUserId)
 {
     m_recipientUserId = recipientUserId;
 }
 
-/*
-Function: setRecipient
-Description: Sets the recipient user pointer for the notification.
-Parameters:
-    - recipient: Pointer to the User object.
-Returns:
-    - void
-*/
 void Notification::setRecipient(User* recipient)
 {
     m_recipient = recipient;
 }
 
-/*
-Function: setTitle
-Description: Sets the title of the notification.
-Parameters:
-    - title: New notification title string.
-Returns:
-    - void
-*/
 void Notification::setTitle(const std::string& title)
 {
     m_title = title;
 }
 
-/*
-Function: setMessage
-Description: Sets the message content of the notification.
-Parameters:
-    - message: New notification message string.
-Returns:
-    - void
-*/
 void Notification::setMessage(const std::string& message)
 {
     m_message = message;
 }
 
-/*
-Function: setCreatedAt
-Description: Sets the timestamp of when the notification was created.
-Parameters:
-    - createdAt: New timestamp value.
-Returns:
-    - void
-*/
 void Notification::setCreatedAt(const util::Timestamp& createdAt)
 {
     m_createdAt = createdAt;
 }
 
+/*
+Function: serialize
+Description: Serializes the notification into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized notification record
+*/
 std::string Notification::serialize() const
 {
     std::ostringstream serializedNotification;
@@ -215,6 +124,16 @@ std::string Notification::serialize() const
     return serializedNotification.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a Notification object.
+Parameters:
+    - record: const std::string&, serialized notification record
+Returns:
+    - Notification*: Pointer to the deserialized Notification object
+Throws:
+    - std::runtime_error if timestamp parsing fails
+*/
 Notification* Notification::deserialize(const std::string& record)
 {
     std::string id, recipientUserId, title, message, createdAtTimestampString;
@@ -242,6 +161,14 @@ Notification* Notification::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for notification serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,RecipientID,Title,Message,Timestamp")
+*/
 std::string Notification::getHeaders()
 {
     return "ID,RecipientID,Title,Message,Timestamp";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Notification.h

@@ -1,11 +1,3 @@
-/*
-File: Notification.h
-Description: Declares the Notification class which represents system messages sent to users in the Vehicle Service Management System.
-             Each notification includes a unique ID, recipient details, title, message content, and timestamp of creation.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Timestamp.h"

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Service.cpp

@@ -1,12 +1,3 @@
-/*
-File: Service.cpp
-Description: Implements the Service class which represents a vehicle service in the Vehicle Service Management System.
-             Provides constructors, accessors, and mutators for service details such as ID, name, required inventory items,
-             labor cost, and state.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include "Service.h"
 #include "InventoryItem.h"
@@ -15,30 +6,11 @@ Date: 19-May-2026
 
 int Service::m_uid = 0;
 
-/*
-Function: Service
-Description: Default constructor that initializes a new service with a unique ID,
-             active state, and zero labor cost.
-Parameters:
-    - None
-Returns:
-    - A new Service object.
-*/
 Service::Service()
     : m_id("SRV" + std::to_string(++m_uid)),
     m_status(util::State::ACTIVE),
     m_laborCost(0.0) {}
 
-/*
-Function: Service
-Description: Parameterized constructor that initializes a new service with a unique ID and specified details.
-Parameters:
-    - name: Name of the service.
-    - requiredInventoryItems: Map of inventory items required for the service.
-    - laborCost: Labor cost associated with the service.
-Returns:
-    - A new Service object.
-*/
 Service::Service(const std::string& name, const util::Map<std::string, InventoryItem*>& requiredInventoryItems, double laborCost)
     : m_id("SRV" + std::to_string(++m_uid)),
     m_name(name),
@@ -54,6 +26,19 @@ Service::Service(const std::string& name, const util::Map<std::string, Inventory
     }
 }
 
+/*
+Function: Service (parameterized constructor with ID)
+Description: Initializes a service with an existing ID, name, inventory item IDs,
+             labor cost, and state. Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique service ID
+    - name: const std::string&, name of the service
+    - requiredInventoryItemIDs: const util::Vector<std::string>&, IDs of required inventory items
+    - laborCost: double, labor cost of the service
+    - status: util::State, state of the service (ACTIVE/INACTIVE)
+Returns:
+    - A new Service object
+*/
 Service::Service(const std::string& id, const std::string& name, const util::Vector<std::string>& requiredInventoryItemIDs, double laborCost, util::State status)
     : m_id(id),
     m_name(name),
@@ -68,100 +53,54 @@ Service::Service(const std::string& id, const std::string& name, const util::Vec
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the service.
-Returns:
-    - const std::string& representing the service ID.
-*/
 const std::string& Service::getId() const
 {
     return m_id;
 }
 
-/*
-Function: getName
-Description: Retrieves the name of the service.
-Returns:
-    - const std::string& representing the service name.
-*/
 const std::string& Service::getName() const
 {
     return m_name;
 }
 
+/*
+Function: getRequiredInventoryItemIDs
+Description: Retrieves the IDs of required inventory items for the service.
+Parameters:
+    - None
+Returns:
+    - const util::Vector<std::string>&: Inventory item IDs
+*/
 const util::Vector<std::string>& Service::getRequiredInventoryItemIDs() const
 {
     return m_requiredInventoryItemIDs;
 }
 
-/*
-Function: getRequiredInventoryItems
-Description: Retrieves the map of inventory items required for the service.
-Returns:
-    - const util::Map<std::string, InventoryItem*>& representing the required inventory items.
-*/
 const util::Map<std::string, InventoryItem*>& Service::getRequiredInventoryItems() const
 {
     return m_requiredInventoryItems;
 }
 
-/*
-Function: getLaborCost
-Description: Retrieves the labor cost associated with the service.
-Returns:
-    - double representing the labor cost.
-*/
 double Service::getLaborCost() const
 {
     return m_laborCost;
 }
 
-/*
-Function: getState
-Description: Retrieves the current state (ACTIVE/INACTIVE) of the service.
-Returns:
-    - util::State representing the service state.
-*/
 util::State Service::getState() const
 {
     return m_status;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the service.
-Parameters:
-    - id: New service ID string.
-Returns:
-    - void
-*/
 void Service::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setName
-Description: Sets the name of the service.
-Parameters:
-    - name: New service name string.
-Returns:
-    - void
-*/
 void Service::setName(const std::string& name)
 {
     m_name = name;
 }
 
-/*
-Function: setRequiredInventoryItems
-Description: Sets the inventory items required for the service.
-Parameters:
-    - requiredInventoryItems: Map of inventory items.
-Returns:
-    - void
-*/
 void Service::setRequiredInventoryItems(const util::Map<std::string, InventoryItem*>& requiredInventoryItems)
 {
     m_requiredInventoryItems = requiredInventoryItems;
@@ -174,32 +113,24 @@ void Service::setRequiredInventoryItems(const util::Map<std::string, InventoryIt
     }
 }
 
-/*
-Function: setLaborCost
-Description: Sets the labor cost for the service.
-Parameters:
-    - laborCost: New labor cost value.
-Returns:
-    - void
-*/
 void Service::setLaborCost(double laborCost)
 {
     m_laborCost = laborCost;
 }
 
-/*
-Function: setState
-Description: Sets the state (ACTIVE/INACTIVE) of the service.
-Parameters:
-    - status: New state value.
-Returns:
-    - void
-*/
 void Service::setState(util::State status)
 {
     m_status = status;
 }
 
+/*
+Function: getInventoryItemIDsAsString (static helper)
+Description: Converts a vector of inventory item IDs into a single string separated by '|'.
+Parameters:
+    - inventoryItemIds: const util::Vector<std::string>&, vector of inventory item IDs
+Returns:
+    - std::string: Concatenated inventory item IDs string
+*/
 static std::string getInventoryItemIDsAsString(const util::Vector<std::string>& inventoryItemIds)
 {
     int numberOfInventoryItems = inventoryItemIds.getSize();
@@ -215,6 +146,14 @@ static std::string getInventoryItemIDsAsString(const util::Vector<std::string>&
     return inventoryItemIDs;
 }
 
+/*
+Function: getInventoryItemIDsAsVector (static helper)
+Description: Converts a string of inventory item IDs separated by '|' into a vector.
+Parameters:
+    - inventoryItemIDsString: const std::string&, concatenated inventory item IDs string
+Returns:
+    - util::Vector<std::string>: Vector of inventory item IDs
+*/
 static util::Vector<std::string> getInventoryItemIDsAsVector(const std::string& inventoryItemIDsString)
 {
     util::Vector<std::string> inventoryItemIDs;
@@ -227,6 +166,14 @@ static util::Vector<std::string> getInventoryItemIDsAsVector(const std::string&
     return inventoryItemIDs;
 }
 
+/*
+Function: serialize
+Description: Serializes the service into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized service record
+*/
 std::string Service::serialize() const
 {
     std::ostringstream serializedService;
@@ -238,6 +185,16 @@ std::string Service::serialize() const
     return serializedService.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a Service object.
+Parameters:
+    - record: const std::string&, serialized service record
+Returns:
+    - Service*: Pointer to the deserialized Service object
+Throws:
+    - std::runtime_error if labor cost parsing fails
+*/
 Service* Service::deserialize(const std::string& record)
 {
     std::string id, name;
@@ -268,6 +225,14 @@ Service* Service::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for service serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,Name,InventoryIDs,LaborCost,Status")
+*/
 std::string Service::getHeaders()
 {
     return "ID,Name,InventoryIDs,LaborCost,Status";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/Service.h

@@ -1,12 +1,3 @@
-/*
-File: Service.h
-Description: Declares the Service class which represents a vehicle service in the Vehicle Service Management System.
-             Each service includes a unique ID, name, required inventory items, labor cost, and status.
-Author: Trenser
-Date: 19-May-2026
-*/
-
-
 #pragma once
 #include <string>
 #include "Map.h"

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/ServiceBooking.cpp

@@ -1,11 +1,3 @@
-/*
-File: ServiceBooking.cpp
-Description: Implementation file containing the method definitions of the
-             ServiceBooking class, including constructors, getters, and setters
-             for booking attributes.
-Author: Trenser
-Date:19-May-2026
-*/
 #include <stdexcept>
 #include <sstream>
 #include "ServiceBooking.h"
@@ -16,36 +8,12 @@ Date:19-May-2026
 
 int ServiceBooking::m_uid = 0;
 
-/*
-Function: ServiceBooking
-Description: Default constructor that initializes a new service booking with a unique ID,
-             null customer, and zero discount percentage.
-Parameters:
-    - None
-Returns:
-    - A new ServiceBooking object.
-*/
 ServiceBooking::ServiceBooking()
     : m_id("SRV" + std::to_string(++m_uid)),
     m_customer(nullptr),
     m_assignedTechnician(nullptr),
     m_discountPercentage(0.0) {}
 
-/*
-Function: ServiceBooking
-Description: Parameterized constructor that initializes a service booking
-             with customer, vehicle, technician, and discount details.
-Parameter: const std::string& id - booking ID
-           util::ServiceJobStatus status - current booking status
-           const util::Map<std::string, Service*>& services - map of services
-           const std::string& customerId - ID of the customer
-           User* customer - pointer to the customer object
-           const std::string& vehicleNumber - vehicle registration number
-           const std::string& vehicleBrand - brand of the vehicle
-           const std::string& vehicleModel - model of the vehicle
-           double discountPercentage - discount applied to the booking
-Return type: Constructor
-*/
 ServiceBooking::ServiceBooking(
     util::ServiceJobStatus status,
     const util::Map<std::string,
@@ -55,6 +23,8 @@ ServiceBooking::ServiceBooking(
     const std::string& vehicleNumber,
     const std::string& vehicleBrand,
     const std::string& vehicleModel,
+    const std::string& assignedTechnicianId,
+    User* assignedTechnician,
     double discountPercentage
 )
     : m_id("SRV" + std::to_string(++m_uid)),
@@ -65,8 +35,8 @@ ServiceBooking::ServiceBooking(
     m_vehicleNumber(vehicleNumber),
     m_vehicleBrand(vehicleBrand),
     m_vehicleModel(vehicleModel),
-    m_assignedTechnicianId(""),
+    m_assignedTechnicianId(assignedTechnicianId),
-    m_assignedTechnician(nullptr),
+    m_assignedTechnician(assignedTechnician),
     m_discountPercentage(discountPercentage)
 {
     int numberOfServices = m_services.getSize();
@@ -77,6 +47,24 @@ ServiceBooking::ServiceBooking(
     }
 }
 
+/*
+Function: ServiceBooking (parameterized constructor with ID)
+Description: Initializes a service booking with an existing ID, status, service IDs,
+             customer details, vehicle details, technician ID, and discount percentage.
+             Updates UID tracking based on ID.
+Parameters:
+    - id: const std::string&, unique booking ID
+    - status: util::ServiceJobStatus, job status of the booking
+    - serviceIDs: const util::Vector<std::string>&, IDs of booked services
+    - customerId: const std::string&, ID of the customer
+    - vehicleNumber: const std::string&, vehicle number
+    - vehicleBrand: const std::string&, vehicle brand
+    - vehicleModel: const std::string&, vehicle model
+    - assignedTechnicianId: const std::string&, ID of the assigned technician
+    - discountPercentage: double, discount applied
+Returns:
+    - A new ServiceBooking object
+*/
 ServiceBooking::ServiceBooking(
     const std::string& id,
     util::ServiceJobStatus status,
@@ -112,155 +100,79 @@ const std::string& ServiceBooking::getId() const
     return m_id;
 }
 
-/*
-Function: getStatus
-Description: Retrieves the current status of the service booking.
-Returns:
-    - util::ServiceJobStatus representing the booking status.
-*/
 util::ServiceJobStatus ServiceBooking::getStatus() const
 {
     return m_status;
 }
 
+/*
+Function: getServiceIDs
+Description: Retrieves the IDs of services booked.
+Parameters:
+    - None
+Returns:
+    - const util::Vector<std::string>&: Service IDs
+*/
 const util::Vector<std::string>& ServiceBooking::getServiceIDs() const
 {
     return m_serviceIDs;
 }
 
-/*
-Function: getServices
-Description: Retrieves the map of services included in the booking.
-Returns:
-    - const util::Map<std::string, Service*>& representing the services.
-*/
 const util::Map<std::string, Service*>& ServiceBooking::getServices() const
 {
     return m_services;
 }
 
-/*
-Function: getCustomerId
-Description: Retrieves the customer ID associated with the booking.
-Returns:
-    - const std::string& representing the customer ID.
-*/
 const std::string& ServiceBooking::getCustomerId() const
 {
     return m_customerId;
 }
 
-/*
-Function: getCustomer
-Description: Retrieves the pointer to the associated customer.
-Returns:
-    - User* representing the customer.
-*/
 User* ServiceBooking::getCustomer() const
 {
     return m_customer;
 }
 
-/*
-Function: getVehicleNumber
-Description: Retrieves the vehicle registration number.
-Returns:
-    - const std::string& representing the vehicle number.
-*/
 const std::string& ServiceBooking::getVehicleNumber() const
 {
     return m_vehicleNumber;
 }
 
-/*
-Function: getVehicleBrand
-Description: Retrieves the brand of the vehicle.
-Returns:
-    - const std::string& representing the vehicle brand.
-*/
 const std::string& ServiceBooking::getVehicleBrand() const
 {
     return m_vehicleBrand;
 }
 
-/*
-Function: getVehicleModel
-Description: Retrieves the model of the vehicle.
-Returns:
-    - const std::string& representing the vehicle model.
-*/
 const std::string& ServiceBooking::getVehicleModel() const
 {
     return m_vehicleModel;
 }
 
-/*
-Function: getAssignedTechnicianId
-Description: Retrieves the ID of the assigned technician.
-Returns:
-    - const std::string& representing the technician ID.
-*/
 const std::string& ServiceBooking::getAssignedTechnicianId() const
 {
     return m_assignedTechnicianId;
 }
 
-/*
+const User* ServiceBooking::getAssignedTechnician() const
-Function: getAssignedTechnician
-Description: Retrieves the technician object assigned to the booking.
-Parameter: None
-Return type: User*
-*/
-User* ServiceBooking::getAssignedTechnician() const
 {
     return m_assignedTechnician;
 }
 
-/*
-Function: getDiscountPercentage
-Description: Retrieves the discount percentage applied to the booking.
-Returns:
-    - double representing the discount percentage.
-*/
 double ServiceBooking::getDiscountPercentage() const
 {
     return m_discountPercentage;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the service booking.
-Parameters:
-    - id: New booking ID string.
-Returns:
-    - void
-*/
 void ServiceBooking::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setStatus
-Description: Sets the current status of the service booking.
-Parameters:
-    - status: New booking status value.
-Returns:
-    - void
-*/
 void ServiceBooking::setStatus(const util::ServiceJobStatus& status)
 {
     m_status = status;
 }
 
-/*
-Function: setServices
-Description: Sets the services included in the booking.
-Parameters:
-    - services: Map of services.
-Returns:
-    - void
-*/
 void ServiceBooking::setServices(const util::Map<std::string, Service*>& services)
 {
     m_services = services;
@@ -273,108 +185,54 @@ void ServiceBooking::setServices(const util::Map<std::string, Service*>& service
     }
 }
 
-/*
-Function: setCustomerId
-Description: Sets the customer ID associated with the booking.
-Parameters:
-    - customerId: New customer ID string.
-Returns:
-    - void
-*/
 void ServiceBooking::setCustomerId(const std::string& customerId)
 {
     m_customerId = customerId;
 }
 
-/*
-Function: setCustomer
-Description: Sets the pointer to the associated customer.
-Parameters:
-    - customer: Pointer to the User object.
-Returns:
-    - void
-*/
 void ServiceBooking::setCustomer(User* customer)
 {
     m_customer = customer;
 }
 
-/*
-Function: setVehicleNumber
-Description: Sets the vehicle registration number.
-Parameters:
-    - vehicleNumber: New vehicle number string.
-Returns:
-    - void
-*/
 void ServiceBooking::setVehicleNumber(const std::string& vehicleNumber)
 {
     m_vehicleNumber = vehicleNumber;
 }
 
-/*
-Function: setVehicleBrand
-Description: Sets the brand of the vehicle.
-Parameters:
-    - vehicleBrand: New vehicle brand string.
-Returns:
-    - void
-*/
 void ServiceBooking::setVehicleBrand(const std::string& vehicleBrand)
 {
     m_vehicleBrand = vehicleBrand;
 }
 
-/*
-Function: setVehicleModel
-Description: Sets the model of the vehicle.
-Parameters:
-    - vehicleModel: New vehicle model string.
-Returns:
-    - void
-*/
 void ServiceBooking::setVehicleModel(const std::string& vehicleModel)
 {
     m_vehicleModel = vehicleModel;
 }
 
-/*
-Function: setAssignedTechnicianId
-Description: Sets the ID of the assigned technician.
-Parameters:
-    - assignedTechnicianId: New technician ID string.
-Returns:
-    - void
-*/
 void ServiceBooking::setAssignedTechnicianId(const std::string& assignedTechnicianId)
 {
     m_assignedTechnicianId = assignedTechnicianId;
 }
 
-/*
-Function: setAssignedTechnician
-Description: Sets the technician object assigned to the booking.
-Parameter: User* assignedTechnician - pointer to the technician object
-Return type: void
-*/
 void ServiceBooking::setAssignedTechnician(User* assignedTechnician)
 {
     m_assignedTechnician = assignedTechnician;
 }
 
-/*
-Function: setDiscountPercentage
-Description: Sets the discount percentage applied to the booking.
-Parameters:
-    - discountPercentage: New discount percentage value.
-Returns:
-    - void
-*/
 void ServiceBooking::setDiscountPercentage(double discountPercentage)
 {
     m_discountPercentage = discountPercentage;
 }
 
+/*
+Function: getServiceIDsAsString (static helper)
+Description: Converts a vector of service IDs into a single string separated by '|'.
+Parameters:
+    - serviceIDs: const util::Vector<std::string>&, vector of service IDs
+Returns:
+    - std::string: Concatenated service IDs string
+*/
 static std::string getServiceIDsAsString(const util::Vector<std::string>& serviceIDs)
 {
     int numberOfServices = serviceIDs.getSize();
@@ -390,6 +248,14 @@ static std::string getServiceIDsAsString(const util::Vector<std::string>& servic
     return serviceIDsString;
 }
 
+/*
+Function: getServiceIDsAsVector (static helper)
+Description: Converts a string of service IDs separated by '|' into a vector.
+Parameters:
+    - serviceIDsString: const std::string&, concatenated service IDs string
+Returns:
+    - util::Vector<std::string>: Vector of service IDs
+*/
 static util::Vector<std::string> getServiceIDsAsVector(const std::string& serviceIDsString)
 {
     util::Vector<std::string> serviceIDs;
@@ -402,6 +268,14 @@ static util::Vector<std::string> getServiceIDsAsVector(const std::string& servic
     return serviceIDs;
 }
 
+/*
+Function: serialize
+Description: Serializes the service booking into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized booking record
+*/
 std::string ServiceBooking::serialize() const
 {
     std::ostringstream serializedBooking;
@@ -417,6 +291,16 @@ std::string ServiceBooking::serialize() const
     return serializedBooking.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a ServiceBooking object.
+Parameters:
+    - record: const std::string&, serialized booking record
+Returns:
+    - ServiceBooking*: Pointer to the deserialized ServiceBooking object
+Throws:
+    - std::runtime_error if discount percentage parsing fails
+*/
 ServiceBooking* ServiceBooking::deserialize(const std::string& record)
 {
     std::string id, customerId, vehicleNumber, vehicleBrand, vehicleModel, assignedTechnicianId;
@@ -455,6 +339,14 @@ ServiceBooking* ServiceBooking::deserialize(const std::string& record)
     );
 }
 
+/*
+Function: getHeaders
+Description: Retrieves the CSV headers for service booking serialization.
+Parameters:
+    - None
+Returns:
+    - std::string: Header string ("ID,Status,ServiceIDs,CustomerID,VehicleNumber,VehicleBrand,VehicleModel,AssignedTechnicianID,DiscountPercentage")
+*/
 std::string ServiceBooking::getHeaders()
 {
     return "ID,Status,ServiceIDs,CustomerID,VehicleNumber,VehicleBrand,VehicleModel,AssignedTechnicianID,DiscountPercentage";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/ServiceBooking.h

@@ -1,11 +1,3 @@
-/*
-File: ServiceBooking.h
-Description: Header file declaring the ServiceBooking class, which represents
-             a booking of services by a customer, including vehicle details,
-             assigned technician, and discount information.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
 #include "Map.h"
@@ -42,6 +34,8 @@ public:
         const std::string& vehicleNumber,
         const std::string& vehicleBrand,
         const std::string& vehicleModel,
+        const std::string& assignedTechnicianId,
+        User* assignedTechnician,
         double discountPercentage
     );
     ServiceBooking(
@@ -65,7 +59,7 @@ public:
     const std::string& getVehicleBrand() const;
     const std::string& getVehicleModel() const;
     const std::string& getAssignedTechnicianId() const;
-    User* getAssignedTechnician() const;
+    const User* getAssignedTechnician() const;
     double getDiscountPercentage() const;
     void setId(const std::string& id);
     void setStatus(const util::ServiceJobStatus& status);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/User.cpp

@@ -1,12 +1,3 @@
-/*
-File: User.cpp
-Description: Implements the User class which represents system users in the Vehicle Service Management System.
-             Provides constructors, destructor, accessors, and mutators for user details such as ID, username,
-             password, name, phone, email, role, state, and notifications.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #include <sstream>
 #include "User.h"
 #include "Notification.h"
@@ -16,33 +7,11 @@ Date: 19-May-2026
 
 int User::m_uid = 0;
 
-/*
-Function: User
-Description: Default constructor that initializes a new user with a unique ID,
-             default role as CUSTOMER, and active state.
-Parameters:
-    - None
-Returns:
-    - A new User object.
-*/
 User::User()
     : m_id("USR" + std::to_string(++m_uid)),
     m_type(util::UserType::CUSTOMER),
     m_status(util::State::ACTIVE) {}
 
-/*
-Function: User
-Description: Parameterized constructor that initializes a new user with a unique ID and specified details.
-Parameters:
-    - userName: Username for login.
-    - password: Password for authentication.
-    - name: Full name of the user.
-    - phone: Phone number of the user.
-    - email: Email address of the user.
-    - role: Role of the user (CUSTOMER, ADMIN, TECHNICIAN, etc.).
-Returns:
-    - A new User object.
-*/
 User::User(const std::string& userName, const std::string& password, const std::string& name, const std::string& phone, const std::string& email, util::UserType role)
     : m_id("USR" + std::to_string(++m_uid)),
     m_userName(userName),
@@ -53,6 +22,22 @@ User::User(const std::string& userName, const std::string& password, const std::
     m_type(role),
     m_status(util::State::ACTIVE) {}
 
+/*
+Function: User (parameterized constructor with ID)
+Description: Initializes a user with an existing ID, credentials, personal details,
+             role, and state. Updates UID tracking based on ID.
+Parameters:
+    - userId: const std::string&, unique user ID
+    - userName: const std::string&, username
+    - password: const std::string&, password
+    - name: const std::string&, full name
+    - phone: const std::string&, phone number
+    - email: const std::string&, email address
+    - role: util::UserType, role of the user
+    - status: util::State, state of the user (ACTIVE/INACTIVE)
+Returns:
+    - A new User object
+*/
 User::User(const std::string& userId, const std::string& userName, const std::string& password, const std::string& name, const std::string& phone, const std::string& email, util::UserType role, util::State status)
     : m_id(userId),
     m_userName(userName),
@@ -70,14 +55,6 @@ User::User(const std::string& userId, const std::string& userName, const std::st
     }
 }
 
-/*
-Function: ~User
-Description: Destructor that cleans up dynamically allocated notifications associated with the user.
-Parameters:
-    - None
-Returns:
-    - void
-*/
 User::~User()
 {
     auto values = m_notifications.getValues();
@@ -87,225 +64,108 @@ User::~User()
     }
 }
 
-/*
-Function: getId
-Description: Retrieves the unique ID of the user.
-Returns:
-    - const std::string& representing the user ID.
-*/
 const std::string& User::getId() const
 {
     return m_id;
 }
 
-/*
-Function: getUserName
-Description: Retrieves the username of the user.
-Returns:
-    - const std::string& representing the username.
-*/
 const std::string& User::getUserName() const
 {
     return m_userName;
 }
 
-/*
-Function: getPassword
-Description: Retrieves the password of the user.
-Returns:
-    - const std::string& representing the password.
-*/
 const std::string& User::getPassword() const
 {
     return m_password;
 }
 
-/*
-Function: getName
-Description: Retrieves the full name of the user.
-Returns:
-    - const std::string& representing the name.
-*/
 const std::string& User::getName() const
 {
     return m_name;
 }
 
-/*
-Function: getPhone
-Description: Retrieves the phone number of the user.
-Returns:
-    - const std::string& representing the phone number.
-*/
 const std::string& User::getPhone() const
 {
     return m_phone;
 }
 
-/*
-Function: getEmail
-Description: Retrieves the email address of the user.
-Returns:
-    - const std::string& representing the email.
-*/
 const std::string& User::getEmail() const
 {
     return m_email;
 }
 
-/*
-Function: getNotifications
-Description: Retrieves the map of notifications associated with the user.
-Returns:
-    - util::Map<std::string, Notification*>& representing the notifications.
-*/
 util::Map<std::string, Notification*>& User::getNotifications()
 {
     return m_notifications;
 }
 
-/*
-Function: getUserType
-Description: Retrieves the role of the user.
-Returns:
-    - util::UserType representing the user role.
-*/
 util::UserType User::getUserType() const
 {
     return m_type;
 }
 
-/*
-Function: getState
-Description: Retrieves the current state (ACTIVE/INACTIVE) of the user.
-Returns:
-    - util::State representing the user state.
-*/
 util::State User::getState() const
 {
     return m_status;
 }
 
-/*
-Function: setId
-Description: Sets the unique ID of the user.
-Parameters:
-    - id: New user ID string.
-Returns:
-    - void
-*/
 void User::setId(const std::string& id)
 {
     m_id = id;
 }
 
-/*
-Function: setUserName
-Description: Sets the username of the user.
-Parameters:
-    - userName: New username string.
-Returns:
-    - void
-*/
 void User::setUserName(const std::string& userName)
 {
     m_userName = userName;
 }
 
-/*
-Function: setPassword
-Description: Sets the password of the user.
-Parameters:
-    - password: New password string.
-Returns:
-    - void
-*/
 void User::setPassword(const std::string& password)
 {
     m_password = password;
 }
 
-/*
-Function: setName
-Description: Sets the full name of the user.
-Parameters:
-    - name: New name string.
-Returns:
-    - void
-*/
 void User::setName(const std::string& name)
 {
     m_name = name;
 }
 
-/*
-Function: setPhone
-Description: Sets the phone number of the user.
-Parameters:
-    - phone: New phone number string.
-Returns:
-    - void
-*/
 void User::setPhone(const std::string& phone)
 {
     m_phone = phone;
 }
 
-/*
-Function: setEmail
-Description: Sets the email address of the user.
-Parameters:
-    - email: New email string.
-Returns:
-    - void
-*/
 void User::setEmail(const std::string& email)
 {
     m_email = email;
 }
 
-/*
-Function: addNotification
-Description: Adds a new notification to the user’s notification map.
-Parameters:
-    - notification: Pointer to the Notification object.
-Returns:
-    - void
-*/
 void User::addNotification(Notification* notification)
-{
-    if (notification)
 {
     m_notifications.insert(notification->getId(), notification);
 }
-}
 
-/*
-Function: setRole
-Description: Sets the role of the user.
-Parameters:
-    - role: New user role value.
-Returns:
-    - void
-*/
 void User::setRole(util::UserType role)
 {
     m_type = role;
 }
 
-/*
-Function: setState
-Description: Sets the state (ACTIVE/INACTIVE) of the user.
-Parameters:
-    - status: New state value.
-Returns:
-    - void
-*/
 void User::setState(util::State status)
 {
     m_status = status;
 }
 
+void User::update(Notification* notification)
+{
+}
+
+/*
+Function: serialize
+Description: Serializes the user into a CSV-formatted string.
+Parameters:
+    - None
+Returns:
+    - std::string: Serialized user record
+*/
 std::string User::serialize() const
 {
     std::ostringstream serializedUser;
@@ -320,6 +180,14 @@ std::string User::serialize() const
     return serializedUser.str();
 }
 
+/*
+Function: deserialize
+Description: Deserializes a CSV-formatted string into a User object.
+Parameters:
+    - record: const std::string&, serialized user record
+Returns:
+    - User*: Pointer to the deserialized User object
+*/
 User* User::deserialize(const std::string& record)
 {
     std::string id, name, username, phone, password, email;
@@ -345,8 +213,15 @@ User* User::deserialize(const std::string& record)
         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";
 }
-

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/models/User.h

@@ -1,12 +1,3 @@
-/*
-File: User.h
-Description: Declares the User class which represents system users in the Vehicle Service Management System.
-             Each user has a unique ID, credentials, personal details, notifications, role type, and status.
-             The User class also implements the Observer interface to handle notifications.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Map.h"
@@ -48,9 +39,10 @@ public:
     void setName(const std::string& name);
     void setPhone(const std::string& phone);
     void setEmail(const std::string& email);
-    void addNotification(Notification* notification) override;
+    void addNotification(Notification* notification);
     void setRole(util::UserType role);
     void setState(util::State status);
+    void update(Notification* notification) override;
     std::string serialize() const;
     static User* deserialize(const std::string&);
     static std::string getHeaders();

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

@@ -1,66 +1,3 @@
-/*
-File: AuthenticationManagementService.cpp
-Description: Implementation file containing the method definitions of the
-			 AuthenticationManagementService class, including logout and
-			 password change logic.
-Author: Trenser
-Date:19-May-2026
-*/
-#include <stdexcept>
 #include "AuthenticationManagementService.h"
-#include "User.h"
 
 User* AuthenticationManagementService::m_authenticatedUser = nullptr;
-
-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++)
-	{
-		User* user = users.getValueAt(index);
-		if (username == user->getUserName())
-		{
-			if (password == user->getPassword())
-			{
-				m_authenticatedUser = user;
-				return true;
-			}
-			return false;
-		}
-	}
-	return false;
-}
-
-User* AuthenticationManagementService::getAuthenticatedUser()
-{
-	return m_authenticatedUser;
-}
-
-/*
-Function: logout
-Description: Logs out the currently authenticated user by clearing the
-			 static authenticated user pointer.
-Parameter: None
-Return type: void
-*/
-void AuthenticationManagementService::logout()
-{
-	m_authenticatedUser = nullptr;
-}
-
-/*
-Function: changePassword
-Description: Changes the password of the currently authenticated user.
-			 Throws an exception if no user is logged in.
-Parameter: const std::string& newPassword - new password to set
-Return type: void
-*/
-void AuthenticationManagementService::changePassword(const std::string& newPassword)
-{
-	if (m_authenticatedUser == nullptr)
-	{
-		throw std::runtime_error("There is no user currently logged in!");
-	}
-	m_authenticatedUser->setPassword(newPassword);
-}

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

@@ -1,11 +1,3 @@
-/*
-File: AuthenticationManagementService.h
-Description: Header file declaring the AuthenticationManagementService class, which manages
-             user authentication, login, logout, password changes, and retrieval of the
-             authenticated user.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
 #include "DataStore.h"

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

@@ -1,205 +1,28 @@
 /*
 File: InventoryManagementService.cpp
-Description: Implementation file containing the method definitions of the
+Description: Implements the InventoryManagementService class, which manages inventory
-             InventoryManagementService class, including inventory operations
+			 items and observer relationships within the system. Provides methods
-             and notification handling.
+			 for loading and saving inventory items from persistent storage, as well
+			 as attaching and persisting observers for notification handling.
 Author: Trenser
-Date:19-May-2026
+Date: 22-May-2026
 */
+
 #include "InventoryManagementService.h"
-#include "Config.h"
-#include "Vector.h"
-#include "Enums.h"
-#include "InventoryItem.h"
-#include "Config.h"
-#include "User.h"
-#include "Factory.h"
-#include "Timestamp.h"
 #include "FileManager.h"
+#include "InventoryItem.h"
 #include "Utility.h"
-
+#include "Config.h"
-util::Map<std::string, User*> InventoryManagementService::m_observers{};
 
 /*
-Function: addInventoryItem
+Function: getObserverIDs
-Description: Creates a new inventory item using the Factory and inserts it
+Description: Retrieves the IDs of all observers currently attached to the
-			 into the DataStore.
+			 InventoryManagementService.
-Parameter: const std::string& partName - name of the part
+Parameters:
-		   int quantity - initial quantity of the part
+	- None
-		   double price - price of the part
+Returns:
-Return type: void
+	- util::Vector<std::string>: Vector of observer user IDs
 */
-void InventoryManagementService::addInventoryItem(const std::string& partName, int quantity, double price)
-{
-	InventoryItem* newItem = Factory::getObject<InventoryItem>(partName, quantity, price);
-	m_dataStore.getInventoryItems().insert(newItem->getId(), newItem);
-}
-
-/*
-Function: addInventoryItemStock
-Description: Increases the stock quantity of an existing inventory item.
-Parameter: const std::string& selectedItemId - ID of the inventory item
-		   int quantity - quantity to add
-Return type: void
-*/
-void InventoryManagementService::addInventoryItemStock(const std::string& selectedItemId, int quantity)
-{
-	int index = m_dataStore.getInventoryItems().find(selectedItemId);
-	if (index != -1)
-	{
-		InventoryItem* item = m_dataStore.getInventoryItems().getValueAt(index);
-		if (item != nullptr)
-		{
-			int totalQuantity = item->getQuantity() + quantity;
-			item->setQuantity(totalQuantity);
-		}
-	}
-}
-
-/*
-Function: getInventoryItems
-Description: Retrieves all inventory items stored in the DataStore.
-Parameter: None
-Return type: util::Map<std::string, InventoryItem*>
-*/
-util::Map<std::string, InventoryItem*> InventoryManagementService::getInventoryItems()
-{
-	return m_dataStore.getInventoryItems();
-}
-
-/*
-Function: removeInventoryItem
-Description: Marks an inventory item as inactive instead of deleting it.
-Parameter: const std::string& inventoryItemID - ID of the inventory item
-Return type: void
-*/
-void InventoryManagementService::removeInventoryItem(const std::string& inventoryItemID)
-{
-	int index = m_dataStore.getInventoryItems().find(inventoryItemID);
-	if (index != -1)
-	{
-		InventoryItem* item = m_dataStore.getInventoryItems().getValueAt(index);
-		if (item != nullptr)
-		{
-			item->setState(util::State::INACTIVE);
-		}
-	}
-}
-
-/*
-Function: getInventoryItem
-Description: Retrieves a specific inventory item by its ID from the DataStore.
-Parameter: const std::string& inventoryItemID - ID of the inventory item
-Return type: InventoryItem*
-*/
-InventoryItem* InventoryManagementService::getInventoryItem(const std::string& inventoryItemID)
-{
-	int index = m_dataStore.getInventoryItems().find(inventoryItemID);
-	if (index != -1)
-	{
-		return m_dataStore.getInventoryItems().getValueAt(index);
-	}
-	return nullptr;
-}
-
-void InventoryManagementService::attach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) == -1)
-		{
-			m_observers[userID] = user;
-		}
-	}
-}
-
-void InventoryManagementService::detach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) != -1)
-		{
-			m_observers.remove(userID);
-		}
-	}
-}
-
-void InventoryManagementService::sendNotification(User* user, const std::string& title, const std::string& message)
-{
-	if (user)
-	{
-		if (m_observers.find(user->getId()) != -1)
-		{
-			Notification* notification =
-				Factory::getObject<Notification>(
-					user->getId(),
-					user,
-					"InventoryManagementService: " + title,
-					message,
-					util::Timestamp()
-				);
-			if (notification)
-			{
-				user->addNotification(notification);
-			}
-			else
-			{
-				throw std::runtime_error("Failed to create notification");
-			}
-		}
-	}
-}
-
-static void sendLowStockAlertsToAdmins(InventoryManagementService& inventoryManagementService, const InventoryItem* inventoryItem, const util::Vector<User*>& adminUsers)
-{
-	int adminUsersSize = adminUsers.getSize();
-	for (int index = 0; index < adminUsersSize; index++)
-	{
-		inventoryManagementService.sendNotification(
-			adminUsers[index],
-			"Low Stock Alert",
-			"The inventory item with ID " + inventoryItem->getId() +
-			" has very low quantity in the inventory"
-			);
-	}
-}
-
-void InventoryManagementService::sendLowStockAlerts()
-{
-	auto& inventoryItems = m_dataStore.getInventoryItems();
-	if (inventoryItems.isEmpty())
-	{
-		return;
-	}
-	int inventoryItemsSize = inventoryItems.getSize();
-	auto& usersMap = m_dataStore.getUsers();
-	int usersMapSize = usersMap.getSize();
-	util::Vector<User*> adminUsers;
-	for (int index = 0; index < usersMapSize; index++)
-	{
-		User* user = usersMap.getValueAt(index);
-		if (user->getUserType() == util::UserType::ADMIN)
-		{
-			adminUsers.push_back(user);
-		}
-	}
-	int adminUsersSize = adminUsers.getSize();
-	if (adminUsersSize < 1)
-	{
-		throw std::runtime_error("The system has no admins present!");
-	}
-	for (int index = 0; index <= inventoryItemsSize; index++)
-	{
-		InventoryItem* inventoryItem = inventoryItems.getValueAt(index);
-		if (inventoryItem && inventoryItem->getQuantity() < config::threshold::INVENTORY_LOW_STOCK_THRESHOLD)
-		{
-			sendLowStockAlertsToAdmins(*this, inventoryItem, adminUsers);
-		}
-	}
-}
-
 util::Vector<std::string> InventoryManagementService::getObserverIDs()
 {
 	util::Vector<std::string> observerIDs;
@@ -215,6 +38,15 @@ util::Vector<std::string> InventoryManagementService::getObserverIDs()
 	return observerIDs;
 }
 
+/*
+Function: loadInventoryItems
+Description: Loads inventory items from persistent storage into the datastore.
+			 Uses FileManager to deserialize inventory items from the configured file.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void InventoryManagementService::loadInventoryItems()
 {
 	util::FileManager<InventoryItem> inventoryItemFileManager(config::file::INVENTORYITEM_FILE);
@@ -227,6 +59,15 @@ void InventoryManagementService::loadInventoryItems()
 	}
 }
 
+/*
+Function: saveInventoryItems
+Description: Saves inventory items from the datastore to persistent storage.
+			 Uses FileManager to serialize inventory items into the configured file.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void InventoryManagementService::saveInventoryItems()
 {
 	util::FileManager<InventoryItem> inventoryItemFileManager(config::file::INVENTORYITEM_FILE);
@@ -234,11 +75,29 @@ void InventoryManagementService::saveInventoryItems()
 	inventoryItemFileManager.save(inventoryItems);
 }
 
+/*
+Function: loadObservers
+Description: Loads observer IDs from persistent storage and attaches corresponding
+			 users as observers to the InventoryManagementService.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void InventoryManagementService::loadObservers()
 {
 	util::loadObservers(config::file::INVENTORYMANAGEMENTOBSERVERS, this, m_dataStore);
 }
 
+/*
+Function: saveObservers
+Description: Saves the current observer IDs of the InventoryManagementService
+			 to persistent storage for future retrieval.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void InventoryManagementService::saveObservers()
 {
 	util::saveObservers(config::file::INVENTORYMANAGEMENTOBSERVERS, this);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/InventoryManagementService.h

@@ -1,11 +1,3 @@
-/*
-File: InventoryManagementService.h
-Description: Header file declaring the InventoryManagementService class,
-             which manages inventory items, stock updates, and notifications
-             related to low stock alerts. Inherits from NotificationManagementService.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
 #include "Map.h"
@@ -27,7 +19,6 @@ public:
     InventoryItem* getInventoryItem(const std::string& inventoryItemID);
     void addInventoryItem(const std::string& partName, int quantity, double price);
     void removeInventoryItem(const std::string& inventoryItemID);
-    void addInventoryItemStock(const std::string& selectedItemId, int quantity);
     void sendLowStockAlerts();
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/NotificationManagementService.h

@@ -1,15 +1,6 @@
-/*
-File: NotificationManagementService.h
-Description: Declares the NotificationManagementService abstract class which defines the contract for managing notifications in the Vehicle Service Management System.
-			 Implements the Subject interface and provides pure virtual methods for sending notifications and managing user subscriptions (attach/detach).
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Subject.h"
-#include "Notification.h"
 #include "User.h"
 
 class NotificationManagementService : public Subject

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

@@ -1,229 +1,19 @@
-/*
-File: PaymentManagementService.cpp
-Description: Implements the PaymentManagementService class which manages payment-related operations
-			 in the Vehicle Service Management System. Provides functionality for attaching/detaching observers,
-			 sending notifications, and issuing payment reminders based on invoice status and thresholds.
-Author: Trenser
-Date: 20-May-2026
-*/
-
 #include <stdexcept>
 #include "PaymentManagementService.h"
-#include "Config.h"
-#include "Enums.h"
-#include "Factory.h"
-#include "FileManager.h"
-#include "InventoryItem.h"
 #include "Invoice.h"
-#include "JobCard.h"
+#include "FileManager.h"
-#include "Service.h"
-#include "ServiceBooking.h"
-#include "Timestamp.h"
-#include "User.h"
 #include "Utility.h"
-
+#include "Config.h"
-util::Map<std::string, User*> PaymentManagementService::m_observers{};
-
-static void createInventoryItemsMap(util::Map<std::string, InventoryItem*>& completeInventoryItemMapOfBooking, const Service* currentService)
-{
-	auto& currentRequiredInventoryItems = currentService->getRequiredInventoryItems();
-	for (int iterator = 0; iterator < currentRequiredInventoryItems.getSize(); iterator++)
-	{
-		auto& currentRequiredInventoryItem = currentRequiredInventoryItems.getValueAt(iterator);
-		completeInventoryItemMapOfBooking.insert(currentRequiredInventoryItem->getId(), currentRequiredInventoryItem);
-	}
-}
-
-void PaymentManagementService::generateInvoice(ServiceBooking* booking)
-{
-	if (!booking)
-	{
-		throw std::runtime_error("Invoice generation failed: booking is null.");
-	}
-	double totalLabourCost = 0, totalPartsCost = 0, totalServiceCost = 0;
-	double discountPercentage = booking->getDiscountPercentage();
-	std::string bookingID = booking->getId();
-	util::Map<std::string, Service*> servicesInTheBookedService = booking->getServices();
-	util::Map<std::string, InventoryItem*> completeInventoryItemMapOfBooking;
-	util::Map<std::string, JobCard*> currentJobCards = m_dataStore.getJobCards();
-	for (int iterator = 0; iterator < currentJobCards.getSize(); iterator++)
-	{
-		JobCard* currentJobCard = currentJobCards.getValueAt(iterator);
-		if (currentJobCard->getBookingId() == bookingID && currentJobCard->getStatus() != util::ServiceJobStatus::COMPLETED)
-		{
-			throw std::runtime_error("Invoice generation failed: not all job cards are completed for booking '" + bookingID + "'.");
-		}
-	}
-	for (int iterator = 0; iterator < servicesInTheBookedService.getSize(); iterator++)
-	{
-		Service* currentService = servicesInTheBookedService.getValueAt(iterator);
-		if (currentService)
-		{
-			createInventoryItemsMap(completeInventoryItemMapOfBooking, currentService);
-			totalLabourCost += currentService->getLaborCost();
-			totalPartsCost += util::calculatePartsCost(currentService);
-		}
-	}
-	totalServiceCost = totalLabourCost + totalPartsCost;
-	totalServiceCost -= (totalServiceCost * (discountPercentage / 100));
-	Invoice* invoice = Factory::getObject<Invoice>(bookingID, booking, util::Timestamp(), totalLabourCost, completeInventoryItemMapOfBooking, totalPartsCost, discountPercentage, totalServiceCost, util::Timestamp(), util::PaymentMode::NOTSET, util::PaymentStatus::PENDING);
-	util::Map<std::string, Invoice*>& currentInvoices = m_dataStore.getInvoices();
-	currentInvoices.insert(invoice->getId(), invoice);
-}
-
-util::Map<std::string, Invoice*> PaymentManagementService::getInvoices(const std::string& customerID)
-{
-	util::Map<std::string, Invoice*>& currentInvoices = m_dataStore.getInvoices();
-	util::Map<std::string, Invoice*> currentUserInvoices;
-	for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
-	{
-		Invoice* currentInvoice = currentInvoices.getValueAt(iterator);
-		if (currentInvoice->getBooking()->getCustomerId() == customerID)
-		{
-			currentUserInvoices.insert(currentInvoice->getId(), currentInvoice);
-		}
-	}
-	return currentUserInvoices;
-}
-
-void PaymentManagementService::completePayment(const std::string& invoiceID, util::PaymentMode paymentMode)
-{
-	auto& currentInvoices = m_dataStore.getInvoices();
-	int invoiceIndex = currentInvoices.find(invoiceID);
-	if (invoiceIndex != -1)
-	{
-		Invoice* invoice = currentInvoices.getValueAt(invoiceIndex);
-		User* currentUser = invoice->getBooking()->getCustomer();
-		invoice->setPaymentMethod(paymentMode);
-		invoice->setPaymentDate(util::Timestamp());
-		invoice->setStatus(util::PaymentStatus::COMPLETED);
-		std::string title, message;
-		title = "Payment successful";
-		message = "Payment successful for invoice ID " + invoiceID;
-		sendNotification(currentUser, title, message);
-	}
-	else
-	{
-		throw std::runtime_error("Payment failed: invalid invoice ID.");
-	}
-}
 
 /*
-Function: attach
+Function: getObserverIDs
-Description: Attaches a user as an observer to the PaymentManagementService for receiving notifications.
+Description: Retrieves the IDs of all observers currently attached to the
-Parameters:
+             PaymentManagementService.
-	- user: Pointer to the User object to be attached.
-Returns:
-	- void
-*/
-void PaymentManagementService::attach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) == -1)
-		{
-			m_observers[userID] = user;
-		}
-	}
-}
-
-/*
-Function: detach
-Description: Detaches a user from the observer list of the PaymentManagementService.
-Parameters:
-	- user: Pointer to the User object to be detached.
-Returns:
-	- void
-*/
-void PaymentManagementService::detach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) != -1)
-		{
-			m_observers.remove(userID);
-		}
-	}
-}
-
-/*
-Function: sendNotification
-Description: Sends a notification to a user if they are registered as an observer.
-Parameters:
-	- user: Pointer to the User object to receive the notification.
-	- title: Title of the notification.
-	- message: Message content of the notification.
-Returns:
-	- void
-Throws:
-	- std::runtime_error if notification creation fails.
-*/
-void PaymentManagementService::sendNotification(User* user, const std::string& title, const std::string& message)
-{
-	if (user)
-	{
-		if (m_observers.find(user->getId()) != -1)
-		{
-			Notification* notification =
-				Factory::getObject<Notification>(
-					user->getId(),
-					user,
-					"PaymentManagementService: " + title,
-					message,
-					util::Timestamp()
-				);
-			if (notification)
-			{
-				user->addNotification(notification);
-			}
-			else
-			{
-				throw std::runtime_error("Failed to create notification");
-			}
-		}
-	}
-}
-
-/*
-Function: sendPaymentReminders
-Description: Iterates through all invoices in the datastore and sends payment reminders to customers
-			 whose invoices are pending beyond the configured threshold duration.
 Parameters:
     - None
 Returns:
-	- void
+    - util::Vector<std::string>: Vector of observer user IDs
 */
-void PaymentManagementService::sendPaymentReminders()
-{
-	auto& invoicesMap = m_dataStore.getInvoices();
-	int invoicesMapSize = invoicesMap.getSize();
-	for (int index = 0; index < invoicesMapSize; index++)
-	{
-		const Invoice* invoice = invoicesMap.getValueAt(index);
-		if (invoice && invoice->getStatus() == util::PaymentStatus::PENDING)
-		{
-			util::Timestamp invoiceCreationTimestamp = invoice->getInvoiceDate();
-			util::Timestamp currentTimestamp;
-			if (util::Timestamp::getDurationInHours(invoiceCreationTimestamp, currentTimestamp) >= config::threshold::PAYMENT_REMINDER_THRESHOLD_HOURS)
-			{
-				const ServiceBooking* serviceBooking = invoice->getBooking();
-				if (serviceBooking)
-				{
-					User* customer = serviceBooking->getCustomer();
-					if (customer)
-					{
-						sendNotification(customer,
-							"Payment Reminder",
-							"Your payment for Invoice ID " + invoice->getId() + " is still pending.Please complete the payment." + invoice->getId());
-					}
-				}
-			}
-		}
-	}
-}
-
 util::Vector<std::string> PaymentManagementService::getObserverIDs()
 {
 	util::Vector<std::string> observerIDs;
@@ -239,6 +29,19 @@ util::Vector<std::string> PaymentManagementService::getObserverIDs()
 	return observerIDs;
 }
 
+/*
+Function: loadInvoices
+Description: Loads invoices from persistent storage into the datastore.
+             Validates associated service bookings and inventory parts before
+             attaching them to each invoice. Throws exceptions if invalid IDs
+             are encountered.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if a booking ID or part ID is invalid
+*/
 void PaymentManagementService::loadInvoices()
 {
     util::FileManager<Invoice> invoiceFileManager(config::file::INVOICE_FILE);
@@ -272,6 +75,16 @@ void PaymentManagementService::loadInvoices()
         invoices[invoice->getId()] = invoice;
     }
 }
+
+/*
+Function: saveInvoices
+Description: Saves invoices from the datastore to persistent storage.
+             Uses FileManager to serialize invoices into the configured file.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void PaymentManagementService::saveInvoices()
 {
     util::FileManager<Invoice> invoiceFileManager(config::file::INVOICE_FILE);
@@ -279,11 +92,31 @@ void PaymentManagementService::saveInvoices()
     invoiceFileManager.save(invoices);
 }
 
+/*
+Function: loadObservers
+Description: Loads observer IDs from persistent storage and attaches corresponding
+             users as observers to the PaymentManagementService.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if an observer ID is invalid (not found in datastore)
+*/
 void PaymentManagementService::loadObservers()
 {
     util::loadObservers(config::file::PAYMENTMANAGEMENTOBSERVERS, this, m_dataStore);
 }
 
+/*
+Function: saveObservers
+Description: Saves the current observer IDs of the PaymentManagementService
+             to persistent storage for future retrieval.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void PaymentManagementService::saveObservers()
 {
     util::saveObservers(config::file::PAYMENTMANAGEMENTOBSERVERS, this);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/PaymentManagementService.h

@@ -1,12 +1,3 @@
-/*
-File: PaymentManagementService.h
-Description: Declares the PaymentManagementService class which manages payment operations in the Vehicle Service Management System.
-             Provides functionality to generate invoices, retrieve customer invoices, complete payments, send payment reminders,
-             and handle notifications using the Observer pattern.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <string>
 #include "Map.h"

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

@@ -1,601 +1,22 @@
-/*
-File: ServiceManagementService.cpp
-Description: Implementation file containing the method definitions of the
-             ServiceManagementService class, including service booking cancellation,
-             job card management, combo package creation, and removal logic.
-Author: Trenser
-Date:19-May-2026
-*/
-
 #include <stdexcept>
-#include "AuthenticationManagementService.h"
-#include "ComboPackage.h"
-#include "Config.h"
-#include "Enums.h"
-#include "Factory.h"
-#include "FileManager.h"
-#include "InventoryItem.h"
-#include "Invoice.h"
-#include "JobCard.h"
-#include "NotificationManagementService.h"
-#include "PaymentManagementService.h"
-#include "Service.h"
-#include "ServiceBooking.h"
 #include "ServiceManagementService.h"
-#include "Timestamp.h"
+#include "FileManager.h"
-#include "User.h"
+#include "Service.h"
-#include "UserManagementService.h"
+#include "ComboPackage.h"
+#include "ServiceBooking.h"
+#include "JobCard.h"
+#include "Config.h"
 #include "Utility.h"
 
-util::Map<std::string, User*> ServiceManagementService::m_observers{};
-
-util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings()
-{
-	return m_dataStore.getServiceBookings();
-}
-
-ServiceBooking* ServiceManagementService::getServiceBooking(const std::string& serviceID)
-{
-	auto currentServiceBookings = getServiceBookings();
-	for (int iterator = 0; iterator < currentServiceBookings.getSize(); iterator++)
-	{
-		if (currentServiceBookings.getValueAt(iterator)->getId() == serviceID)
-		{
-			return currentServiceBookings.getValueAt(iterator);
-		}
-	}
-	return nullptr;
-}
-
-void ServiceManagementService::createJobCard(const std::string& bookingID, const std::string& technicianID, const std::string& serviceID)
-{
-	UserManagementService m_userManagementService;
-	ServiceBooking* currentBooking = getServiceBooking(bookingID);
-	auto& currentJobCards = m_dataStore.getJobCards();
-	if (currentBooking == nullptr)
-	{
-		throw std::runtime_error("Service Booking not available");
-	}
-	auto& currentServices = currentBooking->getServices();
-	if (currentServices.find(serviceID) == -1)
-	{
-		throw std::runtime_error("Invalid service Id");
-	}
-	Service* currentService = currentServices.getValueAt(currentServices.find(serviceID));
-	User* selectedTechnician = m_userManagementService.getUser(technicianID);
-	if (selectedTechnician == nullptr)
-	{
-		throw std::runtime_error("Technician not available");
-	}
-	auto& inventoryItems = currentService->getRequiredInventoryItems();
-	for (int iterator = 0; iterator < inventoryItems.getSize(); iterator++)
-	{
-		InventoryItem* currentInventoryItem = inventoryItems.getValueAt(iterator);
-		if (currentInventoryItem->getQuantity() == 0)
-		{
-			std::string errorMessage = "Failed to create job card, " + currentInventoryItem->getPartName() + " is out of stock.";
-			throw std::runtime_error(errorMessage);
-		}
-		else
-		{
-			int currentStockQuantity = currentInventoryItem->getQuantity();
-			currentInventoryItem->setQuantity(currentStockQuantity - 1);
-		}
-	}
-	currentBooking->setAssignedTechnician(selectedTechnician);
-	currentBooking->setAssignedTechnicianId(selectedTechnician->getId());
-	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());
-	currentJobCards.insert(jobCard->getId(), jobCard);
-	sendNotification(selectedTechnician, title, message);
-}
-
-void ServiceManagementService::createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost)
-{
-	util::Map<std::string, InventoryItem*> currentServiceInventoryItems;
-	auto inventoryItems = m_dataStore.getInventoryItems();
-	for (int iteratorOne = 0; iteratorOne < inventoryItemIDs.getSize(); iteratorOne++)
-	{
-		std::string currentItemID = inventoryItemIDs[iteratorOne];
-		bool itemFound = false;
-		for (int iteratorTwo = 0; iteratorTwo < inventoryItems.getSize(); iteratorTwo++)
-		{
-			InventoryItem* currentInventoryItem = inventoryItems.getValueAt(iteratorTwo);
-			if (currentInventoryItem && currentInventoryItem->getId() == currentItemID)
-			{
-				itemFound = true;
-				currentServiceInventoryItems.insert(currentInventoryItem->getId(), currentInventoryItem);
-				break;
-			}
-		}
-		if (!itemFound)
-		{
-			throw std::runtime_error("Inventory item with ID '" + currentItemID + "' not found.");
-		}
-	}
-	Service* newService = Factory::getObject<Service>(name, currentServiceInventoryItems, laborCost);
-	if (newService == nullptr)
-	{
-		throw std::runtime_error("Unable to create new service.");
-	}
-	util::Map<std::string, Service*>& currentServices = m_dataStore.getServices();
-	if (currentServices.find(newService->getId()) != -1)
-	{
-		throw std::runtime_error("Service with this ID Already exists.");
-	}
-	currentServices.insert(newService->getId(), newService);
-}
-
-util::Map<std::string, Service*> ServiceManagementService::getServices()
-{
-	return m_dataStore.getServices();
-}
-
-void ServiceManagementService::removeService(const std::string& serviceID)
-{
-	util::Map<std::string, Service*> currentServices = getServices();
-	if (currentServices.find(serviceID) != -1)
-	{
-		currentServices.getValueAt(currentServices.find(serviceID))->setState(util::State::INACTIVE);
-	}
-	else
-	{
-		throw std::runtime_error("Service not found.");
-	}
-}
-
-util::Map<std::string, ServiceBooking*> ServiceManagementService::getServiceBookings(const std::string& customerID)
-{
-	util::Map<std::string, ServiceBooking*> currentServiceBookings = getServiceBookings();
-	util::Map<std::string, ServiceBooking*> currentUserServiceBookings;
-	if (currentServiceBookings.getSize() != 0)
-	{
-		for (int iterator = 0; iterator < currentServiceBookings.getSize(); iterator++)
-		{
-			auto currentServiceBooking = currentServiceBookings.getValueAt(iterator);
-			if (currentServiceBooking->getCustomerId() == customerID)
-			{
-				currentUserServiceBookings.insert(currentServiceBooking->getId(), currentServiceBooking);
-			}
-		}
-	}
-	return currentUserServiceBookings;
-}
-
-util::Map<std::string, JobCard*> ServiceManagementService::getJobCards(const std::string& technicianID)
-{
-	util::Map<std::string, JobCard*> jobCards = m_dataStore.getJobCards();
-	util::Map<std::string, JobCard*> technicianJobCards;
-	for (int iterator = 0; iterator < jobCards.getSize(); iterator++)
-	{
-		JobCard* currentJobCard = jobCards.getValueAt(iterator);
-		if (currentJobCard->getTechnicianId() == technicianID)
-		{
-			technicianJobCards.insert(currentJobCard->getId(), currentJobCard);
-		}
-	}
-	return technicianJobCards;
-}
-
-static bool hasAllJobCardsinServiceBookingCompleted(std::string bookingId, util::Map<std::string, JobCard*>& currentAssignedJobs)
-{
-	for (int iterator = 0; iterator < currentAssignedJobs.getSize(); iterator++)
-	{
-		JobCard* currentJob = currentAssignedJobs.getValueAt(iterator);
-		if (currentJob->getBookingId() == bookingId)
-		{
-			if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
-			{
-				return false;
-			}
-		}
-	}
-	return true;
-}
-
-void ServiceManagementService::completeJob(const std::string& jobID)
-{
-	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.");
-	}
-	if (currentAssignedJobs.find(jobID) != -1)
-	{
-		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::COMPLETED);
-			jobStatusUpdated = true;
-		}
-	}
-	else
-	{
-		throw std::runtime_error("Failed to complete the job, some error occured or job already completed.");
-	}
-	if (!jobStatusUpdated)
-	{
-		throw std::runtime_error("Failed to complete the job, some error occured or job already completed.");
-	}
-	serviceBookingCompleted = hasAllJobCardsinServiceBookingCompleted(currentJob->getBookingId(), currentAssignedJobs);
-	if (serviceBookingCompleted)
-	{
-		currentJob->getBooking()->setStatus(util::ServiceJobStatus::COMPLETED);
-		paymentManagementService.generateInvoice(currentJob->getBooking());
-		std::string title = "Service Booking completed,Invoice Generated.\n";
-		std::string message = "Services completed for the booking and invoice generated.\n";
-		sendNotification(currentJob->getBooking()->getCustomer(), title, message);
-	}
-}
-
-void ServiceManagementService::purchaseService(const util::Vector<std::string>& serviceIDs, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
-{
-	AuthenticationManagementService m_authenticationManagementService;
-	auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-	if (authenticatedUser == nullptr)
-	{
-		throw std::runtime_error("No user is currently logged in!");
-	}
-	auto& servicesMap = m_dataStore.getServices();
-	auto& serviceBookingMap = m_dataStore.getServiceBookings();
-	util::Map<std::string, Service*> selectedServices;
-	int selectedServicesCount = serviceIDs.getSize();
-	for (int index = 0; index < selectedServicesCount; index++)
-	{
-		int serviceIndex = servicesMap.find(serviceIDs[index]);
-		if (serviceIndex == -1)
-		{
-			throw std::runtime_error("Service not found!");
-		}
-		Service* service = servicesMap.getValueAt(serviceIndex);
-		selectedServices[service->getId()] = service;
-	}
-	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::STARTED, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, 0);
-	if (serviceBooking == nullptr)
-	{
-		throw std::runtime_error("Failed to create service booking");
-	}
-	serviceBookingMap[serviceBooking->getId()] = serviceBooking;
-	sendNotification(authenticatedUser,
-		"Service Booking succeeded",
-		"Your service booking has been successfully placed with ID " + serviceBooking->getId());
-}
-
-void ServiceManagementService::purchaseComboPackage(const std::string& comboPackageID, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel)
-{
-	AuthenticationManagementService m_authenticationManagementService;
-	auto authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-	if (authenticatedUser == nullptr)
-	{
-		throw std::runtime_error("No user is currently logged in!");
-	}
-	auto& comboPackagesMap = m_dataStore.getComboPackages();
-	auto& serviceBookingMap = m_dataStore.getServiceBookings();
-	int comboPackageIndex = comboPackagesMap.find(comboPackageID);
-	if (comboPackageIndex == -1)
-	{
-		throw std::runtime_error("Combo Package not found!");
-	}
-	const ComboPackage* comboPackage = comboPackagesMap[comboPackageID];
-	util::Map<std::string, Service*> selectedServices = comboPackage->getServices();
-	ServiceBooking* serviceBooking = Factory::getObject<ServiceBooking>(util::ServiceJobStatus::STARTED, selectedServices, authenticatedUser->getId(), authenticatedUser, vehicleNumber, vehicleBrand, vehicleModel, comboPackage->getDiscountPercentage());
-	if (serviceBooking == nullptr)
-	{
-		throw std::runtime_error("Failed to create combo package service booking");
-	}
-	serviceBookingMap[serviceBooking->getId()] = serviceBooking;
-	sendNotification(authenticatedUser,
-		"Combo Package Service Booking succeeded",
-		"Your service booking for the combo package has been successfully placed with ID " + serviceBooking->getId());
-}
-
 /*
-Function: cancelCustomerServiceBookings
+Function: getObserverIDs
-Description: Cancels all service bookings associated with a given customer or technician.
+Description: Retrieves the IDs of all observers currently attached to the
-             Updates booking status, resets customer/technician assignments, sends notifications,
+             ServiceManagementService.
-             and restocks inventory items.
-Parameter: const std::string& userID - ID of the customer or technician
-Return type: void
-*/
-void ServiceManagementService::cancelCustomerServiceBookings(const std::string& userID)
-{
-    const int INCREMENT_VALUE = 1;
-    auto& users = m_dataStore.getUsers();
-    int userIndex = users.find(userID);
-    if (userIndex == -1)
-    {
-        throw std::runtime_error("User not found: " + userID);
-    }
-    User* user = users.getValueAt(userIndex);
-    if (user == nullptr)
-    {
-        throw std::runtime_error("User not found: " + userID);
-    }
-    util::UserType type = user->getUserType();
-    auto& bookings = DataStore::getInstance().getServiceBookings();
-    for (int bookingIterator = 0; bookingIterator < bookings.getSize(); bookingIterator++)
-    {
-        ServiceBooking* booking = bookings.getValueAt(bookingIterator);
-        if (booking != nullptr &&
-            (booking->getCustomerId() == userID || booking->getAssignedTechnicianId() == userID))
-        {
-            if (booking->getStatus() == util::ServiceJobStatus::PENDING ||
-                booking->getStatus() == util::ServiceJobStatus::STARTED)
-            {
-                if (type == util::UserType::CUSTOMER)
-                {
-                    booking->setStatus(util::ServiceJobStatus::CANCELLED);
-                    booking->setCustomer(nullptr);
-                    booking->setCustomerId("");
-                    User* assignedTechnician = booking->getAssignedTechnician();
-                    sendNotification(assignedTechnician, "Customer Service Cancelled", "Uh?Oh. The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.");
-                }
-                else if (type == util::UserType::TECHNICIAN)
-                {
-                    booking->setStatus(util::ServiceJobStatus::PENDING);
-                    sendNotification(booking->getCustomer(), "Technician Unavailable", "Your assigned technician is no longer available. Your booking has been reset to pending, and we will reassign a new technician shortly.");
-                }
-                booking->setAssignedTechnician(nullptr);
-                booking->setAssignedTechnicianId("");
-                const auto& ListOfServices = booking->getServices();
-                for (int serviceIterator = 0; serviceIterator < ListOfServices.getSize(); serviceIterator++)
-                {
-                    Service* service = ListOfServices.getValueAt(serviceIterator);
-                    if (service != nullptr)
-                    {
-                        const auto& items = service->getRequiredInventoryItems();
-                        for (int itemIterator = 0; itemIterator < items.getSize(); itemIterator++)
-                        {
-                            InventoryItem* item = items.getValueAt(itemIterator);
-                            if (item != nullptr)
-                            {
-                                item->setQuantity(item->getQuantity() + INCREMENT_VALUE);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/*
-Function: cancelTechnicianJobs
-Description: Cancels all jobs assigned to a technician. Updates job status, sends notifications,
-             and restocks inventory items used in the service.
-Parameter: const std::string& technicianID - ID of the technician
-Return type: void
-*/
-void ServiceManagementService::cancelTechnicianJobs(const std::string& technicianID)
-{
-    const int INCREMENT_VALUE = 1;
-    auto& jobs = m_dataStore.getJobCards();
-    for (int jobIterator = 0; jobIterator < jobs.getSize(); jobIterator++)
-    {
-        JobCard* job = jobs.getValueAt(jobIterator);
-        if (job != nullptr && job->getTechnicianId() == technicianID)
-        {
-            if (job->getStatus() == util::ServiceJobStatus::PENDING || job->getStatus() == util::ServiceJobStatus::STARTED)
-            {
-                job->setStatus(util::ServiceJobStatus::CANCELLED);
-                sendNotification(job->getTechnician(), "Job Cancelled", "The Job has cancelled. Your job card has been cancelled and the inventory has been restocked.");
-                Service* service = job->getService();
-                if (service != nullptr)
-                {
-                    const auto& items = service->getRequiredInventoryItems();
-                    for (int itemIterator = 0; itemIterator < items.getSize(); itemIterator++)
-                    {
-                        InventoryItem* item = items.getValueAt(itemIterator);
-                        if (item != nullptr)
-                        {
-                            item->setQuantity(item->getQuantity() + INCREMENT_VALUE);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/*
-Function: createComboPackage
-Description: Creates a new combo package with two services and a discount percentage.
-             Validates service IDs, ensures uniqueness, and inserts the new package into the DataStore.
-Parameter: const std::string& packageName - name of the combo package
-           const util::Vector<std::string>& serviceIDsInNewCombo - list of service IDs
-           double discountPercentage - discount percentage for the package
-Return type: void
-*/
-void ServiceManagementService::createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDsInNewCombo, double discountPercentage)
-{
-    if (packageName.empty())
-    {
-        throw std::invalid_argument("The Combo Package Name cannot be empty.\n");
-    }
-    if (serviceIDsInNewCombo.getSize() < 2 || serviceIDsInNewCombo.getSize() > 2)
-    {
-        throw std::invalid_argument("Combo package must contain only two services.");
-    }
-    if (discountPercentage < 0.0 || discountPercentage > 100.0)
-    {
-        throw std::invalid_argument("Discount percentage must be between 0 and 100.");
-    }
-    auto& servicesMap = m_dataStore.getServices();
-    for (int index = 0; index < serviceIDsInNewCombo.getSize(); index++)
-    {
-        const std::string serviceid = serviceIDsInNewCombo[index];
-        if (servicesMap.find(serviceid) == -1)
-        {
-            throw std::runtime_error("Service ID not found: " + serviceid);
-        }
-    }
-    auto& comboPackageMap = m_dataStore.getComboPackages();
-    for (int iterator = 0; iterator < comboPackageMap.getSize(); iterator++)
-    {
-        ComboPackage* existingCombos = comboPackageMap.getValueAt(iterator);
-        const util::Map<std::string, Service*>& servicesInsideExistingCombos = existingCombos->getServices();
-        if (servicesInsideExistingCombos.getSize() == serviceIDsInNewCombo.getSize())
-        {
-            bool isIdentical = true;
-            for (int serviceIterator = 0; serviceIterator < serviceIDsInNewCombo.getSize(); serviceIterator++)
-            {
-                const std::string& id = serviceIDsInNewCombo[serviceIterator];
-                if (servicesInsideExistingCombos.find(id) == -1)
-                {
-                    isIdentical = false;
-                    break;
-                }
-            }
-            if (isIdentical)
-            {
-                throw std::runtime_error("A combo package with the same services already exists.");
-            }
-        }
-    }
-    util::Map<std::string, Service*> selectedServices;
-    for (int iteratorOne = 0; iteratorOne < serviceIDsInNewCombo.getSize(); iteratorOne++)
-    {
-        const std::string& serviceId = serviceIDsInNewCombo[iteratorOne];
-        int serviceIndex = servicesMap.find(serviceId);
-        if (serviceIndex == -1)
-        {
-            throw std::runtime_error("Service ID not found: " + serviceId);
-        }
-        selectedServices.insert(serviceId, servicesMap.getValueAt(serviceIndex));
-    }
-    ComboPackage* newComboPackage = Factory::getObject<ComboPackage>(packageName, discountPercentage, selectedServices);
-    comboPackageMap.insert(newComboPackage->getId(), newComboPackage);
-}
-
-/*
-Function: getComboPackages
-Description: Retrieves all combo packages stored in the DataStore.
-Parameter: None
-Return type: util::Map<std::string, ComboPackage*>
-*/
-util::Map<std::string, ComboPackage*> ServiceManagementService::getComboPackages()
-{
-    return m_dataStore.getComboPackages();
-}
-
-/*
-Function: removeComboPackage
-Description: Removes a combo package by marking it inactive. Throws an exception if the package ID is not found.
-Parameter: const std::string& comboPackageID - ID of the combo package
-Return type: void
-*/
-void ServiceManagementService::removeComboPackage(const std::string& comboPackageID)
-{
-    bool removed = false;
-    util::Map<std::string, ComboPackage*>& currentComboPackages = m_dataStore.getComboPackages();
-    for (int iterator = 0; iterator < currentComboPackages.getSize(); iterator++)
-    {
-        ComboPackage* currentComboPackage = currentComboPackages.getValueAt(iterator);
-        if (currentComboPackage && currentComboPackage->getId() == comboPackageID)
-        {
-            currentComboPackage->setState(util::State::INACTIVE);
-            removed = true;
-            break;
-        }
-    }
-    if (!removed)
-    {
-        throw std::runtime_error("Combo package with ID '" + comboPackageID + "' not found.");
-    }
-}
-
-/*
-Function: attach
-Description: Attaches a user as an observer to the ServiceManagementService for receiving notifications.
 Parameters:
-	- user: Pointer to the User object to be attached.
+    - None
 Returns:
-	- void
+    - util::Vector<std::string>: Vector of observer user IDs
 */
-void ServiceManagementService::attach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) == -1)
-		{
-			m_observers[userID] = user;
-		}
-	}
-}
-
-/*
-Function: detach
-Description: Detaches a user from the observer list of the ServiceManagementService.
-Parameters:
-	- user: Pointer to the User object to be detached.
-Returns:
-	- void
-*/
-void ServiceManagementService::detach(User* user)
-{
-	if (user)
-	{
-		const std::string& userID = user->getId();
-		if (m_observers.find(userID) != -1)
-		{
-			m_observers.remove(userID);
-		}
-	}
-}
-
-/*
-Function: sendNotification
-Description: Sends a notification to a user if they are registered as an observer.
-Parameters:
-	- user: Pointer to the User object to receive the notification.
-	- title: Title of the notification.
-	- message: Message content of the notification.
-Returns:
-	- void
-Throws:
-	- std::runtime_error if notification creation fails.
-*/
-void ServiceManagementService::sendNotification(User* user, const std::string& title, const std::string& message)
-{
-	if (user)
-	{
-		if (m_observers.find(user->getId()) != -1)
-		{
-			Notification* notification =
-				Factory::getObject<Notification>(
-					user->getId(),
-					user,
-					"ServiceManagementService: " + title,
-					message,
-					util::Timestamp()
-				);
-			if (notification)
-			{
-				user->addNotification(notification);
-			}
-			else
-			{
-				throw std::runtime_error("Failed to create notification");
-			}
-		}
-	}
-}
-
 util::Vector<std::string> ServiceManagementService::getObserverIDs()
 {
 	util::Vector<std::string> observerIDs;
@@ -611,6 +32,17 @@ util::Vector<std::string> ServiceManagementService::getObserverIDs()
 	return observerIDs;
 }
 
+/*
+Function: loadServices
+Description: Loads services from persistent storage into the datastore.
+             Validates required inventory items and attaches them to each service.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if an inventory item ID is invalid
+*/
 void ServiceManagementService::loadServices()
 {
     util::FileManager<Service> serviceFileManager(config::file::SERVICE_FILE);
@@ -637,6 +69,15 @@ void ServiceManagementService::loadServices()
     }
 }
 
+/*
+Function: saveServices
+Description: Saves services from the datastore to persistent storage.
+             Uses FileManager to serialize services into the configured file.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void ServiceManagementService::saveServices()
 {
 	util::FileManager<Service> serviceFileManager(config::file::SERVICE_FILE);
@@ -644,6 +85,17 @@ void ServiceManagementService::saveServices()
 	serviceFileManager.save(services);
 }
 
+/*
+Function: loadComboPackages
+Description: Loads combo packages from persistent storage into the datastore.
+             Validates associated services and attaches them to each package.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if a service ID is invalid
+*/
 void ServiceManagementService::loadComboPackages()
 {
     util::FileManager<ComboPackage> comboPackageFileManager(config::file::COMBOPACKAGE_FILE);
@@ -670,6 +122,15 @@ void ServiceManagementService::loadComboPackages()
     }
 }
 
+/*
+Function: saveComboPackages
+Description: Saves combo packages from the datastore to persistent storage.
+             Uses FileManager to serialize combo packages into the configured file.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void ServiceManagementService::saveComboPackages()
 {
     util::FileManager<ComboPackage> comboPackageFileManager(config::file::COMBOPACKAGE_FILE);
@@ -677,6 +138,19 @@ void ServiceManagementService::saveComboPackages()
     comboPackageFileManager.save(comboPackages);
 }
 
+/*
+Function: loadServiceBookings
+Description: Loads service bookings from persistent storage into the datastore.
+             Validates associated services, customers, and technicians before
+             attaching them to each booking.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if a service ID, customer ID, or technician ID is invalid
+    - std::runtime_error if a user is not of the expected type (customer/technician)
+*/
 void ServiceManagementService::loadServiceBookings()
 {
     util::FileManager<ServiceBooking> bookingFileManager(config::file::SERVICEBOOKING_FILE);
@@ -731,6 +205,15 @@ void ServiceManagementService::loadServiceBookings()
     }
 }
 
+/*
+Function: saveServiceBookings
+Description: Saves service bookings from the datastore to persistent storage.
+             Uses FileManager to serialize bookings into the configured file.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void ServiceManagementService::saveServiceBookings()
 {
     util::FileManager<ServiceBooking> bookingFileManager(config::file::SERVICEBOOKING_FILE);
@@ -738,6 +221,20 @@ void ServiceManagementService::saveServiceBookings()
     bookingFileManager.save(serviceBookings);
 }
 
+/*
+Function: loadJobCards
+Description: Loads job cards from persistent storage into the datastore.
+             Validates associated bookings, services, and technicians before
+             attaching them to each job card.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if a booking ID, service ID, or technician ID is invalid
+    - std::runtime_error if a service does not belong to the booking
+    - std::runtime_error if a user is not a technician
+*/
 void ServiceManagementService::loadJobCards()
 {
     util::FileManager<JobCard> jobCardFileManager(config::file::JOBCARD_FILE);
@@ -781,6 +278,16 @@ void ServiceManagementService::loadJobCards()
         jobCards[jobCard->getId()] = jobCard;
     }
 }
+
+/*
+Function: saveJobCards
+Description: Saves job cards from the datastore to persistent storage.
+             Uses FileManager to serialize job cards into the configured file.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void ServiceManagementService::saveJobCards()
 {
     util::FileManager<JobCard> jobCardFileManager(config::file::JOBCARD_FILE);
@@ -788,11 +295,31 @@ void ServiceManagementService::saveJobCards()
     jobCardFileManager.save(jobCards);
 }
 
+/*
+Function: loadObservers
+Description: Loads observer IDs from persistent storage and attaches corresponding
+             users as observers to the ServiceManagementService.
+Parameters:
+    - None
+Returns:
+    - void
+Throws:
+    - std::runtime_error if an observer ID is invalid (not found in datastore)
+*/
 void ServiceManagementService::loadObservers()
 {
     util::loadObservers(config::file::SERVICEMANAGEMENTOBSERVERS, this, m_dataStore);
 }
 
+/*
+Function: saveObservers
+Description: Saves the current observer IDs of the ServiceManagementService
+             to persistent storage for future retrieval.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void ServiceManagementService::saveObservers()
 {
     util::saveObservers(config::file::SERVICEMANAGEMENTOBSERVERS, this);

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

@@ -1,11 +1,3 @@
-/*
-File: ServiceManagementService.h
-Description: Header file declaring the ServiceManagementService class, which manages
-             services, combo packages, job cards, and service bookings. Inherits from
-             NotificationManagementService to handle notifications.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
 #include "Map.h"
@@ -31,7 +23,6 @@ public:
     void purchaseComboPackage(const std::string& comboPackageID, const std::string& vehicleNumber, const std::string& vehicleBrand, const std::string& vehicleModel);
     util::Map<std::string, ServiceBooking*> getServiceBookings();
     util::Map<std::string, ServiceBooking*> getServiceBookings(const std::string& customerID);
-    ServiceBooking* getServiceBooking(const std::string& serviceID);
     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);
@@ -39,7 +30,7 @@ public:
     void completeJob(const std::string& jobID);
     void cancelCustomerServiceBookings(const std::string& customerID);
     void cancelTechnicianJobs(const std::string& technicianID);
-    void createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDs, double discountPercentage);
+    void createComboPackage(const std::string& name, const util::Vector<std::string>& serviceIDs, double discountPercentage);
     void removeComboPackage(const std::string& comboPackageID);
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;

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

@@ -1,213 +1,21 @@
-/*
-File: UserManagementService.cpp
-Description: Implementation file containing the method definitions of the
-			 UserManagementService class, including user retrieval and removal logic.
-Author: Trenser
-Date:19-May-2026
-*/
-
-#include <stdexcept>
-#include "Config.h"
-#include "Enums.h"
-#include "Factory.h"
-#include "FileManager.h"
-#include "InventoryManagementService.h"
-#include "Invoice.h"
-#include "PaymentManagementService.h"
-#include "ServiceManagementService.h"
-#include "User.h"
 #include "UserManagementService.h"
-#include "Utility.h"
+#include "FileManager.h"
-#include "Vector.h"
+#include "User.h"
-
+#include "Notification.h"
-void UserManagementService::ensureAdminExists()
+#include "Config.h"
-{
-	auto& usersMap = m_dataStore.getUsers();
-	int usersMapSize = usersMap.getSize();
-	bool isAdminFound = false;
-	for (int index = 0; index < usersMapSize; index++)
-	{
-		User* user = usersMap.getValueAt(index);
-		if (user && user->getUserType() == util::UserType::ADMIN)
-		{
-			isAdminFound = true;
-			break;
-		}
-	}
-	if (!isAdminFound)
-	{
-		createUser(
-			config::admin::DEFAULT_ADMIN_USERNAME,
-			config::admin::DEFAULT_ADMIN_NAME,
-			config::admin::DEFAULT_ADMIN_PASSWORD,
-			config::admin::DEFAULT_ADMIN_EMAIL,
-			config::admin::DEFAULT_ADMIN_PHONE, 
-			util::UserType::ADMIN);
-	}
-}
-
-void UserManagementService::createUser(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phone, util::UserType type)
-{
-	InventoryManagementService inventoryManagementService;
-	PaymentManagementService paymentManagementService;
-	ServiceManagementService serviceManagementService;
-	auto& usersMap = m_dataStore.getUsers();
-	int index = usersMap.findIf(
-		[&](const std::string&, User* user)
-		{
-			return user->getUserName() == username;
-		}
-	);
-	if (index != -1)
-	{
-		throw std::runtime_error("Username already exists");
-	}
-	User* newUser = Factory::getObject<User>(username, password, name, phone, email, type);
-	usersMap.insert(newUser->getId(), newUser);
-	paymentManagementService.attach(newUser);
-	serviceManagementService.attach(newUser);
-	if (newUser->getUserType() == util::UserType::ADMIN)
-	{
-		inventoryManagementService.attach(newUser);
-	}
-}
-
-void UserManagementService::updateUserDetails(const std::string& userID, const std::string& email, const std::string& phone)
-{
-	auto& usersMap = m_dataStore.getUsers();
-	int index = usersMap.find(userID);
-	if (index == -1)
-	{
-		throw std::runtime_error("User does not exist!");
-	}
-	User* user = usersMap.getValueAt(index);
-	user->setEmail(email);
-	user->setPhone(phone);
-}
 
 /*
-Function: getUsers
+Function: loadUsers
-Description: Retrieves all users stored in the DataStore.
+Description: Loads users and notifications from persistent storage into the datastore.
-Parameter: None
+             Validates that each notification’s recipient exists and attaches the
-Return type: util::Map<std::string, User*>
+             notification to the corresponding user.
-*/
-util::Map<std::string, User*> UserManagementService::getUsers()
-{
-	return m_dataStore.getUsers();
-}
-
-util::Map<std::string, User*> UserManagementService::getUsers(util::UserType type)
-{
-	util::Map<std::string, User*>& currentUsers = m_dataStore.getUsers();
-	util::Map<std::string, User*> filteredUsersMap;
-	for (int iterator = 0; iterator < currentUsers.getSize(); iterator++)
-	{
-		User* currentUser = currentUsers.getValueAt(iterator);
-		if (currentUser->getUserType() == type)
-		{
-			filteredUsersMap.insert(currentUser->getId(), currentUser);
-		}
-	}
-	return filteredUsersMap;
-}
-
-/*
-Function: getUser
-Description: Retrieves a specific user by ID from the DataStore.
-Parameter: const std::string& userID - ID of the user
-Return type: User*
-*/
-User* UserManagementService::getUser(const std::string& userID)
-{
-	int index = m_dataStore.getUsers().find(userID);
-	if (index != -1)
-	{
-		return m_dataStore.getUsers().getValueAt(index);
-	}
-	return nullptr;
-}
-
-/*
-Function: removeUser
-Description: Marks a user as inactive in the DataStore instead of deleting them.
-Parameter: const std::string& userID - ID of the user to remove
-Return type: void
-*/
-void UserManagementService::removeUser(const std::string& userID)
-{
-	int index = m_dataStore.getUsers().find(userID);
-	if (index != -1)
-	{
-		User* user = m_dataStore.getUsers().getValueAt(index);
-		if (user != nullptr)
-		{
-			user->setState(util::State::INACTIVE);
-		}
-	}
-}
-
-/*
-Function: getUserNotifications
-Description: Retrieves all notifications associated with a given user ID.
 Parameters:
-	- userID: The unique ID of the user whose notifications are to be retrieved.
+    - None
-Returns:
-	- util::Vector<Notification*> containing all notifications for the user.
-Throws:
-	- std::runtime_error if no user is found with the given UserID or if the User object is invalid.
-*/
-util::Vector<Notification*> UserManagementService::getUserNotifications(const std::string& userID)
-{
-	auto& usersMap = m_dataStore.getUsers();
-	if (usersMap.find(userID) == -1)
-	{
-		throw std::runtime_error("No user found with given UserID");
-	}
-	User* user = usersMap[userID];
-	if (user)
-	{
-		auto& notifications = user->getNotifications();
-		int numberOfNotifications = notifications.getSize();
-		util::Vector<Notification*> notificationsVector;
-		for (int index = 0; index < numberOfNotifications; index++)
-		{
-			notificationsVector.push_back(notifications.getValueAt(index));
-		}
-		return notificationsVector;
-	}
-	else
-	{
-		throw std::runtime_error("Invalid User object");
-	}
-}
-
-/*
-Function: deleteNotification
-Description: Deletes a specific notification associated with a given user ID.
-Parameters:
-	- notificationID: The unique ID of the notification to be deleted.
-	- userID: The unique ID of the user whose notification is to be deleted.
 Returns:
     - void
 Throws:
-	- std::runtime_error if no user is found with the given UserID or if no notification is found with the given NotificationID.
+    - std::runtime_error if a notification recipient user ID is invalid
 */
-void UserManagementService::deleteNotification(const std::string& notificationID, const std::string& userID)
-{
-	auto& usersMap = m_dataStore.getUsers();
-	if (usersMap.find(userID) == -1)
-	{
-		throw std::runtime_error("No user found with given UserID");
-	}
-	User* user = usersMap[userID];
-	auto& notifications = user->getNotifications();
-	if (notifications.find(notificationID) == -1)
-	{
-		throw std::runtime_error("No notification found with given NotificationID");
-	}
-	notifications.remove(notificationID);
-}
-
 void UserManagementService::loadUsers()
 {
     util::FileManager<User> userFileManager(config::file::USER_FILE);
@@ -235,6 +43,15 @@ void UserManagementService::loadUsers()
     }
 }
 
+/*
+Function: saveUsers
+Description: Saves users and their notifications from the datastore to persistent storage.
+             Collects notifications from all users into a single map before saving.
+Parameters:
+    - None
+Returns:
+    - void
+*/
 void UserManagementService::saveUsers()
 {
     util::FileManager<User> userFileManager(config::file::USER_FILE);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/UserManagementService.h

@@ -1,10 +1,3 @@
-/*
-File: UserManagementService.h
-Description: Header file declaring the UserManagementService class, which manages
-             user creation, updates, retrieval, removal, and notification handling.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include <string>
 #include "Map.h"
@@ -20,7 +13,7 @@ private:
     DataStore& m_dataStore;
 public:
     UserManagementService() : m_dataStore(DataStore::getInstance()) {}
-    void createUser(const std::string& username, const std::string& name, const std::string& password, const std::string& email, const std::string& phone, util::UserType type);
+    void createUser(const std::string& username, const std::string& password, const std::string& email, const std::string& phone, util::UserType type);
     void updateUserDetails(const std::string& userID, const std::string& email, const std::string& phone);
     util::Map<std::string, User*> getUsers();
     util::Map<std::string, User*> getUsers(util::UserType type);
@@ -28,7 +21,6 @@ public:
     void removeUser(const std::string& userID);
     util::Vector<Notification*> getUserNotifications(const std::string& userID);
     void deleteNotification(const std::string& notificationID, const std::string& userID);
-    void ensureAdminExists();
     void loadUsers();
     void saveUsers();
 };

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Config.h

@@ -1,30 +1,7 @@
-/*
-File: Config.h
-Description: Defines configuration constants for system thresholds in the Vehicle Service Management System.
-			 Includes limits for inventory stock alerts and payment reminder intervals.
-Author: Trenser
-Date: 21-May-2026
-*/
-
 #pragma once
 
 namespace config
 {
-	namespace admin
-	{
-		constexpr const char* DEFAULT_ADMIN_USERNAME = "admin";
-		constexpr const char* DEFAULT_ADMIN_NAME = "admin";
-		constexpr const char* DEFAULT_ADMIN_PASSWORD = "admin";
-		constexpr const char* DEFAULT_ADMIN_EMAIL = "admin@vss";
-		constexpr const char* DEFAULT_ADMIN_PHONE = "0000000000";
-	}
-
-	namespace threshold
-	{
-		constexpr int INVENTORY_LOW_STOCK_THRESHOLD = 5;
-		constexpr int PAYMENT_REMINDER_THRESHOLD_HOURS = 168;
-	}
-
 	namespace file
 	{
 		constexpr const char* INVENTORYITEM_FILE = "files/InventoryItem.csv";

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h

@@ -1,12 +1,3 @@
-/*
-File: Enums.h
-Description: Declares enumerations and utility functions for user types, payment modes, payment status,
-             service job status, and state management in the Vehicle Service Management System.
-             Provides string conversion and parsing functions for each enum type.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include <stdexcept>
 
@@ -22,8 +13,7 @@ namespace util
 	enum class PaymentMode
 	{
 		ONLINE,
-		OFFLINE,
+		OFFLINE
-        NOTSET
 	};
 
 	enum class PaymentStatus
@@ -34,10 +24,8 @@ namespace util
 
 	enum class ServiceJobStatus
 	{
-        PENDING,
 		STARTED,
-		COMPLETED,
+		COMPLETED
-        CANCELLED
 	};
 
     enum class State
@@ -46,14 +34,6 @@ namespace util
         INACTIVE
     };
 
-    /*
-    Function: getUserTypeString
-    Description: Converts a UserType enum value to its corresponding string representation.
-    Parameters:
-        - type: UserType enum value.
-    Returns:
-        - std::string representing the UserType.
-    */
     inline std::string getUserTypeString(UserType type)
     {
         switch (type)
@@ -68,16 +48,6 @@ namespace util
         throw std::invalid_argument("Invalid UserType");
     }
 
-    /*
-    Function: getUserType
-    Description: Converts a string value to its corresponding UserType enum.
-    Parameters:
-        - value: std::string representing the UserType.
-    Returns:
-        - UserType enum value.
-    Throws:
-        - std::invalid_argument if the string does not match a valid UserType.
-    */
     inline UserType getUserType(const std::string& value)
     {
         if (value == "ADMIN")
@@ -95,14 +65,6 @@ namespace util
         throw std::invalid_argument("Invalid UserType string");
     }
 
-    /*
-    Function: getPaymentModeString
-    Description: Converts a PaymentMode enum value to its corresponding string representation.
-    Parameters:
-        - mode: PaymentMode enum value.
-    Returns:
-        - std::string representing the PaymentMode.
-    */
     inline std::string getPaymentModeString(PaymentMode mode)
     {
         switch (mode)
@@ -111,22 +73,10 @@ namespace util
             return "ONLINE";
         case PaymentMode::OFFLINE:
             return "OFFLINE";
-        case PaymentMode::NOTSET:
-            return "NOTSET";
         }
         throw std::invalid_argument("Invalid PaymentMode");
     }
 
-    /*
-    Function: getPaymentMode
-    Description: Converts a string value to its corresponding PaymentMode enum.
-    Parameters:
-        - value: std::string representing the PaymentMode.
-    Returns:
-        - PaymentMode enum value.
-    Throws:
-        - std::invalid_argument if the string does not match a valid PaymentMode.
-    */
     inline PaymentMode getPaymentMode(const std::string& value)
     {
         if (value == "ONLINE")
@@ -140,14 +90,6 @@ namespace util
         throw std::invalid_argument("Invalid PaymentMode string");
     }
 
-    /*
-    Function: getPaymentStatusString
-    Description: Converts a PaymentStatus enum value to its corresponding string representation.
-    Parameters:
-        - status: PaymentStatus enum value.
-    Returns:
-        - std::string representing the PaymentStatus.
-    */
     inline std::string getPaymentStatusString(PaymentStatus status)
     {
         switch (status)
@@ -160,16 +102,6 @@ namespace util
         throw std::invalid_argument("Invalid PaymentStatus");
     }
 
-    /*
-    Function: getPaymentStatus
-    Description: Converts a string value to its corresponding PaymentStatus enum.
-    Parameters:
-        - value: std::string representing the PaymentStatus.
-    Returns:
-        - PaymentStatus enum value.
-    Throws:
-        - std::invalid_argument if the string does not match a valid PaymentStatus.
-    */
     inline PaymentStatus getPaymentStatus(const std::string& value)
     {
         if (value == "PENDING")
@@ -185,40 +117,18 @@ namespace util
         throw std::invalid_argument("Invalid PaymentStatus string");
     }
 
-    /*
-    Function: getServiceJobStatusString
-    Description: Converts a ServiceJobStatus enum value to its corresponding string representation.
-    Parameters:
-        - status: ServiceJobStatus enum value.
-    Returns:
-        - std::string representing the ServiceJobStatus.
-    */
     inline std::string getServiceJobStatusString(ServiceJobStatus status)
     {
         switch (status)
         {
-        case ServiceJobStatus::PENDING:
-            return "PENDING";
         case ServiceJobStatus::STARTED:
             return "STARTED";
         case ServiceJobStatus::COMPLETED:
             return "COMPLETED";
-        case ServiceJobStatus::CANCELLED:
-            return "CANCELLED";
         }
         throw std::invalid_argument("Invalid ServiceJobStatus");
     }
 
-    /*
-    Function: getServiceJobStatus
-    Description: Converts a string value to its corresponding ServiceJobStatus enum.
-    Parameters:
-        - value: std::string representing the ServiceJobStatus.
-    Returns:
-        - ServiceJobStatus enum value.
-    Throws:
-        - std::invalid_argument if the string does not match a valid ServiceJobStatus.
-    */
     inline ServiceJobStatus getServiceJobStatus(const std::string& value)
     {
         if (value == "STARTED")
@@ -229,25 +139,9 @@ namespace util
         {
             return ServiceJobStatus::COMPLETED;
         }
-        if (value == "PENDING")
-        {
-            return ServiceJobStatus::PENDING;
-        }
-        if (value == "CANCELLED")
-        {
-            return ServiceJobStatus::CANCELLED;
-        }
         throw std::invalid_argument("Invalid ServiceJobStatus string");
     }
 
-    /*
-    Function: getStateString
-    Description: Converts a State enum value to its corresponding string representation.
-    Parameters:
-        - status: State enum value.
-    Returns:
-        - std::string representing the State.
-    */
     inline std::string getStateString(State status)
     {
         switch (status)
@@ -260,16 +154,6 @@ namespace util
         throw std::invalid_argument("Invalid State");
     }
 
-    /*
-    Function: getState
-    Description: Converts a string value to its corresponding State enum.
-    Parameters:
-        - value: std::string representing the State.
-    Returns:
-        - State enum value.
-    Throws:
-        - std::invalid_argument if the string does not match a valid State.
-    */
     inline State getState(const std::string& value)
     {
         if (value == "ACTIVE")

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/FileHelper.h

@@ -1,3 +1,12 @@
+/*
+File: FileHelper.h
+Description: Provides utility functions for loading and saving records
+             from and to CSV-like text files. Ensures files are created
+             if missing and supports simple record persistence.
+Author: Trenser
+Date: 22-May-2026
+*/
+
 #pragma once
 #include <fstream>
 #include <string>
@@ -6,6 +15,17 @@
 
 namespace util
 {
+    /*
+    Function: loadRecords
+    Description: Loads records from a given file path into a vector of strings.
+                 Skips the header line if present. Creates the file if it does not exist.
+    Parameters:
+        - filePath: const std::string&, path to the file
+    Returns:
+        - util::Vector<std::string>: Vector containing all records (excluding header)
+    Throws:
+        - None (creates file if missing)
+    */
     inline util::Vector<std::string> loadRecords(const std::string& filePath)
     {
         util::Vector<std::string> records;
@@ -30,6 +50,18 @@ namespace util
         return records;
     }
 
+    /*
+    Function: saveRecords
+    Description: Saves records to a given file path. Overwrites existing content
+                 and writes a header line followed by all records.
+    Parameters:
+        - filePath: const std::string&, path to the file
+        - records: const util::Vector<std::string>&, vector of records to save
+    Returns:
+        - void
+    Throws:
+        - std::runtime_error if the file cannot be opened for writing
+    */
     inline void saveRecords(const std::string& filePath, const util::Vector<std::string>& records)
     {
         std::ofstream file(filePath, std::ios::trunc);

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/FileManager.h

@@ -1,5 +1,15 @@
+/*
+File: FileManager.h
+Description: Declares and implements a generic FileManager template class for
+			 loading and saving objects to and from files. Uses serialization
+			 and deserialization methods defined in the object type T.
+			 Provides persistence support for system entities such as Users,
+			 Services, InventoryItems, etc.
+Author: Trenser
+Date: 22-May-2026
+*/
+
 #pragma once
-#include <string>
 #include <stdexcept>
 #include <fstream>
 #include "Vector.h"
@@ -21,6 +31,18 @@ namespace util
 		void save(const objects<T>&);
 	};
 
+	/*
+	Function: load
+	Description: Loads records from the file into a map of objects.
+				 Skips the header line, deserializes each record into an object of type T,
+				 and stores them in a map keyed by object ID.
+	Parameters:
+		- None
+	Returns:
+		- util::Map<std::string, T*> containing deserialized objects
+	Throws:
+		- std::runtime_error if deserialization fails for any record
+	*/
 	template <typename T>
 	objects<T> FileManager<T>::load()
 	{
@@ -58,6 +80,17 @@ namespace util
 		return records;
 	}
 
+	/*
+	Function: save
+	Description: Saves records to the file. Serializes each object of type T into a string,
+				 writes a header line, and then writes all serialized records to the file.
+	Parameters:
+		- records: const util::Map<std::string, T*>&, map of objects to save
+	Returns:
+		- void
+	Throws:
+		- std::runtime_error if the file cannot be opened for writing
+	*/
 	template <typename T>
 	void FileManager<T>::save(const objects<T>& records)
 	{

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/StringHelper.h

@@ -1,8 +1,26 @@
+/*
+File: StringHelper.h
+Description: Provides utility functions for extracting numeric values from strings.
+             Useful for parsing IDs, codes, or mixed alphanumeric inputs where
+             digits need to be isolated and converted into integers.
+Author: Trenser
+Date: 22-May-2026
+*/
+
 #include <cctype>
 #include <string>
 
 namespace util
 {
+    /*
+    Function: extractNumber
+    Description: Extracts all digits from the given string and converts them into an integer.
+                 Ignores non-digit characters. For example, "abc123xyz" returns 123.
+    Parameters:
+        - input: const std::string&, the input string containing digits and/or other characters
+    Returns:
+        - int: The integer value formed by concatenating all digits in the string
+    */
     inline int extractNumber(const std::string& input)
     {
         int result = 0;

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Utility.h

@@ -1,14 +1,14 @@
 /*
-File: Utility.h
+File: ObserversHelper.h
-Description: Header file declaring utility functions used across the system,
+Description: Provides utility functions for loading and saving observers
-             including cost calculation for services based on required inventory items.
+             in the notification management system. Ensures that observer
+             IDs are validated against existing users in the datastore
+             before attaching them to the notification service.
 Author: Trenser
-Date:19-May-2026
+Date: 22-May-2026
 */
+
 #pragma once
-#include "Service.h"
-#include "ComboPackage.h"
-#include "InventoryItem.h"
 #include "NotificationManagementService.h"
 #include "FileHelper.h"
 #include "DataStore.h"
@@ -16,46 +16,19 @@ Date:19-May-2026
 namespace util
 {
     /*
-    Function: calculatePartsCost
+    Function: loadObservers
-    Description: Calculates the total cost of parts required for a given service
+    Description: Loads observer IDs from a file and attaches the corresponding users
-                 by summing the prices of all associated inventory items.
+                 to the notification management service. Validates that each observer ID
-    Parameter: const Service* service - pointer to the service object
+                 exists in the datastore before attaching.
-    Return type: double - total cost of required parts
-    */
-    inline double calculatePartsCost(const Service* service)
-    {
-        double cost = 0;
-        auto& requiredInventoryItems = service->getRequiredInventoryItems();
-        int requiredInventoryItemsSize = requiredInventoryItems.getSize();
-        for (int index = 0; index < requiredInventoryItemsSize; index++)
-        {
-            cost += requiredInventoryItems.getValueAt(index)->getPrice();
-        }
-        return cost;
-    }
-
-    /*
-    Function: calculateComboServiceEstimatedCost
-    Description: Calculates the estimated total cost of a combo package by summing
-                 the labor cost and parts cost of all services included in the package.
     Parameters:
-        - comboPackage: const ComboPackage*, pointer to the combo package whose cost is to be estimated
+        - filePath: const std::string&, path to the file containing observer IDs
+        - service: NotificationManagementService*, pointer to the notification service
+        - dataStore: DataStore&, reference to the datastore containing users
     Returns:
-        - double: The estimated total cost of the combo package
+        - void
+    Throws:
+        - std::runtime_error if an observer ID is invalid (not found in datastore)
     */
-    inline double calculateComboServiceEstimatedCost(const ComboPackage* comboPackage)
-    {
-        double cost = 0;
-        auto& services = comboPackage->getServices();
-        int servicesSize = services.getSize();
-        for (int index = 0; index < servicesSize; index++)
-        {
-            const Service* service = services.getValueAt(index);
-            cost += calculatePartsCost(service) + service->getLaborCost();
-        }
-        return cost;
-    }
-
     inline void loadObservers(const std::string& filePath, NotificationManagementService* service, DataStore& dataStore)
     {
         auto observerIDs = util::loadRecords(filePath);
@@ -72,6 +45,16 @@ namespace util
         }
     }
 
+    /*
+    Function: saveObservers
+    Description: Saves the current observer IDs from the notification management service
+                 to a file for persistence.
+    Parameters:
+        - filePath: const std::string&, path to the file where observer IDs will be saved
+        - service: NotificationManagementService*, pointer to the notification service
+    Returns:
+        - void
+    */
     inline void saveObservers(const std::string& filePath, NotificationManagementService* service)
     {
         auto observerIDs = service->getObserverIDs();

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/AdminMenu.h

@@ -1,11 +1,3 @@
-/*
-File: AdminMenu.h
-Description: Header file declaring the AdminMenu class, which provides
-             administrative operations such as inventory management,
-             user management, service configuration, and notifications.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include "Controller.h"
 

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

@@ -1,65 +1,21 @@
-/*
-File: CustomerMenu.cpp
-Description: Implements the CustomerMenu class which provides the customer’s console interface
-             in the Vehicle Service Management System. Handles menu display, user input, and
-             customer-specific operations such as booking services, viewing history, managing payments,
-             invoices, and notifications.
-Author: Trenser
-Date: 19-May-2026
-*/
-
-#include <iomanip>
-#include <iostream>
-#include "ComboPackage.h"
 #include "CustomerMenu.h"
-#include "Enums.h"
 #include "InputHelper.h"
-#include "InventoryItem.h"
-#include "Invoice.h"
-#include "Map.h"
-#include "MenuHelper.h"
 #include "OutputHelper.h"
-#include "Service.h"
-#include "ServiceBooking.h"
-#include "Timestamp.h"
-#include "User.h"
-#include "Utility.h"
-#include "Validator.h"
-#include "Vector.h"
 
-/*
-Function: showMenu
-Description: Displays the customer menu in a loop until the user chooses to logout.
-             Handles exceptions and ensures smooth user interaction.
-Parameters:
-    - None
-Returns:
-    - void
-*/
 void CustomerMenu::showMenu()
 {
-    while (true)
+	bool isMenuActive = true;
+	while (isMenuActive)
 	{
 		try
 		{
 			int choice;
 			util::clear();
-            std::cout << "Customer Menu"
+			std::cout << "" << std::endl;
-                << "\n1. Select a service"
-                << "\n2. Select a combo package"
-                << "\n3. Update Profile"
-                << "\n4. Change Password"
-                << "\n5. View Service History"
-                << "\n6. Complete Payments"
-                << "\n7. View Invoices"
-                << "\n8. View Notifications"
-                << "\n9. Configure Notifications"
-                << "\n10. Logout"
-                << "\nEnter a choice: ";
 			util::read(choice);
 			if (!handleOperation(choice))
 			{
-                break;
+				isMenuActive = false;
 			}
 		}
 		catch (const std::exception& e)
@@ -72,478 +28,45 @@ void CustomerMenu::showMenu()
 
 bool CustomerMenu::handleOperation(int choice)
 {
-    switch (choice)
-    {
-    case 1:
-        selectService();
-        break;
-    case 2:
-        selectComboPackage();
-        break;
-    case 3:
-        updateDetails();
-        break;
-    case 4:
-        changePassword();
-        break;
-    case 5:
-        viewServiceHistory();
-        break;
-    case 6:
-        completePayments();
-        break;
-    case 7:
-        viewInvoices();
-        break;
-    case 8:
-        viewNotifications();
-        break;
-    case 9:
-        configureNotifications();
-        break;
-    case 10:
-        logout();
 	return false;
-    default:
-        std::cout << "Enter a valid choice!" << std::endl;
-        util::pressEnter();
-    }
-    return true;
 }
 
 void CustomerMenu::logout()
 {
-	m_controller.logout();
 }
 
 void CustomerMenu::changePassword()
 {
-	std::string newPassword;
-	util::clear();
-	std::cout << "Enter new password: ";
-	util::read(newPassword);
-	m_controller.changePassword(newPassword);
-	if (!util::isPasswordValid(newPassword))
-	{
-		std::cout << "Error: Password is not strong enough!";
-		util::pressEnter();
-		return;
-	}
-	std::cout << "Password changed successfully";
-	util::pressEnter();
 }
 
 void CustomerMenu::updateDetails()
 {
-	std::string email, phone;
-	util::clear();
-	std::cout << "Enter new email: ";
-	util::read(email);
-	if (!util::isEmailValid(email))
-	{
-		std::cout << "Error: Email is invalid!";
-		util::pressEnter();
-		return;
-	}
-	std::cout << "Enter new phone: ";
-	util::read(phone);
-	if (!util::isPhoneNumberValid(phone))
-	{
-		std::cout << "Error: Phone number is invalid!";
-		util::pressEnter();
-		return;
-	}
-	m_controller.updateUserDetails(email, phone);
-	std::cout << "Profile details updated successfully";
-	util::pressEnter();
-}
-
-static const Service* selectServiceFromServices(const util::Map<std::string, const Service*>& services)
-{
-    util::Map<int, const Service*> activeServicesMap;
-    int currentIndex = 1;
-    int userInputIndex;
-    std::cout << std::left
-        << std::setw(10) << "Index"
-        << std::setw(15) << "Service ID"
-        << std::setw(25) << "Service Name"
-        << std::setw(15) << "Estimated Cost"
-        << std::endl;
-    for (int index = 0; index < services.getSize(); index++)
-    {
-        const Service* currentService = services.getValueAt(index);
-        if (currentService->getState() != util::State::ACTIVE)
-        {
-            continue;
-        }
-        activeServicesMap.insert(currentIndex, currentService);
-        double partsCost = util::calculatePartsCost(currentService);
-        std::cout << std::left
-            << std::setw(10) << currentIndex
-            << std::setw(15) << currentService->getId()
-            << std::setw(25) << currentService->getName()
-            << std::setw(15) << (currentService->getLaborCost() + partsCost)
-            << std::endl;
-        currentIndex++;
-    }
-    if (activeServicesMap.getSize() == 0)
-    {
-        std::cout << "No active services available." << std::endl;
-        return nullptr;
-    }
-    std::cout << "Enter service index: ";
-    util::read(userInputIndex);
-    if (activeServicesMap.find(userInputIndex) == -1)
-    {
-        std::cout << "Invalid service index." << std::endl;
-        return nullptr;
-    }
-    return activeServicesMap[userInputIndex];
 }
 
 void CustomerMenu::selectService()
 {
-    std::string vehicleNumber, vehicleBrand, vehicleModel;
-	auto services = m_controller.getServices();
-    util::Vector<std::string> selectedServices;
-    util::clear();
-    const Service* selectedService = selectServiceFromServices(services);
-    if (selectedService == nullptr)
-    {
-        std::cout << "Failed to book service!";
-        util::pressEnter();
-        return;
-    }
-    selectedServices.push_back(selectedService->getId());
-    util::clear();
-    std::cout << "Enter vehicle number: ";
-    util::read(vehicleNumber);
-    std::cout << "Enter vehicle brand: ";
-    util::read(vehicleBrand);
-    std::cout << "Enter vehicle model: ";
-    util::read(vehicleModel);
-    m_controller.purchaseService(selectedServices, vehicleNumber, vehicleBrand, vehicleModel);
-    std::cout << "Service has been booked successfully";
-    util::pressEnter();
-}
-
-static const ComboPackage* selectComboPackageFromPackages(const util::Map<std::string, const ComboPackage*>& comboPackages)
-{
-    util::Map<int, const ComboPackage*> activeComboPackages;
-    int currentIndex = 1;
-    int userInputIndex;
-    std::cout << std::left
-        << std::setw(10) << "Index"
-        << std::setw(15) << "Combo Package ID"
-        << std::setw(15) << "Combo Package Name"
-        << std::setw(15) << "Estimate Cost"
-        << std::endl;
-    for (int index = 0; index < comboPackages.getSize(); index++)
-    {
-        const ComboPackage* currentComboPackage = comboPackages.getValueAt(index);
-        if (currentComboPackage->getState() != util::State::ACTIVE)
-        {
-            continue;
-        }
-        activeComboPackages.insert(currentIndex, currentComboPackage);
-        std::cout << std::left
-            << std::setw(10) << currentIndex
-            << std::setw(15) << currentComboPackage->getId()
-            << std::setw(25) << currentComboPackage->getPackageName()
-            << std::setw(15) << util::calculateComboServiceEstimatedCost(currentComboPackage)
-            << std::endl;
-        currentIndex++;
-    }
-    if (activeComboPackages.getSize() == 0)
-    {
-        std::cout << "No active combo packages available." << std::endl;
-        return nullptr;
-    }
-    std::cout << "Enter combo package index: ";
-    util::read(userInputIndex);
-    if (activeComboPackages.find(userInputIndex) == -1)
-    {
-        std::cout << "Invalid combo package index." << std::endl;
-        return nullptr;
-    }
-    return activeComboPackages[userInputIndex];
 }
 
 void CustomerMenu::selectComboPackage()
 {
-    std::string vehicleNumber, vehicleBrand, vehicleModel;
-    auto comboPackages = m_controller.getComboPackages();
-    util::clear();
-    const ComboPackage* selectedComboPackage = selectComboPackageFromPackages(comboPackages);
-    if (selectedComboPackage == nullptr)
-    {
-        std::cout << "Failed to book combo package!";
-        util::pressEnter();
-        return;
-    }
-    util::clear();
-    std::cout << "Enter vehicle number: ";
-    util::read(vehicleNumber);
-    std::cout << "Enter vehicle brand: ";
-    util::read(vehicleBrand);
-    std::cout << "Enter vehicle model: ";
-    util::read(vehicleModel);
-    m_controller.purchaseComboPackage(selectedComboPackage->getId(), vehicleNumber, vehicleBrand, vehicleModel);
-    std::cout << "Combo Package has been booked successfully";
-    util::pressEnter();
 }
 
 void CustomerMenu::viewServiceHistory()
 {
-    util::clear();
-    bool hasServiceHistory = false;
-    const User* currentUser = m_controller.getAuthenticatedUser();
-    std::string currentUserID = currentUser->getId();
-    util::Map<std::string, const ServiceBooking*> serviceBookingsByCurrentUser = m_controller.getServiceBookingsByUser(currentUserID);
-    if (serviceBookingsByCurrentUser.getSize() != 0)
-    {
-        std::cout << std::left
-            << std::setw(12) << "Booking ID"
-            << std::setw(20) << "Technician"
-            << std::setw(15) << "Vehicle Brand"
-            << std::setw(15) << "Vehicle Number"
-            << std::setw(15) << "Vehicle Model"
-            << std::setw(10) << "Discount %"
-            << std::setw(12) << "Status"
-            << std::endl;
-        for (int iterator = 0; iterator < serviceBookingsByCurrentUser.getSize(); iterator++)
-        {
-            const ServiceBooking* currentBooking = serviceBookingsByCurrentUser.getValueAt(iterator);
-            std::string technicianName = currentBooking->getAssignedTechnician() == nullptr
-                ? "Not Assigned"
-                : currentBooking->getAssignedTechnician()->getName();
-            std::cout << std::left
-                << std::setw(12) << currentBooking->getId()
-                << std::setw(20) << technicianName
-                << std::setw(15) << currentBooking->getVehicleBrand()
-                << std::setw(15) << currentBooking->getVehicleNumber()
-                << std::setw(15) << currentBooking->getVehicleModel()
-                << std::setw(10) << currentBooking->getDiscountPercentage()
-                << std::setw(12) << util::getServiceJobStatusString(currentBooking->getStatus())
-                << std::endl;
-            hasServiceHistory = true;
-        }
-    }
-    if (!hasServiceHistory)
-    {
-        std::cout << "No history available." << std::endl;
-    }
-}
-
-static std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices)
-{
-    int currentIndex = 1, choice;
-    util::Map<int, const Invoice*> pendingInvoicesForPayment;
-    std::cout << std::left
-        << std::setw(6) << "Index"
-        << std::setw(12) << "BookingID"
-        << std::setw(15) << "VehicleBrand"
-        << std::setw(15) << "VehicleNumber"
-        << std::setw(12) << "TechID"
-        << std::setw(20) << "TechnicianName"
-        << std::setw(10) << "Discount(%)"
-        << std::setw(12) << "TotalAmount"
-        << std::setw(20) << "InvoiceDate"
-        << std::endl;
-    for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
-    {
-        const Invoice* currentInvoice = currentInvoices.getValueAt(iterator);
-        if (currentInvoice && currentInvoice->getStatus() == util::PaymentStatus::PENDING)
-        {
-            std::cout << std::left
-                << std::setw(6) << currentIndex
-                << std::setw(12) << currentInvoice->getBookingId()
-                << std::setw(15) << currentInvoice->getBooking()->getVehicleBrand()
-                << std::setw(15) << currentInvoice->getBooking()->getVehicleNumber()
-                << std::setw(12) << currentInvoice->getBooking()->getAssignedTechnician()->getId()
-                << std::setw(20) << currentInvoice->getBooking()->getAssignedTechnician()->getName()
-                << std::setw(10) << currentInvoice->getDiscountPercentage()
-                << std::setw(12) << currentInvoice->getTotalAmount()
-                << std::setw(20) << currentInvoice->getInvoiceDate().toString()
-                << std::endl;
-            pendingInvoicesForPayment.insert(currentIndex++, currentInvoice);
-        }
-    }
-    if (pendingInvoicesForPayment.getSize() == 0)
-    {
-        std::cout << "No pending invoices available for payment.\n";
-        return "";
-    }
-    std::cout << "Select the Invoice to pay (Index): ";
-    util::read(choice);
-    int selectedIndex = pendingInvoicesForPayment.find(choice);
-    if (selectedIndex != -1)
-    {
-        const Invoice* selectedInvoice = pendingInvoicesForPayment.getValueAt(selectedIndex);
-        return selectedInvoice->getId();
-    }
-    else
-    {
-        std::cout << "Invalid choice.\n";
-        return "";
-    }
-}
-
-static util::PaymentMode selectPaymentMode()
-{
-    int choice;
-    std::cout << "Enter the payment Mode\n1.OFFLINE\n2.ONLINE\nChoice: ";
-    util::read(choice);
-    if (choice == 1)
-    {
-        std::cout << "Offline mode selected.\n";
-        return util::PaymentMode::OFFLINE;
-    }
-    else if (choice == 2)
-    {
-        std::cout << "Online mode selected.\n";
-        return util::PaymentMode::ONLINE;
-    }
-    else
-    {
-        std::cout << "Invalid choice, Offline mode selected.\n";
-        return util::PaymentMode::OFFLINE;
-    }
 }
 
 void CustomerMenu::completePayments()
 {
-	util::clear();
-	util::Map<std::string, const Invoice*> currentInvoices = m_controller.getInvoicesByUser();
-	std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices);
-    if (selectedID == "")
-    {
-        std::cout << "Payment failed.\n";
-        return;
-    }
-    util::PaymentMode paymentMode = selectPaymentMode();
-    m_controller.completePayment(selectedID, paymentMode);
-    std::cout << "Payment completed successfully.\n";
-}
-
-static void displayInvoices(util::Map<std::string, const Invoice*> currentUserInvoices)
-{
-	if (currentUserInvoices.getSize() == 0)
-	{
-		std::cout << "No invoices found for this account." << std::endl;
-		util::pressEnter();
-		return;
-	}
-	else
-	{
-        for (int index = 0; index < currentUserInvoices.getSize(); index++)
-        {
-            const Invoice* currentInvoice = currentUserInvoices.getValueAt(index);
-            if (currentInvoice)
-            {
-                std::cout << "\nInvoice Details\n";
-                std::cout << "Booking ID: " << currentInvoice->getBookingId() << std::endl;
-                std::cout << "Vehicle Brand: " << currentInvoice->getBooking()->getVehicleBrand() << std::endl;
-                std::cout << "Vehicle Number: " << currentInvoice->getBooking()->getVehicleNumber() << std::endl;
-                std::cout << "Technician ID: " << currentInvoice->getBooking()->getAssignedTechnician()->getId() << std::endl;
-                std::cout << "Technician Name: " << currentInvoice->getBooking()->getAssignedTechnician()->getName() << std::endl;
-                std::cout << "Discount(%): " << currentInvoice->getDiscountPercentage() << std::endl;
-                std::cout << "Total Amount: " << currentInvoice->getTotalAmount() << std::endl;
-                std::cout << "Invoice Date: " << currentInvoice->getInvoiceDate().toString() << std::endl;
-                std::cout << "Payment Status: " << util::getPaymentStatusString(currentInvoice->getStatus()) << std::endl;
-                auto inventoryItemsInInvoice = currentInvoice->getParts();
-                std::cout << "\nItems Used:\n";
-                std::cout << std::left
-                    << std::setw(20) << "ItemName"
-                    << std::setw(10) << "Quantity"
-                    << std::setw(10) << "Price"
-                    << std::endl;
-                std::cout << std::string(40, '-') << std::endl;
-                for (int iterator = 0; iterator < inventoryItemsInInvoice.getSize(); iterator++)
-                {
-                    InventoryItem* currentItem = inventoryItemsInInvoice.getValueAt(iterator);
-                    std::cout << std::left
-                        << std::setw(20) << currentItem->getPartName()
-                        << std::setw(10) << currentItem->getQuantity()
-                        << std::setw(10) << currentItem->getPrice()
-                        << std::endl;
-                }
-            }
-            else
-            {
-                throw std::runtime_error("Null invoice encountered while displaying invoices.");
-            }
-        }
-	}
 }
 
 void CustomerMenu::viewInvoices()
 {
-	util::clear();
-	util::Map<std::string, const Invoice*> currentUserInvoices = m_controller.getInvoicesByUser();
-	displayInvoices(currentUserInvoices);
 }
 
-/*
-Function: viewNotifications
-Description: Displays notifications for the customer and allows deletion of notifications.
-Parameters:
-    - None
-Returns:
-    - void
-*/
 void CustomerMenu::viewNotifications()
 {
-	viewAndDeleteNotification(m_controller);
 }
 
-/*
-Function: getNotificationPreference (static helper)
-Description: Helper function to configure notification preferences for a specific service.
-Parameters:
-    - serviceName: Name of the service for which notifications are being configured.
-Returns:
-    - bool: True if notifications are enabled, False if disabled.
-*/
-static bool getNotificationPreference(const std::string& serviceName)
-{
-    int choice;
-    while (true)
-    {
-        util::clear();
-        std::cout << "    Configure Notification Preferences\n";
-        std::cout << "\n" << serviceName << " Notifications\n";
-        std::cout << "1. Enable Notifications\n";
-        std::cout << "2. Disable Notifications\n";
-        std::cout << "Enter your choice: ";
-        util::read(choice);
-        if (choice == 1)
-        {
-            return true;
-        }
-        if (choice == 2)
-        {
-            return false;
-        }
-        std::cout << "\nInvalid choice. Please enter 1 or 2.\n";
-        util::pressEnter();
-    }
-}
-
-/*
-Function: configureNotifications
-Description: Allows the customer to configure notification preferences for payment and service management.
-Parameters:
-    - None
-Returns:
-    - void
-*/
 void CustomerMenu::configureNotifications()
 {
-    bool paymentServiceNotifications = getNotificationPreference("Payment Management Service");
-    bool serviceManagementNotifications = getNotificationPreference("Service Management Service");
-    m_controller.configureNotifications(paymentServiceNotifications, serviceManagementNotifications);
-    util::clear();
-    std::cout << "Notification preferences updated successfully.\n";
-    util::pressEnter();
 }

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

@@ -1,12 +1,3 @@
-/*
-File: CustomerMenu.h
-Description: Declares the CustomerMenu class which provides the customer-facing console menu in the Vehicle Service Management System.
-             Supports operations such as account management, service selection, combo package booking, viewing service history,
-             handling payments and invoices, and managing notifications.
-Author: Trenser
-Date: 19-May-2026
-*/
-
 #pragma once
 #include "Controller.h"
 

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

@@ -1,116 +0,0 @@
-/*
-File: MenuHelper.h
-Description: Provides inline utility functions to support menu operations in the Vehicle Service Management System.
-             Includes helper functions for selecting, displaying, and managing notifications, as well as
-             integrating with the controller for user interactions.
-Author: Trenser
-Date: 21-May-2026
-*/
-
-#pragma once
-#include <string>
-#include <iomanip>
-#include "Vector.h"
-#include "Controller.h"
-#include "Notification.h"
-#include "Map.h"
-#include "InputHelper.h"
-#include "OutputHelper.h"
-
-/*
-Function: selectNotification
-Description: Displays a list of notifications with index, ID, title, and timestamp,
-             then allows the user to select one by index.
-Parameters:
-    - notifications: Vector of Notification pointers to be displayed.
-Returns:
-    - const Notification* representing the selected notification.
-    - nullptr if no notifications are available or if the selection is invalid.
-*/
-inline const Notification* selectNotification(const util::Vector<const Notification*>& notifications)
-{
-    if (notifications.getSize() == 0)
-    {
-        std::cout << "No notifications available." << std::endl;
-        return nullptr;
-    }
-    util::Map<int, const Notification*> indexedNotifications;
-    std::cout << std::left
-        << std::setw(6) << "Index"
-        << std::setw(15) << "ID"
-        << std::setw(30) << "Title"
-        << std::setw(25) << "Timestamp"
-        << std::endl;
-    int currentIndex = 1;
-    for (int index = 0; index < notifications.getSize(); index++)
-    {
-        const Notification* currentNotification = notifications[index];
-        if (currentNotification)
-        {
-            std::cout << std::left
-                << std::setw(6) << currentIndex
-                << std::setw(15) << currentNotification->getId()
-                << std::setw(30) << currentNotification->getTitle()
-                << std::setw(25) << currentNotification->getCreatedAt().toString()
-                << std::endl;
-            indexedNotifications.insert(currentIndex, currentNotification);
-            currentIndex++;
-        }
-    }
-    int selectedIndex;
-    std::cout << "Select notification: ";
-    util::read(selectedIndex);
-    if (!indexedNotifications.containsKey(selectedIndex))
-    {
-        std::cout << "Invalid selection." << std::endl;
-        return nullptr;
-    }
-    return indexedNotifications[selectedIndex];
-}
-
-/*
-Function: displayNotification
-Description: Displays detailed information about a single notification, including ID, title, timestamp, and message.
-Parameters:
-    - notification: Pointer to the Notification object to be displayed.
-Returns:
-    - void
-*/
-inline void displayNotification(const Notification* notification)
-{
-    util::clear();
-    if (!notification)
-    {
-        std::cout << "Notification not found." << std::endl;
-        return;
-    }
-    std::cout << "Notification Details" << std::endl;
-    std::cout << "ID        : " << notification->getId() << std::endl;
-    std::cout << "Title     : " << notification->getTitle() << std::endl;
-    std::cout << "Timestamp : " << notification->getCreatedAt().toString() << std::endl;
-    std::cout << "Message   : " << notification->getMessage() << std::endl;
-}
-
-/*
-Function: viewAndDeleteNotification
-Description: Allows the user to view a notification and then delete it from the system using the controller.
-Parameters:
-    - controller: Reference to the Controller object used to manage notifications.
-Returns:
-    - void
-*/
-inline void viewAndDeleteNotification(Controller& controller)
-{
-    util::clear();
-	auto notifications = controller.getNotifications();
-	const Notification* selectedNotification = selectNotification(notifications);
-	if (!selectedNotification)
-	{
-		std::cout << "Failed to display notification!";
-		util::pressEnter();
-		return;
-	}
-	displayNotification(selectedNotification);
-    controller.deleteNotification(selectedNotification->getId());
-    util::pressEnter();
-}

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

@@ -1,49 +1,21 @@
-/*
-File: TechnicianMenu.cpp
-Description: Implementation file containing the method definitions of the
-             TechnicianMenu class, including menu handling, job completion,
-             notification viewing, password management, and logout logic.
-Author: Trenser
-Date:19-May-2026
-*/
-
-#include <iomanip>
-#include "Enums.h"
-#include "InputHelper.h"
-#include "JobCard.h"
-#include "MenuHelper.h"
-#include "OutputHelper.h"
-#include "Service.h"
 #include "TechnicianMenu.h"
-#include "Validator.h"
+#include "InputHelper.h"
+#include "OutputHelper.h"
 
-/*
-Function: showMenu
-Description: Displays the technician menu in a loop until the user chooses to logout.
-			 Handles exceptions and ensures smooth user interaction.
-Parameters:
-	- None
-Returns:
-	- void
-*/
 void TechnicianMenu::showMenu()
 {
-    while (true)
+	bool isMenuActive = true;
+	while (isMenuActive)
 	{
 		try
 		{
 			int choice;
 			util::clear();
-            std::cout << "Technician Menu"
+			std::cout << "" << std::endl;
-                << "\n1. Mark Job as Completed"
-                << "\n2. View Notifications"
-                << "\n3. Change Password"
-                << "\n4. Logout"
-                << "\nEnter a choice: ";
 			util::read(choice);
 			if (!handleOperation(choice))
 			{
-                break;
+				isMenuActive = false;
 			}
 		}
 		catch (const std::exception& e)
@@ -54,147 +26,15 @@ void TechnicianMenu::showMenu()
 	}
 }
 
-/*
-Function: handleOperation
-Description: Executes the corresponding technician operation based on the selected menu choice.
-Parameter: int choice - selected menu option
-Return type: bool - true if menu continues, false if logout
-*/
 bool TechnicianMenu::handleOperation(int choice)
 {
-    switch (choice)
-    {
-    case 1:
-        completeJob();
-        break;
-    case 2:
-        viewNotifications();
-        break;
-    case 3:
-        changePassword();
-        break;
-    case 4:
-        logout();
 	return false;
-    default:
-        std::cout << "Enter a valid choice!" << std::endl;
-        util::pressEnter();
 }
-    return true;
-}
-
-static std::string selectJobCardToComplete(util::Map<std::string, const JobCard*>& assignedJobCards, util::Map<int, const JobCard*>& incompleteJobCards)
-{
-    int currentIndex = 1;
-    int choice;
-    bool hasIncompleteJobCard = false;
-    std::cout << std::left
-        << std::setw(6) << "Index"
-        << std::setw(12) << "BookingID"
-        << std::setw(12) << "JobID"
-        << std::setw(20) << "ServiceName"
-        << std::setw(12) << "ServiceID"
-        << std::endl;
-    for (int iterator = 0; iterator < assignedJobCards.getSize(); iterator++)
-    {
-        const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
-        if (currentJobCard && (currentJobCard->getStatus() == util::ServiceJobStatus::STARTED))
-        {
-            std::cout << std::left << std::setw(6) << currentIndex
-                << std::setw(12) << currentJobCard->getBookingId()
-                << std::setw(12) << currentJobCard->getId()
-                << std::setw(20) << currentJobCard->getService()->getName()
-                << std::setw(12) << currentJobCard->getServiceId()
-                << std::endl;
-            hasIncompleteJobCard = true;
-            incompleteJobCards.insert(currentIndex++, currentJobCard);
-        }
-    }
-    if (!hasIncompleteJobCard)
-    {
-        std::cout << "No pending jobs are present.\n";
-        return "";
-    }
-    std::cout << "Select the Job Card to complete (Index): ";
-    util::read(choice);
-    int selectedJobCardIndex = incompleteJobCards.find(choice);
-    if (selectedJobCardIndex != -1)
-    {
-        const JobCard* selectedJobCard = incompleteJobCards.getValueAt(selectedJobCardIndex);
-        return selectedJobCard->getId();
-    }
-    else
-    {
-        std::cout << "Invalid choice.\n";
-        return "";
-    }
-}
-
 
 void TechnicianMenu::completeJob()
 {
-	util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
-	util::Map<int, const JobCard*> incompleteJobCards;
-	std::cout << "Jobs to be completed.\n";
-	std::string selectedJobID = selectJobCardToComplete(assignedJobCards, incompleteJobCards);
-	if (selectedJobID == "")
-	{
-		std::cout << "Failed to complete the job.\n";
-	}
-	else
-	{
-		m_controller.completeJob(selectedJobID);
-		std::cout << "Job marked as completed.\n";
-	}
 }
 
-/*
-Function: viewNotifications
-Description: Displays notifications for the technician and allows deletion of notifications.
-Parameters:
-	- None
-Returns:
-	- void
-*/
 void TechnicianMenu::viewNotifications()
 {
-	viewAndDeleteNotification(m_controller);
-}
-
-/*
-Function: logout
-Description: Logs out the currently authenticated technician user.
-Parameter: None
-Return type: void
-*/
-void TechnicianMenu::logout()
-{
-    m_controller.logout();
-}
-
-/*
-Function: changePassword
-Description: Allows the technician to change their password after validation.
-Parameter: None
-Return type: void
-*/
-void TechnicianMenu::changePassword()
-{
-    std::string newPassword;
-    while (true)
-    {
-        util::clear();
-        std::cout << "Enter new password: ";
-        util::read(newPassword);
-        if (!util::isPasswordValid(newPassword))
-        {
-            std::cout << "Error: Password is not strong enough!\n";
-            util::pressEnter();
-            continue;
-        }
-        m_controller.changePassword(newPassword);
-        std::cout << "Password changed successfully\n";
-        util::pressEnter();
-        break;
-    }
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/TechnicianMenu.h

@@ -1,11 +1,3 @@
-/*
-File: TechnicianMenu.h
-Description: Header file declaring the TechnicianMenu class, which provides
-             technician operations such as job completion, notification viewing,
-             password management, and logout functionality.
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include "Controller.h"
 
@@ -18,6 +10,4 @@ public:
     void showMenu();
     void completeJob();
     void viewNotifications();
-    void logout();
-    void changePassword();
 };

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/UserInterface.cpp

@@ -1,29 +1,10 @@
-/*
-File: UserInterface.cpp
-Description: Implementation file containing the method definitions of the
-			 UserInterface class, including system run loop, login handling,
-			 and customer registration logic.
-Author: Trenser
-Date:19-May-2026
-*/
 #include "UserInterface.h"
-#include "Enums.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
-#include "User.h"
-#include "Validator.h"
 
-/*
-Function: run
-Description: Runs the main system loop, displaying the initial menu for login,
-			 customer registration, or exit. Handles exceptions gracefully.
-Parameter: None
-Return type: void
-*/
 void UserInterface::run()
 {
 	m_controller.loadSystemData();
-	m_controller.runSystemChecks();
 	bool isMenuActive = true;
 	while (isMenuActive)
 	{
@@ -47,12 +28,6 @@ void UserInterface::run()
 	m_controller.saveSystemData();
 }
 
-/*
-Function: handleOperation
-Description: Executes the corresponding system operation based on the selected menu choice.
-Parameter: int choice - selected menu option
-Return type: bool - true if menu continues, false if exit
-*/
 bool UserInterface::handleOperation(int choice)
 {
 	switch (choice)
@@ -73,90 +48,12 @@ bool UserInterface::handleOperation(int choice)
 	return true;
 }
 
-/*
-Function: login
-Description: Handles user login by validating credentials. Based on the authenticated
-			 user type, navigates to the appropriate menu (Admin, Technician, Customer).
-Parameter: None
-Return type: void
-*/
 void UserInterface::login()
 {
-	std::string username, password;
+
-	util::clear();
-	std::cout << "Enter username: ";
-	util::read(username);
-	std::cout << "Enter password: ";
-	util::read(password);
-	if (m_controller.login(username, password))
-	{
-		const User* authenticatedUser = m_controller.getAuthenticatedUser();
-		if (authenticatedUser != nullptr)
-		{
-			switch (authenticatedUser->getUserType())
-			{
-			case util::UserType::ADMIN:
-				m_adminMenu.showMenu();
-				break;
-			case util::UserType::TECHNICIAN:
-				m_technicianMenu.showMenu();
-				break;
-			case util::UserType::CUSTOMER:
-				m_customerMenu.showMenu();
-				break;
-			default:
-				std::cout << "\nError: Unknown user type";
-				break;
-			}
-		}
-	}
-	else
-	{
-		std::cout << "\nError: Invalid Username or Password";
-	}
 }
 
-/*
-Function: registerCustomer
-Description: Handles the registration process for new customers.
-Parameters:
-	- None
-Returns:
-	- void
-*/
 void UserInterface::registerCustomer()
 {
-	std::string username, name, email, phone, password;
+
-	util::clear();
-	std::cout << "Enter username: ";
-	util::read(username);
-	std::cout << "Enter name: ";
-	util::read(name);
-	std::cout << "Enter email: ";
-	util::read(email);
-	if (!util::isEmailValid(email))
-	{
-		std::cout << "Error: Email is invalid!";
-		util::pressEnter();
-		return;
-	}
-	std::cout << "Enter password: ";
-	util::read(password);
-	if (!util::isPasswordValid(password))
-	{
-		std::cout << "Error: Password is invalid!";
-		util::pressEnter();
-		return;
-	}
-	std::cout << "Enter phone: ";
-	util::read(phone);
-	if (!util::isPhoneNumberValid(phone))
-	{
-		std::cout << "Error: Phone number is invalid!";
-		util::pressEnter();
-		return;
-	}
-	m_controller.createCustomer(username, name, password, email, phone);
-	std::cout << "Registration is successful";
-	util::pressEnter();
 }

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/UserInterface.h

@@ -1,12 +1,3 @@
-/*
-File: UserInterface.h
-Description: Header file declaring the UserInterface class, which provides
-             the main entry point for the Vehicle Service System. Handles
-             login, customer registration, and menu navigation for different
-             user roles (Admin, Technician, Customer).
-Author: Trenser
-Date:19-May-2026
-*/
 #pragma once
 #include "Controller.h"
 #include "AdminMenu.h"