From 1263e0ebe1324123363b3a7ec9c2ec416741bd69 Mon Sep 17 00:00:00 2001 From: Joel Thomas <1914@trenser.com> Date: Mon, 23 Feb 2026 16:38:12 +0530 Subject: [PATCH] refactor: use conventional variable names --- .../FoodDeliveryController.cpp | 76 +++++++++---------- .../FoodDeliveryController.h | 2 +- .../RestaurantOwnerMenu.cpp | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp index c4747be..55fb585 100644 --- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp +++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp @@ -22,12 +22,12 @@ Date: 19-02-2026 #include "outputHelper.h" #include "FileDatabase.h" -const std::string usersFile = "User.txt"; -const std::string restaurantsFile = "Restaurant.txt"; -const std::string menuItemsFile = "MenuItem.txt"; -const std::string ordersFile = "Order.txt"; -const std::string itemsFile = "Item.txt"; -const std::string deliveryAssignmentsFile = "DeliveryAssignment.txt"; +const std::string USERS_FILE = "User.txt"; +const std::string RESTAURANTS_FILE = "Restaurant.txt"; +const std::string MENU_ITEMS_FILE = "MenuItem.txt"; +const std::string ORDERS_FILE = "Order.txt"; +const std::string ITEMS_FILE = "Item.txt"; +const std::string DELIVERY_ASSIGNMENTS_FILE = "DeliveryAssignment.txt"; static bool checkAccess(std::shared_ptr user, const std::string& userWithAccess) { @@ -39,7 +39,7 @@ static bool checkAccess(std::shared_ptr user, const std::string& userWithA return true; } -static restaurants::iterator pickRestaurantFromRestaurants(restaurants& ownerRestaurants) +static restaurants::iterator selectRestaurantFromList(restaurants& ownerRestaurants) { util::clear(); int restaurantIndex = 1, restaurantChoiceIndex; @@ -76,7 +76,7 @@ static restaurants::iterator pickRestaurantFromRestaurants(restaurants& ownerRes return restaurantIterator; } -static menuItems::iterator pickItemFromMenu(menuItems& restaurantMenuItems) +static menuItems::iterator selectMenuItemFromList(menuItems& restaurantMenuItems) { util::clear(); int menuItemIndex = 1, menuItemChoiceIndex; @@ -137,7 +137,7 @@ static std::string getOrderStatusString(const OrderStatus& orderStatus) } } -static orders::iterator pickOrderFromOrders(orders& userOrders) +static orders::iterator selectOrderFromList(orders& userOrders) { util::clear(); std::cout << "Pick an Order\n"; @@ -190,7 +190,7 @@ static std::string getDeliveryStatusString(const DeliveryStatus& deliveryStatus) } } -static deliveryAssignments::iterator pickAssignmentFromDeliveryAssignments(deliveryAssignments& assignments, const users& allUsers) +static deliveryAssignments::iterator selectDeliveryAssignmentFromList(deliveryAssignments& assignments, const users& allUsers) { util::clear(); std::cout << "Pick a Delivery Assignment\n"; @@ -236,12 +236,12 @@ static deliveryAssignments::iterator pickAssignmentFromDeliveryAssignments(deliv void FoodDeliveryController::loadStates() { - FileDatabase userDatabase(usersFile); - FileDatabase restaurantDatabase(restaurantsFile); - FileDatabase menuItemDatabase(menuItemsFile); - FileDatabase orderDatabase(ordersFile); - FileDatabase itemDatabase(itemsFile); - FileDatabase deliveryAssignmentsDatabase(deliveryAssignmentsFile); + FileDatabase userDatabase(USERS_FILE); + FileDatabase restaurantDatabase(RESTAURANTS_FILE); + FileDatabase menuItemDatabase(MENU_ITEMS_FILE); + FileDatabase orderDatabase(ORDERS_FILE); + FileDatabase itemDatabase(ITEMS_FILE); + FileDatabase deliveryAssignmentsDatabase(DELIVERY_ASSIGNMENTS_FILE); objects menuItems; objects items; m_users = userDatabase.load(); @@ -353,12 +353,12 @@ void FoodDeliveryController::loadStates() void FoodDeliveryController::persistStates() { - FileDatabase userDatabase(usersFile); - FileDatabase restaurantDatabase(restaurantsFile); - FileDatabase menuItemDatabase(menuItemsFile); - FileDatabase orderDatabase(ordersFile); - FileDatabase itemDatabase(itemsFile); - FileDatabase deliveryAssignmentsDatabase(deliveryAssignmentsFile); + FileDatabase userDatabase(USERS_FILE); + FileDatabase restaurantDatabase(RESTAURANTS_FILE); + FileDatabase menuItemDatabase(MENU_ITEMS_FILE); + FileDatabase orderDatabase(ORDERS_FILE); + FileDatabase itemDatabase(ITEMS_FILE); + FileDatabase deliveryAssignmentsDatabase(DELIVERY_ASSIGNMENTS_FILE); userDatabase.save(m_users); restaurantDatabase.save(m_restaurants); objects allMenuItems; @@ -610,7 +610,7 @@ void FoodDeliveryController::updateRestaurantStatus() const return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { if (restaurantIterator->second->getStatus() == true) @@ -646,7 +646,7 @@ void FoodDeliveryController::listRestaurantOrders() const return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { orders& restaurantOrders = restaurantIterator->second->getOrders(); @@ -655,7 +655,7 @@ void FoodDeliveryController::listRestaurantOrders() const std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n"; return; } - orders::iterator orderIterator = pickOrderFromOrders(restaurantOrders); + orders::iterator orderIterator = selectOrderFromList(restaurantOrders); if (orderIterator != restaurantOrders.end()) { util::clear(); @@ -699,7 +699,7 @@ void FoodDeliveryController::listRestaurantOrders() const } } -void FoodDeliveryController::markOrderReady() +void FoodDeliveryController::setOrderReady() { try { @@ -709,7 +709,7 @@ void FoodDeliveryController::markOrderReady() return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { orders& restaurantOrders = restaurantIterator->second->getOrders(); @@ -718,7 +718,7 @@ void FoodDeliveryController::markOrderReady() std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n"; return; } - orders::iterator orderIterator = pickOrderFromOrders(restaurantOrders); + orders::iterator orderIterator = selectOrderFromList(restaurantOrders); if (orderIterator != restaurantOrders.end()) { OrderStatus orderStatus = orderIterator->second->getStatus(); @@ -762,7 +762,7 @@ void FoodDeliveryController::listMenuItems() const return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { util::clear(); @@ -811,7 +811,7 @@ void FoodDeliveryController::addMenuItem() const return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { util::clear(); @@ -849,11 +849,11 @@ void FoodDeliveryController::removeMenuItem() const return; } RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast(m_authenticatedUser)); - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); + restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants()); if (restaurantIterator != restaurantOwner.getRestaurants().end()) { menuItems& restaurantMenuItems = restaurantIterator->second->getMenuItems(); - menuItems::iterator menuItemIterator = pickItemFromMenu(restaurantMenuItems); + menuItems::iterator menuItemIterator = selectMenuItemFromList(restaurantMenuItems); if (menuItemIterator != restaurantMenuItems.end()) { menuItemIterator->second->makeUnavailable(); @@ -896,7 +896,7 @@ void FoodDeliveryController::listCustomerOrders() const std::cout << "You have not placed any orders!\n"; return; } - orders::iterator orderIterator = pickOrderFromOrders(customerOrders); + orders::iterator orderIterator = selectOrderFromList(customerOrders); if (orderIterator != customerOrders.end()) { util::clear(); @@ -949,7 +949,7 @@ void FoodDeliveryController::placeOrder() { throw std::runtime_error("Cannot place order. Failed to verify access!"); } - restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(m_restaurants); + restaurants::iterator restaurantIterator = selectRestaurantFromList(m_restaurants); if (restaurantIterator != m_restaurants.end()) { bool isMenuActive = true; @@ -968,7 +968,7 @@ void FoodDeliveryController::placeOrder() std::shared_ptr order; while (isMenuActive) { - menuItems::iterator menuItemIterator = pickItemFromMenu(restaurantMenuItems); + menuItems::iterator menuItemIterator = selectMenuItemFromList(restaurantMenuItems); if (menuItemIterator != restaurantMenuItems.end()) { int quantity; @@ -1045,7 +1045,7 @@ void FoodDeliveryController::cancelOrder() const std::cout << "You have not placed any orders!\n"; return; } - orders::iterator orderIterator = pickOrderFromOrders(customerOrders); + orders::iterator orderIterator = selectOrderFromList(customerOrders); if (orderIterator != customerOrders.end()) { OrderStatus orderStatus = orderIterator->second->getStatus(); @@ -1136,7 +1136,7 @@ void FoodDeliveryController::acceptDeliveryAssignment() std::cout << "No Delivery Assignments available at the moment!\n"; return; } - deliveryAssignments::iterator assignmentIterator = pickAssignmentFromDeliveryAssignments(m_assignments, m_users); + deliveryAssignments::iterator assignmentIterator = selectDeliveryAssignmentFromList(m_assignments, m_users); if (assignmentIterator != m_assignments.end()) { DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus(); @@ -1184,7 +1184,7 @@ void FoodDeliveryController::confirmDeliveryAssignment() const std::cout << "You haven't accepted any Delivery Assignments!\n"; return; } - deliveryAssignments::iterator assignmentIterator = pickAssignmentFromDeliveryAssignments(assignments, m_users); + deliveryAssignments::iterator assignmentIterator = selectDeliveryAssignmentFromList(assignments, m_users); if (assignmentIterator != assignments.end()) { DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus(); diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.h b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.h index 4bf7cb8..471097e 100644 --- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.h +++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.h @@ -41,7 +41,7 @@ public: void addNewRestaurant(); void updateRestaurantStatus() const; void listRestaurantOrders() const; - void markOrderReady(); + void setOrderReady(); void listMenuItems() const; void addMenuItem() const; void removeMenuItem() const; diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/RestaurantOwnerMenu.cpp b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/RestaurantOwnerMenu.cpp index e5760ea..99aa54c 100644 --- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/RestaurantOwnerMenu.cpp +++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/RestaurantOwnerMenu.cpp @@ -64,7 +64,7 @@ bool RestaurantOwnerMenu::handleOperation(int choice) m_foodDeliveryController.listRestaurantOrders(); break; case 5: - m_foodDeliveryController.markOrderReady(); + m_foodDeliveryController.setOrderReady(); break; case 6: m_foodDeliveryController.listMenuItems();