Skip to content

fix(gateway): use entity cache for detail endpoints instead of DiscoveryManager #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfaferek93 merged 2 commits into from
Mar 30, 2026
+39 −38
Merged

fix(gateway): use entity cache for detail endpoints instead of DiscoveryManager #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f79ccbb
fix(gateway): use entity cache for detail endpoints instead of Discov…
mfaferek93 Mar 30, 2026
f16aae0
fix(gateway): switch app depends-on and function hosts to cache lookup
mfaferek93 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions src/ros2_medkit_gateway/src/http/handlers/discovery_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ void DiscoveryHandlers::handle_get_area(const httplib::Request & req, httplib::R
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto area_opt = discovery->get_area(area_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto area_opt = cache.get_area(area_id);

if (!area_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Area not found", {{"area_id", area_id}});
Expand Down Expand Up @@ -257,18 +257,24 @@ void DiscoveryHandlers::handle_get_subareas(const httplib::Request & req, httpli
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto area_opt = discovery->get_area(area_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto area_opt = cache.get_area(area_id);

if (!area_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Area not found", {{"area_id", area_id}});
return;
}

auto subareas = discovery->get_subareas(area_id);
auto subarea_ids = cache.get_subareas(area_id);

json items = json::array();
for (const auto & subarea : subareas) {
for (const auto & sa_id : subarea_ids) {
auto sa_opt = cache.get_area(sa_id);
if (!sa_opt) {
continue;
}
const auto & subarea = *sa_opt;

json item;
item["id"] = subarea.id;
item["name"] = subarea.name.empty() ? subarea.id : subarea.name;
Expand Down Expand Up @@ -317,14 +323,16 @@ void DiscoveryHandlers::handle_get_contains(const httplib::Request & req, httpli
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto area_opt = discovery->get_area(area_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto area_opt = cache.get_area(area_id);

if (!area_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Area not found", {{"area_id", area_id}});
return;
}

// Use DiscoveryManager for contains - it resolves subarea hierarchy
auto discovery = ctx_.node()->get_discovery_manager();
auto components = discovery->get_components_for_area(area_id);

json items = json::array();
Expand Down Expand Up @@ -431,8 +439,8 @@ void DiscoveryHandlers::handle_get_component(const httplib::Request & req, httpl
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto comp_opt = discovery->get_component(component_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto comp_opt = cache.get_component(component_id);

if (!comp_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Component not found",
Expand Down Expand Up @@ -543,15 +551,16 @@ void DiscoveryHandlers::handle_get_subcomponents(const httplib::Request & req, h
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto comp_opt = discovery->get_component(component_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto comp_opt = cache.get_component(component_id);

if (!comp_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Component not found",
{{"component_id", component_id}});
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto subcomponents = discovery->get_subcomponents(component_id);

json items = json::array();
Expand Down Expand Up @@ -607,15 +616,17 @@ void DiscoveryHandlers::handle_get_hosts(const httplib::Request & req, httplib::
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto comp_opt = discovery->get_component(component_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto comp_opt = cache.get_component(component_id);

if (!comp_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Component not found",
{{"component_id", component_id}});
return;
}

// Use DiscoveryManager for hosts - returns full App objects with online status
auto discovery = ctx_.node()->get_discovery_manager();
auto apps = discovery->get_apps_for_component(component_id);

json items = json::array();
Expand Down Expand Up @@ -670,8 +681,8 @@ void DiscoveryHandlers::handle_component_depends_on(const httplib::Request & req
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto comp_opt = discovery->get_component(component_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto comp_opt = cache.get_component(component_id);

if (!comp_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Component not found",
Expand All @@ -687,7 +698,7 @@ void DiscoveryHandlers::handle_component_depends_on(const httplib::Request & req
item["id"] = dep_id;
item["href"] = "/api/v1/components/" + dep_id;

auto dep_opt = discovery->get_component(dep_id);
auto dep_opt = cache.get_component(dep_id);
if (dep_opt) {
item["name"] = dep_opt->name.empty() ? dep_id : dep_opt->name;

Expand Down Expand Up @@ -794,8 +805,8 @@ void DiscoveryHandlers::handle_get_app(const httplib::Request & req, httplib::Re
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto app_opt = discovery->get_app(app_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto app_opt = cache.get_app(app_id);

if (!app_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "App not found", {{"app_id", app_id}});
Expand Down Expand Up @@ -900,8 +911,8 @@ void DiscoveryHandlers::handle_app_depends_on(const httplib::Request & req, http
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto app_opt = discovery->get_app(app_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto app_opt = cache.get_app(app_id);

if (!app_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "App not found", {{"app_id", app_id}});
Expand All @@ -916,7 +927,7 @@ void DiscoveryHandlers::handle_app_depends_on(const httplib::Request & req, http
item["id"] = dep_id;
item["href"] = "/api/v1/apps/" + dep_id;

auto dep_opt = discovery->get_app(dep_id);
auto dep_opt = cache.get_app(dep_id);
if (dep_opt) {
item["name"] = dep_opt->name.empty() ? dep_id : dep_opt->name;

Expand Down Expand Up @@ -971,11 +982,7 @@ void DiscoveryHandlers::handle_app_is_located_on(const httplib::Request & req, h
}

const auto & cache = ctx_.node()->get_thread_safe_cache();
auto discovery = ctx_.node()->get_discovery_manager();
auto app_opt = cache.get_app(app_id);
if (!app_opt) {
app_opt = discovery->get_app(app_id);
}

if (!app_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "App not found", {{"app_id", app_id}});
Expand All @@ -987,9 +994,6 @@ void DiscoveryHandlers::handle_app_is_located_on(const httplib::Request & req, h

if (!app.component_id.empty()) {
auto component_opt = cache.get_component(app.component_id);
if (!component_opt) {
component_opt = discovery->get_component(app.component_id);
}
if (component_opt) {
json item;
item["id"] = component_opt->id;
Expand Down Expand Up @@ -1096,10 +1100,6 @@ void DiscoveryHandlers::handle_get_function(const httplib::Request & req, httpli

const auto & cache = ctx_.node()->get_thread_safe_cache();
auto func_opt = cache.get_function(function_id);
if (!func_opt) {
auto discovery = ctx_.node()->get_discovery_manager();
func_opt = discovery->get_function(function_id);
}

if (!func_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Function not found", {{"function_id", function_id}});
Expand Down Expand Up @@ -1179,19 +1179,20 @@ void DiscoveryHandlers::handle_function_hosts(const httplib::Request & req, http
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto func_opt = discovery->get_function(function_id);
const auto & cache = ctx_.node()->get_thread_safe_cache();
auto func_opt = cache.get_function(function_id);

if (!func_opt) {
HandlerContext::send_error(res, 404, ERR_ENTITY_NOT_FOUND, "Function not found", {{"function_id", function_id}});
return;
}

auto discovery = ctx_.node()->get_discovery_manager();
auto host_ids = discovery->get_hosts_for_function(function_id);

json items = json::array();
for (const auto & app_id : host_ids) {
auto app_opt = discovery->get_app(app_id);
auto app_opt = cache.get_app(app_id);
if (app_opt) {
json item;
item["id"] = app_opt->id;
Expand Down
4 changes: 2 additions & 2 deletions src/ros2_medkit_gateway/test/test_discovery_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ TEST_F(DiscoveryHandlersFixtureTest, AppDependsOnReturnsResolvedAndMissingDepend
ASSERT_EQ(body["items"].size(), 2);
EXPECT_EQ(body["items"][0]["id"], "planner");
EXPECT_EQ(body["items"][0]["x-medkit"]["source"], "manifest");
EXPECT_EQ(body["items"][0]["x-medkit"]["is_online"], false);
EXPECT_EQ(body["items"][0]["x-medkit"]["is_online"], true); // cache has enriched is_online from SetUp
EXPECT_EQ(body["items"][1]["id"], "ghost_app");
EXPECT_EQ(body["items"][1]["x-medkit"]["missing"], true);
EXPECT_EQ(body["_links"]["app"], "/api/v1/apps/mapper");
Expand Down Expand Up @@ -800,6 +800,6 @@ TEST_F(DiscoveryHandlersFixtureTest, FunctionHostsReturnsHostingApps) {
ASSERT_EQ(body["items"].size(), 1);
EXPECT_EQ(body["items"][0]["id"], "planner");
EXPECT_EQ(body["items"][0]["x-medkit"]["source"], "manifest");
EXPECT_EQ(body["items"][0]["x-medkit"]["is_online"], false);
EXPECT_EQ(body["items"][0]["x-medkit"]["is_online"], true); // cache has enriched is_online from SetUp
EXPECT_EQ(body["_links"]["function"], "/api/v1/functions/navigation");
}
Loading