owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduced Feedback service

Browse Source
This commit is contained in:
emeric
2021-10-24 16:31:04 +02:00
parent 9adfafc589
commit 97aba4ae82
20 changed files with 463 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/database/impl/User.cpp
+9 -9
View File
@@ -161,61 +161,61 @@ User::getQueuedTrackList(Session& session) const
}
void
User::starArtist(ObjectPtr<Artist> artist)
User::star(ObjectPtr<Artist> artist)
{
if (_starredArtists.count(getDboPtr(artist)) == 0)
_starredArtists.insert(getDboPtr(artist));
}
void
User::unstarArtist(ObjectPtr<Artist> artist)
User::unstar(ObjectPtr<Artist> artist)
{
if (_starredArtists.count(getDboPtr(artist)) != 0)
_starredArtists.erase(getDboPtr(artist));
}
bool
User::hasStarredArtist(ObjectPtr<Artist> artist) const
User::isStarred(ObjectPtr<Artist> artist) const
{
return _starredArtists.count(getDboPtr(artist)) != 0;
}
void
User::starRelease(ObjectPtr<Release> release)
User::star(ObjectPtr<Release> release)
{
if (_starredReleases.count(getDboPtr(release)) == 0)
_starredReleases.insert(getDboPtr(release));
}
void
User::unstarRelease(ObjectPtr<Release> release)
User::unstar(ObjectPtr<Release> release)
{
if (_starredReleases.count(getDboPtr(release)) != 0)
_starredReleases.erase(getDboPtr(release));
}
bool
User::hasStarredRelease(ObjectPtr<Release> release) const
User::isStarred(ObjectPtr<Release> release) const
{
return _starredReleases.count(getDboPtr(release)) != 0;
}
void
User::starTrack(ObjectPtr<Track> track)
User::star(ObjectPtr<Track> track)
{
if (_starredTracks.count(getDboPtr(track)) == 0)
_starredTracks.insert(getDboPtr(track));
}
void
User::unstarTrack(ObjectPtr<Track> track)
User::unstar(ObjectPtr<Track> track)
{
if (_starredTracks.count(getDboPtr(track)) != 0)
_starredTracks.erase(getDboPtr(track));
}
bool
User::hasStarredTrack(ObjectPtr<Track> track) const
User::isStarred(ObjectPtr<Track> track) const
{
return _starredTracks.count(getDboPtr(track)) != 0;
}
src/libs/services/database/include/services/database/User.hpp
+9 -9
View File
@@ -167,18 +167,18 @@ class User : public Object<User, UserId>
ObjectPtr<TrackList> getQueuedTrackList(Session& session) const;
void starArtist(ObjectPtr<Artist> artist);
void unstarArtist(ObjectPtr<Artist> artist);
bool hasStarredArtist(ObjectPtr<Artist> artist) const;
void star(ObjectPtr<Artist> artist);
void unstar(ObjectPtr<Artist> artist);
bool isStarred(ObjectPtr<Artist> artist) const;
void starRelease(ObjectPtr<Release> release);
void unstarRelease(ObjectPtr<Release> release);
bool hasStarredRelease(ObjectPtr<Release> release) const;
void star(ObjectPtr<Release> release);
void unstar(ObjectPtr<Release> release);
bool isStarred(ObjectPtr<Release> release) const;
// Stars
void starTrack(ObjectPtr<Track> track);
void unstarTrack(ObjectPtr<Track> track);
bool hasStarredTrack(ObjectPtr<Track> track) const;
void star(ObjectPtr<Track> track);
void unstar(ObjectPtr<Track> track);
bool isStarred(ObjectPtr<Track> track) const;
template<class Action>
void persist(Action& a)
src/libs/services/database/test/Artist.cpp
+33
View File
@@ -366,3 +366,36 @@ TEST_F(DatabaseFixture, SingleArtistNonReleaseTracks)
EXPECT_EQ(tracks.front()->getId(), track2.getId());
}
}
TEST_F(DatabaseFixture, SingleStarredArtist)
{
ScopedArtist artist {session, "MyArtist"};
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createUniqueTransaction()};
EXPECT_FALSE(user->isStarred(artist.get()));
}
{
auto transaction {session.createUniqueTransaction()};
auto trackArtistLink {TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist)};
user.get().modify()->star(artist.get());
}
{
auto transaction {session.createSharedTransaction()};
EXPECT_TRUE(user->isStarred(artist.get()));
bool hasMore {};
auto artists {Artist::getStarred(session, user.get(), {}, std::nullopt, Artist::SortMethod::BySortName, std::nullopt, hasMore)};
ASSERT_EQ(artists.size(), 1);
EXPECT_EQ(artists.front()->getId(), artist.getId());
EXPECT_FALSE(hasMore);
}
}
src/libs/services/database/test/DatabaseTest.cpp
-94
View File
@@ -104,100 +104,6 @@ TEST_F(DatabaseFixture, SingleUser)
}
}
TEST_F(DatabaseFixture, SingleStarredArtist)
{
ScopedArtist artist {session, "MyArtist"};
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createUniqueTransaction()};
EXPECT_FALSE(user->hasStarredArtist(artist.get()));
}
{
auto transaction {session.createUniqueTransaction()};
auto trackArtistLink {TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist)};
user.get().modify()->starArtist(artist.get());
}
{
auto transaction {session.createSharedTransaction()};
EXPECT_TRUE(user->hasStarredArtist(artist.get()));
bool hasMore {};
auto artists {Artist::getStarred(session, user.get(), {}, std::nullopt, Artist::SortMethod::BySortName, std::nullopt, hasMore)};
ASSERT_EQ(artists.size(), 1);
EXPECT_EQ(artists.front()->getId(), artist.getId());
EXPECT_FALSE(hasMore);
}
}
TEST_F(DatabaseFixture, SingleStarredRelease)
{
ScopedRelease release {session, "MyRelease"};
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createSharedTransaction()};
EXPECT_FALSE(user->hasStarredRelease(release.get()));
}
{
auto transaction {session.createUniqueTransaction()};
track.get().modify()->setRelease(release.get());
user.get().modify()->starRelease(release.get());
}
{
auto transaction {session.createSharedTransaction()};
EXPECT_TRUE(user->hasStarredRelease(release.get()));
bool hasMore {};
auto releases {Release::getStarred(session, user.get(), {}, std::nullopt, hasMore)};
ASSERT_EQ(releases.size(), 1);
EXPECT_EQ(releases.front()->getId(), release.getId());
EXPECT_FALSE(hasMore);
}
}
TEST_F(DatabaseFixture, SingleStarredTrack)
{
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createUniqueTransaction()};
EXPECT_FALSE(user->hasStarredTrack(track.get()));
}
{
auto transaction {session.createUniqueTransaction()};
user.get().modify()->starTrack(track.get());
}
{
auto transaction {session.createUniqueTransaction()};
EXPECT_TRUE(user->hasStarredTrack(track.get()));
bool hasMore {};
auto tracks {Track::getStarred(session, user.get(), {}, std::nullopt, hasMore)};
ASSERT_EQ(tracks.size(), 1);
EXPECT_EQ(tracks.front()->getId(), track.getId());
EXPECT_FALSE(hasMore);
}
}
TEST_F(DatabaseFixture, SingleTrackList)
{
ScopedUser user {session, "MyUser"};
src/libs/services/database/test/Release.cpp
+33
View File
@@ -361,3 +361,36 @@ TEST_F(DatabaseFixture, MultiTracksSingleReleaseDate)
}
}
TEST_F(DatabaseFixture, SingleStarredRelease)
{
ScopedRelease release {session, "MyRelease"};
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createSharedTransaction()};
EXPECT_FALSE(user->isStarred(release.get()));
}
{
auto transaction {session.createUniqueTransaction()};
track.get().modify()->setRelease(release.get());
user.get().modify()->star(release.get());
}
{
auto transaction {session.createSharedTransaction()};
EXPECT_TRUE(user->isStarred(release.get()));
bool hasMore {};
auto releases {Release::getStarred(session, user.get(), {}, std::nullopt, hasMore)};
ASSERT_EQ(releases.size(), 1);
EXPECT_EQ(releases.front()->getId(), release.getId());
EXPECT_FALSE(hasMore);
}
}
src/libs/services/database/test/Track.cpp
+31
View File
@@ -115,5 +115,36 @@ TEST_F(DatabaseFixture, SingleTrackDate)
}
}
TEST_F(DatabaseFixture, SingleStarredTrack)
{
ScopedTrack track {session, "MyTrack"};
ScopedUser user {session, "MyUser"};
{
auto transaction {session.createUniqueTransaction()};
EXPECT_FALSE(user->isStarred(track.get()));
}
{
auto transaction {session.createUniqueTransaction()};
user.get().modify()->star(track.get());
}
{
auto transaction {session.createUniqueTransaction()};
EXPECT_TRUE(user->isStarred(track.get()));
bool hasMore {};
auto tracks {Track::getStarred(session, user.get(), {}, std::nullopt, hasMore)};
ASSERT_EQ(tracks.size(), 1);
EXPECT_EQ(tracks.front()->getId(), track.getId());
EXPECT_FALSE(hasMore);
}
}