joelthomastrenser/Training-1914-Jan26
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use conventional variable names

Browse Source
This commit is contained in:
Joel Thomas
2026-02-23 16:38:12 +05:30
parent 81deba222d
commit 1263e0ebe1
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
+38 -38
View File
@@ -22,12 +22,12 @@ Date: 19-02-2026
#include "outputHelper.h" #include "outputHelper.h"
#include "FileDatabase.h" #include "FileDatabase.h"
const std::string usersFile = "User.txt"; const std::string USERS_FILE = "User.txt";
const std::string restaurantsFile = "Restaurant.txt"; const std::string RESTAURANTS_FILE = "Restaurant.txt";
const std::string menuItemsFile = "MenuItem.txt"; const std::string MENU_ITEMS_FILE = "MenuItem.txt";
const std::string ordersFile = "Order.txt"; const std::string ORDERS_FILE = "Order.txt";
const std::string itemsFile = "Item.txt"; const std::string ITEMS_FILE = "Item.txt";
const std::string deliveryAssignmentsFile = "DeliveryAssignment.txt"; const std::string DELIVERY_ASSIGNMENTS_FILE = "DeliveryAssignment.txt";
static bool checkAccess(std::shared_ptr<User> user, const std::string& userWithAccess) static bool checkAccess(std::shared_ptr<User> user, const std::string& userWithAccess)
{ {
@@ -39,7 +39,7 @@ static bool checkAccess(std::shared_ptr<User> user, const std::string& userWithA
return true; return true;
} }
static restaurants::iterator pickRestaurantFromRestaurants(restaurants& ownerRestaurants) static restaurants::iterator selectRestaurantFromList(restaurants& ownerRestaurants)
{ {
util::clear(); util::clear();
int restaurantIndex = 1, restaurantChoiceIndex; int restaurantIndex = 1, restaurantChoiceIndex;
@@ -76,7 +76,7 @@ static restaurants::iterator pickRestaurantFromRestaurants(restaurants& ownerRes
return restaurantIterator; return restaurantIterator;
} }
static menuItems::iterator pickItemFromMenu(menuItems& restaurantMenuItems) static menuItems::iterator selectMenuItemFromList(menuItems& restaurantMenuItems)
{ {
util::clear(); util::clear();
int menuItemIndex = 1, menuItemChoiceIndex; 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(); util::clear();
std::cout << "Pick an Order\n"; 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(); util::clear();
std::cout << "Pick a Delivery Assignment\n"; std::cout << "Pick a Delivery Assignment\n";
@@ -236,12 +236,12 @@ static deliveryAssignments::iterator pickAssignmentFromDeliveryAssignments(deliv
void FoodDeliveryController::loadStates() void FoodDeliveryController::loadStates()
{ {
FileDatabase<User> userDatabase(usersFile); FileDatabase<User> userDatabase(USERS_FILE);
FileDatabase<Restaurant> restaurantDatabase(restaurantsFile); FileDatabase<Restaurant> restaurantDatabase(RESTAURANTS_FILE);
FileDatabase<MenuItem> menuItemDatabase(menuItemsFile); FileDatabase<MenuItem> menuItemDatabase(MENU_ITEMS_FILE);
FileDatabase<Order> orderDatabase(ordersFile); FileDatabase<Order> orderDatabase(ORDERS_FILE);
FileDatabase<Item> itemDatabase(itemsFile); FileDatabase<Item> itemDatabase(ITEMS_FILE);
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(deliveryAssignmentsFile); FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(DELIVERY_ASSIGNMENTS_FILE);
objects<MenuItem> menuItems; objects<MenuItem> menuItems;
objects<Item> items; objects<Item> items;
m_users = userDatabase.load(); m_users = userDatabase.load();
@@ -353,12 +353,12 @@ void FoodDeliveryController::loadStates()
void FoodDeliveryController::persistStates() void FoodDeliveryController::persistStates()
{ {
FileDatabase<User> userDatabase(usersFile); FileDatabase<User> userDatabase(USERS_FILE);
FileDatabase<Restaurant> restaurantDatabase(restaurantsFile); FileDatabase<Restaurant> restaurantDatabase(RESTAURANTS_FILE);
FileDatabase<MenuItem> menuItemDatabase(menuItemsFile); FileDatabase<MenuItem> menuItemDatabase(MENU_ITEMS_FILE);
FileDatabase<Order> orderDatabase(ordersFile); FileDatabase<Order> orderDatabase(ORDERS_FILE);
FileDatabase<Item> itemDatabase(itemsFile); FileDatabase<Item> itemDatabase(ITEMS_FILE);
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(deliveryAssignmentsFile); FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(DELIVERY_ASSIGNMENTS_FILE);
userDatabase.save(m_users); userDatabase.save(m_users);
restaurantDatabase.save(m_restaurants); restaurantDatabase.save(m_restaurants);
objects<MenuItem> allMenuItems; objects<MenuItem> allMenuItems;
@@ -610,7 +610,7 @@ void FoodDeliveryController::updateRestaurantStatus() const
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
if (restaurantIterator->second->getStatus() == true) if (restaurantIterator->second->getStatus() == true)
@@ -646,7 +646,7 @@ void FoodDeliveryController::listRestaurantOrders() const
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
orders& restaurantOrders = restaurantIterator->second->getOrders(); orders& restaurantOrders = restaurantIterator->second->getOrders();
@@ -655,7 +655,7 @@ void FoodDeliveryController::listRestaurantOrders() const
std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n"; std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n";
return; return;
} }
orders::iterator orderIterator = pickOrderFromOrders(restaurantOrders); orders::iterator orderIterator = selectOrderFromList(restaurantOrders);
if (orderIterator != restaurantOrders.end()) if (orderIterator != restaurantOrders.end())
{ {
util::clear(); util::clear();
@@ -699,7 +699,7 @@ void FoodDeliveryController::listRestaurantOrders() const
} }
} }
void FoodDeliveryController::markOrderReady() void FoodDeliveryController::setOrderReady()
{ {
try try
{ {
@@ -709,7 +709,7 @@ void FoodDeliveryController::markOrderReady()
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
orders& restaurantOrders = restaurantIterator->second->getOrders(); orders& restaurantOrders = restaurantIterator->second->getOrders();
@@ -718,7 +718,7 @@ void FoodDeliveryController::markOrderReady()
std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n"; std::cout << "Restaurant " << restaurantIterator->second->getName() << " has no orders!\n";
return; return;
} }
orders::iterator orderIterator = pickOrderFromOrders(restaurantOrders); orders::iterator orderIterator = selectOrderFromList(restaurantOrders);
if (orderIterator != restaurantOrders.end()) if (orderIterator != restaurantOrders.end())
{ {
OrderStatus orderStatus = orderIterator->second->getStatus(); OrderStatus orderStatus = orderIterator->second->getStatus();
@@ -762,7 +762,7 @@ void FoodDeliveryController::listMenuItems() const
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
util::clear(); util::clear();
@@ -811,7 +811,7 @@ void FoodDeliveryController::addMenuItem() const
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
util::clear(); util::clear();
@@ -849,11 +849,11 @@ void FoodDeliveryController::removeMenuItem() const
return; return;
} }
RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser)); RestaurantOwner& restaurantOwner = *(std::dynamic_pointer_cast<RestaurantOwner>(m_authenticatedUser));
restaurants::iterator restaurantIterator = pickRestaurantFromRestaurants(restaurantOwner.getRestaurants()); restaurants::iterator restaurantIterator = selectRestaurantFromList(restaurantOwner.getRestaurants());
if (restaurantIterator != restaurantOwner.getRestaurants().end()) if (restaurantIterator != restaurantOwner.getRestaurants().end())
{ {
menuItems& restaurantMenuItems = restaurantIterator->second->getMenuItems(); menuItems& restaurantMenuItems = restaurantIterator->second->getMenuItems();
menuItems::iterator menuItemIterator = pickItemFromMenu(restaurantMenuItems); menuItems::iterator menuItemIterator = selectMenuItemFromList(restaurantMenuItems);
if (menuItemIterator != restaurantMenuItems.end()) if (menuItemIterator != restaurantMenuItems.end())
{ {
menuItemIterator->second->makeUnavailable(); menuItemIterator->second->makeUnavailable();
@@ -896,7 +896,7 @@ void FoodDeliveryController::listCustomerOrders() const
std::cout << "You have not placed any orders!\n"; std::cout << "You have not placed any orders!\n";
return; return;
} }
orders::iterator orderIterator = pickOrderFromOrders(customerOrders); orders::iterator orderIterator = selectOrderFromList(customerOrders);
if (orderIterator != customerOrders.end()) if (orderIterator != customerOrders.end())
{ {
util::clear(); util::clear();
@@ -949,7 +949,7 @@ void FoodDeliveryController::placeOrder()
{ {
throw std::runtime_error("Cannot place order. Failed to verify access!"); 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()) if (restaurantIterator != m_restaurants.end())
{ {
bool isMenuActive = true; bool isMenuActive = true;
@@ -968,7 +968,7 @@ void FoodDeliveryController::placeOrder()
std::shared_ptr<Order> order; std::shared_ptr<Order> order;
while (isMenuActive) while (isMenuActive)
{ {
menuItems::iterator menuItemIterator = pickItemFromMenu(restaurantMenuItems); menuItems::iterator menuItemIterator = selectMenuItemFromList(restaurantMenuItems);
if (menuItemIterator != restaurantMenuItems.end()) if (menuItemIterator != restaurantMenuItems.end())
{ {
int quantity; int quantity;
@@ -1045,7 +1045,7 @@ void FoodDeliveryController::cancelOrder() const
std::cout << "You have not placed any orders!\n"; std::cout << "You have not placed any orders!\n";
return; return;
} }
orders::iterator orderIterator = pickOrderFromOrders(customerOrders); orders::iterator orderIterator = selectOrderFromList(customerOrders);
if (orderIterator != customerOrders.end()) if (orderIterator != customerOrders.end())
{ {
OrderStatus orderStatus = orderIterator->second->getStatus(); OrderStatus orderStatus = orderIterator->second->getStatus();
@@ -1136,7 +1136,7 @@ void FoodDeliveryController::acceptDeliveryAssignment()
std::cout << "No Delivery Assignments available at the moment!\n"; std::cout << "No Delivery Assignments available at the moment!\n";
return; return;
} }
deliveryAssignments::iterator assignmentIterator = pickAssignmentFromDeliveryAssignments(m_assignments, m_users); deliveryAssignments::iterator assignmentIterator = selectDeliveryAssignmentFromList(m_assignments, m_users);
if (assignmentIterator != m_assignments.end()) if (assignmentIterator != m_assignments.end())
{ {
DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus(); DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus();
@@ -1184,7 +1184,7 @@ void FoodDeliveryController::confirmDeliveryAssignment() const
std::cout << "You haven't accepted any Delivery Assignments!\n"; std::cout << "You haven't accepted any Delivery Assignments!\n";
return; return;
} }
deliveryAssignments::iterator assignmentIterator = pickAssignmentFromDeliveryAssignments(assignments, m_users); deliveryAssignments::iterator assignmentIterator = selectDeliveryAssignmentFromList(assignments, m_users);
if (assignmentIterator != assignments.end()) if (assignmentIterator != assignments.end())
{ {
DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus(); DeliveryStatus deliveryStatus = assignmentIterator->second->getStatus();
Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.h
+1 -1
View File
@@ -41,7 +41,7 @@ public:
void addNewRestaurant(); void addNewRestaurant();
void updateRestaurantStatus() const; void updateRestaurantStatus() const;
void listRestaurantOrders() const; void listRestaurantOrders() const;
void markOrderReady(); void setOrderReady();
void listMenuItems() const; void listMenuItems() const;
void addMenuItem() const; void addMenuItem() const;
void removeMenuItem() const; void removeMenuItem() const;
Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/RestaurantOwnerMenu.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ bool RestaurantOwnerMenu::handleOperation(int choice)
m_foodDeliveryController.listRestaurantOrders(); m_foodDeliveryController.listRestaurantOrders();
break; break;
case 5: case 5:
m_foodDeliveryController.markOrderReady(); m_foodDeliveryController.setOrderReady();
break; break;
case 6: case 6:
m_foodDeliveryController.listMenuItems(); m_foodDeliveryController.listMenuItems();