Merge pull request #18 from snandasena/dev

Dev

Author: snandasena

app/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(server)
 
-set(CMAKE_CXX_FLAGS "-std=c++17 -O3 -pedantic -Wall -Werror")
+set(CMAKE_CXX_FLAGS "-std=c++17 -fsanitize=address -ggdb3 -Wall -Wextra -pedantic -Werror")
 
 add_subdirectory(external)
 add_subdirectory(common)

app/interfaces/include/interfaces/parsers/ICredentialsParser.h

@@ -15,7 +15,7 @@ namespace parsers
     class ICredentialsParser
     {
     public:
-        virtual ~ICredentialParser() = default;
+        virtual ~ICredentialsParser() = default;
 
         virtual std::optional<types::User> parseCredentials(const std::string &) const = 0;
     };

app/interfaces/include/interfaces/parsers/IReportParser.h

@@ -17,7 +17,7 @@ namespace parsers
     public:
         virtual ~IReportParser() = default;
 
-        virtual std::optional<types::Report> parseRepost(const std::string &) const = 0;
+        virtual std::optional<types::Report> parseReport(const std::string &) const = 0;
     };
 }
 

app/parsers/CMakeLists.txt

@@ -1,16 +1,24 @@
 project(Parsers)
 
+add_subdirectory(test)
+
 find_package(Boost REQUIRED)
 
 include_directories(${Boost_INCLUDE_DIRS})
 
 set(HEADERS
         ${PROJECT_SOURCE_DIR}/include/parsers/JsonParser.h
+        ${PROJECT_SOURCE_DIR}/include/parsers/XmlParser.h
+        ${PROJECT_SOURCE_DIR}/include/parsers/ParsersFactory.h
+        ${PROJECT_SOURCE_DIR}/include/parsers/ValidatedReportParser.h
         )
 
 
 set(SOURCES
         ${PROJECT_SOURCE_DIR}/src/JsonParser.cpp
+        ${PROJECT_SOURCE_DIR}/src/ParsersFactory.cpp
+        ${PROJECT_SOURCE_DIR}/src/XmlParser.cpp
+        ${PROJECT_SOURCE_DIR}/src/ValidatedReportParser.cpp
         )
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})

app/parsers/include/parsers/JsonParser.h

@@ -10,7 +10,7 @@
 
 namespace parsers
 {
-    class JsonParser : public IReportParser, public ICredentialParser
+    class JsonParser : public IReportParser, public ICredentialsParser
     {
     public:
         std::optional <types::Report> parseReport(const std::string &) const override;

app/parsers/include/parsers/ParsersFactory.h

@@ -0,0 +1,8 @@
+//
+// Created by sajith on 6/21/22.
+//
+
+#ifndef DESIGN_PATTERNS_PARSERSFACTORY_H
+#define DESIGN_PATTERNS_PARSERSFACTORY_H
+
+#endif //DESIGN_PATTERNS_PARSERSFACTORY_H

app/parsers/include/parsers/ValidatedReportParser.h

@@ -0,0 +1,8 @@
+//
+// Created by sajith on 6/21/22.
+//
+
+#ifndef DESIGN_PATTERNS_VALIDATEDREPORTPARSER_H
+#define DESIGN_PATTERNS_VALIDATEDREPORTPARSER_H
+
+#endif //DESIGN_PATTERNS_VALIDATEDREPORTPARSER_H

app/parsers/include/parsers/XmlParser.h

@@ -5,4 +5,18 @@
 #ifndef DESIGN_PATTERNS_XMLPARSER_H
 #define DESIGN_PATTERNS_XMLPARSER_H
 
+
+#include "parsers/ICredentialsParser.h"
+#include "parsers/IReportParser.h"
+
+
+namespace parsers
+{
+    class XmlParser : public IReportParser, public ICredentialsParser
+    {
+        std::optional<types::Report> parseReport(const std::string &) const override;
+
+        std::optional<types::User> parseCredentials(const std::string &) const override;
+    };
+}
 #endif //DESIGN_PATTERNS_XMLPARSER_H

app/parsers/src/JsonParser.cpp

@@ -4,3 +4,46 @@
 
 #include "parsers/JsonParser.h"
 
+#include <iostream>
+#include <stdexcept>
+
+#include "nlohmann/json.hpp"
+
+namespace parsers
+{
+    std::optional<types::Report> JsonParser::parseReport(const std::string &rawReport) const try
+    {
+        if (const auto json = nlohmann::json::parse(rawReport); !json.empty())
+        {
+            return types::Report{
+                    json.at("payer"),
+                    json.at("tax"),
+                    json.at("amount"),
+                    json.at("year")};
+        }
+        return std::nullopt;
+    } catch (const std::exception &e)
+    {
+        std::cerr << __FILE__ << ' ' << e.what() << '\n';
+        return std::nullopt;
+    }
+
+    std::optional<types::User> JsonParser::parseCredentials(const std::string &rawCredentials) const try
+    {
+        if (const auto json = nlohmann::json::parse(rawCredentials); !json.empty())
+        {
+            return types::User
+                    {
+                            {json.at("login")},
+                            {json.at("password")},
+                            {}
+                    };
+        }
+        return std::nullopt;
+
+    } catch (const std::exception &e)
+    {
+        std::cerr << __FILE__ << ' ' << e.what() << '\n';
+        return std::nullopt;
+    }
+}

app/parsers/src/ParsersFactory.cpp

@@ -0,0 +1,8 @@
+//
+// Created by sajith on 6/22/22.
+//
+
+#include "parsers/ParsersFactory.h"
+#include "parsers/JsonParser.h"
+#include "parsers/ValidatedReportParser.h"
+#include "parsers/XmlParser.h"