Databsae service refactoring. Warning, loses stars and listens stats

src/libs/services/database/impl/TrackFeatures.cpp

@@ -25,6 +25,8 @@
 #include "services/database/Session.hpp"
 #include "services/database/Track.hpp"
 #include "utils/Logger.hpp"
+#include "IdTypeTraits.hpp"
+#include "Utils.hpp"
 
 namespace Database {
 
@@ -34,11 +36,53 @@ _track {getDboPtr(track)}
 {
 }
 
+std::size_t
+TrackFeatures::getCount(Session& session)
+{
+	session.checkSharedLocked();
+
+	return session.getDboSession().query<int>("SELECT COUNT(*) FROM track_features");
+}
+
+TrackFeatures::pointer
+TrackFeatures::find(Session& session, TrackFeaturesId id)
+{
+	session.checkSharedLocked();
+
+	return session.getDboSession().find<TrackFeatures>()
+		.where("id = ?").bind(id)
+		.resultValue();
+}
+
+TrackFeatures::pointer
+TrackFeatures::find(Session& session, TrackId trackId)
+{
+	session.checkSharedLocked();
+
+	return session.getDboSession().find<TrackFeatures>()
+		.where("track_id = ?").bind(trackId)
+		.resultValue();
+}
+
+RangeResults<TrackFeaturesId>
+TrackFeatures::find(Session& session, Range range)
+{
+	session.checkSharedLocked();
+
+	auto query {session.getDboSession().query<TrackFeaturesId>("SELECT id from track_features")};
+
+	return execQuery(query, range);
+}
+
 TrackFeatures::pointer
 TrackFeatures::create(Session& session, ObjectPtr<Track> track, const std::string& jsonEncodedFeatures)
 {
 	session.checkUniqueLocked();
-	return session.getDboSession().add(std::make_unique<TrackFeatures>(track, jsonEncodedFeatures));
+
+	TrackFeatures::pointer res {session.getDboSession().add(std::make_unique<TrackFeatures>(track, jsonEncodedFeatures))};
+	session.getDboSession().flush();
+
+	return res;
 }
 
 FeatureValues
@@ -51,6 +95,8 @@ TrackFeatures::getFeatureValues(const FeatureName& featureNode) const
 FeatureValuesMap
 TrackFeatures::getFeatureValuesMap(const std::unordered_set<FeatureName>& featureNames) const
 {
+	FeatureValuesMap res;
+
 	try
 	{
 		std::istringstream iss {_data};
@@ -58,7 +104,6 @@ TrackFeatures::getFeatureValuesMap(const std::unordered_set<FeatureName>& featur
 
 		boost::property_tree::read_json(iss, root);
 
-		FeatureValuesMap res;
 		for (const FeatureName& featureName : featureNames)
 		{
 			FeatureValues& featureValues {res[featureName]};
@@ -75,14 +120,14 @@ TrackFeatures::getFeatureValuesMap(const std::unordered_set<FeatureName>& featur
 			if (!hasChildren)
 				featureValues.push_back(node.get_value<double>());
 		}
-
-		return res;
 	}
 	catch (boost::property_tree::ptree_error& error)
 	{
 		LMS_LOG(DB, ERROR) << "Track " << _track.id() << ": ptree exception: " << error.what();
-		return {};
+		res.clear();
 	}
+
+	return res;
 }
 
 } // namespace Database