Removed the database lib from services as it is still not a service

src/libs/services/recommendation/impl/IEngine.hpp

@@ -20,8 +20,8 @@
 #pragma once
 
 #include <memory>
-#include "services/database/Types.hpp"
-#include "services/database/TrackListId.hpp"
+#include "database/Types.hpp"
+#include "database/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 #include "utils/EnumSet.hpp"
 

src/libs/services/recommendation/impl/PlaylistGeneratorService.cpp

@@ -19,9 +19,9 @@
 
 #include "PlaylistGeneratorService.hpp"
 
-#include "services/database/Db.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "playlist-constraints/ConsecutiveArtists.hpp"
 #include "playlist-constraints/ConsecutiveReleases.hpp"

src/libs/services/recommendation/impl/RecommendationService.cpp

@@ -25,9 +25,9 @@
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
 
-#include "services/database/Db.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/ScanSettings.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/ScanSettings.hpp"
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 

src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp

@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/Cluster.hpp"
-#include "services/database/Db.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
 
 namespace Recommendation {
 

src/libs/services/recommendation/impl/features/FeaturesEngine.cpp

@@ -21,14 +21,14 @@
 
 #include <numeric>
 
-#include "services/database/Artist.hpp"
-#include "services/database/Db.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackArtistLink.hpp"
-#include "services/database/TrackFeatures.hpp"
-#include "services/database/TrackList.hpp"
+#include "database/Artist.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackFeatures.hpp"
+#include "database/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 #include "utils/ILogger.hpp"
 #include "utils/Random.hpp"

src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp

@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include "services/database/TrackId.hpp"
+#include "database/TrackId.hpp"
 #include "som/Network.hpp"
 
 namespace Recommendation {

src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.cpp

@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "services/database/Db.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/ILogger.hpp"
 
 namespace Recommendation::PlaylistGeneratorConstraint

src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveArtists.hpp

@@ -21,7 +21,7 @@
 
 #include "IConstraint.hpp"
 
-#include "services/database/ReleaseId.hpp"
+#include "database/ReleaseId.hpp"
 
 namespace Database
 {

src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.cpp

@@ -19,10 +19,10 @@
 
 #include "ConsecutiveReleases.hpp"
 
-#include "services/database/Db.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
+#include "database/Db.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
 #include "utils/ILogger.hpp"
 
 namespace Recommendation::PlaylistGeneratorConstraint

src/libs/services/recommendation/impl/playlist-constraints/ConsecutiveReleases.hpp

@@ -21,7 +21,7 @@
 
 #include "IConstraint.hpp"
 
-#include "services/database/ReleaseId.hpp"
+#include "database/ReleaseId.hpp"
 
 namespace Database
 {

src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp

@@ -20,8 +20,8 @@
 #pragma once
 
 #include <memory>
-#include "services/database/TrackListId.hpp"
-#include "services/database/Types.hpp"
+#include "database/TrackListId.hpp"
+#include "database/Types.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace Database

src/libs/services/recommendation/include/services/recommendation/IRecommendationService.hpp

@@ -22,8 +22,8 @@
 #include <memory>
 #include <vector>
 #include "utils/EnumSet.hpp"
-#include "services/database/TrackListId.hpp"
-#include "services/database/Types.hpp"
+#include "database/TrackListId.hpp"
+#include "database/Types.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace Database

src/libs/services/recommendation/include/services/recommendation/Types.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <functional>
-#include "services/database/ArtistId.hpp"
-#include "services/database/ReleaseId.hpp"
-#include "services/database/TrackId.hpp"
+#include "database/ArtistId.hpp"
+#include "database/ReleaseId.hpp"
+#include "database/TrackId.hpp"
 
 namespace Recommendation
 {