Imoproved

Author: snandasena

app/interfaces/include/interfaces/parsers/IParsersFactory.h

@@ -5,4 +5,23 @@
 #ifndef DESIGN_PATTERNS_IPARSERSFACTORY_H
 #define DESIGN_PATTERNS_IPARSERSFACTORY_H
 
+#include <memory>
+#include "parsers/ICredentialsParser.h"
+#include "parsers/IReportParser.h"
+
+namespace parsers
+{
+    class IParserFactory
+    {
+    public:
+        virtual ~IParserFactory() = default;
+
+        virtual std::unique_ptr<IReportParser> createReportParser() const = 0;
+
+        virtual std::unique_ptr<ICredentialsParser> createCredentialParser() const = 0;
+
+    };
+}
+
+
 #endif //DESIGN_PATTERNS_IPARSERSFACTORY_H

app/parsers/include/parsers/ParsersFactory.h

@@ -5,4 +5,25 @@
 #ifndef DESIGN_PATTERNS_PARSERSFACTORY_H
 #define DESIGN_PATTERNS_PARSERSFACTORY_H
 
+#include "parsers/IParsersFactory.h"
+#include <memory>
+#include "types/ReportFormat.h"
+
+namespace parsers
+{
+    class ParserFactory : public IParserFactory
+    {
+    public:
+        ParserFactory(const types::ReportFormat);
+
+        std::unique_ptr<IReportParser> createReportParser() const override;
+
+        std::unique_ptr<ICredentialsParser> createCredentialParser() const override;
+
+    private:
+        const types::ReportFormat reportFormat;
+    };
+}
+
+
 #endif //DESIGN_PATTERNS_PARSERSFACTORY_H

app/parsers/src/ParsersFactory.cpp

@@ -5,4 +5,34 @@
 #include "parsers/ParsersFactory.h"
 #include "parsers/JsonParser.h"
 #include "parsers/ValidatedReportParser.h"
-#include "parsers/XmlParser.h"
+#include "parsers/XmlParser.h"
+
+namespace parsers
+{
+    ParserFactory::ParserFactory(const types::ReportFormat rF) : reportFormat{rF} {}
+
+    std::unique_ptr<IReportParser> ParserFactory::createReportParser() const
+    {
+        switch (reportFormat)
+        {
+            case types::ReportFormat::Json:
+                return std::make_unique<parsers::ValidatedReportParser<JsonParser>>();
+
+            case types::ReportFormat::Xml:
+                return std::make_unique<parsers::ValidatedReportParser<XmlParser>>();
+        }
+        return nullptr;
+    }
+
+    std::unique_ptr<ICredentialsParser> ParserFactory::createCredentialParser() const
+    {
+        switch (reportFormat)
+        {
+            case types::ReportFormat::Json:
+                return std::make_unique<JsonParser>();
+            case types::ReportFormat::Xml:
+                return std::make_unique<XmlParser>();
+        }
+        return nullptr;
+    }
+}

app/parsers/test/ValidatedReportParser_tests.cpp

@@ -48,6 +48,14 @@ namespace parsers
 
     TEST_F(ValidatedReportParserTest, reportValidationSucceeds)
     {
-//        ASSERT_NE(sut.parseReport(validReport), std::nullopt);
+        ASSERT_NE(sut.parseReport(validReport), std::nullopt);
+    }
+
+    TEST_F(ValidatedReportParserTest, reportValidationFails)
+    {
+        for (const auto &item: invalidReports)
+        {
+            ASSERT_EQ(sut.parseReport(item), std::nullopt);
+        }
     }
 }