Merged PR 1152: Vehicle Service System v1.0.0.0

Features Included:

Secure access and session management with role-based authentication
Customer and technician account management
Service booking and technician assignment
Service and combo package management
Job card tracking and completion workflow
Inventory management and stock monitoring
Invoice generation and payment processing
Notification management with configurable preferences
Observer pattern based alerts for inventory, payments, and service updates

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

@@ -392,9 +392,9 @@ Parameters:
 Returns:
     - void
 */
-void Controller::updateJobStatus(const std::string& jobID)
+void Controller::completeJob(const std::string& jobID)
 {
-    m_serviceManagementService.updateJobStatus(jobID);
+    m_serviceManagementService.completeJob(jobID);
 }
 
 /*
@@ -462,38 +462,6 @@ util::Map<std::string, const Invoice*> Controller::getInvoicesByUser()
     return userInvoicesReadOnly;
 }
 
-/*
-Function: getAllInvoices
-Description: Retrieves all invoices from the PaymentManagementService and returns them as a read-only map.
-Parameters:
-    - none
-Returns:
-    - util::Map<std::string, const Invoice*>: Map of invoice IDs to invoice objects
-*/
-util::Map<std::string, const Invoice*> Controller::getAllInvoices()
-{
-    auto invoices = m_paymentManagementService.getAllInvoices();
-    util::Map<std::string, const Invoice*> readOnlyInvoice;
-    for (int iterator = 0; iterator < invoices.getSize(); iterator++)
-    {
-        readOnlyInvoice.insert(invoices.getKeyAt(iterator), invoices.getValueAt(iterator));
-    }
-    return readOnlyInvoice;
-}
-
-/*
-Function: confirmPayment
-Description: Delegates payment confirmation for a given invoice ID to the PaymentManagementService.
-Parameters:
-    - invoiceID: std::string, ID of the invoice to confirm
-Returns:
-    - void
-*/
-void Controller::confirmPayment(const std::string& invoiceID)
-{
-    m_paymentManagementService.confirmPayment(invoiceID);
-}
-
 /*
 Function: completePayment
 Description: Completes payment for a specific invoice using the given payment mode.

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

@@ -59,13 +59,11 @@ public:
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
     void removeService(const std::string& serviceID);
     util::Map<std::string, const JobCard*> getJobCardsByUser();
-    void updateJobStatus(const std::string& jobID);
+    void completeJob(const std::string& jobID);
     void removeUser(const std::string& userID);
     void createComboPackage(const std::string& name, const util::Vector<std::string>& serviceIDs, double discountPercentage);
     void removeComboPackage(const std::string& comboPackageID);
     util::Map<std::string, const Invoice*> getInvoicesByUser();
-    util::Map<std::string, const Invoice*> getAllInvoices();
-    void confirmPayment(const std::string& invoiceID);
     void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
     util::Vector<const Notification*> getNotifications();
     void deleteNotification(const std::string& notificationID);

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

@@ -368,12 +368,12 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
 	if (invoiceIndex != -1)
 	{
 		Invoice* invoice = currentInvoices.getValueAt(invoiceIndex);
-		if (invoice && invoice->getStatus() != util::PaymentStatus::PAID)
+		if (invoice && invoice->getStatus() != util::PaymentStatus::COMPLETED)
 		{
 			User* currentUser = invoice->getBooking()->getCustomer();
 			invoice->setPaymentMethod(paymentMode);
 			invoice->setPaymentDate(util::Timestamp());
-			invoice->setStatus(util::PaymentStatus::PAID);
+			invoice->setStatus(util::PaymentStatus::COMPLETED);
 			std::string title, message;
 			title = "Payment successful";
 			message = "Payment successful for Invoice ID " + invoiceID;
@@ -385,47 +385,3 @@ void PaymentManagementService::completePayment(const std::string& invoiceID, uti
 		throw std::runtime_error("Payment failed: invalid invoice ID.");
 	}
 }
-
-/*
-Function: getAllInvoice
-Description: Provides access to all invoices stored in the data store.
-Parameters:
-	- none
-Returns:
-	- util::Map<std::string, Invoice*>&: Map of invoice IDs to invoice objects
-*/
-util::Map<std::string, Invoice*>& PaymentManagementService::getAllInvoices()
-{
-	return m_dataStore.getInvoices();
-}
-
-/*
-Function: confirmPayment
-Description: Confirms payment for a specific invoice. Updates payment date and status,
-			 then sends a notification to the customer.
-Parameters:
-	- invoiceID: std::string, ID of the invoice to confirm
-Returns:
-	- void
-Throws:
-	- std::runtime_error if the invoice ID is invalid
-*/
-void PaymentManagementService::confirmPayment(const std::string& invoiceID)
-{
-	auto& currentInvoices = m_dataStore.getInvoices();
-	int invoiceIndex = currentInvoices.find(invoiceID);
-	if (invoiceIndex == -1)
-	{
-		throw std::runtime_error("Payment confirmation failed: invalid invoice ID.");
-	}
-	Invoice* invoice = currentInvoices.getValueAt(invoiceIndex);
-	if (!invoice || invoice->getStatus() != util::PaymentStatus::PAID)
-	{
-		throw std::runtime_error("Payment confirmation failed: invoice is not awaiting confirmation.");
-	}
-	User* currentUser = invoice->getBooking()->getCustomer();
-	invoice->setStatus(util::PaymentStatus::COMPLETED);
-	std::string title = "Payment Confirmed";
-	std::string message = "Payment Confirmed for Invoice ID " + invoiceID;
-	sendNotification(currentUser, title, message);
-}

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

@@ -28,8 +28,6 @@ public:
     void generateInvoice(ServiceBooking* booking);
     util::Map<std::string, Invoice*> getInvoices(const std::string& customerID);
     void completePayment(const std::string& invoiceID, util::PaymentMode paymentMode);
-    util::Map<std::string, Invoice*>& getAllInvoices();
-    void confirmPayment(const std::string& invoiceID);
     void sendPaymentReminders();
     void sendNotification(User* user, const std::string& title, const std::string& message) override;
     void attach(User* user) override;

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

@@ -1080,7 +1080,7 @@ static bool hasCompletedAllJobs(std::string bookingId, util::Map<std::string, Jo
 		JobCard* currentJob = currentAssignedJobs.getValueAt(iterator);
 		if (currentJob->getBookingId() == bookingId)
 		{
-			if (currentJob->getStatus() != util::ServiceJobStatus::COMPLETED && currentJob->getStatus() != util::ServiceJobStatus::CANCELLED)
+			if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
 			{
 				return false;
 			}
@@ -1090,19 +1090,18 @@ static bool hasCompletedAllJobs(std::string bookingId, util::Map<std::string, Jo
 }
 
 /*
-Function: updateJobStatus
-Description:
-    Updates the status of a job card assigned to the currently authenticated technician.
-    - If the job is STARTED, it moves to IN_PROGRESS.
-    - If the job is IN_PROGRESS, it moves to COMPLETED.
-    When all jobs in a service booking are completed, the booking status is updated,
-    an invoice is generated, and a notification is sent to the customer.
+Function: completeJob
+Description: Marks a job card as completed for the authenticated technician.
+			 If all job cards in the booking are completed, marks the booking as completed
+			 and generates an invoice.
 Parameters:
-    - jobID: const std::string&, unique identifier of the job card to update.
+	- jobID: std::string, ID of the job card
 Returns:
-    - void
+	- void
+Throws:
+	- std::runtime_error if technician is not authenticated, job card not found, or job already completed
 */
-void ServiceManagementService::updateJobStatus(const std::string& jobID)
+void ServiceManagementService::completeJob(const std::string& jobID)
 {
 	AuthenticationManagementService authenticationManagementService;
 	PaymentManagementService paymentManagementService;
@@ -1127,30 +1126,26 @@ void ServiceManagementService::updateJobStatus(const std::string& jobID)
 		}
 		if (currentJob->getStatus() == util::ServiceJobStatus::STARTED)
 		{
-			currentJob->setStatus(util::ServiceJobStatus::IN_PROGRESS);
+			currentJob->setStatus(util::ServiceJobStatus::COMPLETED);
 			jobStatusUpdated = true;
 		}
-        else if (currentJob->getStatus() == util::ServiceJobStatus::IN_PROGRESS)
-        {
-            currentJob->setStatus(util::ServiceJobStatus::COMPLETED);
-            jobStatusUpdated = true;
-            serviceBookingCompleted = hasCompletedAllJobs(currentJob->getBookingId(), currentAssignedJobs);
-            if (serviceBookingCompleted)
-            {
-                currentJob->getBooking()->setStatus(util::ServiceJobStatus::COMPLETED);
-                paymentManagementService.generateInvoice(currentJob->getBooking());
-                std::string title = "Service Booking completed. Invoice Generated.";
-                std::string message = "Services completed for the booking and invoice generated.";
-                sendNotification(currentJob->getBooking()->getCustomer(), title, message);
-            }
-        }
 	}
 	else
 	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
+		throw std::runtime_error("Failed to complete the job, some error occurred or job already completed.");
 	}
 	if (!jobStatusUpdated)
 	{
-		throw std::runtime_error("Failed to update job status. Job may already be completed.");
+		throw std::runtime_error("Failed to complete the job, some error occurred or job already completed.");
+	}
+
+	serviceBookingCompleted = hasCompletedAllJobs(currentJob->getBookingId(), currentAssignedJobs);
+	if (serviceBookingCompleted)
+	{
+		currentJob->getBooking()->setStatus(util::ServiceJobStatus::COMPLETED);
+		paymentManagementService.generateInvoice(currentJob->getBooking());
+		std::string title = "Service Booking completed. Invoice Generated.";
+		std::string message = "Services completed for the booking and invoice generated.";
+		sendNotification(currentJob->getBooking()->getCustomer(), title, message);
 	}
 }

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

@@ -37,7 +37,7 @@ public:
     void createService(const std::string& name, const util::Vector<std::string>& inventoryItemIDs, double laborCost);
     void removeService(const std::string& serviceID);
     util::Map<std::string, JobCard*> getJobCards(const std::string& technicianID);
-    void updateJobStatus(const std::string& jobID);
+    void completeJob(const std::string& jobID);
     void cancelCustomerServiceBookings(const std::string& customerID);
     void cancelTechnicianJobs(const std::string& technicianID);
     void createComboPackage(const std::string& packageName, const util::Vector<std::string>& serviceIDs, double discountPercentage);

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

@@ -29,8 +29,7 @@ namespace util
 	enum class PaymentStatus
 	{
 		PENDING,
-		COMPLETED,
-        PAID
+		COMPLETED
 	};
 
 	enum class ServiceJobStatus
@@ -38,7 +37,6 @@ namespace util
         PENDING,
 		STARTED,
 		COMPLETED,
-        IN_PROGRESS,
         CANCELLED
 	};
 
@@ -162,8 +160,6 @@ namespace util
             return "PENDING";
         case PaymentStatus::COMPLETED:
             return "COMPLETED";
-        case PaymentStatus::PAID:
-            return "PAID";
         }
         throw std::invalid_argument("Invalid PaymentStatus");
     }
@@ -213,8 +209,6 @@ namespace util
             return "COMPLETED";
         case ServiceJobStatus::CANCELLED:
             return "CANCELLED";
-        case ServiceJobStatus::IN_PROGRESS:
-            return "IN_PROGRESS";
         }
         throw std::invalid_argument("Invalid ServiceJobStatus");
     }
@@ -247,10 +241,6 @@ namespace util
         {
             return ServiceJobStatus::CANCELLED;
         }
-        if (value == "IN_PROGRESS")
-        {
-            return ServiceJobStatus::IN_PROGRESS;
-        }
         throw std::invalid_argument("Invalid ServiceJobStatus string");
     }
 

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

@@ -53,8 +53,7 @@ void AdminMenu::showMenu()
                 << "\n14. Remove Combo Package"
                 << "\n15. View Notifications"
                 << "\n16. Change Password"
-				<< "\n17. Confirm Payment"
-                << "\n18. Logout"
+                << "\n17. Logout"
                 << "\nEnter a choice: ";
             util::read(choice);
             if (!handleOperation(choice))
@@ -128,10 +127,7 @@ bool AdminMenu::handleOperation(int choice)
     case 16:
         changePassword();
         break;
-	case 17:
-		confirmPayment();
-		break;
-    case 18:
+    case 17:
         logout();
         return false;
     default:
@@ -500,54 +496,6 @@ void AdminMenu::displayUsers()
 	util::pressEnter();
 }
 
-/*
-Function: confirmPayment
-Description: Confirms payment for a selected invoice. Validates invoice status, updates payment date,
-			 sets status to COMPLETED, and sends a notification to the customer.
-Parameters:
-	- invoiceID: std::string, ID of the invoice to confirm
-Returns:
-	- void
-*/
-void AdminMenu::confirmPayment()
-{
-	util::clear();
-	std::cout << "Confirm Payment\n";
-	auto invoiceList = m_controller.getAllInvoices();
-	if (invoiceList.isEmpty())
-	{
-		std::cout << "No pending invoices available for confirmation.";
-		util::pressEnter();
-		return;
-	}
-	bool hasConfirmableInvoice = false;
-	for (int index = 0; index < invoiceList.getSize(); ++index)
-	{
-		const Invoice* invoice = invoiceList.getValueAt(index);
-		if (invoice && invoice->getStatus() == util::PaymentStatus::PAID)
-		{
-			hasConfirmableInvoice = true;
-			break;
-		}
-	}
-	if (!hasConfirmableInvoice)
-	{
-		std::cout << "No invoices awaiting confirmation.\n";
-		util::pressEnter();
-		return;
-	}
-	std::string selectedID = selectInvoiceFromUserForPayment(invoiceList, util::PaymentStatus::PAID);
-	if (selectedID == "")
-	{
-		std::cout << "Payment failed.\n";
-		util::pressEnter();
-		return;
-	}
-	m_controller.confirmPayment(selectedID);
-	std::cout << "Payment Confirmed successfully.\n";
-	util::pressEnter();
-}
-
 /*
 Function: addTechnician
 Description: Adds a new technician after validating username, password, email, and phone number.

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

@@ -28,7 +28,6 @@ public:
     void createService();
     void removeService();
     void displayUsers();
-    void confirmPayment();
     void addTechnician();
     void removeUser();
     void displayComboPackages();

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

@@ -338,7 +338,7 @@ void CustomerMenu::completePayments()
         util::pressEnter();
         return;
     }
-	std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices, util::PaymentStatus::PENDING);
+	std::string selectedID = selectInvoiceFromUserForPayment(currentInvoices);
     if (selectedID == "")
     {
         std::cout << "Payment failed.\n";

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

@@ -365,17 +365,13 @@ inline const User* selectTechnician(util::Map<int, const User*>& currentAvailabl
 
 /*
 Function: selectInvoiceFromUserForPayment 
-Description: Displays a list of invoices filtered by the required payment status.
-             Allows the user to select an invoice by index and returns the corresponding invoice ID.
+Description: Lists all pending invoices for the customer and allows selection by index.
 Parameters:
-    - currentInvoices: const util::Map<std::string, const Invoice*>&,
-                       map of all invoices keyed by invoice ID
-    - requiredStatus: util::PaymentStatus,
-                      the status to filter invoices (e.g., PENDING, PAID, COMPLETED)
+	- currentInvoices: util::Map<std::string, const Invoice*>&, map of customer invoices
 Returns:
-    - std::string: ID of the selected invoice, or empty string if none selected or invalid index
+	- std::string: ID of the selected invoice, or empty string if none selected
 */
-inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices, util::PaymentStatus requiredStatus)
+inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string, const Invoice*>& currentInvoices)
 {
 	int currentIndex = 1, choice;
 	util::Map<int, const Invoice*> pendingInvoicesForPayment;
@@ -393,7 +389,7 @@ inline std::string selectInvoiceFromUserForPayment(const util::Map<std::string,
 	for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
 	{
 		const Invoice* currentInvoice = currentInvoices.getValueAt(iterator);
-		if (currentInvoice && currentInvoice->getStatus() == requiredStatus)
+		if (currentInvoice && currentInvoice->getStatus() == util::PaymentStatus::PENDING)
 {
 			const User* currentTechnician = currentInvoice->getBooking()->getAssignedTechnician();
             std::cout << std::left
@@ -631,6 +627,7 @@ inline void displayInvoices(util::Map<std::string, const Invoice*> currentUserIn
                 std::cout << "Unable to fetch the selected invoice\n";
                 doRun = false;
             }
+
         } while (doRun);
     }
 }
@@ -649,35 +646,7 @@ inline util::Map<std::string, const JobCard*> filterStartedJobCards(util::Map<st
     for (int iterator = 0; iterator  < assignedJobCards.getSize(); iterator++)
     {
         const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
-        if (currentJobCard && (currentJobCard->getStatus() == util::ServiceJobStatus::STARTED || currentJobCard->getStatus() == util::ServiceJobStatus::IN_PROGRESS))
-        {
-            startedJobCards.insert(currentJobCard->getId(), currentJobCard);
-        }
-    }
-    return startedJobCards;
-}
-
-/*
-Function: filterJobCards
-Description:
-    Filters the given list of job cards and returns only those
-    whose status matches the specified ServiceJobStatus.
-Parameters:
-    - assignedJobCards: util::Map<std::string, const JobCard*>&
-        Map of job card IDs to JobCard pointers assigned to the technician.
-    - selectedJobStatus: util::ServiceJobStatus
-        The status type to filter job cards by.
-Returns:
-    - util::Map<std::string, const JobCard*>
-        A map containing only job cards with the specified status.
-*/
-inline util::Map<std::string, const JobCard*> filterJobCards(util::Map<std::string, const JobCard*>& assignedJobCards, util::ServiceJobStatus selectedJobStatus)
-{
-    util::Map<std::string, const JobCard*> startedJobCards;
-    for (int iterator = 0; iterator < assignedJobCards.getSize(); iterator++)
-    {
-        const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
-        if (currentJobCard && currentJobCard->getStatus() == selectedJobStatus)
+        if (currentJobCard && currentJobCard->getStatus() == util::ServiceJobStatus::STARTED)
         {
             startedJobCards.insert(currentJobCard->getId(), currentJobCard);
         }
@@ -706,18 +675,16 @@ inline void displayAllJobs(util::Map<std::string, const JobCard*>& assignedJobCa
         << std::setw(12) << "JobID"
         << std::setw(20) << "ServiceName"
         << std::setw(12) << "ServiceID"
-        << std::setw(12) << "Status"
         << std::endl;
     for (int iterator = 0; iterator < assignedJobCards.getSize(); iterator++)
     {
         const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
-        if (currentJobCard && (currentJobCard->getStatus() == util::ServiceJobStatus::STARTED || currentJobCard->getStatus() == util::ServiceJobStatus::IN_PROGRESS))
+        if (currentJobCard && (currentJobCard->getStatus() == util::ServiceJobStatus::STARTED))
         {
             std::cout << std::left << std::setw(12) << currentJobCard->getBookingId()
                 << std::setw(12) << currentJobCard->getId()
-                << std::setw(20) << util::truncateString(currentJobCard->getService()->getName(), 15)
+                << std::setw(20) << currentJobCard->getService()->getName()
                 << std::setw(12) << currentJobCard->getServiceId()
-                << std::setw(12) << util::getServiceJobStatusString(currentJobCard->getStatus())
                 << std::endl;
         }
     }
@@ -731,31 +698,16 @@ Parameters:
 Returns:
 	- std::string: ID of the selected job card, or empty string if none selected
 */
-inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>& assignedJobCards,  util::ServiceJobStatus selectedJobStatusType)
+inline std::string selectJobCardToComplete(util::Map<std::string, const JobCard*>& assignedJobCards)
 {
     util::Map<int, const JobCard* > incompleteJobCards;
     if (assignedJobCards.getSize() == 0)
     {
-        std::cout << "No jobs available.\n\n";
+        std::cout << "No started jobs available to complete.\n";
         return "";
     }
     int currentIndex = 1;
     int choice;
-    if (selectedJobStatusType == util::ServiceJobStatus::STARTED)
-    {
-        util::clear();
-        std::cout << "Select a job to update to Inprogress\n";
-    }
-    else if (selectedJobStatusType == util::ServiceJobStatus::IN_PROGRESS)
-    {
-        util::clear();
-        std::cout << "Select a job to update to Completed\n";
-    }
-    else
-    {
-        std::cout << "Unable to update completed or pending jobs.\n\n";
-        return "";
-    }
     std::cout << std::endl;
     std::cout << std::left
         << std::setw(6) << "Index"
@@ -763,24 +715,22 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
         << std::setw(12) << "JobID"
         << std::setw(20) << "ServiceName"
         << std::setw(12) << "ServiceID"
-        << std::setw(12) << "JobStatus"
         << std::endl;
     for (int iterator = 0; iterator < assignedJobCards.getSize(); iterator++)
     {
         const JobCard* currentJobCard = assignedJobCards.getValueAt(iterator);
-        if (currentJobCard && (currentJobCard->getStatus() == selectedJobStatusType))
+        if (currentJobCard && (currentJobCard->getStatus() == util::ServiceJobStatus::STARTED))
         {
             std::cout << std::left << std::setw(6) << currentIndex
                 << std::setw(12) << currentJobCard->getBookingId()
                 << std::setw(12) << currentJobCard->getId()
-                << std::setw(20) << util::truncateString(currentJobCard->getService()->getName(), 15)
+                << std::setw(20) << currentJobCard->getService()->getName()
                 << std::setw(12) << currentJobCard->getServiceId()
-                << std::setw(12) << util::getServiceJobStatusString(currentJobCard->getStatus())
                 << std::endl;
             incompleteJobCards.insert(currentIndex++, currentJobCard);
         }
     }
-    std::cout << "Select the Job Card to Update (Index): ";
+    std::cout << "Select the Job Card to complete (Index): ";
     util::read(choice);
     int selectedJobCardIndex = incompleteJobCards.find(choice);
     if (selectedJobCardIndex != -1)
@@ -791,7 +741,7 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
     else
     {
         std::cout << "Invalid index.\n";
-        std::cout << "Failed to update job.\n\n";
+        std::cout << "Failed to complete jobs.\n\n";
         return "";
     }
 }

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

@@ -35,7 +35,7 @@ void TechnicianMenu::showMenu()
             util::clear();
             std::cout << "Technician Menu"
                 << "\n1. Display My Jobs"
-                << "\n2. Update Job Status"
+                << "\n2. Mark Job as Completed"
                 << "\n3. View Notifications"
                 << "\n4. Change Password"
                 << "\n5. Logout"
@@ -68,7 +68,7 @@ bool TechnicianMenu::handleOperation(int choice)
         displayJobs();
         break;
     case 2:
-        updateJobStatus();
+        completeJob();
         break;
     case 3:
         viewNotifications();
@@ -99,50 +99,31 @@ void TechnicianMenu::displayJobs()
     util::clear();
     std::cout << "My Jobs\n";
     util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
-    util::Map<std::string, const JobCard*> jobCards = filterStartedJobCards(assignedJobCards);
-    displayAllJobs(jobCards);
+    util::Map<std::string, const JobCard*> startedJobCards = filterStartedJobCards(assignedJobCards);
+    displayAllJobs(startedJobCards);
     util::pressEnter();
 }
 
 /*
-Function: updateJobStatus
-Description: Allows the technician to update a selected job card.
+Function: completeJob
+Description: Allows the technician to mark a selected job card as completed.
              Validates selection and updates job status through the controller.
 Parameters:
     - None
 Returns:
     - void
 */
-void TechnicianMenu::updateJobStatus()
+void TechnicianMenu::completeJob()
 {
     util::clear();
-    std::cout << "Update Job Status\n";
-    int choice;
-    std::string selectedJobID;
-    util::ServiceJobStatus selectedJobStatus = util::ServiceJobStatus::PENDING;
+    std::cout << "Complete Job\n";
 	util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
-    std::cout << "Select the type of job you want to update\n1.Started\n2.Inprogress\nChoice: ";
-    util::read(choice);
-    if (choice == 1)
-    {
-        selectedJobStatus = util::ServiceJobStatus::STARTED;
-    }
-    else if (choice == 2)
-    {
-        selectedJobStatus = util::ServiceJobStatus::IN_PROGRESS;
-    }
-    else
-    {
-        std::cout << "Invalid choice. Please try again.\n";
-        util::pressEnter();
-        return;
-    }
-    util::Map<std::string, const JobCard*> selectedTypeJobCard = filterJobCards(assignedJobCards, selectedJobStatus);
-	selectedJobID = selectJobCardToUpdate(selectedTypeJobCard, selectedJobStatus);
+    util::Map<std::string, const JobCard*> startedJobCards = filterStartedJobCards(assignedJobCards);
+	std::string selectedJobID = selectJobCardToComplete(startedJobCards);
     if (!selectedJobID.empty())
 	{
-		m_controller.updateJobStatus(selectedJobID);
-		std::cout << "\nJob status updated.\n\n";
+		m_controller.completeJob(selectedJobID);
+		std::cout << "\nJob marked as completed.\n\n";
 	}
     util::pressEnter();
 }

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

@@ -18,7 +18,7 @@ private:
 public:
     void showMenu();
     void displayJobs();
-    void updateJobStatus();
+    void completeJob();
     void viewNotifications();
     void logout();
     void changePassword();