From b044d1883e1031d79d78e95e0b43c44c69d08d39 Mon Sep 17 00:00:00 2001 From: gulliver Date: Tue, 15 Nov 2022 12:42:35 +0100 Subject: [PATCH] added RequestCDDC::from_json --- src/model.cpp | 17 ++++++++++++++--- src/model.hpp | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/model.cpp b/src/model.cpp index 228b4be..975968c 100644 --- a/src/model.cpp +++ b/src/model.cpp @@ -97,7 +97,6 @@ crow::json::wvalue MintKeyCert::to_json() const { return r; } - crow::json::wvalue ResponseCDDC::to_json() const { crow::json::wvalue r; @@ -108,7 +107,19 @@ crow::json::wvalue ResponseCDDC::to_json() const r["type"]= "response cddc"; return r; -} +} +std::optional RequestCDDC::from_json(const crow::json::rvalue & json) { + + if (json.has("cdd_serial")&&json.has("message_reference")) { + auto r = std::make_optional(); + r->cdd_serial=json["cdd_serial"].u(); + r->message_reference= json["message_reference"].u(); + return r; + } + else { + return std::nullopt; + } +} /** blafasel */ class DefaultModel : public Model { @@ -122,7 +133,7 @@ private: CDDC m_cddc; }; -std::unique_ptr Model::getModel(const std::string& backend_name) +std::unique_ptr Model::getModel(const std::string& /*backend_name*/) { //:wq //if (backend_name=="default") diff --git a/src/model.hpp b/src/model.hpp index 0e3ecc7..a2d1c86 100644 --- a/src/model.hpp +++ b/src/model.hpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "crow/json.h"