Merge branch 'develop' into develop-sm-service-management

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/datastores/DataStore.cpp

@@ -146,11 +146,6 @@ bool DataStore::initialize()
             success = false;
             break;
         }
-        if (!SharedMemory::createOrOpenMapping(m_payments))
-        {
-            success = false;
-            break;
-        }
         if (!SharedMemory::createOrOpenMapping(m_serviceManagementObservers))
         {
             success = false;
@@ -195,7 +190,6 @@ void DataStore::shutdown()
     SharedMemory::closeMapping(m_serviceBookings);
     SharedMemory::closeMapping(m_jobCards);
     SharedMemory::closeMapping(m_invoices);
-    SharedMemory::closeMapping(m_payments);
     SharedMemory::closeMapping(m_serviceManagementObservers);
     SharedMemory::closeMapping(m_paymentManagementObservers);
     SharedMemory::closeMapping(m_inventoryManagementObservers);
@@ -230,6 +224,8 @@ Returns:
 */
 util::Map<std::string, TrackedRecord<User>>& DataStore::getUsers()
 {
+    auto users = loadRecords<User, SerializedUser>(m_users);
+    refreshCache(m_userCache, users);
     return m_userCache;
 }
 
@@ -243,6 +239,8 @@ Returns:
 */
 util::Map<std::string, TrackedRecord<Notification>>& DataStore::getNotifications()
 {
+    auto notifications = loadRecords<Notification, SerializedNotification>(m_notifications);
+    refreshCache(m_notificationCache, notifications);
     return m_notificationCache;
 }
 
@@ -453,6 +451,37 @@ util::Map<std::string, TrackedRecord<Invoice>>& DataStore::getInvoices()
     return m_invoiceCache;
 }
 
+/*
+Function: getObservers
+Description: Retrieves observer records from the specified observer mapping
+             and resolves them to User objects.
+Parameters:
+    - mapping: Observer mapping to read from
+Returns:
+    - util::Map<std::string, User*>: Collection of observer records
+Throws:
+    - std::runtime_error if an observer references an invalid user ID
+*/
+util::Map<std::string, User*> DataStore::getObservers(MappingInfo& mapping)
+{
+    auto& users = getUsers();
+    util::Map<std::string, User*> observers;
+    SharedMemory::ensureLatestMapping(mapping);
+    size_t recordCount = SharedMemory::getRecordCount(mapping);
+    for (size_t index = 0; index < recordCount; index++)
+    {
+        const SerializedObserver* observer = static_cast<SerializedObserver*>(SharedMemory::getRecordAddress(mapping, index));
+        int userIndex = users.find(observer->id);
+        if (userIndex == -1)
+        {
+            throw std::runtime_error("Invalid observer user ID");
+        }
+        User* user = users.getValueAt(userIndex).data;
+        observers.insert(user->getId(), user);
+    }
+    return observers;
+}
+
 /*
 Function: getServiceManagementObservers
 Description: Retrieves all service management observer records from the datastore.
@@ -463,7 +492,7 @@ Returns:
 */
 util::Map<std::string, User*> DataStore::getServiceManagementObservers()
 {
-    return util::Map<std::string, User*>();
+    return getObservers(m_serviceManagementObservers);
 }
 
 /*
@@ -476,7 +505,7 @@ Returns:
 */
 util::Map<std::string, User*> DataStore::getPaymentManagementObservers()
 {
-    return util::Map<std::string, User*>();
+    return getObservers(m_paymentManagementObservers);
 }
 
 /*
@@ -489,7 +518,7 @@ Returns:
 */
 util::Map<std::string, User*> DataStore::getInventoryManagementObservers()
 {
-    return util::Map<std::string, User*>();
+    return getObservers(m_inventoryManagementObservers);
 }
 
 /*
@@ -502,6 +531,7 @@ Returns:
 */
 void DataStore::saveUsers()
 {
+    saveRecords<User, SerializedUser>(m_users, m_userCache);
 }
 
 /*
@@ -514,6 +544,7 @@ Returns:
 */
 void DataStore::saveNotifications()
 {
+    saveRecords<Notification, SerializedNotification>(m_notifications, m_notificationCache);
 }
 
 /*
@@ -592,16 +623,49 @@ void DataStore::saveInvoices()
 {
 }
 
+/*
+Function: saveObservers
+Description: Persists observer records to the specified observer mapping.
+Parameters:
+    - mapping: MappingInfo&, observer mapping to save to
+    - observers: util::Map<std::string, User*>&, collection of observer records
+Returns:
+    - None
+*/
+void DataStore::saveObservers(MappingInfo& mapping, util::Map<std::string, User*>& observers)
+{
+    size_t observerCount = static_cast<size_t>(observers.getSize());
+    size_t capacity = config::file::INITIAL_CAPACITY;
+    while (capacity < observerCount)
+    {
+        capacity *= config::file::GROWTH_FACTOR;
+    }
+    if (!SharedMemory::resizeMapping(mapping, capacity))
+    {
+        throw std::runtime_error("Failed to resize observer mapping");
+    }
+    SharedMemory::setRecordCount(mapping, observerCount);
+    for (size_t index = 0; index < observerCount; index++)
+    {
+        SerializedObserver serializedObserver;
+        User* user = observers.getValueAt(static_cast<int>(index));
+        strcpy_s(serializedObserver.id, sizeof(serializedObserver.id), user->getId().c_str());
+        SerializedObserver* destination = static_cast<SerializedObserver*>(SharedMemory::getRecordAddress(mapping, index));
+        *destination = serializedObserver;
+    }
+}
+
 /*
 Function: saveServiceManagementObservers
 Description: Persists all service management observer records to the datastore.
 Parameters:
-    - observers: util::Map<std::string, TrackedRecord<std::string>>&, collection of observer records
+    - observers: util::Map<std::string, User*>&, collection of observer records
 Returns:
     - None
 */
 void DataStore::saveServiceManagementObservers(util::Map<std::string, User*>& observers)
 {
+    saveObservers(m_serviceManagementObservers, observers);
 }
 
 /*
@@ -614,6 +678,7 @@ Returns:
 */
 void DataStore::savePaymentManagementObservers(util::Map<std::string, User*>& observers)
 {
+    saveObservers(m_paymentManagementObservers, observers);
 }
 
 /*
@@ -626,32 +691,7 @@ Returns:
 */
 void DataStore::saveInventoryManagementObservers(util::Map<std::string, User*>& observers)
 {
-}
-
-/*
-Function: lockDataStore
-Description: Acquires exclusive access to the datastore.
-Parameters:
-    - None
-Returns:
-    - bool: True if the datastore was successfully locked, otherwise false
-*/
-bool DataStore::lockDataStore()
-{
-    return false;
-}
-
-/*
-Function: unlockDataStore
-Description: Releases exclusive access to the datastore.
-Parameters:
-    - None
-Returns:
-    - bool: True if the datastore was successfully unlocked, otherwise false
-*/
-bool DataStore::unlockDataStore()
-{
-    return false;
+    saveObservers(m_inventoryManagementObservers, observers);
 }
 
 /*