ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add device and rule as adding response

pull/135/head
Simon Stürz 2015-09-15 21:15:43 +02:00 committed by Michael Zanetti
parent 0700aab2b3
commit 4f90536f2c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/rest/devicesresource.cpp
View File

@ -334,8 +334,7 @@ HttpReply *DevicesResource::addConfiguredDevice(const QByteArray &payload) const
if (status != DeviceManager::DeviceErrorNoError)
return createErrorReply(HttpReply::InternalServerError);
QVariantMap result;
result.insert("id", newDeviceId);
QVariant result = JsonTypes::packDevice(GuhCore::instance()->findConfiguredDevice(newDeviceId));
HttpReply *reply = createSuccessReply();
reply->setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
reply->setPayload(QJsonDocument::fromVariant(result).toJson());
@ -472,8 +471,7 @@ void DevicesResource::deviceSetupFinished(Device *device, DeviceManager::DeviceE
reply->setHttpStatusCode(HttpReply::InternalServerError);
}
QVariantMap result;
result.insert("id", device->id());
QVariant result = JsonTypes::packDevice(device);
reply->setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
reply->setPayload(QJsonDocument::fromVariant(result).toJson());
reply->finished();
@ -504,10 +502,9 @@ void DevicesResource::pairingFinished(const PairingTransactionId &pairingTransac
HttpReply *reply = m_asyncPairingRequests.take(pairingTransactionId);
if (status == DeviceManager::DeviceErrorNoError) {
qCDebug(dcRest) << "Pairing device finished successfully";
QVariantMap response;
response.insert("id", deviceId.toString());
QVariant result = JsonTypes::packDevice(GuhCore::instance()->findConfiguredDevice(deviceId));
reply->setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
reply->setPayload(QJsonDocument::fromVariant(response).toJson());
reply->setPayload(QJsonDocument::fromVariant(result).toJson());
reply->setHttpStatusCode(HttpReply::Ok);
} else {
qCDebug(dcRest) << "Pairing device finished with error" << status;

3
server/rest/rulesresource.cpp
View File

@ -236,8 +236,7 @@ HttpReply *RulesResource::addRule(const QByteArray &payload) const
RuleEngine::RuleError status = GuhCore::instance()->addRule(newRuleId, name, eventDescriptorList, stateEvaluator, actions, exitActions, enabled);
if (status == RuleEngine::RuleErrorNoError) {
QVariantMap returns;
returns.insert("id", newRuleId.toString());
QVariant returns = JsonTypes::packRule(GuhCore::instance()->findRule(newRuleId));
HttpReply *reply = createSuccessReply();
reply->setHeader(HttpReply::ContentTypeHeader, "application/json; charset=\"utf-8\";");
reply->setPayload(QJsonDocument::fromVariant(returns).toJson());