refactor(orderGraphValidator): Isolate OrderGraphValidator and use vda5050_types

vda5050_core/CMakeLists.txt

@@ -34,7 +34,9 @@ target_include_directories(logger
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
-add_library(client src/vda5050_core/state_manager/state_manager.cpp)
+add_library(client 
+  src/vda5050_core/state_manager/state_manager.cpp
+  src/vda5050_core/client/order/order_graph_validator.cpp)
 target_link_libraries(client
   vda5050_types::vda5050_types)
 target_include_directories(client
@@ -79,7 +81,7 @@ install(
 )
 
 ament_export_targets(export_vda5050_core HAS_LIBRARY_TARGET)
-ament_export_dependencies(PahoMqttCpp fmt)
+ament_export_dependencies(PahoMqttCpp fmt vda5050_types)
 
 if(BUILD_TESTING)
   find_package(ament_cmake_cppcheck REQUIRED)
@@ -106,6 +108,7 @@ if(BUILD_TESTING)
     test/unit/mqtt_client/test_mqtt_client_interface.cpp
     test/unit/logger/test_logger.cpp
     test/unit/logger/test_default_logger.cpp
+    test/unit/order_graph_validator/test_order_graph_validator.cpp
     test/unit/state_manager/test_state_manager.cpp
     test/integration/mqtt_client/test_paho_mqtt_client.cpp
   )

vda5050_core/include/vda5050_core/client/order/order_graph_validator.hpp

@@ -0,0 +1,63 @@
+/**
+ * Copyright (C) 2025 ROS-Industrial Consortium Asia Pacific
+ * Advanced Remanufacturing and Technology Centre
+ * A*STAR Research Entities (Co. Registration No. 199702110H)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VDA5050_CORE__CLIENT__ORDER__ORDER_GRAPH_VALIDATOR_HPP_
+#define VDA5050_CORE__CLIENT__ORDER__ORDER_GRAPH_VALIDATOR_HPP_
+
+#include <vector>
+
+#include "vda5050_core/client/order/validation_result.hpp"
+#include "vda5050_types/order.hpp"
+
+namespace vda5050_core {
+namespace order {
+
+/// \brief Utility class with functions to perform validity checks on the graph
+/// contained in a VDA5050 Order message
+class OrderGraphValidator
+{
+public:
+  OrderGraphValidator() = delete;
+
+  /// \brief Checks that the nodes and edges in a VDA5050 Order form a valid
+  /// graph according to the VDA5050 specification sheet.
+  ///
+  /// \param order The order to be checked.
+  /// \return ValidationResult containing if the order being checked is valid,
+  /// and any errors if it is not.
+  ///
+  /// \return True if nodes and edges create a valid graph, false otherwise
+  static ValidationResult is_valid_graph(
+    const vda5050_types::Order& order) noexcept(false);
+
+  /// \brief Checks if order update is valid for order stitching
+  ///
+  /// \param base_order The base order.
+  ///
+  /// \param next_order the update order.
+  ///
+  /// \return True new order is valid for stitching, false otherwise
+  static ValidationResult is_valid_order_update(
+    const vda5050_types::Order& base_order,
+    const vda5050_types::Order& next_order) noexcept(false);
+};
+
+}  // namespace order
+}  // namespace vda5050_core
+
+#endif  // VDA5050_CORE__CLIENT__ORDER__ORDER_GRAPH_VALIDATOR_HPP_

vda5050_core/include/vda5050_core/client/order/validation_result.hpp

@@ -0,0 +1,48 @@
+/**
+ * Copyright (C) 2025 ROS-Industrial Consortium Asia Pacific
+ * Advanced Remanufacturing and Technology Centre
+ * A*STAR Research Entities (Co. Registration No. 199702110H)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef VDA5050_CORE__CLIENT__ORDER__VALIDATION_RESULT_HPP_
+#define VDA5050_CORE__CLIENT__ORDER__VALIDATION_RESULT_HPP_
+
+#include <vector>
+
+#include "vda5050_types/error.hpp"
+
+namespace vda5050_core {
+namespace order {
+
+/// \brief Struct that details the validity of an order
+struct ValidationResult
+{
+  /// \brief A vector of error(s) that resulted in an invalid order. Empty if
+  /// order is valid.
+  std::vector<vda5050_types::Error> errors;
+
+  /// \brief Allows use in boolean contexts
+  ///
+  /// \return True if the order is valid, false otherwise.
+  explicit operator bool() const
+  {
+    return errors.empty();
+  }
+};
+
+}  // namespace order
+}  // namespace vda5050_core
+
+#endif  // VDA5050_CORE__CLIENT__ORDER__VALIDATION_RESULT_HPP_