Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Added test and verified use of assets and no device or type supplied #240

Merged
wsobel merged 1 commit into from
Dec 6, 2022
Merged

Added test and verified use of assets and no device or type supplied #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 28 additions & 18 deletions src/sink/rest_sink/rest_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,25 +504,31 @@ namespace mtconnect {
return true;
};

for (const auto &t : list<boost::beast::http::verb> {boost::beast::http::verb::put,
boost::beast::http::verb::post})
for (const auto &asset : list<string> {"asset", "assets"})
{
m_server->addRouting({t, "/asset/{uuid}?device={string}&type={string}", putHandler});
m_server->addRouting({t, "/asset?device={string}&type={string}", putHandler});
m_server->addRouting({t, "/{device}/asset/{uuid}?type={string}", putHandler});
m_server->addRouting({t, "/{device}/asset?type={string}", putHandler});
}
for (const auto &t : list<boost::beast::http::verb> {boost::beast::http::verb::put,
boost::beast::http::verb::post})
{
m_server->addRouting(
{t, "/" + asset + "/{uuid}?device={string}&type={string}", putHandler});
m_server->addRouting({t, "/" + asset + "?device={string}&type={string}", putHandler});
m_server->addRouting({t, "/{device}/" + asset + "/{uuid}?type={string}", putHandler});
m_server->addRouting({t, "/{device}/" + asset + "?type={string}", putHandler});
}

m_server->addRouting({boost::beast::http::verb::delete_,
"/asset?&device={string}&type={string}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_,
"/asset?&device={string}&type={string}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_, "/asset/{asset}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_, "/asset/{asset}", deleteHandler});
m_server->addRouting(
{boost::beast::http::verb::delete_, "/{device}/asset?type={string}", deleteHandler});
m_server->addRouting(
{boost::beast::http::verb::delete_, "/{device}/asset?type={string}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_,
"/" + asset + "?&device={string}&type={string}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_,
"/" + asset + "?&device={string}&type={string}", deleteHandler});
m_server->addRouting(
{boost::beast::http::verb::delete_, "/" + asset + "/{asset}", deleteHandler});
m_server->addRouting(
{boost::beast::http::verb::delete_, "/" + asset + "/{asset}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_,
"/{device}/" + asset + "?type={string}", deleteHandler});
m_server->addRouting({boost::beast::http::verb::delete_,
"/{device}/" + asset + "?type={string}", deleteHandler});
}
}
}

Expand Down Expand Up @@ -1059,7 +1065,11 @@ namespace mtconnect {
using namespace rest_sink;

entity::ErrorList errors;
auto dev = checkDevice(printer, *device);
DevicePtr dev;
if (device)
dev = checkDevice(printer, *device);
else
dev = m_sinkContract->defaultDevice();
auto ap = m_loopback->receiveAsset(dev, asset, uuid, type, nullopt, errors);
if (!ap || errors.size() > 0 || (type && ap->getType() != *type))
{
Expand Down
19 changes: 19 additions & 0 deletions test/agent_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2851,3 +2851,22 @@ TEST_F(AgentTest, asset_count_should_track_asset_additions_by_type)
ASSERT_XML_PATH_EQUAL(doc, "//m:AssetCountDataSet/m:Entry[@key='PartThing']", "1");
}
}

TEST_F(AgentTest, asset_should_also_work_using_post_with_assets)
{
auto agent = m_agentTestHelper->createAgent("/samples/test_config.xml", 8, 4, "2.0", 4, true);

string body = "<Part assetId='P1'>TEST 1</Part>";
QueryMap queries;
const auto &storage = agent->getAssetStorage();

{
PARSE_XML_RESPONSE_PUT("/assets", body, queries);
ASSERT_EQ((unsigned int)1, storage->getCount());
}
{
PARSE_XML_RESPONSE_PUT("/assets/P2", body, queries);
ASSERT_EQ((unsigned int)2, storage->getCount());
}

}