Refactor core

cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_executable(log-analyzer-cli main.cpp)
+add_executable(log-analyzer-cli main.cpp reporter.cpp)
 target_link_libraries(log-analyzer-cli core_lib)
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY EP_PREFIX ${CMAKE_BINARY_DIR})

cli/main.cpp

@@ -1,4 +1,5 @@
 #include "../core/analyzer.h"
+#include "reporter.h"
 #include <iostream>
 
 int main() {
@@ -7,7 +8,9 @@ int main() {
     std::getline(std::cin, path);
 
     Analyzer analysis;
-    std::string report = analysis.analyze(path);
+    AnalysisResult result = analysis.analyze(path);
+    Reporter reporter;
+    std::string report = reporter.GenerateTextReport(result);
 
     std::cout << report;
 

core/reporter.h → cli/reporter.h

@@ -1,5 +1,6 @@
 #pragma once
-#include "common.h"
+
+#include "../core/common.h"
 
 #include <vector>
 

core/CMakeLists.txt

@@ -2,6 +2,5 @@ add_library(core_lib
     reader.cpp
     parser.cpp
     statistics.cpp
-    reporter.cpp
     analyzer.cpp
 )

core/analyzer.cpp

@@ -1,6 +1,6 @@
 #include "analyzer.h"
 
-std::string Analyzer::analyze(std::string path) {
+AnalysisResult Analyzer::analyze(std::string path) {
     reader_.OpenFile(path);
 
     AnalysisResult res;
@@ -11,7 +11,6 @@ std::string Analyzer::analyze(std::string path) {
     }
 
     reader_.CloseFile();
-    std::string report = reporter_.GenerateTextReport(res);
 
-    return report;
+    return res;
 }

core/analyzer.h

@@ -3,17 +3,15 @@
 #include "reader.h"
 #include "parser.h"
 #include "statistics.h"
-#include "reporter.h"
 #include <string>
 
 class Analyzer {
 private:
    Reader reader_; 
    Parser parser_;
-   Reporter reporter_;
    Statistics statistics_;
 
 public:
-    std::string analyze(std::string path);
+    AnalysisResult analyze(std::string path);
 };
 

core/parser.cpp

@@ -1,5 +1,4 @@
 #include "parser.h"
-#include <iostream>
 
 LogFormat Parser::DetectFormat(const std::string& line) {
     if (line.find("HTTP/1.0") != std::string::npos) {

tests/CMakeLists.txt

@@ -5,7 +5,6 @@ add_executable(test-runner
     test_reader.cpp
     test_parser.cpp
     test_statistics.cpp
-    test_reporter.cpp
     test_analyzer.cpp
 )
 

tests/test_analyzer.cpp

@@ -3,20 +3,20 @@
 TEST(AnalyzerTest, StandardTest) {
     Analyzer analyzer;
     fs::path path = fs::path("test_data") / "normal_test.log";
-    std::string report = analyzer.analyze(path.string());
+    AnalysisResult res = analyzer.analyze(path.string());
 
-    EXPECT_TRUE(report.find("Sucсessful - 5") != std::string::npos);
-    EXPECT_TRUE(report.find("Failed Parsing - 8") != std::string::npos);
-    EXPECT_TRUE(report.find("192.168.2.145 - 4") != std::string::npos);
-    EXPECT_TRUE(report.find("20:00 - 2") != std::string::npos);
-    EXPECT_TRUE(report.find("500 - 2") != std::string::npos);
-    EXPECT_FALSE(report.find("402 - 1") != std::string::npos);
+    EXPECT_TRUE(res.successful_requests == 5);
+    EXPECT_TRUE(res.failed_parses == 8);
+    EXPECT_TRUE(res.ip["192.168.2.145"] == 4);
+    EXPECT_TRUE(res.time_distribution["20:00"]  == 2);
+    EXPECT_TRUE(res.error_counts["500"] == 2);
+    EXPECT_FALSE(res.error_counts["402"] == 2);
 }
 
 TEST(AnalyzerTest, EmptyTest) {
     Analyzer analyzer;
     fs::path path = fs::path("test_data") / "empty_test.log";
-    std::string report = analyzer.analyze(path.string());
+    AnalysisResult res = analyzer.analyze(path.string());
 
-    EXPECT_TRUE(report == "invalid file format or file empty");
+    EXPECT_TRUE(res.total_processed == 0);
 }

tests/tests.h

@@ -3,7 +3,6 @@
 #include "../core/reader.h"
 #include "../core/parser.h"
 #include "../core/statistics.h"
-#include "../core/reporter.h"
 #include "../core/analyzer.h"
 
 #include <filesystem>