Placed db object related files in a subdirectory

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

@@ -22,8 +22,8 @@
 #include <memory>
 
 #include "core/EnumSet.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db

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

@@ -24,7 +24,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 
 #include "playlist-constraints/ConsecutiveArtists.hpp"

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

@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "database/IDb.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"

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

@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 
 namespace lms::recommendation
 {

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

@@ -23,14 +23,14 @@
 
 #include "core/ILogger.hpp"
 #include "core/Random.hpp"
-#include "database/Artist.hpp"
 #include "database/IDb.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 "database/objects/Artist.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 
 namespace lms::recommendation

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

@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <unordered_map>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 #include "som/Network.hpp"
 
 namespace lms::recommendation

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

@@ -22,9 +22,9 @@
 #include <algorithm>
 
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::recommendation::PlaylistGeneratorConstraint
 {

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

@@ -20,9 +20,9 @@
 #include "ConsecutiveReleases.hpp"
 
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::recommendation::PlaylistGeneratorConstraint
 {

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

@@ -21,7 +21,7 @@
 
 #include "IConstraint.hpp"
 
-#include "database/ReleaseId.hpp"
+#include "database/objects/ReleaseId.hpp"
 
 namespace lms::db
 {

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

@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include "database/TrackListId.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db

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

@@ -23,10 +23,10 @@
 #include <vector>
 
 #include "core/EnumSet.hpp"
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackListId.hpp"
 #include "database/Types.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackListId.hpp"
 #include "services/recommendation/Types.hpp"
 
 namespace lms::db

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

@@ -2,9 +2,9 @@
 
 #include <functional>
 
-#include "database/ArtistId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
 
 namespace lms::recommendation
 {