refactor: move /info input/ouput to oatpp::dto

Author: sileht

src/http/controller.hpp

@@ -26,12 +26,16 @@
 #include <vector>
 #include <iostream>
 
+#include <boost/lexical_cast.hpp>
+
 #include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/parser/json/mapping/ObjectMapper.hpp"
 #include "oatpp/core/macro/codegen.hpp"
 #include "oatpp/core/macro/component.hpp"
 
+#include "apidata.h"
 #include "oatppjsonapi.h"
+#include "http/dto/info.hpp"
 
 #include OATPP_CODEGEN_BEGIN(ApiController)
 
@@ -61,11 +65,31 @@ class DedeController : public oatpp::web::server::api::ApiController
   }
   ENDPOINT("GET", "info", get_info, QUERIES(QueryParams, queryParams))
   {
-    // TODO(sileht): why do serialize the query string to char*
-    // to later get again a APIData...
-    std::string jsonstr = _oja->uri_query_to_json(queryParams);
-    auto janswer = _oja->info(jsonstr);
-    return _oja->jdoc_to_response(janswer);
+    auto info_resp = InfoResponse::createShared();
+    info_resp->head = InfoHead::createShared();
+    info_resp->head->services = {};
+
+    auto qs_status = queryParams.get("status");
+    bool status = false;
+    if (qs_status)
+      status = boost::lexical_cast<bool>(qs_status->std_str());
+
+    auto hit = _oja->_mlservices.begin();
+    while (hit != _oja->_mlservices.end())
+      {
+        // TODO(sileht): update visitor_info to return directly a Service()
+        JDoc jd;
+        jd.SetObject();
+        mapbox::util::apply_visitor(dd::visitor_info(status), (*hit).second)
+            .toJDoc(jd);
+        auto json_str = _oja->jrender(jd);
+        auto service_info
+            = getDefaultObjectMapper()->readFromString<oatpp::Object<Service>>(
+                json_str.c_str());
+        info_resp->head->services->emplace_back(service_info);
+        ++hit;
+      }
+    return createDtoResponse(Status::CODE_200, info_resp);
   }
 
   ENDPOINT_INFO(get_service)

src/http/dto/info.hpp

@@ -0,0 +1,83 @@
+/**
+ * DeepDetect
+ * Copyright (c) 2020 Jolibrain SASU
+ * Author: Mehdi Abaakouk <mehdi.abaakouk@jolibrain.com>
+ *
+ * This file is part of deepdetect.
+ *
+ * deepdetect is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * deepdetect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with deepdetect.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef HTTP_DTO_INFO_H
+#define HTTP_DTO_INFO_H
+
+#include "dd_config.h"
+#include "oatpp/core/Types.hpp"
+#include "oatpp/core/macro/codegen.hpp"
+
+#include OATPP_CODEGEN_BEGIN(DTO) ///< Begin DTO codegen section
+
+class Service : public oatpp::DTO
+{
+  DTO_INIT(Service, DTO /* extends */)
+
+  DTO_FIELD(String, name);
+  DTO_FIELD(String, description);
+  DTO_FIELD(String, mllib);
+  DTO_FIELD(String, mltype);
+  DTO_FIELD(Boolean, predict) = false;
+  DTO_FIELD(Boolean, training) = false;
+};
+
+class InfoHead : public oatpp::DTO
+{
+  DTO_INIT(InfoHead, DTO /* extends */)
+  DTO_FIELD(String, method) = "/info";
+
+  // Why this is not in body ?
+  DTO_FIELD(String, build_type, "build-type") = BUILD_TYPE;
+  DTO_FIELD(String, version) = GIT_VERSION;
+  DTO_FIELD(String, branch) = GIT_BRANCH;
+  DTO_FIELD(String, commit) = GIT_COMMIT_HASH;
+  DTO_FIELD(String, compile_flags) = COMPLIE_FLAGS;
+  DTO_FIELD(String, deps_version) = DEPS_VERSION;
+  DTO_FIELD(List<Object<Service>>, services);
+};
+
+class InfoBody : public oatpp::DTO
+{
+  DTO_INIT(InfoBody, DTO /* extends */)
+};
+
+class Status : public oatpp::DTO
+{
+  DTO_INIT(Status, DTO /* extends */)
+  DTO_FIELD(Int32, code);
+  DTO_FIELD(String, msg);
+  DTO_FIELD(Int32, dd_code);
+  DTO_FIELD(String, dd_msg);
+};
+
+class InfoResponse : public oatpp::DTO
+{
+  DTO_INIT(InfoResponse, DTO /* extends */)
+  DTO_FIELD(String, dd_msg);
+  DTO_FIELD(Object<Status>, status);
+  DTO_FIELD(Object<InfoHead>, head);
+  DTO_FIELD(Object<InfoBody>, body);
+};
+
+#include OATPP_CODEGEN_END(DTO) ///< End DTO codegen section
+
+#endif // HTTP_DTO_INFO_H

src/oatppjsonapi.cc

@@ -264,7 +264,10 @@ namespace dd
 
     auto router = components.httpRouter.getObject();
 
-    auto dedeController = DedeController::createShared(this);
+    std::shared_ptr<oatpp::data::mapping::ObjectMapper> defaultObjectMapper
+        = oatpp::parser::json::mapping::ObjectMapper::createShared();
+    auto dedeController
+        = DedeController::createShared(this, defaultObjectMapper);
     dedeController->addEndpointsToRouter(router);
 
     auto docEndpoints = oatpp::swagger::Controller::Endpoints::createShared();

tests/ut-oatpp.h

@@ -140,7 +140,10 @@ class DedeControllerTest : public oatpp::test::UnitTest
     dd::OatppJsonAPI oja;
     TestComponent component;
     oatpp::test::web::ClientServerTestRunner runner;
-    runner.addController(std::make_shared<DedeController>(&oja, nullptr));
+    std::shared_ptr<oatpp::data::mapping::ObjectMapper> defaultObjectMapper
+        = oatpp::parser::json::mapping::ObjectMapper::createShared();
+    runner.addController(
+        std::make_shared<DedeController>(&oja, defaultObjectMapper));
     runner.run(
         [this, &runner] {
           OATPP_COMPONENT(