[Database] restored id on Artist, Genre and Release tables. Added basic MusicBrainz ID support. Improved search filters a bit

src/database/Release.cpp

@@ -0,0 +1,115 @@
+
+#include "Release.hpp"
+
+#include "SearchFilter.hpp"
+#include "SqlQuery.hpp"
+
+namespace Database
+{
+
+Release::Release(const std::string& name, const std::string& MBID)
+: _name(std::string(name, 0 , _maxNameLength)),
+_MBID(MBID)
+{
+
+}
+
+std::vector<Release::pointer>
+Release::getByName(Wt::Dbo::Session& session, const std::string& name)
+{
+	Wt::Dbo::collection<Release::pointer> res = session.find<Release>().where("name = ?").bind( std::string(name, 0, _maxNameLength) );
+	return std::vector<Release::pointer>(res.begin(), res.end());
+}
+
+Release::pointer
+Release::getByMBID(Wt::Dbo::Session& session, const std::string& mbid)
+{
+	return session.find<Release>().where("mbid = ?").bind(mbid);
+}
+
+
+Release::pointer
+Release::create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID)
+{
+	return session.add(new Release(name, MBID));
+}
+
+Release::pointer
+Release::getNone(Wt::Dbo::Session& session)
+{
+	std::vector<pointer> res = getByName(session, "<None>");
+	if (res.empty())
+		return create(session, "<None>");
+
+	return res.front();
+}
+
+std::vector<Release::pointer>
+Release::getAll(Wt::Dbo::Session& session, int offset, int size)
+{
+	Wt::Dbo::collection<pointer> res = session.find<Release>().offset(offset).limit(size);
+	return std::vector<pointer>(res.begin(), res.end());
+}
+
+std::vector<Release::pointer>
+Release::getAllOrphans(Wt::Dbo::Session& session)
+{
+	Wt::Dbo::collection<Release::pointer> res = session.query< Wt::Dbo::ptr<Release> >("select a from artist a LEFT OUTER JOIN Track t ON a.id = t.artist_id WHERE t.id IS NULL");
+
+	return std::vector<pointer>(res.begin(), res.end());
+}
+
+Wt::Dbo::Query<Release::pointer>
+Release::getQuery(Wt::Dbo::Session& session, SearchFilter filter)
+{
+	SqlQuery sqlQuery = generatePartialQuery(filter);
+
+	Wt::Dbo::Query<pointer> query
+		= session.query<pointer>("SELECT r FROM release r INNER JOIN artist a ON a.id = t.artist_id INNER JOIN track t ON t.release_id = r.id INNER JOIN genre g ON g.id = t_g.genre_id INNER JOIN track_genre t_g ON t_g.track_id = t.id " + sqlQuery.where().get()).groupBy("r.id").orderBy("r.name");
+
+	for (const std::string& bindArg : sqlQuery.where().getBindArgs())
+		query.bind(bindArg);
+
+	return query;
+}
+
+Wt::Dbo::Query<Release::UIQueryResult>
+Release::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter)
+{
+	SqlQuery sqlQuery = generatePartialQuery(filter);
+
+	// TODO DATE of RELEASE
+	Wt::Dbo::Query<UIQueryResult> query
+		= session.query<UIQueryResult>("SELECT r.id, r.name, t.date, COUNT(DISTINCT t.id) FROM release r INNER JOIN track t ON t.release_id = r.id INNER JOIN artist a ON a.id = t.artist_id INNER JOIN genre g ON g.id = t_g.genre_id INNER JOIN track_genre t_g ON t_g.track_id = t.id " + sqlQuery.where().get()).groupBy("r.id").orderBy("r.name");
+
+	for (const std::string& bindArg : sqlQuery.where().getBindArgs())
+		query.bind(bindArg);
+
+	return query;
+}
+
+void
+Release::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<UIQueryResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
+{
+	Wt::Dbo::Query<UIQueryResult> query = getUIQuery(session, filter);
+
+	model.setQuery(query, columnNames.empty() ? true : false);
+
+	// TODO do something better
+	if (columnNames.size() == 3)
+	{
+		model.addColumn( "r.name", columnNames[0]);
+		model.addColumn( "t.date", columnNames[1]);
+		model.addColumn( "COUNT(DISTINCT t.id)", columnNames[2]);
+	}
+}
+
+std::vector<Release::pointer>
+Release::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
+{
+	Wt::Dbo::collection<pointer> res = getQuery(session, filter).limit(size).offset(offset);
+
+	return std::vector<pointer>(res.begin(), res.end());
+}
+
+} // namespace Database