Make CreateSubscription asynchronous

PiperOrigin-RevId: 615234587

Author: rahkr

ecclesia/lib/redfish/event/server/BUILD

@@ -7,6 +7,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/hash",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
@@ -28,6 +29,7 @@ cc_library(
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/hash",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:die_if_null",
@@ -106,6 +108,7 @@ cc_test(
     srcs = ["subscription_test.cc"],
     deps = [
         ":subscription",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -122,7 +125,9 @@ cc_test(
         ":subscription",
         ":subscription_impl",
         ":subscription_mock",
+        "//ecclesia/lib/testing:status",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -159,7 +164,9 @@ cc_test(
     deps = [
         ":subscription",
         ":subscription_store",
+        "//ecclesia/lib/testing:status",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",

ecclesia/lib/redfish/event/server/subscription.cc

@@ -19,9 +19,9 @@
 #include <functional>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "absl/container/flat_hash_map.h"
+#include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -77,9 +77,12 @@ std::string EventId::ToString() const { return this->ToJSON().dump(); }
 
 SubscriptionContext::SubscriptionContext(
     const SubscriptionId& subscription_id_in,
+    const absl::flat_hash_map<EventSourceId, absl::flat_hash_set<std::string>>&
+        event_source_to_uris_in,
     absl::flat_hash_map<std::string, Trigger> id_to_triggers_in,
     std::function<void(const nlohmann::json&)>&& on_event_callback_in)
     : subscription_id(subscription_id_in),
+      event_source_to_uri(event_source_to_uris_in),
       id_to_triggers(std::move(id_to_triggers_in)),
       on_event_callback(std::move(on_event_callback_in)) {}
 
@@ -104,9 +107,9 @@ absl::StatusOr<Trigger> Trigger::Create(const nlohmann::json& trigger_json) {
     return absl::InvalidArgumentError("Origin resources not populated");
   }
 
-  std::vector<std::string> origin_resources;
+  absl::flat_hash_set<std::string> origin_resources;
   for (const auto& origin_resource : *find_origin_resources) {
-    origin_resources.push_back(origin_resource["@odata.id"].get<std::string>());
+    origin_resources.insert(origin_resource["@odata.id"].get<std::string>());
   }
 
   std::string predicate;
@@ -121,14 +124,16 @@ absl::StatusOr<Trigger> Trigger::Create(const nlohmann::json& trigger_json) {
   }
 
   // Create a Trigger object with the extracted information
-  Trigger trigger(std::move(origin_resources), predicate, event_mask);
+  Trigger trigger(id, std::move(origin_resources), predicate, event_mask);
 
   return trigger;
 }
 
-Trigger::Trigger(std::vector<std::string> origin_resources_in,
+Trigger::Trigger(absl::string_view id_in,
+                 absl::flat_hash_set<std::string> origin_resources_in,
                  absl::string_view predicate_in, bool mask_in)
-    : origin_resources(std::move(origin_resources_in)),
+    : id(id_in),
+      origin_resources(std::move(origin_resources_in)),
       predicate(predicate_in),
       mask(mask_in) {}
 

ecclesia/lib/redfish/event/server/subscription.h

@@ -26,6 +26,7 @@
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
+#include "absl/container/flat_hash_set.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
@@ -134,17 +135,21 @@ struct Trigger {
   static absl::StatusOr<Trigger> Create(const nlohmann::json &trigger_json);
 
   // Constructor for Trigger
-  explicit Trigger(std::vector<std::string> origin_resources_in,
+  explicit Trigger(absl::string_view id_in,
+                   absl::flat_hash_set<std::string> origin_resources_in,
                    absl::string_view predicate_in = "", bool mask_in = false);
 
+  // Trigger id
+  std::string id;
+
   // Converts Trigger to JSON format
   nlohmann::json ToJSON() const;
 
   // Converts Trigger to string format
   std::string ToString() const;
 
   // List of origin resources associated with the Trigger
-  std::vector<std::string> origin_resources;
+  absl::flat_hash_set<std::string> origin_resources;
 
   // Map of event source to Redfish resource URI
   EventSourceToUri event_source_to_uri;
@@ -156,13 +161,25 @@ struct Trigger {
   bool mask;
 };
 
+// Structure representing a subscription
 struct SubscriptionContext {
   SubscriptionContext(
       const SubscriptionId &subscription_id_in,
+      const absl::flat_hash_map<EventSourceId, absl::flat_hash_set<std::string>>
+          &event_source_to_uris_in,
       absl::flat_hash_map<std::string, Trigger> id_to_triggers_in,
       std::function<void(const nlohmann::json &)> &&on_event_callback_in);
 
+  // Unique identifier for the subscription
   SubscriptionId subscription_id;
+
+  // Map of event source IDs to corresponding URIs.
+  // This map is used to process incoming events by looking up the URI an event
+  // is associated with and then the URI is used to create an internal query
+  // that builds `OriginOfCondtion`.
+  absl::flat_hash_map<EventSourceId, absl::flat_hash_set<std::string>>
+      event_source_to_uri;
+
   // Map of trigger IDs to corresponding Trigger objects
   // This map associates each trigger ID with the corresponding Trigger
   // object, enabling efficient lookup and management of triggers for a given
@@ -277,6 +294,12 @@ class SubscriptionService {
       const nlohmann::json &request,
       std::function<void(const nlohmann::json &)> &&on_event_callback) = 0;
 
+  virtual void CreateSubscription(
+      const nlohmann::json &request,
+      std::function<void(const absl::StatusOr<SubscriptionId> &)>
+          on_subscribe_callback,
+      std::function<void(const nlohmann::json &)> on_event_callback) = 0;
+
   // Deletes the subscription with the given subscription ID
   virtual void DeleteSubscription(const SubscriptionId &subscription_id) = 0;