Added clusters for track list

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

@@ -466,6 +466,57 @@ TrackList::getClusters() const
 	return std::vector<Cluster::pointer>(res.begin(), res.end());
 }
 
+std::vector<std::vector<Cluster::pointer>>
+TrackList::getClusterGroups(const std::vector<ClusterType::pointer>& clusterTypes, std::size_t size) const
+{
+	assert(session());
+	std::vector<std::vector<Cluster::pointer>> res;
+
+	if (clusterTypes.empty())
+		return res;
+
+	auto query {session()->query<Wt::Dbo::ptr<Cluster>>("SELECT c from cluster c")};
+
+	query.join("track t ON c.id = t_c.cluster_id")
+		.join("track_cluster t_c ON t_c.track_id = t.id")
+		.join("cluster_type c_type ON c.cluster_type_id = c_type.id")
+		.join("tracklist_entry t_l_e ON t_l_e.track_id = t.id")
+		.join("tracklist t_l ON t_l.id = t_l_e.tracklist_id")
+		.where("t_l.id = ?").bind(getId());
+
+	{
+		std::ostringstream oss;
+		oss << "c_type.id IN (";
+		bool first {true};
+		for (auto clusterType : clusterTypes)
+		{
+			if (!first)
+				oss << ", ";
+			oss << "?";
+			query.bind(clusterType ->getId());
+			first = false;
+		}
+		oss << ")";
+		query.where(oss.str());
+	}
+	query.groupBy("c.id");
+	query.orderBy("COUNT(c.id) DESC");
+
+	auto queryRes {query.resultList()};
+
+	std::map<ClusterTypeId, std::vector<Cluster::pointer>> clustersByType;
+	for (const Wt::Dbo::ptr<Cluster>& cluster : queryRes)
+	{
+		if (clustersByType[cluster->getType()->getId()].size() < size)
+			clustersByType[cluster->getType()->getId()].push_back(cluster);
+	}
+
+	for (const auto& [clusterTypeId, clusters] : clustersByType)
+		res.push_back(clusters);
+
+	return res;
+}
+
 bool
 TrackList::hasTrack(TrackId trackId) const
 {

src/libs/services/database/include/services/database/TrackList.hpp

@@ -38,6 +38,7 @@ namespace Database {
 
 class Artist;
 class Cluster;
+class ClusterType;
 class Release;
 class Session;
 class Track;
@@ -107,6 +108,7 @@ class TrackList : public Object<TrackList, TrackListId>
 
 		// Get clusters, order by occurence
 		std::vector<ObjectPtr<Cluster>> getClusters() const;
+		std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(const std::vector<ObjectPtr<ClusterType>>& clusterTypes, std::size_t size) const;
 
 		bool hasTrack(TrackId trackId) const;