Fix regression when displaying tags of a track

src/database/DbArtist.cpp

@@ -143,7 +143,7 @@ std::vector<Wt::Dbo::ptr<Release>>
 Artist::getReleases(const std::set<IdType>& clusterIds) const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<Artist>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	WhereClause where;
@@ -188,7 +188,7 @@ std::vector<std::vector<Wt::Dbo::ptr<Cluster>>>
 Artist::getClusterGroups(std::vector<ClusterType::pointer> clusterTypes, std::size_t size) const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<Artist>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	WhereClause where;

src/database/Playlist.cpp

@@ -87,6 +87,7 @@ std::vector<Wt::Dbo::ptr<PlaylistEntry>>
 Playlist::getEntries(int offset, int size, bool& moreResults) const
 {
 	assert(session());
+	assert(IdIsValid(self()->id()));
 
 	moreResults = false;
 

src/database/Release.cpp

@@ -166,7 +166,7 @@ std::vector<Wt::Dbo::ptr<Artist>>
 Release::getArtists() const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<Release>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	Wt::Dbo::collection<Wt::Dbo::ptr<Artist>> res = session()->query<Wt::Dbo::ptr<Artist>>(

src/database/Track.cpp

@@ -214,7 +214,7 @@ std::vector<std::vector<Cluster::pointer>>
 Track::getClusterGroups(std::vector<ClusterType::pointer> clusterTypes, std::size_t size) const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<Artist>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	WhereClause where;
@@ -322,7 +322,7 @@ Cluster::pointer
 ClusterType::getCluster(std::string name) const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<ClusterType>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	return session()->find<Cluster>()
@@ -334,7 +334,7 @@ std::vector<Cluster::pointer>
 ClusterType::getClusters() const
 {
 	assert(self());
-	assert(self()->id() != Wt::Dbo::dbo_traits<ClusterType>::invalidId() );
+	assert(IdIsValid(self()->id()));
 	assert(session());
 
 	Wt::Dbo::collection<Cluster::pointer> res = session()->find<Cluster>()

src/database/Track.hpp

@@ -120,7 +120,7 @@ class ClusterType : public Wt::Dbo::Dbo<ClusterType>
 		Wt::Dbo::collection< Wt::Dbo::ptr<Cluster> > _clusters;
 };
 
-class Track : public Wt::Dbo::Dbo<Cluster>
+class Track : public Wt::Dbo::Dbo<Track>
 {
 	public:
 

src/database/Types.hpp

@@ -23,5 +23,10 @@
 
 namespace Database {
 	using IdType = Wt::Dbo::dbo_default_traits::IdType;
+
+	static inline bool IdIsValid(IdType id)
+	{
+		return id != Wt::Dbo::dbo_default_traits::invalidId();
+	}
 }