Rename Database files and store it as constants in FoodDeliveryController
- Rename Database files to corresponding class names - Keep string constants to file names in FoodDeliveryController.cpp
This commit is contained in:
@@ -22,6 +22,13 @@ 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";
|
||||
|
||||
static bool checkAccess(std::shared_ptr<User> user, const std::string& userWithAccess)
|
||||
{
|
||||
if (!user || user->getType() != userWithAccess)
|
||||
@@ -229,12 +236,12 @@ static deliveryAssignments::iterator pickAssignmentFromDeliveryAssignments(deliv
|
||||
|
||||
void FoodDeliveryController::loadStates()
|
||||
{
|
||||
FileDatabase<User> userDatabase("users.txt");
|
||||
FileDatabase<Restaurant> restaurantDatabase("restaurants.txt");
|
||||
FileDatabase<MenuItem> menuItemDatabase("menuItems.txt");
|
||||
FileDatabase<Order> orderDatabase("orders.txt");
|
||||
FileDatabase<Item> itemDatabase("items.txt");
|
||||
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase("assignments.txt");
|
||||
FileDatabase<User> userDatabase(usersFile);
|
||||
FileDatabase<Restaurant> restaurantDatabase(restaurantsFile);
|
||||
FileDatabase<MenuItem> menuItemDatabase(menuItemsFile);
|
||||
FileDatabase<Order> orderDatabase(ordersFile);
|
||||
FileDatabase<Item> itemDatabase(itemsFile);
|
||||
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(deliveryAssignmentsFile);
|
||||
objects<MenuItem> menuItems;
|
||||
objects<Item> items;
|
||||
m_users = userDatabase.load();
|
||||
@@ -346,12 +353,12 @@ void FoodDeliveryController::loadStates()
|
||||
|
||||
void FoodDeliveryController::persistStates()
|
||||
{
|
||||
FileDatabase<User> userDatabase("users.txt");
|
||||
FileDatabase<Restaurant> restaurantDatabase("restaurants.txt");
|
||||
FileDatabase<MenuItem> menuItemDatabase("menuItems.txt");
|
||||
FileDatabase<Order> orderDatabase("orders.txt");
|
||||
FileDatabase<Item> itemDatabase("items.txt");
|
||||
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase("assignments.txt");
|
||||
FileDatabase<User> userDatabase(usersFile);
|
||||
FileDatabase<Restaurant> restaurantDatabase(restaurantsFile);
|
||||
FileDatabase<MenuItem> menuItemDatabase(menuItemsFile);
|
||||
FileDatabase<Order> orderDatabase(ordersFile);
|
||||
FileDatabase<Item> itemDatabase(itemsFile);
|
||||
FileDatabase<DeliveryAssignment> deliveryAssignmentsDatabase(deliveryAssignmentsFile);
|
||||
userDatabase.save(m_users);
|
||||
restaurantDatabase.save(m_restaurants);
|
||||
objects<MenuItem> allMenuItems;
|
||||
|
||||
@@ -162,12 +162,12 @@
|
||||
<ClInclude Include="User.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="assignments.txt" />
|
||||
<Text Include="items.txt" />
|
||||
<Text Include="menuItems.txt" />
|
||||
<Text Include="orders.txt" />
|
||||
<Text Include="restaurants.txt" />
|
||||
<Text Include="users.txt" />
|
||||
<Text Include="DeliveryAssignment.txt" />
|
||||
<Text Include="Item.txt" />
|
||||
<Text Include="MenuItem.txt" />
|
||||
<Text Include="Order.txt" />
|
||||
<Text Include="Restaurant.txt" />
|
||||
<Text Include="User.txt" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
+6
-6
@@ -136,22 +136,22 @@
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="users.txt">
|
||||
<Text Include="DeliveryAssignment.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
<Text Include="restaurants.txt">
|
||||
<Text Include="Item.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
<Text Include="menuItems.txt">
|
||||
<Text Include="MenuItem.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
<Text Include="orders.txt">
|
||||
<Text Include="Order.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
<Text Include="items.txt">
|
||||
<Text Include="Restaurant.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
<Text Include="assignments.txt">
|
||||
<Text Include="User.txt">
|
||||
<Filter>Files</Filter>
|
||||
</Text>
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user