From 81deba222dcac1633c3fe4fe0c0b77a841b250c0 Mon Sep 17 00:00:00 2001
From: Joel Thomas <1914@trenser.com>
Date: Mon, 23 Feb 2026 15:38:07 +0530
Subject: [PATCH] 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
---
 ...assignments.txt => DeliveryAssignment.txt} |  0
 .../FoodDeliveryController.cpp                | 31 ++++++++++++-------
 .../{items.txt => Item.txt}                   |  0
 .../{menuItems.txt => MenuItem.txt}           |  0
 .../{orders.txt => Order.txt}                 |  0
 .../{restaurants.txt => Restaurant.txt}       |  0
 .../Trenser.FoodDeliveryApp.vcxproj           | 12 +++----
 .../Trenser.FoodDeliveryApp.vcxproj.filters   | 12 +++----
 .../{users.txt => User.txt}                   |  0
 9 files changed, 31 insertions(+), 24 deletions(-)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{assignments.txt => DeliveryAssignment.txt} (100%)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{items.txt => Item.txt} (100%)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{menuItems.txt => MenuItem.txt} (100%)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{orders.txt => Order.txt} (100%)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{restaurants.txt => Restaurant.txt} (100%)
 rename Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/{users.txt => User.txt} (100%)

diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/assignments.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/DeliveryAssignment.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/assignments.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/DeliveryAssignment.txt
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
index 17c14f3..c4747be 100644
--- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
+++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/FoodDeliveryController.cpp
@@ -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;
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/items.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Item.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/items.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Item.txt
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/menuItems.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/MenuItem.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/menuItems.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/MenuItem.txt
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/orders.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Order.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/orders.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Order.txt
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/restaurants.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Restaurant.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/restaurants.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Restaurant.txt
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj
index 5f39e68..873cedf 100644
--- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj
+++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj
@@ -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">
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj.filters b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj.filters
index fde9094..cd4c4e8 100644
--- a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj.filters
+++ b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp.vcxproj.filters
@@ -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>
diff --git a/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/users.txt b/Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/User.txt
similarity index 100%
rename from Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/users.txt
rename to Trenser.FoodDeliveryApp/Trenser.FoodDeliveryApp/User.txt