Add method to get artist by ID.

[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 ba2f61e..520a3d9 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -64,6 +64,20 @@ public class DataManager {
                return artistLoader.all();
        }
 
+       public Artist getArtistById(String id) 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.addWhereClause(new ValueFieldWhereClause(new ValueField("ARTISTS.ID", new StringParameter(id))));
+               query.addOrderField(new OrderField(new Field("ARTISTS.ID")));
+               ArtistLoader artistLoader = new ArtistLoader();
+               database.process(query, artistLoader);
+               return artistLoader.get();
+       }
+
        public Track trackById(String id) throws DatabaseException {
                Query query = new Query(Type.SELECT, "TRACKS");
                query.addField(new Field("TRACKS.*"));
@@ -94,31 +108,14 @@ public class DataManager {
                public void processResult(ResultSet resultSet) throws SQLException {
                        String trackId = resultSet.getString("TRACKS.ID");
                        if ((track == null) || (!track.id().equals(trackId))) {
-                               track = new AbstractTrack(trackId) {
-
-                                       public void save() {
-                                               if (!dirty()) {
-                                                       return;
-                                               }
-                                       }
-                               }.name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
+                               track = new DefaultTrack(trackId).name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
                                loadedTracks.add(track);
                        }
-                       Artist artist = new AbstractArtist(resultSet.getString("ARTISTS.ID")) {
-
-                               public void save() {
-                               }
-
-                       }.name(resultSet.getString("ARTISTS.NAME"));
+                       Artist artist = new DefaultArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
                        if (!track.artists().contains(artist)) {
                                track.artists().add(artist);
                        }
-                       Style style = new AbstractStyle(resultSet.getString("STYLES.ID")) {
-
-                               public void save() {
-                               }
-
-                       }.name(resultSet.getString("STYLES.NAME"));
+                       Style style = new DefaultStyle(resultSet.getString("STYLES.ID")).name(resultSet.getString("STYLES.NAME"));
                        track.styles().add(style);
                }
 
@@ -147,21 +144,11 @@ public class DataManager {
                public void processResult(ResultSet resultSet) throws SQLException {
                        String artistId = resultSet.getString("ARTISTS.ID");
                        if ((artist == null) || (!artist.id().equals(artistId))) {
-                               artist = new AbstractArtist(artistId) {
-
-                                       public void save() {
-                                       }
-
-                               }.name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
+                               artist = new DefaultArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
                                artists.add(artist);
                        }
 
-                       Group group = new AbstractGroup(resultSet.getString("GROUPS.ID")) {
-
-                               public void save() {
-                               }
-
-                       }.name(resultSet.getString("GROUPS.NAME")).url(resultSet.getString("GROUPS.URL"));
+                       Group group = new DefaultGroup(resultSet.getString("GROUPS.ID")).name(resultSet.getString("GROUPS.NAME")).url(resultSet.getString("GROUPS.URL"));
                        artist.groups().add(group);
                }