Add method to get all artists for a group.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / data / DataManager.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index a3af13c..b56634f 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -59,14 +59,7 @@ public class DataManager {
        public Collection<Artist> getAllArtists() throws DatabaseException {
                Query query = new Query(Type.SELECT, "ARTISTS");
                query.addField(new Field("ARTISTS.*"));
-               query.addField(new Field("GROUP_ARTISTS.*"));
-               query.addField(new Field("GROUPS.*"));
-               query.addJoin(new Join(JoinType.INNER, "GROUP_ARTISTS", new Field("ARTISTS.ID"), new Field("GROUP_ARTISTS.ARTIST")));
-               query.addJoin(new Join(JoinType.INNER, "GROUPS", new Field("GROUP_ARTISTS.GROUP_"), new Field("GROUPS.ID")));
-               query.addOrderField(new OrderField(new Field("ARTISTS.ID")));
-               ArtistLoader artistLoader = new ArtistLoader();
-               database.process(query, artistLoader);
-               return artistLoader.all();
+               return database.getMultiple(query, artistCreator);
        }
 
        public Artist getArtistById(String id) throws DatabaseException {
@@ -83,6 +76,14 @@ public class DataManager {
                return artistLoader.get();
        }
 
+       public Collection<Artist> getArtistsByGroup(String groupId) throws DatabaseException {
+               Query query = new Query(Type.SELECT, "ARTISTS");
+               query.addField(new Field("ARTISTS.*"));
+               query.addJoin(new Join(JoinType.INNER, "GROUP_ARTISTS", new Field("ARTISTS.ID"), new Field("GROUP_ARTISTS.ARTIST")));
+               query.addWhereClause(new ValueFieldWhereClause(new ValueField("GROUP_ARTISTS.GROUP_", new StringParameter(groupId))));
+               return database.getMultiple(query, artistCreator);
+       }
+
        public Track trackById(String id) throws DatabaseException {
                Query query = new Query(Type.SELECT, "TRACKS");
                query.addField(new Field("TRACKS.*"));