Add documentation headers across system modules

<UserStory> NOT001: View Customer Notifications </UserStory>

<Changes>
1. Added shared notification helper functions to display notifications in tabular format, support notification selection, and show full notification details.
2. Implemented notification deletion logic in Controller and UserManagementService to remove notifications for the authenticated user after viewing.
3. Updated CustomerMenu::viewNotifications() to use the shared notification viewing and deletion flow.
</Changes>

<Test>

Precondition:
1. Customer is registered in the system.
2. Customer is logged into the system.
3. Customer has one or more notifications available.

Steps:
1. Navigate to “View Notifications” from the customer menu.
- Verify that the system displays the list of notifications with title and timestamp.

2. Select a notification from the displayed list.
   - Verify that the system displays the full notification details including message.

3. View the selected notification and continue.
   - Verify that the viewed notification is deleted from the system.

4. Navigate to “View Notifications” again.
   - Verify that the previously viewed notification no longer appears in the notification list.

</Test>

<Review>
Sreeja Reghukumar, please review
</Review>

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

@@ -1,5 +1,22 @@
+/*
+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

@@ -173,18 +173,16 @@
     <ClInclude Include="services\UserManagementService.h" />
     <ClInclude Include="utilities\Config.h" />
     <ClInclude Include="utilities\Enums.h" />
-    <ClInclude Include="utilities\FileHelper.h" />
-    <ClInclude Include="utilities\FileManager.h" />
     <ClInclude Include="utilities\InputHelper.h" />
     <ClInclude Include="utilities\Map.h" />
     <ClInclude Include="utilities\OutputHelper.h" />
-    <ClInclude Include="utilities\StringHelper.h" />
     <ClInclude Include="utilities\Timestamp.h" />
     <ClInclude Include="utilities\Utility.h" />
     <ClInclude Include="utilities\Validator.h" />
     <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,20 +233,8 @@
     <ClInclude Include="models\ComboPackage.h">
       <Filter>Header Files\Models</Filter>
     </ClInclude>
-    <ClInclude Include="utilities\Config.h">
+    <ClInclude Include="views\MenuHelper.h">
-      <Filter>Header Files\Utilities</Filter>
+      <Filter>Header Files\Views</Filter>
-    </ClInclude>
-    <ClInclude Include="utilities\FileManager.h">
-      <Filter>Header Files\Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="utilities\StringHelper.h">
-      <Filter>Header Files\Utilities</Filter>
-    </ClInclude>
-    <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,4 +1,13 @@
+/*
+File: Controller.cpp
+Description: Implements the Controller class which manages authentication, user, service, inventory, payment, and notification operations in the Vehicle Service Management System.
+Author: Trenser
+Date: 19-May-2026
+*/
+
+#include <stdexcept>
 #include "Controller.h"
+#include "User.h"
 
 bool Controller::login(const std::string& username, const std::string& password)
 {
@@ -128,68 +137,94 @@ void Controller::completePayment(const std::string& invoiceID, util::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()
 {
-    return util::Vector<const Notification*>();
+    const User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
+    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)
-void Controller::configureNotifications(const std::string& userID, bool paymentNotifications, bool serviceNotifications)
     {
+        throw std::runtime_error("No user is currently logged in!");
+    }
+    m_userManagementService.deleteNotification(notificationID, authenticatedUser->getId());
 }
 
 /*
-Function: loadSystemData
+Function: configureNotifications
-Description: Loads all system data from persistent storage into memory.
+Description: Configures notification preferences for the authenticated user.
-             Invokes the respective management services to load users, inventory items, services,
+             Attaches or detaches the user from payment and service notifications.
-             combo packages, service bookings, job cards, invoices, and observers.
 Parameters:
-    - None
+    - paymentNotifications: bool, enable/disable payment notifications
-Returns:
+    - serviceNotifications: bool, enable/disable service notifications
-    - void
+Return type: void
 */
-void Controller::loadSystemData()
+void Controller::configureNotifications(bool paymentNotifications, bool serviceNotifications)
 {
-    m_userManagementService.loadUsers();
+    User* authenticatedUser = m_authenticationManagementService.getAuthenticatedUser();
-    m_inventoryManagementService.loadInventoryItems();
+    if (authenticatedUser)
-    m_serviceManagementService.loadServices();
+    {
-    m_serviceManagementService.loadComboPackages();
+        if (paymentNotifications)
-    m_serviceManagementService.loadServiceBookings();
+        {
-    m_serviceManagementService.loadJobCards();
+            m_paymentManagementService.attach(authenticatedUser);
-    m_paymentManagementService.loadInvoices();
+        }
-    m_serviceManagementService.loadObservers();
+        else
-    m_paymentManagementService.loadObservers();
+        {
-    m_inventoryManagementService.loadObservers();
+            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!");
+    }
 }
 
 /*
-Function: saveSystemData
+Function: runSystemChecks
-Description: Saves all system data from memory back to persistent storage.
+Description: Executes system checks including sending low stock alerts
-             Invokes the respective management services to save users, inventory items, services,
+             and payment reminders.
-             combo packages, service bookings, job cards, invoices, and observers.
+Parameters: None
-Parameters:
+Return type: void
-    - None
-Returns:
-    - void
 */
-void Controller::saveSystemData()
-{
-    m_userManagementService.saveUsers();
-    m_inventoryManagementService.saveInventoryItems();
-    m_serviceManagementService.saveServices();
-    m_serviceManagementService.saveComboPackages();
-    m_serviceManagementService.saveServiceBookings();
-    m_serviceManagementService.saveJobCards();
-    m_paymentManagementService.saveInvoices();
-    m_serviceManagementService.saveObservers();
-    m_paymentManagementService.saveObservers();
-    m_inventoryManagementService.saveObservers();
-}
-
 void Controller::runSystemChecks()
 {
+    m_inventoryManagementService.sendLowStockAlerts();
+    m_paymentManagementService.sendPaymentReminders();
 }
 

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

@@ -1,10 +1,18 @@
+/*
+File: Controller.h
+Description: File contains the Controller class which manages authentication, user, service, inventory, payment, and notification operations in the Vehicle Service Management System.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include "Map.h"
 #include <string>
 #include "Enums.h"
-#include "InventoryManagementService.h"
+#include "AuthenticationManagementService.h"
-#include "UserManagementService.h"
 #include "ServiceManagementService.h"
+#include "UserManagementService.h"
+#include "InventoryManagementService.h"
 #include "PaymentManagementService.h"
 
 class Service;
@@ -19,10 +27,11 @@ class Notification;
 class Controller
 {
 private:
+    AuthenticationManagementService m_authenticationManagementService;
     UserManagementService m_userManagementService;
     InventoryManagementService m_inventoryManagementService;
-    ServiceManagementService m_serviceManagementService;
     PaymentManagementService m_paymentManagementService;
+    ServiceManagementService m_serviceManagementService;
 public:
     bool login(const std::string& username, const std::string& password);
     void logout();
@@ -55,8 +64,6 @@ public:
     void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
     util::Vector<const Notification*> getNotifications();
     void deleteNotification(const std::string& notificationID);
-    void configureNotifications(const std::string& userID, bool paymentNotifications, bool serviceNotifications);
+    void configureNotifications(bool paymentNotifications, bool serviceNotifications);
-    void loadSystemData();
-    void saveSystemData();
     void runSystemChecks();
 };

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

@@ -1,3 +1,10 @@
+/*
+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;
@@ -6,5 +13,5 @@ class Observer
 {
 public:
     virtual ~Observer() = default;
-    virtual void update(Notification* notification) = 0;
+    virtual void addNotification(Notification* notification) = 0;
 };

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

@@ -1,7 +1,13 @@
+/*
+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"
-#include "Vector.h"
 
 class User;
 class Notification;

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

@@ -1,46 +1,128 @@
+/*
+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,5 +1,11 @@
-#pragma once
+/*
+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/files/README.md

@@ -1 +0,0 @@
-Place files here.

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

@@ -1,232 +1,174 @@
-#include <sstream>
+/*
-#include <stdexcept>
+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 "ComboPackage.h"
-#include "Service.h"
-#include "Factory.h"
-#include "StringHelper.h"
 
 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),
     m_discountPercentage(discountPercentage),
     m_status(util::State::ACTIVE),
-    m_services(services)
+    m_services(services) {}
-{
-    int numberOfServices = m_services.getSize();
-    auto servicePointers = m_services.getValues();
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        m_serviceIDs.push_back(servicePointers[index]->getId());
-    }
-}
 
 /*
-Function: ComboPackage (parameterized constructor with ID)
+Function: getId
-Description: Initializes a combo package with an existing ID, name, discount percentage,
+Description: Retrieves the unique ID of the combo package.
-             service IDs, and state. Updates UID tracking based on ID.
 Parameters:
-    - id: const std::string&, unique ID of the package
+    - None
-    - 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
+    - const std::string& representing the package ID.
 */
-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),
-    m_discountPercentage(discountPercentage),
-    m_serviceIDs(serviceIDs),
-    m_status(status)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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;
 }
 
-const util::Vector<std::string>& ComboPackage::getServiceIDs() const
+/*
-{
+Function: getServices
-    return m_serviceIDs;
+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;
-    m_serviceIDs.clear();
-    int numberOfServices = m_services.getSize();
-    auto servicePointers = m_services.getValues();
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        m_serviceIDs.push_back(servicePointers[index]->getId());
-    }
 }
 
+/*
+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();
-    std::string serviceIDsString;
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        serviceIDsString += serviceIDs[index];
-        if (index < numberOfServices - 1)
-        {
-            serviceIDsString += '|';
-        }
-    }
-    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;
-    std::string serviceID;
-    std::istringstream serializedServiceIDs(serviceIDsString);
-    while (getline(serializedServiceIDs, serviceID, '|'))
-    {
-        serviceIDs.push_back(serviceID);
-    }
-    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;
-    serializedComboPackage << m_id << ','
-        << m_packageName << ','
-        << m_discountPercentage << ','
-        << getServiceIDsAsString(m_serviceIDs) << ','
-        << util::getStateString(m_status);
-    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;
-    std::string discountPercentageString, serviceIDsString, statusString;
-    double discountPercentage;
-    std::istringstream serializedComboPackage(record);
-    getline(serializedComboPackage, id, ',');
-    getline(serializedComboPackage, packageName, ',');
-    getline(serializedComboPackage, discountPercentageString, ',');
-    getline(serializedComboPackage, serviceIDsString, ',');
-    getline(serializedComboPackage, statusString, ',');
-    try
-    {
-        discountPercentage = std::stod(discountPercentageString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid combo package data");
-    }
-    util::Vector<std::string> serviceIDs = getServiceIDsAsVector(serviceIDsString);
-    util::State status = util::getState(statusString);
-    return Factory::getObject<ComboPackage>(
-        id,
-        packageName,
-        discountPercentage,
-        serviceIDs,
-        status
-    );
-}
-
-/*
-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,7 +1,13 @@
+/*
+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"
-#include "Vector.h"
 #include "Enums.h"
 
 class Service;
@@ -13,17 +19,14 @@ private:
     std::string m_id;
     std::string m_packageName;
     double m_discountPercentage;
-    util::Vector<std::string> m_serviceIDs;
     util::Map<std::string, Service*> m_services;
     util::State m_status;
 public:
     ComboPackage();
     ComboPackage(const std::string& packageName, double discountPercentage, const util::Map<std::string, Service*>& services);
-    ComboPackage(const std::string& id, const std::string& packageName, double discountPercentage, const util::Vector<std::string>& serviceIDs, util::State status);
     const std::string& getId() const;
     const std::string& getPackageName() const;
     double getDiscountPercentage() const;
-    const util::Vector<std::string>& getServiceIDs() const;
     const util::Map<std::string, Service*>& getServices() const;
     util::State getState() const;
     void setId(const std::string& id);
@@ -31,7 +34,4 @@ public:
     void setDiscountPercentage(double discountPercentage);
     void setServices(const util::Map<std::string, Service*>& services);
     void setState(util::State status);
-    std::string serialize() const;
-    static ComboPackage* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,17 +1,41 @@
-#include <sstream>
+/*
-#include <stdexcept>
+File: InventoryItem.cpp
-#include "Factory.h"
+Description: Implements the InventoryItem class which represents an inventory item in the Vehicle Service Management System.
-#include "StringHelper.h"
+             Provides constructors, accessors, and mutators for item details such as ID, part name, quantity, price, and state.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #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),
@@ -20,151 +44,131 @@ InventoryItem::InventoryItem(const std::string& partName, int quantity, double p
     m_price(price) {}
 
 /*
-Function: InventoryItem (parameterized constructor with ID)
+Function: getId
-Description: Initializes an inventory item with an existing ID, part name, quantity,
+Description: Retrieves the unique ID of the inventory item.
-             price, and state. Updates UID tracking based on ID.
 Parameters:
-    - id: const std::string&, unique ID of the item
+    - None
-    - 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
+    - const std::string& representing the item ID.
 */
-InventoryItem::InventoryItem(const std::string& id, const std::string& partName, int quantity, double price, util::State status)
-    : m_id(id),
-    m_partName(partName),
-    m_quantity(quantity),
-    m_status(status),
-    m_price(price)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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;
-    serializedInventoryItem << m_id << ','
-        << m_partName << ','
-        << m_quantity << ','
-        << m_price << ','
-        << util::getStateString(m_status);
-    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;
-    std::string quantityString, priceString, statusString;
-    int quantity;
-    double price;
-    std::istringstream serializedInventoryItem(record);
-    getline(serializedInventoryItem, id, ',');
-    getline(serializedInventoryItem, partName, ',');
-    getline(serializedInventoryItem, quantityString, ',');
-    getline(serializedInventoryItem, priceString, ',');
-    getline(serializedInventoryItem, statusString, ',');
-    try
-    {
-        quantity = std::stoi(quantityString);
-        price = std::stod(priceString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid inventory item data");
-    }
-    util::State status = util::getState(statusString);
-    return Factory::getObject<InventoryItem>(
-        id,
-        partName,
-        quantity,
-        price,
-        status
-    );
-}
-
-/*
-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,3 +1,12 @@
+/*
+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"
@@ -14,7 +23,6 @@ private:
 public:
     InventoryItem();
     InventoryItem(const std::string& partName, int quantity, double price);
-    InventoryItem(const std::string& id, const std::string& partName, int quantity, double price, util::State status);
     const std::string& getId() const;
     const std::string& getPartName() const;
     int getQuantity() const;
@@ -25,7 +33,4 @@ public:
     void setQuantity(int quantity);
     void setPrice(double price);
     void setState(util::State status);
-    std::string serialize() const;
-    static InventoryItem* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,12 +1,26 @@
-#include <sstream>
+/*
-#include <stdexcept>
+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 "Invoice.h"
-#include "Factory.h"
-#include "InventoryItem.h"
-#include "StringHelper.h"
 
 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),
@@ -17,11 +31,29 @@ 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, const util::Map<std::string,
+    double laborCost, const util::Map<int,
     InventoryItem*>& parts,
     double partsCost,
     double discountPercentage, 
@@ -41,328 +73,292 @@ Invoice::Invoice(
     m_totalAmount(totalAmount),
     m_paymentDate(paymentDate),
     m_paymentMethod(paymentMethod),
-    m_status(status) 
+    m_status(status) {}
-{
-    int numberOfParts = m_parts.getSize();
-    auto partPointers = m_parts.getValues();
-    for (int index = 0; index < numberOfParts; index++)
-    {
-        m_partIDs.push_back(partPointers[index]->getId());
-    }
-}
-
-Invoice::Invoice(
-    const std::string& id,
-    const std::string& bookingId,
-    const util::Timestamp& invoiceDate,
-    const util::Vector<std::string>& partIDs,
-    double laborCost,
-    double partsCost,
-    double discountPercentage,
-    double totalAmount,
-    const util::Timestamp& paymentDate,
-    util::PaymentMode paymentMethod,
-    util::PaymentStatus status
-)
-    : m_id(id),
-    m_bookingId(bookingId),
-    m_booking(nullptr),
-    m_invoiceDate(invoiceDate),
-    m_partIDs(partIDs),
-    m_laborCost(laborCost),
-    m_partsCost(partsCost),
-    m_discountPercentage(discountPercentage),
-    m_totalAmount(totalAmount),
-    m_paymentDate(paymentDate),
-    m_paymentMethod(paymentMethod),
-    m_status(status)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
 
+/*
+Function: getId
+Description: Retrieves the unique ID of the invoice.
+Returns:
+    - const std::string& representing the invoice ID.
+*/
 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
+Function: getParts
-Description: Retrieves the IDs of parts used in the invoice.
+Description: Retrieves the map of inventory items used in the service.
-Parameters:
-    - None
 Returns:
-    - const util::Vector<std::string>&: Part IDs
+    - const util::Map<int, InventoryItem*>& representing the parts.
 */
-const util::Vector<std::string>& Invoice::getPartIDs() const
+const util::Map<int, InventoryItem*>& Invoice::getParts() const
-{
-    return m_partIDs;
-}
-
-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;
 }
 
-void Invoice::setParts(const util::Map<std::string, InventoryItem*>& parts)
+/*
+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<int, InventoryItem*>& parts)
 {
     m_parts = parts;
-    m_partIDs.clear();
-    int numberOfParts = m_parts.getSize();
-    auto partPointers = m_parts.getValues();
-    for (int index = 0; index < numberOfParts; index++)
-    {
-        m_partIDs.push_back(partPointers[index]->getId());
-    }
 }
 
+/*
+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();
-    std::string partIDsString;
-    for (int index = 0; index < numberOfParts; index++)
-    {
-        partIDsString += partIDs[index];
-        if (index < numberOfParts - 1)
-        {
-            partIDsString += '|';
-        }
-    }
-    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;
-    std::string partID;
-    std::istringstream serializedPartIDs(partIDsString);
-    while (getline(serializedPartIDs, partID, '|'))
-    {
-        partIDs.push_back(partID);
-    }
-    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;
-    serializedInvoice << m_id << ','
-        << m_bookingId << ','
-        << m_invoiceDate.toString() << ','
-        << m_laborCost << ','
-        << getPartIDsAsString(m_partIDs) << ','
-        << m_partsCost << ','
-        << m_discountPercentage << ','
-        << m_totalAmount << ','
-        << m_paymentDate.toString() << ','
-        << util::getPaymentModeString(m_paymentMethod) << ','
-        << util::getPaymentStatusString(m_status);
-    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;
-    std::string invoiceDateString, laborCostString, partIDsString;
-    std::string partsCostString, discountPercentageString, totalAmountString;
-    std::string paymentDateString, paymentMethodString, statusString;
-    double laborCost, partsCost, discountPercentage, totalAmount;
-    std::istringstream serializedInvoice(record);
-    getline(serializedInvoice, id, ',');
-    getline(serializedInvoice, bookingId, ',');
-    getline(serializedInvoice, invoiceDateString, ',');
-    getline(serializedInvoice, laborCostString, ',');
-    getline(serializedInvoice, partIDsString, ',');
-    getline(serializedInvoice, partsCostString, ',');
-    getline(serializedInvoice, discountPercentageString, ',');
-    getline(serializedInvoice, totalAmountString, ',');
-    getline(serializedInvoice, paymentDateString, ',');
-    getline(serializedInvoice, paymentMethodString, ',');
-    getline(serializedInvoice, statusString, ',');
-    util::Timestamp invoiceDate;
-    util::Timestamp paymentDate;
-    try
-    {
-        invoiceDate = util::Timestamp::fromString(invoiceDateString);
-        paymentDate = util::Timestamp::fromString(paymentDateString);
-        laborCost = std::stod(laborCostString);
-        partsCost = std::stod(partsCostString);
-        discountPercentage = std::stod(discountPercentageString);
-        totalAmount = std::stod(totalAmountString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid invoice data");
-    }
-    util::Vector<std::string> partIDs = getPartIDsAsVector(partIDsString);
-    util::PaymentMode paymentMethod = util::getPaymentMode(paymentMethodString);
-    util::PaymentStatus status = util::getPaymentStatus(statusString);
-    return Factory::getObject<Invoice>(
-        id,
-        bookingId,
-        invoiceDate,
-        partIDs,
-        laborCost,
-        partsCost,
-        discountPercentage,
-        totalAmount,
-        paymentDate,
-        paymentMethod,
-        status
-    );
-}
-
-/*
-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,7 +1,15 @@
+/*
+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"
-#include "Vector.h"
 #include "Timestamp.h"
 #include "Enums.h"
 
@@ -17,21 +25,21 @@ private:
     ServiceBooking* m_booking;
     util::Timestamp m_invoiceDate;
     double m_laborCost;
-    util::Vector<std::string> m_partIDs;
+    util::Map<int, InventoryItem*> m_parts;
-    util::Map<std::string, InventoryItem*> m_parts;
     double m_partsCost;
     double m_discountPercentage;
     double m_totalAmount;
     util::Timestamp m_paymentDate;
     util::PaymentMode m_paymentMethod;
     util::PaymentStatus m_status;
+
 public:
     Invoice();
     Invoice(
         const std::string& bookingId,
         ServiceBooking* booking,
         const util::Timestamp& invoiceDate, 
-        double laborCost, const util::Map<std::string,
+        double laborCost, const util::Map<int,
         InventoryItem*>& parts,
         double partsCost,
         double discountPercentage, 
@@ -40,26 +48,12 @@ public:
         util::PaymentMode paymentMethod, 
         util::PaymentStatus status
     );
-    Invoice(
-        const std::string& id,
-        const std::string& bookingId,
-        const util::Timestamp& invoiceDate,
-        const util::Vector<std::string>& partIDs,
-        double laborCost,
-        double partsCost,
-        double discountPercentage,
-        double totalAmount,
-        const util::Timestamp& paymentDate,
-        util::PaymentMode paymentMethod,
-        util::PaymentStatus status
-    );
     const std::string& getId() const;
     const std::string& getBookingId() const;
     ServiceBooking* getBooking() const;
     const util::Timestamp& getInvoiceDate() const;
     double getLaborCost() const;
-    const util::Vector<std::string>& getPartIDs() const;
+    const util::Map<int, InventoryItem*>& getParts() const;
-    const util::Map<std::string, InventoryItem*>& getParts() const;
     double getPartsCost() const;
     double getDiscountPercentage() const;
     double getTotalAmount() const;
@@ -71,14 +65,11 @@ public:
     void setBooking(ServiceBooking* booking);
     void setInvoiceDate(const util::Timestamp& invoiceDate);
     void setLaborCost(double laborCost);
-    void setParts(const util::Map<std::string, InventoryItem*>& parts);
+    void setParts(const util::Map<int, InventoryItem*>& parts);
     void setPartsCost(double partsCost);
     void setDiscountPercentage(double discountPercentage);
     void setTotalAmount(double totalAmount);
     void setPaymentDate(const util::Timestamp& paymentDate);
     void setPaymentMethod(util::PaymentMode paymentMethod);
     void setStatus(util::PaymentStatus status);
-    std::string serialize() const;
-    static Invoice* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,19 +1,48 @@
-#include <sstream>
+/*
-#include <stdexcept>
+File: JobCard.cpp
+Description: Implements the JobCard class which represents a technician’s job assignment in the Vehicle Service Management System.
+             Provides constructors, accessors, and mutators for job details such as ID, booking, service, technician,
+             assigned date, completion date, and job status.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #include "JobCard.h"
-#include "Factory.h"
-#include "StringHelper.h"
-#include "Enums.h"
 
 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),
     m_service(nullptr),
     m_technician(nullptr),
-    m_status(util::ServiceJobStatus()) {}
+    m_status(ServiceJobStatus()) {}
 
+/*
+Function: JobCard
+Description: Parameterized constructor that initializes a new job card with a unique ID and specified details.
+Parameters:
+    - bookingId: ID of the associated service booking.
+    - booking: Pointer to the ServiceBooking object.
+    - service: Pointer to the Service object.
+    - serviceId: ID of the associated service.
+    - technicianId: ID of the assigned technician.
+    - technician: Pointer to the User object representing the technician.
+    - assignedDate: Timestamp of when the job was assigned.
+    - status: Current status of the job (STARTED/COMPLETED).
+    - completionDate: Timestamp of when the job was completed.
+Returns:
+    - A new JobCard object.
+*/
 JobCard::JobCard(const std::string& bookingId,
     ServiceBooking* booking,
     Service* service,
@@ -21,7 +50,7 @@ JobCard::JobCard(const std::string& bookingId,
     const std::string& technicianId,
     User* technician,
     const util::Timestamp& assignedDate,
-    util::ServiceJobStatus status,
+    ServiceJobStatus status,
     const util::Timestamp& completionDate
 )
     : m_id("JC" + std::to_string(++m_uid)),
@@ -36,222 +65,241 @@ JobCard::JobCard(const std::string& bookingId,
     m_completionDate(completionDate) {}
 
 /*
-Function: JobCard (parameterized constructor with ID)
+Function: getId
-Description: Initializes a job card with an existing ID, booking ID, service ID,
+Description: Retrieves the unique ID of the job card.
-             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
+    - const std::string& representing the job card ID.
 */
-JobCard::JobCard(const std::string& id,
-    const std::string& bookingId,
-    const std::string& serviceId,
-    const std::string& technicianId,
-    const util::Timestamp& assignedDate,
-    util::ServiceJobStatus status,
-    const util::Timestamp& completionDate
-)
-    : m_id(id),
-    m_bookingId(bookingId),
-    m_booking(nullptr),
-    m_service(nullptr),
-    m_serviceId(serviceId),
-    m_technicianId(technicianId),
-    m_technician(nullptr),
-    m_assignedDate(assignedDate),
-    m_status(status),
-    m_completionDate(completionDate)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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;
 }
 
-util::ServiceJobStatus JobCard::getStatus() const
+/*
+Function: getStatus
+Description: Retrieves the current status of the job.
+Returns:
+    - ServiceJobStatus representing the job status.
+*/
+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;
 }
 
-void JobCard::setStatus(util::ServiceJobStatus status)
+/*
+Function: setStatus
+Description: Sets the current status of the job.
+Parameters:
+    - status: New job status value.
+Returns:
+    - void
+*/
+void JobCard::setStatus(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;
-    serializedJobCard << m_id << ','
-        << m_bookingId << ','
-        << m_serviceId << ','
-        << m_technicianId << ','
-        << m_assignedDate.toString() << ','
-        << util::getServiceJobStatusString(m_status) << ','
-        << m_completionDate.toString();
-    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;
-    std::string assignedDateString, statusString, completionDateString;
-    std::istringstream serializedJobCard(record);
-    getline(serializedJobCard, id, ',');
-    getline(serializedJobCard, bookingId, ',');
-    getline(serializedJobCard, serviceId, ',');
-    getline(serializedJobCard, technicianId, ',');
-    getline(serializedJobCard, assignedDateString, ',');
-    getline(serializedJobCard, statusString, ',');
-    getline(serializedJobCard, completionDateString, ',');
-    util::Timestamp assignedDate;
-    util::Timestamp completionDate;
-    try
-    {
-        assignedDate = util::Timestamp::fromString(assignedDateString);
-        completionDate = util::Timestamp::fromString(completionDateString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid timestamp");
-    }
-    util::ServiceJobStatus status = util::getServiceJobStatus(statusString);
-    return Factory::getObject<JobCard>(
-        id,
-        bookingId,
-        serviceId,
-        technicianId,
-        assignedDate,
-        status,
-        completionDate
-    );
-}
-
-/*
-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,12 +1,21 @@
+/*
+File: JobCard.h
+Description: Declares the JobCard class which represents a technician’s job assignment in the Vehicle Service Management System.
+             Each job card includes booking details, associated service, technician information, assigned and completion dates, and job status.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "Timestamp.h"
-#include "Enums.h"
 
 class ServiceBooking;
 class Service;
 class User;
 
+enum class ServiceJobStatus : int;
+
 class JobCard
 {
 private:
@@ -19,7 +28,7 @@ private:
     std::string m_technicianId;
     User* m_technician;
     util::Timestamp m_assignedDate;
-    util::ServiceJobStatus m_status;
+    ServiceJobStatus m_status;
     util::Timestamp m_completionDate;
 
 public:
@@ -31,15 +40,7 @@ public:
         const std::string& technicianId, 
         User* technician, 
         const util::Timestamp& assignedDate, 
-        util::ServiceJobStatus status,
+        ServiceJobStatus status,
-        const util::Timestamp& completionDate
-    );
-    JobCard(const std::string& id,
-        const std::string& bookingId,
-        const std::string& serviceId,
-        const std::string& technicianId,
-        const util::Timestamp& assignedDate,
-        util::ServiceJobStatus status,
         const util::Timestamp& completionDate
     );
     const std::string& getId() const;
@@ -50,7 +51,7 @@ public:
     const std::string& getTechnicianId() const;
     User* getTechnician() const;
     const util::Timestamp& getAssignedDate() const;
-    util::ServiceJobStatus getStatus() const;
+    ServiceJobStatus getStatus() const;
     const util::Timestamp& getCompletionDate() const;
     void setId(const std::string& id);
     void setBookingId(const std::string& bookingId);
@@ -60,9 +61,6 @@ public:
     void setTechnicianId(const std::string& technicianId);
     void setTechnician(User* technician);
     void setAssignedDate(const util::Timestamp& assignedDate);
-    void setStatus(util::ServiceJobStatus status);
+    void setStatus(ServiceJobStatus status);
     void setCompletionDate(const util::Timestamp& completionDate);
-    std::string serialize() const;
-    static JobCard* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,14 +1,39 @@
-#include <sstream>
+/*
+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 "Notification.h"
-#include "StringHelper.h"
-#include "Factory.h"
 
 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),
@@ -18,158 +43,145 @@ Notification::Notification(const std::string& recipientUserId, User* recipient,
     m_createdAt(createdAt) {}
 
 /*
-Function: Notification (parameterized constructor with ID)
+Function: getId
-Description: Initializes a notification with an existing ID, recipient details,
+Description: Retrieves the unique ID of the notification.
-             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
+    - const std::string& representing the notification ID.
 */
-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),
-    m_recipient(nullptr),
-    m_title(title),
-    m_message(message),
-    m_createdAt(createdAt) 
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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;
-    serializedNotification << m_id << ','
-        << m_recipientUserId << ','
-        << m_title << ','
-        << m_message << ','
-        << m_createdAt.toString();
-    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;
-    std::istringstream serializedNotification(record);
-    getline(serializedNotification, id, ',');
-    getline(serializedNotification, recipientUserId, ',');
-    getline(serializedNotification, title, ',');
-    getline(serializedNotification, message, ',');
-    getline(serializedNotification, createdAtTimestampString, ',');
-    util::Timestamp createdAtTimestamp;
-    try
-    {
-        createdAtTimestamp = util::Timestamp::fromString(createdAtTimestampString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid createdAt timestamp");
-    }
-    return Factory::getObject<Notification>(
-        id,
-        recipientUserId,
-        title,
-        message,
-        createdAtTimestamp
-    );
-}
-
-/*
-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,3 +1,11 @@
+/*
+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"
@@ -17,7 +25,6 @@ private:
 public:
     Notification();
     Notification(const std::string& recipientUserId, User* recipient, const std::string& title, const std::string& message, const util::Timestamp& createdAt);
-    Notification(const std::string& id, const std::string& recipientUserId, const std::string& title, const std::string& message, const util::Timestamp& createdAt);
     const std::string& getId() const;
     const std::string& getRecipientUserId() const;
     User* getRecipient() const;
@@ -30,7 +37,4 @@ public:
     void setTitle(const std::string& title);
     void setMessage(const std::string& message);
     void setCreatedAt(const util::Timestamp& createdAt);
-    std::string serialize() const;
-    static Notification* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,239 +1,163 @@
-#include <sstream>
+/*
+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 "Service.h"
-#include "InventoryItem.h"
-#include "StringHelper.h"
-#include "Factory.h"
 
 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),
     m_requiredInventoryItems(requiredInventoryItems),
     m_status(util::State::ACTIVE),
-    m_laborCost(laborCost) 
+    m_laborCost(laborCost) {}
-{
-    int numberOfInventoryItems = m_requiredInventoryItems.getSize();
-    auto inventoryItemPointers = m_requiredInventoryItems.getValues();
-    for (int index = 0; index < numberOfInventoryItems; index++)
-    {
-        m_requiredInventoryItemIDs.push_back(inventoryItemPointers[index]->getId());
-    }
-}
 
 /*
-Function: Service (parameterized constructor with ID)
+Function: getId
-Description: Initializes a service with an existing ID, name, inventory item IDs,
+Description: Retrieves the unique ID of the service.
-             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
+    - const std::string& representing the service ID.
 */
-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),
-    m_requiredInventoryItemIDs(requiredInventoryItemIDs),
-    m_status(status),
-    m_laborCost(laborCost)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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
+Function: getRequiredInventoryItems
-Description: Retrieves the IDs of required inventory items for the service.
+Description: Retrieves the map of inventory items required for the service.
-Parameters:
-    - None
 Returns:
-    - const util::Vector<std::string>&: Inventory item IDs
+    - const util::Map<std::string, InventoryItem*>& representing the required inventory items.
 */
-const util::Vector<std::string>& Service::getRequiredInventoryItemIDs() const
-{
-    return m_requiredInventoryItemIDs;
-}
-
 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;
-    m_requiredInventoryItemIDs.clear();
-    int numberOfRequiredInventoryItems = m_requiredInventoryItems.getSize();
-    auto inventoryItemPointers = m_requiredInventoryItems.getValues();
-    for (int index = 0; index < numberOfRequiredInventoryItems; index++)
-    {
-        m_requiredInventoryItemIDs.push_back(inventoryItemPointers[index]->getId());
-    }
 }
 
+/*
+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();
-    std::string inventoryItemIDs;
-    for (int index = 0; index < numberOfInventoryItems; index++)
-    {
-        inventoryItemIDs += inventoryItemIds[index];
-        if (index < numberOfInventoryItems - 1)
-        {
-            inventoryItemIDs += '|';
-        }
-    }
-    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;
-    std::string inventoryItemID;
-    std::istringstream serializedInventoryItemIDs(inventoryItemIDsString);
-    while (getline(serializedInventoryItemIDs, inventoryItemID, '|'))
-    {
-        inventoryItemIDs.push_back(inventoryItemID);
-    }
-    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;
-    serializedService << m_id << ','
-        << m_name << ','
-        << getInventoryItemIDsAsString(m_requiredInventoryItemIDs) << ','
-        << m_laborCost << ','
-        << util::getStateString(m_status);
-    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;
-    std::string inventoryItemIDsString, laborCostString, statusString;
-    double laborCost;
-    std::istringstream serializedService(record);
-    getline(serializedService, id, ',');
-    getline(serializedService, name, ',');
-    getline(serializedService, inventoryItemIDsString, ',');
-    getline(serializedService, laborCostString, ',');
-    getline(serializedService, statusString, ',');
-    util::Vector<std::string> inventoryItemIDs = getInventoryItemIDsAsVector(inventoryItemIDsString);
-    try
-    {
-        laborCost = std::stod(laborCostString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid labor cost");
-    }
-    util::State status = util::getState(statusString);
-    return Factory::getObject<Service>(
-        id,
-        name,
-        inventoryItemIDs,
-        laborCost,
-        status
-    );
-}
-
-/*
-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,7 +1,15 @@
+/*
+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"
-#include "Vector.h"
 #include "Enums.h"
 
 class InventoryItem;
@@ -12,17 +20,14 @@ private:
     static int m_uid;
     std::string m_id;
     std::string m_name;
-    util::Vector<std::string> m_requiredInventoryItemIDs;
     util::Map<std::string, InventoryItem*> m_requiredInventoryItems;
     double m_laborCost;
     util::State m_status;
 public:
     Service();
     Service(const std::string& name, const util::Map<std::string, InventoryItem*>& requiredInventoryItems, double laborCost);
-    Service(const std::string& id, const std::string& name, const util::Vector<std::string>& requiredInventoryItemIDs, double laborCost, util::State state);
     const std::string& getId() const;
     const std::string& getName() const;
-    const util::Vector<std::string>& getRequiredInventoryItemIDs() const;
     const util::Map<std::string, InventoryItem*>& getRequiredInventoryItems() const;
     double getLaborCost() const;
     util::State getState() const;
@@ -31,7 +36,4 @@ public:
     void setRequiredInventoryItems(const util::Map<std::string, InventoryItem*>& requiredInventoryItems);
     void setLaborCost(double laborCost);
     void setState(util::State status);
-    std::string serialize() const;
-    static Service* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,20 +1,50 @@
-#include <stdexcept>
+/*
-#include <sstream>
+File: ServiceBooking.cpp
+Description: Implements the ServiceBooking class which represents a customer’s service booking in the Vehicle Service Management System.
+             Provides constructors, accessors, and mutators for booking details such as ID, status, services, customer,
+             vehicle information, assigned technician, and discount percentage.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #include "ServiceBooking.h"
-#include "Service.h"
-#include "Enums.h"
-#include "Factory.h"
-#include "StringHelper.h"
 
 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 new service booking with a unique ID and specified details.
+Parameters:
+    - id: Booking ID string.
+    - status: Current status of the booking (e.g., PENDING, COMPLETED).
+    - services: Map of services included in the booking.
+    - customerId: ID of the customer.
+    - customer: Pointer to the User object representing the customer.
+    - vehicleNumber: Vehicle registration number.
+    - vehicleBrand: Brand of the vehicle.
+    - vehicleModel: Model of the vehicle.
+    - assignedTechnicianId: ID of the assigned technician.
+    - assignedTechnician: Name of the assigned technician.
+    - discountPercentage: Discount applied to the booking.
+Returns:
+    - A new ServiceBooking object.
+*/
 ServiceBooking::ServiceBooking(
+    const std::string& id,
     util::ServiceJobStatus status,
     const util::Map<std::string,
     Service*>& services,
@@ -24,7 +54,7 @@ ServiceBooking::ServiceBooking(
     const std::string& vehicleBrand,
     const std::string& vehicleModel,
     const std::string& assignedTechnicianId,
-    User* assignedTechnician,
+    const std::string& assignedTechnician,
     double discountPercentage
 )
     : m_id("SRV" + std::to_string(++m_uid)),
@@ -39,315 +69,268 @@ ServiceBooking::ServiceBooking(
     m_assignedTechnician(assignedTechnician),
     m_discountPercentage(discountPercentage)
 {
-    int numberOfServices = m_services.getSize();
-    auto servicePointers = m_services.getValues();
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        m_serviceIDs.push_back(servicePointers[index]->getId());
-    }
 }
 
 /*
-Function: ServiceBooking (parameterized constructor with ID)
+Function: getId
-Description: Initializes a service booking with an existing ID, status, service IDs,
+Description: Retrieves the unique ID of the service booking.
-             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
+    - const std::string& representing the booking ID.
 */
-ServiceBooking::ServiceBooking(
-    const std::string& id,
-    util::ServiceJobStatus status,
-    const util::Vector<std::string>& serviceIDs,
-    const std::string& customerId,
-    const std::string& vehicleNumber,
-    const std::string& vehicleBrand,
-    const std::string& vehicleModel,
-    const std::string& assignedTechnicianId,
-    double discountPercentage
-)
-    : m_id(id),
-    m_status(status),
-    m_serviceIDs(serviceIDs),
-    m_customerId(customerId),
-    m_customer(nullptr),
-    m_vehicleNumber(vehicleNumber),
-    m_vehicleBrand(vehicleBrand),
-    m_vehicleModel(vehicleModel),
-    m_assignedTechnicianId(assignedTechnicianId),
-    m_assignedTechnician(nullptr),
-    m_discountPercentage(discountPercentage)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 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
+Function: getServices
-Description: Retrieves the IDs of services booked.
+Description: Retrieves the map of services included in the booking.
-Parameters:
-    - None
 Returns:
-    - const util::Vector<std::string>&: Service IDs
+    - const util::Map<std::string, Service*>& representing the services.
 */
-const util::Vector<std::string>& ServiceBooking::getServiceIDs() const
-{
-    return m_serviceIDs;
-}
-
 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 name of the assigned technician.
+Returns:
+    - const std::string& representing the technician name.
+*/
+const std::string& 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;
-    m_serviceIDs.clear();
-    int numberOfServices = m_services.getSize();
-    auto servicePointers = m_services.getValues();
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        m_serviceIDs.push_back(servicePointers[index]->getId());
-    }
 }
 
+/*
+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;
 }
 
-void ServiceBooking::setAssignedTechnician(User* assignedTechnician)
+/*
+Function: setAssignedTechnician
+Description: Sets the name of the assigned technician.
+Parameters:
+    - assignedTechnician: New technician name string.
+Returns:
+    - void
+*/
+void ServiceBooking::setAssignedTechnician(const std::string& 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();
-    std::string serviceIDsString;
-    for (int index = 0; index < numberOfServices; index++)
-    {
-        serviceIDsString += serviceIDs[index];
-        if (index < numberOfServices - 1)
-        {
-            serviceIDsString += '|';
-        }
-    }
-    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;
-    std::string serviceID;
-    std::istringstream serializedServiceIDs(serviceIDsString);
-    while (getline(serializedServiceIDs, serviceID, '|'))
-    {
-        serviceIDs.push_back(serviceID);
-    }
-    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;
-    serializedBooking << m_id << ','
-        << util::getServiceJobStatusString(m_status) << ','
-        << getServiceIDsAsString(m_serviceIDs) << ','
-        << m_customerId << ','
-        << m_vehicleNumber << ','
-        << m_vehicleBrand << ','
-        << m_vehicleModel << ','
-        << m_assignedTechnicianId << ','
-        << m_discountPercentage << ',';
-    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;
-    std::string serviceJobStatusString, serviceIDsString, discountPercentageString;
-    double discountPercentage;
-    std::istringstream serializedBooking(record);
-    getline(serializedBooking, id, ',');
-    getline(serializedBooking, serviceJobStatusString, ',');
-    getline(serializedBooking, serviceIDsString, ',');
-    getline(serializedBooking, customerId, ',');
-    getline(serializedBooking, vehicleNumber, ',');
-    getline(serializedBooking, vehicleBrand, ',');
-    getline(serializedBooking, vehicleModel, ',');
-    getline(serializedBooking, assignedTechnicianId, ',');
-    getline(serializedBooking, discountPercentageString, ',');
-    util::Vector<std::string> serviceIDs = getServiceIDsAsVector(serviceIDsString);
-    try
-    {
-        discountPercentage = std::stod(discountPercentageString);
-    }
-    catch (...)
-    {
-        throw std::runtime_error("Invalid discount percentage");
-    }
-    util::ServiceJobStatus status = util::getServiceJobStatus(serviceJobStatusString);
-    return Factory::getObject<ServiceBooking>(
-        id,
-        status,
-        serviceIDs,
-        customerId,
-        vehicleNumber,
-        vehicleBrand,
-        vehicleModel,
-        assignedTechnicianId,
-        discountPercentage
-    );
-}
-
-/*
-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,7 +1,14 @@
+/*
+File: ServiceBooking.h
+Description: Declares the ServiceBooking class which represents a customer’s service booking in the Vehicle Service Management System.
+             Each booking includes a unique ID, status, associated services, customer details, vehicle information, assigned technician, and discount percentage.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "Map.h"
-#include "Vector.h"
 #include "Enums.h"
 
 class Service;
@@ -13,7 +20,6 @@ private:
     static int m_uid;
     std::string m_id;
     util::ServiceJobStatus m_status;
-    util::Vector<std::string> m_serviceIDs;
     util::Map<std::string, Service*> m_services;
     std::string m_customerId;
     User* m_customer;
@@ -21,11 +27,12 @@ private:
     std::string m_vehicleBrand;
     std::string m_vehicleModel;
     std::string m_assignedTechnicianId;
-    User* m_assignedTechnician;
+    std::string m_assignedTechnician;
     double m_discountPercentage;
 public:
     ServiceBooking();
     ServiceBooking(
+        const std::string& id,
         util::ServiceJobStatus status,
         const util::Map<std::string,
         Service*>& services,
@@ -35,23 +42,11 @@ public:
         const std::string& vehicleBrand,
         const std::string& vehicleModel,
         const std::string& assignedTechnicianId,
-        User* assignedTechnician,
+        const std::string& assignedTechnician,
-        double discountPercentage
-    );
-    ServiceBooking(
-        const std::string& id,
-        util::ServiceJobStatus status,
-        const util::Vector<std::string>& serviceIDs,
-        const std::string& customerId,
-        const std::string& vehicleNumber,
-        const std::string& vehicleBrand,
-        const std::string& vehicleModel,
-        const std::string& assignedTechnicianId,
         double discountPercentage
     );
     const std::string& getId() const;
     util::ServiceJobStatus getStatus() const;
-    const util::Vector<std::string>& getServiceIDs() const;
     const util::Map<std::string, Service*>& getServices() const;
     const std::string& getCustomerId() const;
     User* getCustomer() const;
@@ -59,7 +54,7 @@ public:
     const std::string& getVehicleBrand() const;
     const std::string& getVehicleModel() const;
     const std::string& getAssignedTechnicianId() const;
-    const User* getAssignedTechnician() const;
+    const std::string& getAssignedTechnician() const;
     double getDiscountPercentage() const;
     void setId(const std::string& id);
     void setStatus(const util::ServiceJobStatus& status);
@@ -70,9 +65,6 @@ public:
     void setVehicleBrand(const std::string& vehicleBrand);
     void setVehicleModel(const std::string& vehicleModel);
     void setAssignedTechnicianId(const std::string& assignedTechnicianId);
-    void setAssignedTechnician(User* assignedTechnician);
+    void setAssignedTechnician(const std::string& assignedTechnician);
     void setDiscountPercentage(double discountPercentage);
-    std::string serialize() const;
-    static ServiceBooking* deserialize(const std::string&);
-    static std::string getHeaders();
 };

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

@@ -1,17 +1,45 @@
-#include <sstream>
+/*
+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 "User.h"
 #include "Notification.h"
 #include "Enums.h"
-#include "Factory.h"
-#include "StringHelper.h"
 
 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),
@@ -23,205 +51,236 @@ User::User(const std::string& userName, const std::string& password, const std::
     m_status(util::State::ACTIVE) {}
 
 /*
-Function: User (parameterized constructor with ID)
+Function: ~User
-Description: Initializes a user with an existing ID, credentials, personal details,
+Description: Destructor that cleans up dynamically allocated notifications associated with the user.
-             role, and state. Updates UID tracking based on ID.
 Parameters:
-    - userId: const std::string&, unique user ID
+    - None
-    - 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
+    - void
 */
-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),
-    m_password(password),
-    m_name(name),
-    m_phone(phone),
-    m_email(email),
-    m_type(role),
-    m_status(status)
-{
-    int idNumber = util::extractNumber(m_id);
-    if (idNumber > m_uid)
-    {
-        m_uid = idNumber;
-    }
-}
-
 User::~User()
 {
-    auto values = m_notifications.getValues();
+    for (int index = 0; index < m_notifications.getSize(); index++)
-    for (int index = 0; index < values.getSize(); index++)
     {
-        delete values[index];
+        delete m_notifications.getValues()[index];
     }
 }
 
+/*
+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;
-    serializedUser << m_id << ','
-        << m_userName << ','
-        << m_password << ','
-        << m_name << ','
-        << m_phone << ','
-        << m_email << ','
-        << util::getUserTypeString(m_type) << ','
-        << util::getStateString(m_status);
-    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;
-    std::string userTypeString, stateString;
-    std::istringstream serializedUser(record);
-    getline(serializedUser, id, ',');
-    getline(serializedUser, username, ',');
-    getline(serializedUser, password, ',');
-    getline(serializedUser, name, ',');
-    getline(serializedUser, phone, ',');
-    getline(serializedUser, email, ',');
-    getline(serializedUser, userTypeString, ',');
-    getline(serializedUser, stateString);
-    util::UserType userType = util::getUserType(userTypeString);
-    util::State status = util::getState(stateString);
-    return Factory::getObject<User>(id,
-        username,
-        password,
-        name,
-        phone,
-        email,
-        userType,
-        status);
-}
-
-/*
-Function: getHeaders
-Description: Retrieves the CSV headers for user serialization.
-Parameters:
-    - None
-Returns:
-    - std::string: Header string ("ID,Username,Password,Name,Phone,Email,UserType,UserStatus")
-*/
-std::string User::getHeaders()
-{
-    return "ID,Username,Password,Name,Phone,Email,UserType,UserStatus";
-}

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

@@ -1,3 +1,12 @@
+/*
+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"
@@ -22,7 +31,6 @@ private:
 public:
     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);
-    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);
     ~User();
     const std::string& getId() const;
     const std::string& getUserName() const;
@@ -39,11 +47,7 @@ public:
     void setName(const std::string& name);
     void setPhone(const std::string& phone);
     void setEmail(const std::string& email);
-    void addNotification(Notification* notification);
+    void addNotification(Notification* notification) override;
     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.h

@@ -1,3 +1,11 @@
+/*
+File: AuthenticationManagementService.h
+Description: Declares the AuthenticationManagementService class which manages user authentication in the Vehicle Service Management System.
+             Provides functionality for login, logout, password change, and retrieving the currently authenticated user.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "DataStore.h"

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

@@ -1,104 +1,105 @@
-/*
+#include <stdexcept>
-File: InventoryManagementService.cpp
-Description: Implements the InventoryManagementService class, which manages inventory
-			 items and observer relationships within the system. Provides methods
-			 for loading and saving inventory items from persistent storage, as well
-			 as attaching and persisting observers for notification handling.
-Author: Trenser
-Date: 22-May-2026
-*/
-
 #include "InventoryManagementService.h"
-#include "FileManager.h"
+#include "Vector.h"
+#include "Enums.h"
 #include "InventoryItem.h"
-#include "Utility.h"
 #include "Config.h"
+#include "User.h"
+#include "Factory.h"
+#include "Timestamp.h"
 
-/*
+util::Map<std::string, User*> InventoryManagementService::m_observers{};
-Function: getObserverIDs
+
-Description: Retrieves the IDs of all observers currently attached to the
+void InventoryManagementService::attach(User* user)
-			 InventoryManagementService.
-Parameters:
-	- None
-Returns:
-	- util::Vector<std::string>: Vector of observer user IDs
-*/
-util::Vector<std::string> InventoryManagementService::getObserverIDs()
 {
-	util::Vector<std::string> observerIDs;
+	if (user)
-	int numberOfObservers = m_observers.getSize();
-	for (int index = 0; index < numberOfObservers; index++)
 	{
-		User* observer = m_observers.getValueAt(index);
+		const std::string& userID = user->getId();
-		if (observer)
+		if (m_observers.find(userID) == -1)
 		{
-			observerIDs.push_back(observer->getId());
+			m_observers[userID] = user;
 		}
 	}
-	return observerIDs;
 }
 
-/*
+void InventoryManagementService::detach(User* user)
-Function: loadInventoryItems
+{
-Description: Loads inventory items from persistent storage into the datastore.
+	if (user)
-			 Uses FileManager to deserialize inventory items from the configured file.
+	{
-Parameters:
+		const std::string& userID = user->getId();
-	- None
+		if (m_observers.find(userID) != -1)
-Returns:
+		{
-	- void
+			m_observers.remove(userID);
-*/
+		}
-void InventoryManagementService::loadInventoryItems()
+	}
+}
+
+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()
 {
-	util::FileManager<InventoryItem> inventoryItemFileManager(config::file::INVENTORYITEM_FILE);
 	auto& inventoryItems = m_dataStore.getInventoryItems();
-	auto inventoryItemsMap = inventoryItemFileManager.load();
+	int inventoryItemsSize = inventoryItems.getSize();
-	int numberOfInventoryItems = inventoryItemsMap.getSize();
+	auto& usersMap = m_dataStore.getUsers();
-	for (int index = 0; index < numberOfInventoryItems; index++)
+	int usersMapSize = usersMap.getSize();
+	util::Vector<User*> adminUsers;
+	for (int index = 0; index < usersMapSize; index++)
 	{
-		inventoryItems[inventoryItemsMap.getKeyAt(index)] = inventoryItemsMap.getValueAt(index);
+		User* user = usersMap.getValueAt(index);
-	}
+		if (user->getUserType() == util::UserType::ADMIN)
-}
-
-/*
-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);
+			adminUsers.push_back(user);
-	auto& inventoryItems = m_dataStore.getInventoryItems();
-	inventoryItemFileManager.save(inventoryItems);
 		}
-
+	}
-/*
+	int adminUsersSize = adminUsers.getSize();
-Function: loadObservers
+	if (adminUsersSize < 1)
-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);
+		throw std::runtime_error("The system has no admins present!");
 	}
-
+	for (int index = 0; index <= inventoryItemsSize; index++)
-/*
-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);
+		InventoryItem* inventoryItem = inventoryItems.getValueAt(index);
+		if (inventoryItem && inventoryItem->getQuantity() < config::threshold::INVENTORY_LOW_STOCK_THRESHOLD)
+		{
+			sendLowStockAlertsToAdmins(*this, inventoryItem, adminUsers);
+		}
+	}
 }

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

@@ -1,7 +1,14 @@
+/*
+File: InventoryManagementService.h
+Description: Declares the InventoryManagementService class which manages inventory operations in the Vehicle Service Management System.
+             Provides functionality to retrieve, add, and remove inventory items, send low stock alerts, and handle notifications using the Observer pattern.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "Map.h"
-#include "Vector.h"
 #include "NotificationManagementService.h"
 #include "DataStore.h"
 
@@ -12,7 +19,6 @@ class InventoryManagementService : public NotificationManagementService
 private:
     DataStore& m_dataStore;
     static util::Map<std::string, User*> m_observers;
-    util::Vector<std::string> getObserverIDs() override;
 public:
     InventoryManagementService() : m_dataStore(DataStore::getInstance()) {}
     util::Map<std::string, InventoryItem*> getInventoryItems();
@@ -23,8 +29,4 @@ public:
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;
     void detach(User* user) override;
-    void loadInventoryItems();
-    void saveInventoryItems();
-    void loadObservers();
-    void saveObservers();
 };

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

@@ -1,6 +1,15 @@
+/*
+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
@@ -10,5 +19,4 @@ public:
 	virtual void sendNotification(User* recipient, const std::string& title, const std::string& message) = 0;
 	virtual void attach(User* user) = 0;
 	virtual void detach(User* user) = 0;
-	virtual util::Vector<std::string> getObserverIDs() = 0;
 };

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

@@ -1,123 +1,136 @@
+/*
+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 "Invoice.h"
-#include "FileManager.h"
+#include "ServiceBooking.h"
-#include "Utility.h"
+#include "Enums.h"
+#include "Timestamp.h"
 #include "Config.h"
+#include "User.h"
+#include "Factory.h"
+
+util::Map<std::string, User*> PaymentManagementService::m_observers{};
 
 /*
-Function: getObserverIDs
+Function: attach
-Description: Retrieves the IDs of all observers currently attached to the
+Description: Attaches a user as an observer to the PaymentManagementService for receiving notifications.
-             PaymentManagementService.
 Parameters:
-    - None
+	- user: Pointer to the User object to be attached.
 Returns:
-    - util::Vector<std::string>: Vector of observer user IDs
+	- void
 */
-util::Vector<std::string> PaymentManagementService::getObserverIDs()
+void PaymentManagementService::attach(User* user)
 {
-	util::Vector<std::string> observerIDs;
+	if (user)
-	int numberOfObservers = m_observers.getSize();
-	for (int index = 0; index < numberOfObservers; index++)
 	{
-		User* observer = m_observers.getValueAt(index);
+		const std::string& userID = user->getId();
-		if (observer)
+		if (m_observers.find(userID) == -1)
 		{
-			observerIDs.push_back(observer->getId());
+			m_observers[userID] = user;
 		}
 	}
-	return observerIDs;
 }
 
 /*
-Function: loadInvoices
+Function: detach
-Description: Loads invoices from persistent storage into the datastore.
+Description: Detaches a user from the observer list of the PaymentManagementService.
-             Validates associated service bookings and inventory parts before
-             attaching them to each invoice. Throws exceptions if invalid IDs
-             are encountered.
 Parameters:
-    - None
+	- 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 a booking ID or part ID is invalid
+	- std::runtime_error if notification creation fails.
 */
-void PaymentManagementService::loadInvoices()
+void PaymentManagementService::sendNotification(User* user, const std::string& title, const std::string& message)
 {
-    util::FileManager<Invoice> invoiceFileManager(config::file::INVOICE_FILE);
+	if (user)
-    auto& invoices = m_dataStore.getInvoices();
-    auto& serviceBookings = m_dataStore.getServiceBookings();
-    auto& inventoryItems = m_dataStore.getInventoryItems();
-    auto invoicesMap = invoiceFileManager.load();
-    for (int invoiceIndex = 0; invoiceIndex < invoicesMap.getSize(); invoiceIndex++)
 	{
-        Invoice* invoice = invoicesMap.getValueAt(invoiceIndex);
+		if (m_observers.find(user->getId()) != -1)
-        int bookingIndex = serviceBookings.find(invoice->getBookingId());
-        if (bookingIndex == -1)
 		{
-            throw std::runtime_error("Invalid Booking ID");
+			Notification* notification =
+				Factory::getObject<Notification>(
+					user->getId(),
+					user,
+					"PaymentManagementService: " + title,
+					message,
+					util::Timestamp()
+				);
+			if (notification)
+			{
+				user->addNotification(notification);
 			}
-        ServiceBooking* booking = serviceBookings.getValueAt(bookingIndex);
+			else
-        invoice->setBooking(booking);
-        util::Map<std::string, InventoryItem*> invoiceParts;
-        auto& partIDs = invoice->getPartIDs();
-        for (int partIndex = 0; partIndex < partIDs.getSize(); partIndex++)
 			{
-            const std::string& partID = partIDs[partIndex];
+				throw std::runtime_error("Failed to create notification");
-            int inventoryIndex = inventoryItems.find(partID);
-            if (inventoryIndex == -1)
-            {
-                throw std::runtime_error("Invalid Part ID");
 			}
-            invoiceParts[partID] = inventoryItems.getValueAt(inventoryIndex);
 		}
-        invoice->setParts(invoiceParts);
-        invoices[invoice->getId()] = invoice;
 	}
 }
 
 /*
-Function: saveInvoices
+Function: sendPaymentReminders
-Description: Saves invoices from the datastore to persistent storage.
+Description: Iterates through all invoices in the datastore and sends payment reminders to customers
-             Uses FileManager to serialize invoices into the configured file.
+			 whose invoices are pending beyond the configured threshold duration.
 Parameters:
 	- None
 Returns:
 	- void
 */
-void PaymentManagementService::saveInvoices()
+void PaymentManagementService::sendPaymentReminders()
 {
-    util::FileManager<Invoice> invoiceFileManager(config::file::INVOICE_FILE);
+	auto& invoicesMap = m_dataStore.getInvoices();
-    auto& invoices = m_dataStore.getInvoices();
+	int invoicesMapSize = invoicesMap.getSize();
-    invoiceFileManager.save(invoices);
+	for (int index = 0; index < invoicesMapSize; index++)
-}
-
-/*
-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);
+		const Invoice* invoice = invoicesMap.getValueAt(index);
-}
+		if (invoice && invoice->getStatus() == util::PaymentStatus::PENDING)
-
-/*
-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);
+			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());
+					}
+				}
+			}
+		}
+	}
 }

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

@@ -1,3 +1,12 @@
+/*
+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"
@@ -13,7 +22,6 @@ class PaymentManagementService : public NotificationManagementService
 private:
     DataStore& m_dataStore;
     static util::Map<std::string, User*> m_observers;
-    util::Vector<std::string> getObserverIDs() override;
 public:
     PaymentManagementService() : m_dataStore(DataStore::getInstance()) {}
     void generateInvoice(ServiceBooking* booking);
@@ -23,8 +31,4 @@ public:
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;
     void detach(User* user) override;
-    void loadInvoices();
-    void saveInvoices();
-    void loadObservers();
-    void saveObservers();
 };

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

@@ -1,326 +1,94 @@
+/*
+File: ServiceManagementService.cpp
+Description: Implements the ServiceManagementService class which manages service-related operations
+			 in the Vehicle Service Management System. Provides functionality for attaching/detaching observers
+			 and sending notifications to users regarding service events.
+Author: Trenser
+Date: 20-May-2026
+*/
+
 #include <stdexcept>
 #include "ServiceManagementService.h"
-#include "FileManager.h"
+#include "User.h"
-#include "Service.h"
+#include "Factory.h"
-#include "ComboPackage.h"
+#include "Timestamp.h"
-#include "ServiceBooking.h"
+
-#include "JobCard.h"
+util::Map<std::string, User*> ServiceManagementService::m_observers{};
-#include "Config.h"
-#include "Utility.h"
 
 /*
-Function: getObserverIDs
+Function: attach
-Description: Retrieves the IDs of all observers currently attached to the
+Description: Attaches a user as an observer to the ServiceManagementService for receiving notifications.
-             ServiceManagementService.
 Parameters:
-    - None
+	- user: Pointer to the User object to be attached.
 Returns:
-    - util::Vector<std::string>: Vector of observer user IDs
+	- void
 */
-util::Vector<std::string> ServiceManagementService::getObserverIDs()
+void ServiceManagementService::attach(User* user)
 {
-	util::Vector<std::string> observerIDs;
+	if (user)
-	int numberOfObservers = m_observers.getSize();
-	for (int index = 0; index < numberOfObservers; index++)
 	{
-		User* observer = m_observers.getValueAt(index);
+		const std::string& userID = user->getId();
-		if (observer)
+		if (m_observers.find(userID) == -1)
 		{
-			observerIDs.push_back(observer->getId());
+			m_observers[userID] = user;
 		}
 	}
-	return observerIDs;
 }
 
 /*
-Function: loadServices
+Function: detach
-Description: Loads services from persistent storage into the datastore.
+Description: Detaches a user from the observer list of the ServiceManagementService.
-             Validates required inventory items and attaches them to each service.
 Parameters:
-    - None
+	- 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 an inventory item ID is invalid
+	- std::runtime_error if notification creation fails.
 */
-void ServiceManagementService::loadServices()
+void ServiceManagementService::sendNotification(User* user, const std::string& title, const std::string& message)
 {
-    util::FileManager<Service> serviceFileManager(config::file::SERVICE_FILE);
+	if (user)
-    auto& services = m_dataStore.getServices();
-    auto& inventoryItems = m_dataStore.getInventoryItems();
-    auto servicesMap = serviceFileManager.load();
-    for (int serviceIndex = 0; serviceIndex < servicesMap.getSize(); serviceIndex++)
 	{
-        Service* service = servicesMap.getValueAt(serviceIndex);
+		if (m_observers.find(user->getId()) != -1)
-        services[service->getId()] = service;
-        util::Map<std::string, InventoryItem*> inventoryItemsMap;
-        auto& inventoryItemIDs = service->getRequiredInventoryItemIDs();
-        for (int inventoryItemIndex = 0; inventoryItemIndex < inventoryItemIDs.getSize(); inventoryItemIndex++)
 		{
-            const std::string& inventoryItemID = inventoryItemIDs[inventoryItemIndex];
+			Notification* notification =
-            int index = inventoryItems.find(inventoryItemID);
+				Factory::getObject<Notification>(
-            if (index == -1)
+					user->getId(),
+					user,
+					"ServiceManagementService: " + title,
+					message,
+					util::Timestamp()
+				);
+			if (notification)
 			{
-                throw std::runtime_error("Invalid Inventory Item ID");
+				user->addNotification(notification);
 			}
-            inventoryItemsMap[inventoryItemID] = inventoryItems.getValueAt(index);
+			else
-        }
+			{
-        service->setRequiredInventoryItems(inventoryItemsMap);
+				throw std::runtime_error("Failed to create notification");
 			}
 		}
-
-/*
-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);
-	auto& services = m_dataStore.getServices();
-	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);
-    auto& comboPackages = m_dataStore.getComboPackages();
-    auto& services = m_dataStore.getServices();
-    auto comboPackagesMap = comboPackageFileManager.load();
-    for (int packageIndex = 0; packageIndex < comboPackagesMap.getSize(); packageIndex++)
-    {
-        ComboPackage* comboPackage = comboPackagesMap.getValueAt(packageIndex);
-        util::Map<std::string, Service*> packageServices;
-        auto& serviceIDs = comboPackage->getServiceIDs();
-        for (int serviceIndex = 0; serviceIndex < serviceIDs.getSize(); serviceIndex++)
-        {
-            const std::string& serviceID = serviceIDs[serviceIndex];
-            int serviceMapIndex = services.find(serviceID);
-            if (serviceMapIndex == -1)
-            {
-                throw std::runtime_error("Invalid Service ID");
-            }
-            packageServices[serviceID] = services.getValueAt(serviceMapIndex);
-        }
-        comboPackage->setServices(packageServices);
-        comboPackages[comboPackage->getId()] = comboPackage;
 	}
 }
-
-/*
-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);
-    auto& comboPackages = m_dataStore.getComboPackages();
-    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);
-    auto& serviceBookings = m_dataStore.getServiceBookings();
-    auto& services = m_dataStore.getServices();
-    auto& users = m_dataStore.getUsers();
-    auto bookingsMap = bookingFileManager.load();
-    for (int bookingIndex = 0; bookingIndex < bookingsMap.getSize(); bookingIndex++)
-    {
-        ServiceBooking* booking = bookingsMap.getValueAt(bookingIndex);
-        util::Map<std::string, Service*> bookingServices;
-        auto& serviceIDs = booking->getServiceIDs();
-        for (int serviceIndex = 0; serviceIndex < serviceIDs.getSize(); serviceIndex++)
-        {
-            const std::string& serviceID = serviceIDs[serviceIndex];
-            int serviceMapIndex = services.find(serviceID);
-            if (serviceMapIndex == -1)
-            {
-                throw std::runtime_error("Invalid Service ID");
-            }
-
-            bookingServices[serviceID] = services.getValueAt(serviceMapIndex);
-        }
-        booking->setServices(bookingServices);
-        int customerIndex = users.find(booking->getCustomerId());
-        if (customerIndex == -1)
-        {
-            throw std::runtime_error("Invalid Customer ID");
-        }
-        User* customer = users.getValueAt(customerIndex);
-        if (customer->getUserType() != util::UserType::CUSTOMER)
-        {
-            throw std::runtime_error("User is not a customer");
-        }
-        booking->setCustomer(customer);
-        const std::string& technicianId = booking->getAssignedTechnicianId();
-        if (!technicianId.empty())
-        {
-            int technicianIndex = users.find(technicianId);
-            if (technicianIndex == -1)
-            {
-                throw std::runtime_error("Invalid Technician ID");
-            }
-            User* technician = users.getValueAt(technicianIndex);
-            if (technician->getUserType() != util::UserType::TECHNICIAN)
-            {
-                throw std::runtime_error("User is not a technician");
-            }
-            booking->setAssignedTechnician(technician);
-        }
-        serviceBookings[booking->getId()] = booking;
-    }
-}
-
-/*
-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);
-    auto& serviceBookings = m_dataStore.getServiceBookings();
-    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);
-    auto& jobCards = m_dataStore.getJobCards();
-    auto& serviceBookings = m_dataStore.getServiceBookings();
-    auto& services = m_dataStore.getServices();
-    auto& users = m_dataStore.getUsers();
-    auto jobCardsMap = jobCardFileManager.load();
-    for (int jobCardIndex = 0; jobCardIndex < jobCardsMap.getSize(); jobCardIndex++)
-    {
-        JobCard* jobCard = jobCardsMap.getValueAt(jobCardIndex);
-        int bookingIndex = serviceBookings.find(jobCard->getBookingId());
-        if (bookingIndex == -1)
-        {
-            throw std::runtime_error("Invalid Booking ID");
-        }
-        ServiceBooking* booking = serviceBookings.getValueAt(bookingIndex);
-        jobCard->setBooking(booking);
-        int serviceIndex = services.find(jobCard->getServiceId());
-        if (serviceIndex == -1)
-        {
-            throw std::runtime_error("Invalid Service ID");
-        }
-        Service* service = services.getValueAt(serviceIndex);
-        if (booking->getServices().find(jobCard->getServiceId()) == -1)
-        {
-            throw std::runtime_error("Service does not belong to booking");
-        }
-        jobCard->setService(service);
-        int technicianIndex = users.find(jobCard->getTechnicianId());
-        if (technicianIndex == -1)
-        {
-            throw std::runtime_error("Invalid Technician ID");
-        }
-        User* technician = users.getValueAt(technicianIndex);
-        if (technician->getUserType() != util::UserType::TECHNICIAN)
-        {
-            throw std::runtime_error("User is not a technician");
-        }
-        jobCard->setTechnician(technician);
-        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);
-    auto& jobCards = m_dataStore.getJobCards();
-    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,3 +1,12 @@
+/*
+File: ServiceManagementService.h
+Description: Declares the ServiceManagementService class which manages services, combo packages, service bookings, and job cards
+             in the Vehicle Service Management System. Provides functionality to purchase services or packages, create and remove
+             services, assign and complete jobs, cancel bookings, and handle notifications using the Observer pattern.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "Map.h"
@@ -14,7 +23,6 @@ class ServiceManagementService : public NotificationManagementService
 private:
     DataStore& m_dataStore;
     static util::Map<std::string, User*> m_observers;
-    util::Vector<std::string> getObserverIDs() override;
 public:
     ServiceManagementService() : m_dataStore(DataStore::getInstance()) {}
     util::Map<std::string, Service*> getServices();
@@ -35,14 +43,4 @@ public:
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;
     void detach(User* user) override;
-    void loadServices();
-    void saveServices();
-    void loadComboPackages();
-    void saveComboPackages();
-    void loadServiceBookings();
-    void saveServiceBookings();
-    void loadJobCards();
-    void saveJobCards();
-    void loadObservers();
-    void saveObservers();
 };

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

@@ -1,73 +1,75 @@
+/*
+File: UserManagementService.cpp
+Description: Implements the UserManagementService class which manages user-related operations
+			 in the Vehicle Service Management System. Provides functionality for retrieving user notifications
+			 and deleting notifications by ID.
+Author: Trenser
+Date: 20-May-2026
+*/
+
+#include <stdexcept>
 #include "UserManagementService.h"
-#include "FileManager.h"
 #include "User.h"
-#include "Notification.h"
+#include "Vector.h"
-#include "Config.h"
 
 /*
-Function: loadUsers
+Function: getUserNotifications
-Description: Loads users and notifications from persistent storage into the datastore.
+Description: Retrieves all notifications associated with a given user ID.
-             Validates that each notification’s recipient exists and attaches the
-             notification to the corresponding user.
 Parameters:
-    - None
+	- userID: The unique ID of the user whose notifications are to be retrieved.
+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 a notification recipient user ID is invalid
+	- std::runtime_error if no user is found with the given UserID or if no notification is found with the given NotificationID.
 */
-void UserManagementService::loadUsers()
+void UserManagementService::deleteNotification(const std::string& notificationID, const std::string& userID)
 {
-    util::FileManager<User> userFileManager(config::file::USER_FILE);
+	auto& usersMap = m_dataStore.getUsers();
-    util::FileManager<Notification> notificationFileManager(config::file::NOTIFICATION_FILE);
+	if (usersMap.find(userID) == -1)
-    auto& users = m_dataStore.getUsers();
-    auto usersMap = userFileManager.load();
-    auto notificationsMap = notificationFileManager.load();
-    int numberOfUsers = usersMap.getSize();
-    int numberOfNotifications = notificationsMap.getSize();
-    for (int index = 0; index < numberOfUsers; index++)
 	{
-        users[usersMap.getKeyAt(index)] = usersMap.getValueAt(index);
+		throw std::runtime_error("No user found with given UserID");
 	}
-    for (int index = 0; index < numberOfNotifications; index++)
+	User* user = usersMap[userID];
+	auto& notifications = user->getNotifications();
+	if (notifications.find(notificationID) == -1)
 	{
-        Notification* notification = notificationsMap.getValueAt(index);
+		throw std::runtime_error("No notification found with given NotificationID");
-        const std::string& recipientUserId = notification->getRecipientUserId();
-        int userIndex = users.find(recipientUserId);
-        if (userIndex == -1)
-        {
-            throw std::runtime_error("Invalid recipient user ID");
 	}
-        User* user = users.getValueAt(userIndex);
+	notifications.remove(notificationID);
-        user->addNotification(notification);
-    }
-}
-
-/*
-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);
-    util::FileManager<Notification> notificationFileManager(config::file::NOTIFICATION_FILE);
-    auto& users = m_dataStore.getUsers();
-    util::Map<std::string, Notification*> notifications;
-    for (int userIndex = 0; userIndex < users.getSize(); userIndex++)
-    {
-        User* user = users.getValueAt(userIndex);
-        auto& userNotifications = user->getNotifications();
-        for (int notificationIndex = 0; notificationIndex < userNotifications.getSize(); notificationIndex++)
-        {
-            notifications[userNotifications.getKeyAt(notificationIndex)] =
-                userNotifications.getValueAt(notificationIndex);
-        }
-    }
-    userFileManager.save(users);
-    notificationFileManager.save(notifications);
 }

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

@@ -1,3 +1,11 @@
+/*
+File: UserManagementService.h
+Description: Declares the UserManagementService class which manages user-related operations in the Vehicle Service Management System.
+             Provides functionality to create, update, retrieve, and remove users, as well as manage user notifications.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include <string>
 #include "Map.h"
@@ -21,6 +29,4 @@ 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 loadUsers();
-    void saveUsers();
 };

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

@@ -1,19 +1,18 @@
+/*
+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 file
+	namespace threshold
 	{
-		constexpr const char* INVENTORYITEM_FILE = "files/InventoryItem.csv";
+		constexpr int INVENTORY_LOW_STOCK_THRESHOLD = 5;
-		constexpr const char* USER_FILE = "files/User.csv";
+		constexpr int PAYMENT_REMINDER_THRESHOLD_HOURS = 168;
-		constexpr const char* NOTIFICATION_FILE = "files/Notification.csv";
-		constexpr const char* SERVICE_FILE = "files/Service.csv";
-		constexpr const char* COMBOPACKAGE_FILE = "files/ComboPackage.csv";
-		constexpr const char* SERVICEBOOKING_FILE = "files/ServiceBooking.csv";
-		constexpr const char* JOBCARD_FILE = "files/JobCard.csv";
-		constexpr const char* INVOICE_FILE = "files/Invoice.csv";
-		constexpr const char* SERVICEMANAGEMENTOBSERVERS = "files/ServiceManagementObservers.csv";
-		constexpr const char* PAYMENTMANAGEMENTOBSERVERS = "files/PaymentManagementObservers.csv";
-		constexpr const char* INVENTORYMANAGEMENTOBSERVERS = "files/InventoryManagementObservers.csv";
 	}
 }

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

@@ -1,3 +1,12 @@
+/*
+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>
 
@@ -34,6 +43,14 @@ 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)
@@ -48,6 +65,16 @@ 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")
@@ -65,6 +92,14 @@ 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)
@@ -77,6 +112,16 @@ namespace util
         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")
@@ -90,6 +135,14 @@ 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)
@@ -102,6 +155,16 @@ 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")
@@ -117,6 +180,14 @@ 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)
@@ -129,6 +200,16 @@ namespace util
         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")
@@ -142,25 +223,43 @@ namespace util
         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)
         {
         case State::ACTIVE:
-            return "ACTIVE";
+            return "STARTED";
         case State::INACTIVE:
-            return "INACTIVE";
+            return "COMPLETED";
         }
         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")
         {
             return State::ACTIVE;
         }
-        if (value == "INACTIVE")
+        if (value == "COMPLETED")
         {
             return State::INACTIVE;
         }

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

@@ -1,79 +0,0 @@
-/*
-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>
-#include <stdexcept>
-#include "Vector.h"
-
-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;
-        std::ifstream file(filePath);
-        if (!file.is_open())
-        {
-            std::ofstream newFile(filePath);
-            newFile.close();
-            file.open(filePath);
-        }
-        std::string line;
-        bool isHeader = true;
-        while (std::getline(file, line))
-        {
-            if (isHeader)
-            {
-                isHeader = false;
-                continue;
-            }
-            records.push_back(line);
-        }
-        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);
-        if (!file.is_open())
-        {
-            throw std::runtime_error("Failed to open file " + filePath);
-        }
-        file << "Values" << '\n';
-        int numberOfRecords = records.getSize();
-        for (int index = 0; index < numberOfRecords; index++)
-        {
-            file << records[index] << '\n';
-        }
-    }
-}

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

@@ -1,116 +0,0 @@
-/*
-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 <stdexcept>
-#include <fstream>
-#include "Vector.h"
-#include "Map.h"
-
-namespace util
-{
-	template <typename T> using objects = util::Map<std::string, T*>;
-
-	template <typename T>
-	class FileManager
-	{
-	private:
-		std::string m_filePath;
-	public:
-		FileManager() : m_filePath("") {}
-		FileManager(const std::string& filePath) : m_filePath(filePath) {}
-		objects<T> load();
-		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()
-	{
-		objects<T> records;
-		std::ifstream file(m_filePath);
-		if (!file.is_open())
-		{
-			std::ofstream newFile(m_filePath);
-			newFile.close();
-			file.open(m_filePath);
-		}
-		util::Vector<std::string> lines;
-		std::string line;
-		while (std::getline(file, line))
-		{
-			lines.push_back(line);
-		}
-		int numberOfLines = lines.getSize();
-		bool isHeader = true;
-		for (int lineIndex = 0; lineIndex < numberOfLines; lineIndex++)
-		{
-			const auto& record = lines[lineIndex];
-			if (isHeader)
-			{
-				isHeader = false;
-				continue;
-			}
-			auto object = T::deserialize(record);
-			if (!object)
-			{
-				throw std::runtime_error("Failed to deserialize record");
-			}
-			records[object->getId()] = object;
-		}
-		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)
-	{
-		util::Vector<std::string> lines;
-		lines.push_back(T::getHeaders());
-		int numberOfRecords = records.getSize();
-		for (int recordIndex = 0; recordIndex < numberOfRecords; recordIndex++)
-		{
-			const auto& record = records.getValueAt(recordIndex);
-			lines.push_back(record->serialize());
-		}
-		std::ofstream file(m_filePath, std::ios::trunc);
-		if (!file.is_open())
-		{
-			throw std::runtime_error("Failed to open file " + m_filePath);
-		}
-		int numberOfLines = lines.getSize();
-		for (int lineIndex = 0; lineIndex < numberOfLines; lineIndex++)
-		{
-			file << lines[lineIndex] << '\n';
-		}
-	}
-}

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/InputHelper.h

@@ -34,7 +34,7 @@ namespace util
 
     /*
      * Function: read
-     * Description: Reads a line of text input from console into a string and cleans it up.
+     * Description: Reads a line of text input from console into a string.
      * Parameters:
      *     value - reference to a string where the input will be stored
      * Returns:
@@ -43,15 +43,6 @@ namespace util
     inline void read(std::string& value)
     {
         std::getline(std::cin >> std::ws, value);
-        std::string cleanedValue;
-        for (int index = 0; index < value.length(); index++)
-        {
-            if (value[index] != ',')
-            {
-                cleanedValue += value[index];
-            }
-        }
-        value = cleanedValue;
     }
 
     /*

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

@@ -1,36 +0,0 @@
-/*
-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;
-        for (char character : input)
-        {
-            if (std::isdigit(static_cast<unsigned char>(character)))
-            {
-                result = result * 10 + (character - '0');
-            }
-        }
-        return result;
-    }
-}

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

@@ -1,63 +1,8 @@
 /*
-File: ObserversHelper.h
+File: Utility.h
-Description: Provides utility functions for loading and saving observers
+Description:
-             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: 22-May-2026
+Date: 20-May-2026
 */
 
 #pragma once
-#include "NotificationManagementService.h"
-#include "FileHelper.h"
-#include "DataStore.h"
-
-namespace util
-{
-    /*
-    Function: loadObservers
-    Description: Loads observer IDs from a file and attaches the corresponding users
-                 to the notification management service. Validates that each observer ID
-                 exists in the datastore before attaching.
-    Parameters:
-        - 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:
-        - void
-    Throws:
-        - std::runtime_error if an observer ID is invalid (not found in datastore)
-    */
-    inline void loadObservers(const std::string& filePath, NotificationManagementService* service, DataStore& dataStore)
-    {
-        auto observerIDs = util::loadRecords(filePath);
-        auto& users = dataStore.getUsers();
-        for (int index = 0; index < observerIDs.getSize(); index++)
-        {
-            const std::string& observerID = observerIDs[index];
-            int userIndex = users.find(observerID);
-            if (userIndex == -1)
-            {
-                throw std::runtime_error("Invalid Observer ID");
-            }
-            service->attach(users.getValueAt(userIndex));
-        }
-    }
-
-    /*
-    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();
-        util::saveRecords(filePath, observerIDs);
-    }
-}

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

@@ -1,7 +1,27 @@
+/*
+File: AdminMenu.cpp
+Description: Implements the AdminMenu class which provides the administrator’s console interface
+			 in the Vehicle Service Management System. Handles menu display, user input, and
+			 admin-specific operations such as inventory management, technician management,
+			 service creation, combo package management, job assignment, and notifications.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #include "AdminMenu.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
+#include "MenuHelper.h"
 
+/*
+Function: showMenu
+Description: Displays the admin menu in a loop until the user chooses to logout.
+			 Handles exceptions and ensures smooth user interaction.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void AdminMenu::showMenu()
 {
 	bool isMenuActive = true;
@@ -84,6 +104,15 @@ void AdminMenu::removeComboPackage()
 {
 }
 
+/*
+Function: viewNotifications
+Description: Displays notifications for the admin and allows deletion of notifications.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void AdminMenu::viewNotifications()
 {
+	viewAndDeleteNotification(m_controller);
 }

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

@@ -1,3 +1,12 @@
+/*
+File: AdminMenu.h
+Description: Declares the AdminMenu class which provides the administrative console menu in the Vehicle Service Management System.
+             Supports operations such as inventory management, job assignment, service creation/removal, technician management,
+             combo package handling, notification viewing, and account management functions like logout and password change.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include "Controller.h"
 

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

@@ -1,7 +1,27 @@
+/*
+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 "CustomerMenu.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
+#include "MenuHelper.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()
 {
 	bool isMenuActive = true;
@@ -63,10 +83,66 @@ void CustomerMenu::viewInvoices()
 {
 }
 
+/*
+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,3 +1,12 @@
+/*
+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

@@ -0,0 +1,114 @@
+/*
+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 <iomanip>
+#include "Vector.h"
+#include "Controller.h"
+#include "Notification.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,7 +1,26 @@
+/*
+File: TechnicianMenu.cpp
+Description: Implements the TechnicianMenu class which provides the technician’s console interface
+			 in the Vehicle Service Management System. Handles menu display, user input, and
+			 technician-specific operations such as completing jobs and viewing notifications.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #include "TechnicianMenu.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
+#include "MenuHelper.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()
 {
 	bool isMenuActive = true;
@@ -35,6 +54,15 @@ void TechnicianMenu::completeJob()
 {
 }
 
+/*
+Function: viewNotifications
+Description: Displays notifications for the technician and allows deletion of notifications.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void TechnicianMenu::viewNotifications()
 {
+	viewAndDeleteNotification(m_controller);
 }

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

@@ -1,3 +1,11 @@
+/*
+File: TechnicianMenu.h
+Description: Declares the TechnicianMenu class which provides the technician-facing console menu in the Vehicle Service Management System.
+             Supports operations such as viewing assigned jobs, completing jobs, and managing notifications.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include "Controller.h"
 

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

@@ -1,10 +1,27 @@
+/*
+File: UserInterface.cpp
+Description: Implements the UserInterface class which provides the main entry point for the Vehicle Service Management System.
+			 Handles system checks, displays the main menu, and manages user operations such as login and customer registration.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #include "UserInterface.h"
 #include "InputHelper.h"
 #include "OutputHelper.h"
 
+/*
+Function: run
+Description: Runs the Vehicle Service Management System interface.
+			 Performs system checks, displays the main menu, and processes user input until exit.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void UserInterface::run()
 {
-	m_controller.loadSystemData();
+	m_controller.runSystemChecks();
 	bool isMenuActive = true;
 	while (isMenuActive)
 	{
@@ -25,9 +42,16 @@ void UserInterface::run()
 			util::pressEnter();
 		}
 	}
-	m_controller.saveSystemData();
 }
 
+/*
+Function: handleOperation
+Description: Processes the user’s menu choice and executes the corresponding action.
+Parameters:
+	- choice: Integer representing the selected menu option.
+Returns:
+	- bool: True if the menu should remain active, False if exit is selected.
+*/
 bool UserInterface::handleOperation(int choice)
 {
 	switch (choice)
@@ -48,11 +72,27 @@ bool UserInterface::handleOperation(int choice)
 	return true;
 }
 
+/*
+Function: login
+Description: Handles the login process for existing users.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void UserInterface::login()
 {
 
 }
 
+/*
+Function: registerCustomer
+Description: Handles the registration process for new customers.
+Parameters:
+	- None
+Returns:
+	- void
+*/
 void UserInterface::registerCustomer()
 {
 

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

@@ -1,3 +1,12 @@
+/*
+File: UserInterface.h
+Description: Declares the UserInterface class which provides the main console interface for the Vehicle Service Management System.
+             Handles user interactions such as login, customer registration, and role-based menu navigation
+             for Admin, Technician, and Customer modules.
+Author: Trenser
+Date: 19-May-2026
+*/
+
 #pragma once
 #include "Controller.h"
 #include "AdminMenu.h"