Settingsjsonweird

.vscode/settings.json

@@ -1,33 +1,116 @@
 {
-    "editor.formatOnSave": true,
-    "editor.tabSize": 4,
-    "editor.codeActionsOnSave": {
-        "source.organizeImports": true,
-        "source.fixAll": true
-    },
-    "terminal.integrated.env.linux": {
-        "PATH": "${env:PATH}:${workspaceFolder}/kanban-board-service/node_modules/.bin"
-    },
-    "terminal.integrated.env.osx": {
-        "PATH": "${env:PATH}:${workspaceFolder}/kanban-board-service/node_modules/.bin"
-    },
-    "terminal.integrated.env.windows": {
-        "PATH": "${env:PATH};${workspaceFolder}\\kanban-board-service\\node_modules\\.bin"
-    },
-    "git.inputValidationLength": 100,
-    "git.inputValidationSubjectLength": 100,
-    "cmake.sourceDirectory": "${workspaceFolder}/kanban-board-service",
-    "cmake.buildDirectory": "${workspaceFolder}/kanban-board-service/build",
-    "cmake.debugConfig": {
-        "cwd": "${workspaceFolder}/kanban-board-service/build"
-    },
-    "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: LLVM, IndentWidth: 4, ColumnLimit: 0}",
-    "python.testing.pytestArgs": [
-        "-v",
-        "-s"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.nosetestsEnabled": false,
-    "python.testing.pytestEnabled": true,
-    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
-}
+  "editor.formatOnSave": true,
+  "editor.tabSize": 4,
+  "editor.codeActionsOnSave": {
+      "source.organizeImports": true,
+      "source.fixAll": true
+  },
+  "terminal.integrated.env.linux": {
+      "PATH": "${env:PATH}:${workspaceFolder}/kanban-board-service/node_modules/.bin"
+  },
+  "terminal.integrated.env.osx": {
+      "PATH": "${env:PATH}:${workspaceFolder}/kanban-board-service/node_modules/.bin"
+  },
+  "terminal.integrated.env.windows": {
+      "PATH": "${env:PATH};${workspaceFolder}\\kanban-board-service\\node_modules\\.bin"
+  },
+  "git.inputValidationLength": 100,
+  "git.inputValidationSubjectLength": 100,
+  "cmake.sourceDirectory": "${workspaceFolder}/kanban-board-service",
+  "cmake.buildDirectory": "${workspaceFolder}/kanban-board-service/build",
+  "cmake.debugConfig": {
+      "cwd": "${workspaceFolder}/kanban-board-service/build"
+  },
+  "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: LLVM, IndentWidth: 4, ColumnLimit: 0}",
+  "python.testing.pytestArgs": [
+      "-v",
+      "-s"
+  ],
+  "python.testing.unittestEnabled": false,
+  "python.testing.nosetestsEnabled": false,
+  "python.testing.pytestEnabled": true,
+  "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+
+  "cmake.generator": "MinGW Makefiles",
+  "cmake.cmakePath": "C:/msys64/mingw64/bin/cmake.exe",
+  "cmake.mingwSearchDirs": [
+      "C:/msys64/mingw64",
+  ],
+  "cmake.preferredGenerators": [
+      "MinGW Makefiles"
+],
+"files.associations": {
+  "optional": "cpp",
+  "cctype": "cpp",
+  "clocale": "cpp",
+  "cmath": "cpp",
+  "csignal": "cpp",
+  "cstdarg": "cpp",
+  "cstddef": "cpp",
+  "cstdio": "cpp",
+  "cstdlib": "cpp",
+  "cstring": "cpp",
+  "ctime": "cpp",
+  "cwchar": "cpp",
+  "cwctype": "cpp",
+  "any": "cpp",
+  "array": "cpp",
+  "atomic": "cpp",
+  "strstream": "cpp",
+  "bit": "cpp",
+  "*.tcc": "cpp",
+  "bitset": "cpp",
+  "chrono": "cpp",
+  "codecvt": "cpp",
+  "compare": "cpp",
+  "complex": "cpp",
+  "concepts": "cpp",
+  "condition_variable": "cpp",
+  "coroutine": "cpp",
+  "cstdint": "cpp",
+  "deque": "cpp",
+  "list": "cpp",
+  "map": "cpp",
+  "set": "cpp",
+  "unordered_map": "cpp",
+  "vector": "cpp",
+  "exception": "cpp",
+  "algorithm": "cpp",
+  "functional": "cpp",
+  "iterator": "cpp",
+  "memory": "cpp",
+  "memory_resource": "cpp",
+  "numeric": "cpp",
+  "random": "cpp",
+  "ratio": "cpp",
+  "regex": "cpp",
+  "source_location": "cpp",
+  "string": "cpp",
+  "string_view": "cpp",
+  "system_error": "cpp",
+  "tuple": "cpp",
+  "type_traits": "cpp",
+  "utility": "cpp",
+  "fstream": "cpp",
+  "future": "cpp",
+  "initializer_list": "cpp",
+  "iomanip": "cpp",
+  "iosfwd": "cpp",
+  "iostream": "cpp",
+  "istream": "cpp",
+  "limits": "cpp",
+  "mutex": "cpp",
+  "new": "cpp",
+  "ostream": "cpp",
+  "ranges": "cpp",
+  "sstream": "cpp",
+  "stdexcept": "cpp",
+  "stop_token": "cpp",
+  "streambuf": "cpp",
+  "thread": "cpp",
+  "cinttypes": "cpp",
+  "typeindex": "cpp",
+  "typeinfo": "cpp",
+  "variant": "cpp"
+},
+}

kanban-board-service/src/Api/Parser/JsonParser.cpp

@@ -16,25 +16,124 @@ string JsonParser::convertToApiString(Board &board) {
 }
 
 string JsonParser::convertToApiString(Column &column) {
-    throw NotImplementedException();
+    Document document(kObjectType);
+
+    Value jsonColumn = getJsonValueFromModel(column, document.GetAllocator());
+    return jsonValueToString(jsonColumn);
+}
+
+rapidjson::Value JsonParser::getJsonValueFromModel(Column const &column, rapidjson::Document::AllocatorType &allocator) {
+    Value jsonColumn(kObjectType);
+
+    jsonColumn.AddMember("id", column.getId(), allocator);
+    jsonColumn.AddMember("name", Value(column.getName().c_str(), allocator), allocator);
+    jsonColumn.AddMember("position", column.getPos(), allocator);
+
+    Value jsonItems(kArrayType);
+
+    for (Item const &item : column.getItems()) {
+        Value jsonItem = getJsonValueFromModel(item, allocator);
+        jsonItems.PushBack(jsonItem, allocator);
+    }
+
+    jsonColumn.AddMember("items", jsonItems, allocator);
+
+    return jsonColumn;
+}
+
+rapidjson::Value JsonParser::getJsonValueFromModel(Item const &item, rapidjson::Document::AllocatorType &allocator) {
+    Value jsonItem(kObjectType);
+
+    jsonItem.AddMember("id", item.getId(), allocator);
+    jsonItem.AddMember("title", Value(item.getTitle().c_str(), allocator), allocator);
+    jsonItem.AddMember("position", item.getPos(), allocator);
+    jsonItem.AddMember("timestamp", Value(item.getTimestamp().c_str(), allocator), allocator);
+
+    return jsonItem;
+}
+
+string JsonParser::jsonValueToString(rapidjson::Value const &json) {
+    StringBuffer buffer;
+    Writer<StringBuffer> writer(buffer);
+    json.Accept(writer);
+
+    return buffer.GetString();
 }
 
 string JsonParser::convertToApiString(std::vector<Column> &columns) {
     throw NotImplementedException();
 }
 
 string JsonParser::convertToApiString(Item &item) {
-    throw NotImplementedException();
+    string result = EMPTY_JSON;
+    Document document(kObjectType);
+
+    Value jsonItem = getJsonValueFromModel(item, document.GetAllocator());
+    result = jsonValueToString(jsonItem);
+    return result;
 }
 
 string JsonParser::convertToApiString(std::vector<Item> &items) {
     throw NotImplementedException();
 }
 
 std::optional<Column> JsonParser::convertColumnToModel(int columnId, std::string &request) {
-    throw NotImplementedException();
+    std::optional<Column> resultColumn;
+    Document document;
+    document.Parse(request.c_str());
+
+    if (true == isValidColumn(document)) {
+        std::string name = document["name"].GetString();
+        int position = document["position"].GetInt();
+        resultColumn = Column(columnId, name, position);
+    }
+    return resultColumn;
 }
 
 std::optional<Item> JsonParser::convertItemToModel(int itemId, std::string &request) {
-    throw NotImplementedException();
+    std::optional<Item> resultItem;
+
+    Document document;
+    document.Parse(request.c_str());
+
+    if (true == isValidItem(document)) {
+        std::string title = document["title"].GetString();
+        int position = document["position"].GetInt();
+        resultItem = Item(itemId, title, position, "");
+    }
+    return resultItem;
+}
+
+bool JsonParser::isValidColumn(rapidjson::Document const &document) {
+
+    bool isValid = true;
+
+    if (document.HasParseError()) {
+        isValid = false;
+    }
+    if (false == document["name"].IsString()) {
+        isValid = false;
+    }
+    if (false == document["position"].IsInt()) {
+        isValid = false;
+    }
+
+    return isValid;
+}
+
+bool JsonParser::isValidItem(rapidjson::Document const &document) {
+
+    bool isValid = true;
+
+    if (document.HasParseError()) {
+        isValid = false;
+    }
+    if (false == document["title"].IsString()) {
+        isValid = false;
+    }
+    if (false == document["position"].IsInt()) {
+        isValid = false;
+    }
+
+    return isValid;
 }

kanban-board-service/src/Api/Parser/JsonParser.hpp

@@ -11,6 +11,14 @@ class JsonParser : public ParserIf {
   private:
     static inline std::string const EMPTY_JSON = "{}";
 
+    bool isValidColumn(rapidjson::Document const &document);
+    bool isValidItem(rapidjson::Document const &document);
+
+    rapidjson::Value getJsonValueFromModel(Prog3::Core::Model::Item const &item, rapidjson::Document::AllocatorType &allocator);
+    rapidjson::Value getJsonValueFromModel(Prog3::Core::Model::Column const &column, rapidjson::Document::AllocatorType &allocator);
+
+    std::string jsonValueToString(rapidjson::Value const &json);
+
   public:
     JsonParser(){};
     virtual ~JsonParser(){};