Merge branch 'restbed_rewrite'

4 files changed, 28 insertions, 15 deletions

diff --git a/db/mongo_access.cpp b/db/mongo_access.cpp
index 56936f3..a19488e 100644
--- a/db/mongo_access.cpp
+++ b/db/mongo_access.cpp
@@ -1,9 +1,9 @@
 #include "mongo_access.h"
 
-mongo_access::mongo_access(void) {};
-mongo_access::~mongo_access(void) {};
+UmosapiService::mongo_access::mongo_access(void) {};
+UmosapiService::mongo_access::~mongo_access(void) {};
 
-void mongo_access::configure(mongocxx::uri uri) {
+void UmosapiService::mongo_access::configure(mongocxx::uri uri) {
     class noop_logger : public mongocxx::logger {
         public:
             virtual void operator()(mongocxx::log_level,
@@ -11,6 +11,6 @@ void mongo_access::configure(mongocxx::uri uri) {
                                     bsoncxx::stdx::string_view) noexcept {}
     };
 
-    _pool = bsoncxx::stdx::make_unique<mongocxx::pool>(std::move(uri));
-    _instance = bsoncxx::stdx::make_unique<mongocxx::instance>(bsoncxx::stdx::make_unique<noop_logger>());
+    UmosapiService::mongo_access::_pool = bsoncxx::stdx::make_unique<mongocxx::pool>(std::move(uri));
+    UmosapiService::mongo_access::_instance = bsoncxx::stdx::make_unique<mongocxx::instance>(bsoncxx::stdx::make_unique<noop_logger>());
 }
diff --git a/db/mongo_access.h b/db/mongo_access.h
index f03cece..a37bc1b 100644
--- a/db/mongo_access.h
+++ b/db/mongo_access.h
@@ -15,7 +15,7 @@
 
 #include <iostream>
 
-
+namespace UmosapiService {
 class mongo_access {
     public:
 
@@ -39,5 +39,6 @@ class mongo_access {
         std::unique_ptr<mongocxx::pool> _pool = nullptr;
 
 };
+}
 
 #endif
diff --git a/db/uobject.cpp b/db/uobject.cpp
index 6401307..bb911bb 100644
--- a/db/uobject.cpp
+++ b/db/uobject.cpp
@@ -3,7 +3,9 @@
 using bsoncxx::builder::basic::kvp;
 using bsoncxx::builder::basic::make_document;
 
-std::string uobject::retrieveAll(std::string collection, struct json_object* jsonObjects) {
+UmosapiService::uobject::uobject() {}
+
+std::string UmosapiService::uobject::retrieveAll(std::string collection, struct json_object* jsonObjects) {
 
     auto conn = mongo.get_connection();
 
@@ -11,14 +13,14 @@ std::string uobject::retrieveAll(std::string collection, struct json_object* jso
 
     auto cursor = coll.find({});
 
-    for (auto&& doc : cursor) {
+    for (const auto& doc : cursor) {
         json_object_array_add(jsonObjects, json_tokener_parse(bsoncxx::to_json(doc).c_str()));
     }
 
     return json_object_to_json_string_ext(jsonObjects, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY);
 }
 
-std::string uobject::add(std::string collection, struct json_object* jsonObject, const char * body) {
+std::string UmosapiService::uobject::add(std::string collection, struct json_object* jsonObject, const char * body) {
     auto conn = mongo.get_connection();
 
     auto coll = (*conn)[config["mongo_db"]][collection];
@@ -77,7 +79,7 @@ std::string uobject::add(std::string collection, struct json_object* jsonObject,
     return json_object_to_json_string_ext(jsonObject, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY);
 }
 
-std::string uobject::remove(std::string collection, std::string oid, struct json_object* jsonObject) {
+std::string UmosapiService::uobject::remove(std::string collection, std::string oid, struct json_object* jsonObject) {
     auto conn = mongo.get_connection();
 
     auto coll = (*conn)[config["mongo_db"]][collection];
@@ -103,11 +105,13 @@ std::string uobject::remove(std::string collection, std::string oid, struct json
         json_object_object_add(json_id, "$oid", json_oid);
         json_object_object_add(jsonObject, "_id", json_id);
         json_object_object_add(jsonObject, "datas", {});
+        return json_object_to_json_string_ext(jsonObject, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY);
+    } else {
+        return "0";
     }
-    return json_object_to_json_string_ext(jsonObject, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY);
 }
 
-std::string uobject::searchKeyValue(std::string collection, std::string key, std::string value, struct json_object* jsonArray) {
+std::string UmosapiService::uobject::searchKeyValue(std::string collection, std::string key, std::string value, struct json_object* jsonArray) {
     auto conn = mongo.get_connection();
 
     auto coll = (*conn)[config["mongo_db"]][collection];
@@ -122,7 +126,7 @@ std::string uobject::searchKeyValue(std::string collection, std::string key, std
 
     auto cursor = coll.find(bsoncxx::from_json(json_string));
 
-    for (auto&& doc : cursor) {
+    for (const auto& doc : cursor) {
         json_object_array_add(jsonArray, json_tokener_parse(bsoncxx::to_json(doc).c_str()));
     }
 
diff --git a/db/uobject.h b/db/uobject.h
index 0533661..2abf7dd 100644
--- a/db/uobject.h
+++ b/db/uobject.h
@@ -19,11 +19,19 @@
 #include "../shared.h"
 #include "../db/mongo_access.h"
 
-namespace uobject {
+namespace UmosapiService {
+
+class uobject {
+    public:
+
+    uobject();
+    virtual ~uobject() {};
+
     std::string retrieveAll(std::string collection, struct json_object* jsonObjects);
     std::string add(std::string collection, struct json_object* jsonObjects, const char * body);
     std::string remove(std::string collection, std::string oid, struct json_object* jsonObjects);
     std::string searchKeyValue(std::string collection, std::string key, std::string value, struct json_object* jsonArray);
-}
+};
 
+}
 #endif