https://telecominfraproject.atlassian.net/browse/WIFI-11303

Signed-off-by: stephb9959 <stephane.bourque@gmail.com>

CMakeLists.txt

@@ -85,7 +85,7 @@ add_executable(owprov
         src/framework/SubSystemServer.cpp
         src/framework/SubSystemServer.h
         src/framework/RESTAPI_utils.h
-        src/framework/WebSocketClientNotification.cpp
+        src/framework/UI_WebSocketClientNotifications.cpp
         src/framework/AuthClient.cpp
         src/framework/AuthClient.h
         src/framework/MicroServiceNames.h
@@ -116,6 +116,8 @@ add_executable(owprov
         src/framework/MicroServiceExtra.h
         src/framework/ConfigurationValidator.cpp
         src/framework/ConfigurationValidator.h
+        src/UI_Prov_WebSocketNotifications.h
+        src/UI_Prov_WebSocketNotifications.cpp
         src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
         src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
         src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
@@ -185,7 +187,22 @@ add_executable(owprov
         src/storage/storage_operataor.cpp src/storage/storage_operataor.h
         src/storage/storage_sub_devices.cpp src/storage/storage_sub_devices.h
         src/storage/storage_service_class.cpp src/storage/storage_service_class.h
-        src/RESTAPI/RESTAPI_sub_devices_list_handler.cpp src/RESTAPI/RESTAPI_sub_devices_list_handler.h src/RESTAPI/RESTAPI_sub_devices_handler.cpp src/RESTAPI/RESTAPI_sub_devices_handler.h src/RESTAPI/RESTAPI_service_class_list_handler.cpp src/RESTAPI/RESTAPI_service_class_list_handler.h src/RESTAPI/RESTAPI_service_class_handler.cpp src/RESTAPI/RESTAPI_service_class_handler.h src/RESTAPI/RESTAPI_operators_list_handler.cpp src/RESTAPI/RESTAPI_operators_list_handler.h src/RESTAPI/RESTAPI_operators_handler.cpp src/RESTAPI/RESTAPI_operators_handler.h src/storage/storage_op_contacts.cpp src/storage/storage_op_contacts.h src/storage/storage_op_locations.cpp src/storage/storage_op_locations.h src/RESTAPI/RESTAPI_op_contact_list_handler.cpp src/RESTAPI/RESTAPI_op_contact_list_handler.h src/RESTAPI/RESTAPI_op_contact_handler.cpp src/RESTAPI/RESTAPI_op_contact_handler.h src/RESTAPI/RESTAPI_op_location_list_handler.cpp src/RESTAPI/RESTAPI_op_location_list_handler.h src/RESTAPI/RESTAPI_op_location_handler.cpp src/RESTAPI/RESTAPI_op_location_handler.h src/ProvWebSocketClient.cpp src/ProvWebSocketClient.h src/Tasks/VenueRebooter.h src/Tasks/VenueUpgrade.h src/sdks/SDK_fms.cpp src/sdks/SDK_fms.h)
+        src/RESTAPI/RESTAPI_sub_devices_list_handler.cpp src/RESTAPI/RESTAPI_sub_devices_list_handler.h
+        src/RESTAPI/RESTAPI_sub_devices_handler.cpp src/RESTAPI/RESTAPI_sub_devices_handler.h
+        src/RESTAPI/RESTAPI_service_class_list_handler.cpp src/RESTAPI/RESTAPI_service_class_list_handler.h
+        src/RESTAPI/RESTAPI_service_class_handler.cpp src/RESTAPI/RESTAPI_service_class_handler.h
+        src/RESTAPI/RESTAPI_operators_list_handler.cpp src/RESTAPI/RESTAPI_operators_list_handler.h
+        src/RESTAPI/RESTAPI_operators_handler.cpp src/RESTAPI/RESTAPI_operators_handler.h
+        src/storage/storage_op_contacts.cpp src/storage/storage_op_contacts.h
+        src/storage/storage_op_locations.cpp src/storage/storage_op_locations.h
+        src/RESTAPI/RESTAPI_op_contact_list_handler.cpp src/RESTAPI/RESTAPI_op_contact_list_handler.h
+        src/RESTAPI/RESTAPI_op_contact_handler.cpp src/RESTAPI/RESTAPI_op_contact_handler.h
+        src/RESTAPI/RESTAPI_op_location_list_handler.cpp src/RESTAPI/RESTAPI_op_location_list_handler.h
+        src/RESTAPI/RESTAPI_op_location_handler.cpp src/RESTAPI/RESTAPI_op_location_handler.h
+        src/ProvWebSocketClient.cpp src/ProvWebSocketClient.h
+        src/Tasks/VenueRebooter.h src/Tasks/VenueUpgrade.h
+        src/sdks/SDK_fms.cpp src/sdks/SDK_fms.h
+        )
 
 target_link_libraries(owprov PUBLIC
         ${Poco_LIBRARIES}

src/RESTAPI/RESTAPI_routers.cpp

@@ -34,6 +34,7 @@
 #include "RESTAPI/RESTAPI_op_contact_list_handler.h"
 #include "RESTAPI/RESTAPI_op_location_handler.h"
 #include "RESTAPI/RESTAPI_op_location_list_handler.h"
+
 #include "framework/RESTAPI_SystemCommand.h"
 #include "framework/RESTAPI_WebSocketServer.h"
 

src/Tasks/VenueConfigUpdater.h

@@ -7,9 +7,9 @@
 #include "StorageService.h"
 #include "APConfig.h"
 #include "sdks/SDK_gw.h"
-#include "framework/WebSocketClientNotifications.h"
 #include "JobController.h"
 #include "framework/MicroServiceFuncs.h"
+#include "UI_Prov_WebSocketNotifications.h"
 
 namespace OpenWifi {
 

src/Tasks/VenueRebooter.h

@@ -2,13 +2,12 @@
 // Created by stephane bourque on 2022-05-04.
 //
 
-#include "framework/WebSocketClientNotifications.h"
-
 #include "StorageService.h"
 #include "APConfig.h"
 #include "sdks/SDK_gw.h"
 #include "JobController.h"
 #include "framework/MicroServiceFuncs.h"
+#include "UI_Prov_WebSocketNotifications.h"
 
 namespace OpenWifi {
 

src/Tasks/VenueUpgrade.h

@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include "framework/WebSocketClientNotifications.h"
-
 #include "StorageService.h"
 #include "APConfig.h"
 #include "sdks/SDK_gw.h"
 #include "sdks/SDK_fms.h"
 #include "JobController.h"
 #include "framework/MicroServiceFuncs.h"
+#include "UI_Prov_WebSocketNotifications.h"
 
 namespace OpenWifi {
     class VenueDeviceUpgrade : public Poco::Runnable {

src/UI_Prov_WebSocketNotifications.cpp

@@ -0,0 +1,118 @@
+//
+// Created by stephane bourque on 2022-10-29.
+//
+
+#include "UI_Prov_WebSocketNotifications.h"
+
+
+namespace OpenWifi {
+
+    void WebSocketNotificationJobContent::to_json(Poco::JSON::Object &Obj) const {
+        RESTAPI_utils::field_to_json(Obj,"title",title);
+        RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
+        RESTAPI_utils::field_to_json(Obj,"success",success);
+        RESTAPI_utils::field_to_json(Obj,"error",error);
+        RESTAPI_utils::field_to_json(Obj,"warning",warning);
+        RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
+        RESTAPI_utils::field_to_json(Obj,"details",details);
+    }
+
+    bool WebSocketNotificationJobContent::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            RESTAPI_utils::field_from_json(Obj,"title",title);
+            RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
+            RESTAPI_utils::field_from_json(Obj,"success",success);
+            RESTAPI_utils::field_from_json(Obj,"error",error);
+            RESTAPI_utils::field_from_json(Obj,"warning",warning);
+            RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
+            RESTAPI_utils::field_from_json(Obj,"details",details);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void WebSocketNotificationRebootList::to_json(Poco::JSON::Object &Obj) const {
+        RESTAPI_utils::field_to_json(Obj,"title",title);
+        RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
+        RESTAPI_utils::field_to_json(Obj,"success",success);
+        RESTAPI_utils::field_to_json(Obj,"warning",warning);
+        RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
+        RESTAPI_utils::field_to_json(Obj,"details",details);
+    }
+
+    bool WebSocketNotificationRebootList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            RESTAPI_utils::field_from_json(Obj,"title",title);
+            RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
+            RESTAPI_utils::field_from_json(Obj,"success",success);
+            RESTAPI_utils::field_from_json(Obj,"warning",warning);
+            RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
+            RESTAPI_utils::field_from_json(Obj,"details",details);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void WebSocketNotificationUpgradeList::to_json(Poco::JSON::Object &Obj) const {
+        RESTAPI_utils::field_to_json(Obj,"title",title);
+        RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
+        RESTAPI_utils::field_to_json(Obj,"success",success);
+        RESTAPI_utils::field_to_json(Obj,"notConnected",not_connected);
+        RESTAPI_utils::field_to_json(Obj,"noFirmware",no_firmware);
+        RESTAPI_utils::field_to_json(Obj,"skipped",skipped);
+        RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
+        RESTAPI_utils::field_to_json(Obj,"details",details);
+    }
+
+    bool WebSocketNotificationUpgradeList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            RESTAPI_utils::field_from_json(Obj,"title",title);
+            RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
+            RESTAPI_utils::field_from_json(Obj,"success",success);
+            RESTAPI_utils::field_from_json(Obj,"notConnected",not_connected);
+            RESTAPI_utils::field_from_json(Obj,"noFirmware",no_firmware);
+            RESTAPI_utils::field_from_json(Obj,"skipped",skipped);
+            RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
+            RESTAPI_utils::field_from_json(Obj,"details",details);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void WebSocketClientNotificationVenueUpdateJobCompletionToUser( WebSocketClientNotificationVenueUpdateJob_t &N) {
+        N.type = "venue_configuration_update";
+        UI_WebSocketClientServer()->SendNotification(N);
+    }
+
+    void WebSocketClientNotificationVenueRebootCompletionToUser( WebSocketClientNotificationVenueRebootList_t &N) {
+        N.type = "venue_rebooter";
+        UI_WebSocketClientServer()->SendNotification(N);
+    }
+
+    void WebSocketClientNotificationVenueUpgradeCompletionToUser( WebSocketClientNotificationVenueUpgradeList_t &N) {
+        N.type = "venue_upgrader";
+        UI_WebSocketClientServer()->SendNotification(N);
+    }
+
+    void WebSocketClientNotificationVenueUpdateJobCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpdateJob_t &N) {
+        N.type = "venue_configuration_update";
+        UI_WebSocketClientServer()->SendUserNotification(User,N);
+    }
+
+    void WebSocketClientNotificationVenueRebootCompletionToUser( const std::string & User, WebSocketClientNotificationVenueRebootList_t &N) {
+        N.type = "venue_rebooter";
+        UI_WebSocketClientServer()->SendUserNotification(User,N);
+    }
+
+    void WebSocketClientNotificationVenueUpgradeCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpgradeList_t &N) {
+        N.type = "venue_upgrader";
+        UI_WebSocketClientServer()->SendUserNotification(User,N);
+    }
+
+} // namespace OpenWifi

src/UI_Prov_WebSocketNotifications.h

@@ -0,0 +1,64 @@
+//
+// Created by stephane bourque on 2022-10-29.
+//
+
+#pragma once
+
+#include "framework/UI_WebSocketClientNotifications.h"
+#include "framework/UI_WebSocketClientServer.h"
+
+namespace OpenWifi {
+    struct WebSocketNotificationJobContent {
+        std::string                 title,
+                details,
+                jobId;
+        std::vector<std::string>    success,
+                error,
+                warning;
+        uint64_t                    timeStamp=OpenWifi::Utils::Now();
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef WebSocketNotification<WebSocketNotificationJobContent>  WebSocketClientNotificationVenueUpdateJob_t;
+
+    struct WebSocketNotificationRebootList {
+        std::string                 title,
+                details,
+                jobId;
+        std::vector<std::string>    success,
+                warning;
+        uint64_t                    timeStamp=OpenWifi::Utils::Now();
+
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef WebSocketNotification<WebSocketNotificationRebootList> WebSocketClientNotificationVenueRebootList_t;
+
+    struct WebSocketNotificationUpgradeList {
+        std::string title,
+                details,
+                jobId;
+        std::vector<std::string> success,
+                skipped,
+                no_firmware,
+                not_connected;
+        uint64_t timeStamp = OpenWifi::Utils::Now();
+
+        void to_json(Poco::JSON::Object &Obj) const;
+
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    typedef WebSocketNotification<WebSocketNotificationUpgradeList> WebSocketClientNotificationVenueUpgradeList_t;
+
+    void WebSocketClientNotificationVenueUpdateJobCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpdateJob_t &N);
+    void WebSocketClientNotificationVenueRebootCompletionToUser( const std::string & User, WebSocketClientNotificationVenueRebootList_t &N);
+    void WebSocketClientNotificationVenueUpgradeCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpgradeList_t &N);
+    void WebSocketClientNotificationVenueUpdateJobCompletionToUser( WebSocketClientNotificationVenueUpdateJob_t &N);
+    void WebSocketClientNotificationVenueRebootCompletionToUser( WebSocketClientNotificationVenueRebootList_t &N);
+    void WebSocketClientNotificationVenueUpgradeCompletionToUser( WebSocketClientNotificationVenueUpgradeList_t &N);
+}
+// namespace OpenWifi

src/framework/UI_WebSocketClientNotifications.cpp

@@ -0,0 +1,11 @@
+//
+// Created by stephane bourque on 2022-10-25.
+//
+
+#include "framework/UI_WebSocketClientNotifications.h"
+#include "framework/UI_WebSocketClientServer.h"
+
+namespace OpenWifi {
+
+}
+

src/framework/UI_WebSocketClientNotifications.h

@@ -0,0 +1,44 @@
+//
+// Created by stephane bourque on 2022-05-05.
+//
+
+#pragma once
+
+#include "framework/RESTAPI_utils.h"
+#include "framework/utils.h"
+
+namespace OpenWifi {
+
+    template<typename ContentStruct>
+    struct WebSocketNotification {
+        inline static uint64_t xid = 1;
+        uint64_t notification_id = ++xid;
+        std::string type;
+        ContentStruct content;
+
+        void to_json(Poco::JSON::Object &Obj) const;
+
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+
+    template<typename ContentStruct>
+    void WebSocketNotification<ContentStruct>::to_json(Poco::JSON::Object &Obj) const {
+        RESTAPI_utils::field_to_json(Obj, "notification_id", notification_id);
+        RESTAPI_utils::field_to_json(Obj, "type", type);
+        RESTAPI_utils::field_to_json(Obj, "content", content);
+    }
+
+    template<typename ContentStruct>
+    bool WebSocketNotification<ContentStruct>::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            RESTAPI_utils::field_from_json(Obj, "notification_id", notification_id);
+            RESTAPI_utils::field_from_json(Obj, "content", content);
+            RESTAPI_utils::field_from_json(Obj, "type", type);
+            return true;
+        } catch (...) {
+
+        }
+        return false;
+    }
+}
+

src/framework/UI_WebSocketClientServer.h

@@ -15,7 +15,7 @@
 
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
 #include "framework/SubSystemServer.h"
-#include "framework/WebSocketClientNotifications.h"
+#include "framework/UI_WebSocketClientNotifications.h"
 
 namespace OpenWifi {
 

src/framework/WebSocketClientNotification.cpp

@@ -1,146 +0,0 @@
-//
-// Created by stephane bourque on 2022-10-25.
-//
-
-#include "framework/WebSocketClientNotifications.h"
-#include "framework/UI_WebSocketClientServer.h"
-
-namespace OpenWifi {
-
-
-	void  WebSocketClientNotificationNumberOfConnections(std::uint64_t numberOfDevices,
-														   std::uint64_t averageConnectedTime,
-														   std::uint64_t numberOfConnectingDevices) {
-		WebSocketNotification<WebSocketClientNotificationNumberOfConnection>	N;
-		N.content.numberOfDevices = numberOfDevices;
-		N.content.averageConnectedTime = averageConnectedTime;
-		N.content.numberOfConnectingDevices = numberOfConnectingDevices;
-		N.type = "device_connections_statistics";
-		UI_WebSocketClientServer()->SendNotification(N);
-	}
-
-	void WebSocketClientNotificationDeviceConfigurationChange(const std::string &SerialNumber, uint64_t oldUUID, uint64_t newUUID) {
-		WebSocketNotification<WebNotificationSingleDeviceConfigurationChange>	N;
-		N.content.serialNumber = SerialNumber;
-		N.content.oldUUID = oldUUID;
-		N.content.newUUID = newUUID;
-		N.type = "device_configuration_upgrade";
-		UI_WebSocketClientServer()->SendNotification(N);
-	}
-
-	void WebSocketClientNotificationDeviceFirmwareUpdated(const std::string &SerialNumber, const std::string &Firmware) {
-		WebSocketNotification<WebNotificationSingleDeviceFirmwareChange>	N;
-		N.content.serialNumber = SerialNumber;
-		N.content.newFirmware = Firmware;
-		N.type = "device_firmware_upgrade";
-		UI_WebSocketClientServer()->SendNotification(N);
-	}
-
-	void WebSocketClientNotificationDeviceConnected(const std::string &SerialNumber) {
-		WebSocketNotification<WebNotificationSingleDevice>	N;
-		N.content.serialNumber = SerialNumber;
-		N.type = "device_connection";
-		UI_WebSocketClientServer()->SendNotification(N);
-	}
-
-	void WebSocketClientNotificationDeviceDisconnected(const std::string & SerialNumber) {
-		WebSocketNotification<WebNotificationSingleDevice>	N;
-		N.content.serialNumber = SerialNumber;
-		N.type = "device_disconnection";
-		UI_WebSocketClientServer()->SendNotification(N);
-	}
-
-	void WebSocketNotificationJobContent::to_json(Poco::JSON::Object &Obj) const {
-		RESTAPI_utils::field_to_json(Obj,"title",title);
-		RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
-		RESTAPI_utils::field_to_json(Obj,"success",success);
-		RESTAPI_utils::field_to_json(Obj,"error",error);
-		RESTAPI_utils::field_to_json(Obj,"warning",warning);
-		RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
-		RESTAPI_utils::field_to_json(Obj,"details",details);
-	}
-
-	bool WebSocketNotificationJobContent::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			RESTAPI_utils::field_from_json(Obj,"title",title);
-			RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
-			RESTAPI_utils::field_from_json(Obj,"success",success);
-			RESTAPI_utils::field_from_json(Obj,"error",error);
-			RESTAPI_utils::field_from_json(Obj,"warning",warning);
-			RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
-			RESTAPI_utils::field_from_json(Obj,"details",details);
-			return true;
-		} catch(...) {
-
-		}
-		return false;
-	}
-
-	void WebSocketClientNotificationVenueUpdateJobCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpdateJob_t &N) {
-		N.type = "venue_configuration_update";
-		UI_WebSocketClientServer()->SendUserNotification(User,N);
-	}
-
-	void WebSocketNotificationRebootList::to_json(Poco::JSON::Object &Obj) const {
-		RESTAPI_utils::field_to_json(Obj,"title",title);
-		RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
-		RESTAPI_utils::field_to_json(Obj,"success",success);
-		RESTAPI_utils::field_to_json(Obj,"warning",warning);
-		RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
-		RESTAPI_utils::field_to_json(Obj,"details",details);
-	}
-
-	bool WebSocketNotificationRebootList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			RESTAPI_utils::field_from_json(Obj,"title",title);
-			RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
-			RESTAPI_utils::field_from_json(Obj,"success",success);
-			RESTAPI_utils::field_from_json(Obj,"warning",warning);
-			RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
-			RESTAPI_utils::field_from_json(Obj,"details",details);
-			return true;
-		} catch(...) {
-
-		}
-		return false;
-	}
-
-	void WebSocketClientNotificationVenueRebootCompletionToUser( const std::string & User, WebSocketClientNotificationVenueRebootList_t &N) {
-		N.type = "venue_rebooter";
-		UI_WebSocketClientServer()->SendUserNotification(User,N);
-	}
-
-	void WebSocketNotificationUpgradeList::to_json(Poco::JSON::Object &Obj) const {
-		RESTAPI_utils::field_to_json(Obj,"title",title);
-		RESTAPI_utils::field_to_json(Obj,"jobId",jobId);
-		RESTAPI_utils::field_to_json(Obj,"success",success);
-		RESTAPI_utils::field_to_json(Obj,"notConnected",not_connected);
-		RESTAPI_utils::field_to_json(Obj,"noFirmware",no_firmware);
-		RESTAPI_utils::field_to_json(Obj,"skipped",skipped);
-		RESTAPI_utils::field_to_json(Obj,"timeStamp",timeStamp);
-		RESTAPI_utils::field_to_json(Obj,"details",details);
-	}
-
-	bool WebSocketNotificationUpgradeList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			RESTAPI_utils::field_from_json(Obj,"title",title);
-			RESTAPI_utils::field_from_json(Obj,"jobId",jobId);
-			RESTAPI_utils::field_from_json(Obj,"success",success);
-			RESTAPI_utils::field_from_json(Obj,"notConnected",not_connected);
-			RESTAPI_utils::field_from_json(Obj,"noFirmware",no_firmware);
-			RESTAPI_utils::field_from_json(Obj,"skipped",skipped);
-			RESTAPI_utils::field_from_json(Obj,"timeStamp",timeStamp);
-			RESTAPI_utils::field_from_json(Obj,"details",details);
-			return true;
-		} catch(...) {
-
-		}
-		return false;
-	}
-
-	void WebSocketClientNotificationVenueUpgradeCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpgradeList_t &N) {
-		N.type = "venue_upgrader";
-		UI_WebSocketClientServer()->SendUserNotification(User,N);
-	}
-}
-

src/framework/WebSocketClientNotifications.h

@@ -1,190 +0,0 @@
-//
-// Created by stephane bourque on 2022-05-05.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_utils.h"
-#include "framework/utils.h"
-
-namespace OpenWifi {
-
-	template <typename ContentStruct> struct WebSocketNotification {
-		inline static uint64_t          xid=1;
-		uint64_t                        notification_id=++xid;
-		std::string						type;
-		ContentStruct    				content;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	template <typename ContentStruct> void WebSocketNotification<ContentStruct>::to_json(Poco::JSON::Object &Obj) const {
-		RESTAPI_utils::field_to_json(Obj,"notification_id",notification_id);
-		RESTAPI_utils::field_to_json(Obj,"type",type);
-		RESTAPI_utils::field_to_json(Obj,"content",content);
-	}
-
-	template <typename ContentStruct> bool WebSocketNotification<ContentStruct>::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			RESTAPI_utils::field_from_json(Obj,"notification_id",notification_id);
-			RESTAPI_utils::field_from_json(Obj,"content",content);
-			RESTAPI_utils::field_from_json(Obj,"type",type);
-			return true;
-		} catch(...) {
-
-		}
-		return false;
-	}
-
-	struct WebNotificationSingleDevice {
-		std::string		serialNumber;
-		inline void to_json(Poco::JSON::Object &Obj) const {
-			RESTAPI_utils::field_to_json(Obj,"serialNumber", serialNumber);
-		}
-
-		inline bool from_json(const Poco::JSON::Object::Ptr &Obj) {
-			try {
-				RESTAPI_utils::field_from_json(Obj,"serialNumber", serialNumber);
-				return true;
-			} catch (...) {
-
-			}
-			return false;
-		}
-	};
-
-	struct WebNotificationSingleDeviceConfigurationChange {
-		std::string		serialNumber;
-		uint64_t 		oldUUID;
-		uint64_t 		newUUID;
-
-		inline void to_json(Poco::JSON::Object &Obj) const {
-			RESTAPI_utils::field_to_json(Obj,"serialNumber", serialNumber);
-			RESTAPI_utils::field_to_json(Obj,"oldUUID", oldUUID);
-			RESTAPI_utils::field_to_json(Obj,"newUUID", newUUID);
-		}
-
-		inline bool from_json(const Poco::JSON::Object::Ptr &Obj) {
-			try {
-				RESTAPI_utils::field_from_json(Obj,"serialNumber", serialNumber);
-				RESTAPI_utils::field_from_json(Obj,"oldUUID", oldUUID);
-				RESTAPI_utils::field_from_json(Obj,"newUUID", newUUID);
-				return true;
-			} catch (...) {
-
-			}
-			return false;
-		}
-	};
-
-	struct WebNotificationSingleDeviceFirmwareChange {
-		std::string		serialNumber;
-		std::string		newFirmware;
-		inline void to_json(Poco::JSON::Object &Obj) const {
-			RESTAPI_utils::field_to_json(Obj,"serialNumber", serialNumber);
-			RESTAPI_utils::field_to_json(Obj,"newFirmware", newFirmware);
-		}
-
-		inline bool from_json(const Poco::JSON::Object::Ptr &Obj) {
-			try {
-				RESTAPI_utils::field_from_json(Obj,"serialNumber", serialNumber);
-				RESTAPI_utils::field_from_json(Obj,"newFirmware", newFirmware);
-				return true;
-			} catch (...) {
-
-			}
-			return false;
-		}
-	};
-
-	struct WebSocketClientNotificationNumberOfConnection {
-		std::uint64_t 	numberOfDevices=0;
-		std::uint64_t 	averageConnectedTime=0;
-		std::uint64_t 	numberOfConnectingDevices=0;
-
-		inline void to_json(Poco::JSON::Object &Obj) const {
-			RESTAPI_utils::field_to_json(Obj,"numberOfDevices", numberOfDevices);
-			RESTAPI_utils::field_to_json(Obj,"averageConnectedTime", averageConnectedTime);
-			RESTAPI_utils::field_to_json(Obj,"numberOfConnectingDevices", numberOfConnectingDevices);
-		}
-
-		inline bool from_json(const Poco::JSON::Object::Ptr &Obj) {
-			try {
-				RESTAPI_utils::field_from_json(Obj,"numberOfDevices", numberOfDevices);
-				RESTAPI_utils::field_from_json(Obj,"averageConnectedTime", averageConnectedTime);
-				RESTAPI_utils::field_from_json(Obj,"numberOfConnectingDevices", numberOfConnectingDevices);
-				return true;
-			} catch (...) {
-
-			}
-			return false;
-		}
-	};
-
-	void WebSocketClientNotificationNumberOfConnections(std::uint64_t numberOfDevices,
-													   std::uint64_t averageConnectedTime,
-													   std::uint64_t numberOfConnectingDevices);
-	void WebSocketClientNotificationDeviceConfigurationChange(const std::string &SerialNumber, uint64_t oldUUID, uint64_t newUUID);
-	void WebSocketClientNotificationDeviceFirmwareUpdated(const std::string &SerialNumber, const std::string &Firmware);
-	void WebSocketClientNotificationDeviceConnected(const std::string &SerialNumber);
-	void WebSocketClientNotificationDeviceDisconnected(const std::string & SerialNumber);
-
-    struct WebSocketNotificationJobContent {
-        std::string                 title,
-                                    details,
-                                    jobId;
-        std::vector<std::string>    success,
-                                    error,
-                                    warning;
-        uint64_t                    timeStamp=OpenWifi::Utils::Now();
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef WebSocketNotification<WebSocketNotificationJobContent>  WebSocketClientNotificationVenueUpdateJob_t;
-
-    void WebSocketClientNotificationVenueUpdateJobCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpdateJob_t &N);
-
-    /////
-    /////
-    /////
-
-    struct WebSocketNotificationRebootList {
-        std::string                 title,
-                details,
-                jobId;
-        std::vector<std::string>    success,
-                warning;
-        uint64_t                    timeStamp=OpenWifi::Utils::Now();
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef WebSocketNotification<WebSocketNotificationRebootList> WebSocketClientNotificationVenueRebootList_t;
-
-    void WebSocketClientNotificationVenueRebootCompletionToUser( const std::string & User, WebSocketClientNotificationVenueRebootList_t &N);
-
-    struct WebSocketNotificationUpgradeList {
-        std::string                 title,
-                details,
-                jobId;
-        std::vector<std::string>    success,
-                                    skipped,
-                                    no_firmware,
-                                    not_connected;
-        uint64_t                    timeStamp=OpenWifi::Utils::Now();
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef WebSocketNotification<WebSocketNotificationUpgradeList> WebSocketClientNotificationVenueUpgradeList_t;
-
-
-    void WebSocketClientNotificationVenueUpgradeCompletionToUser( const std::string & User, WebSocketClientNotificationVenueUpgradeList_t &N);
-
-} // namespace OpenWifi
-