refactor

222100414/src/CMakeLists.txt

@@ -6,12 +6,19 @@ set(CMAKE_CXX_STANDARD 20)
 add_compile_definitions(__DEVELOPMENT__)
 
 add_library(sqlite3 STATIC ${CMAKE_SOURCE_DIR}/lib/sqlite3/sqlite3.c)
-include_directories(${CMAKE_SOURCE_DIR}/lib/sqlite3)
+include_directories(
+        ${CMAKE_SOURCE_DIR}/lib/sqlite3
+        ${CMAKE_SOURCE_DIR}/utils/database
+        ${CMAKE_SOURCE_DIR}/utils/logger
+        ${CMAKE_SOURCE_DIR}/dao
+        ${CMAKE_SOURCE_DIR}/entity
+        ${CMAKE_SOURCE_DIR}/controller
+)
 
 add_executable(DWASearch DWASearch.cpp
-        DatabaseManager.cpp
-        DatabaseManager.h
-        Logger.cpp
-        Logger.h
-        SQLiteObject.h)
+        utils/database/DatabaseManager.cpp
+        utils/database/DatabaseManager.h
+        utils/logger/Logger.cpp
+        utils/logger/Logger.h
+        utils/database/SQLiteObject.h)
 target_link_libraries(DWASearch sqlite3)

222100414/src/DWASearch.cpp

-#include "DatabaseManager.h"
-#include "SQLiteObject.h"
-#include <map>
-
+#include <SQLiteObject.h>
 
 class Player {
 SQLITE_OBJECT
@@ -12,7 +9,7 @@ DECLARE_PROPERTY(firstName, std::string, 1)
 
 DECLARE_PROPERTY(lastName, std::string, 2)
 
-DECLARE_PROPERTY(country, std::string, 3)
+DECLARE_PROPERTY(country, std::string, 4)
 };
 
 

222100414/src/DatabaseManager.h → 222100414/src/utils/database/DatabaseManager.h

@@ -13,8 +13,8 @@
 
 #include <vector>
 #include <string>
-#include <sqlite3.h>
-#include "Logger.h"
+#include "sqlite3.h"
+#include "../logger/Logger.h"
 
 
 namespace Mika {