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