From 87a55c53b7d6ceddaca2ed0dae9b0613994842a2 Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Sat, 8 Aug 2020 14:37:12 -0400
Subject: [PATCH] Return preview URLs

---
 .../musicgraph/entities/ArtistDetails.java    |  3 ++-
 .../entities/SpotifyPreviewUrl.java           |  6 +++++
 .../simon987/musicgraph/io/MusicDatabase.java | 24 +++++++++++--------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/simon987/musicgraph/entities/ArtistDetails.java b/src/main/java/net/simon987/musicgraph/entities/ArtistDetails.java
index 3f094a2..0f9d4b1 100644
--- a/src/main/java/net/simon987/musicgraph/entities/ArtistDetails.java
+++ b/src/main/java/net/simon987/musicgraph/entities/ArtistDetails.java
@@ -11,11 +11,12 @@ public class ArtistDetails {
     public List<Release> releases;
     public List<WeightedTag> tags;
     public List<Label> labels;
-    public SpotifyPreviewUrl[] spotifyPreviewUrls;
+    public List<SpotifyPreviewUrl> tracks;
 
     public ArtistDetails() {
         releases = new ArrayList<>();
         tags = new ArrayList<>();
         labels = new ArrayList<>();
+        tracks = new ArrayList<>();
     }
 }
diff --git a/src/main/java/net/simon987/musicgraph/entities/SpotifyPreviewUrl.java b/src/main/java/net/simon987/musicgraph/entities/SpotifyPreviewUrl.java
index 9194092..cca0e09 100644
--- a/src/main/java/net/simon987/musicgraph/entities/SpotifyPreviewUrl.java
+++ b/src/main/java/net/simon987/musicgraph/entities/SpotifyPreviewUrl.java
@@ -4,4 +4,10 @@ public class SpotifyPreviewUrl {
     public String url;
     public String release;
     public String name;
+
+    public SpotifyPreviewUrl(String release, String name, String url) {
+        this.url = url;
+        this.release = release;
+        this.name = name;
+    }
 }
diff --git a/src/main/java/net/simon987/musicgraph/io/MusicDatabase.java b/src/main/java/net/simon987/musicgraph/io/MusicDatabase.java
index dee6467..b0007af 100644
--- a/src/main/java/net/simon987/musicgraph/io/MusicDatabase.java
+++ b/src/main/java/net/simon987/musicgraph/io/MusicDatabase.java
@@ -1,6 +1,5 @@
 package net.simon987.musicgraph.io;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import net.simon987.musicgraph.entities.*;
 import net.simon987.musicgraph.logging.LogManager;
@@ -12,7 +11,6 @@ import org.neo4j.driver.types.Node;
 import org.neo4j.driver.types.Relationship;
 
 import javax.inject.Singleton;
-import javax.validation.constraints.Max;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,9 +86,11 @@ public class MusicDatabase extends AbstractBinder {
                             "WITH collect(DISTINCT {id: ID(r), mbid:r.id, name:r.name, year:r.year, labels:labels(r)}) as releases, a " +
                             "OPTIONAL MATCH (a)-[r:IS_TAGGED]->(t:Tag) " +
                             "WITH collect({weight: r.weight, name: t.name, id:ID(t), tagid:t.id}) as tags, a, releases " +
+                            "OPTIONAL MATCH (a)-[:REL_TRACK]->(tr:Track) " +
+                            "WITH collect({release:tr.album, name:tr.track, url:tr.url}) as tracks, a, releases, tags " +
                             "OPTIONAL MATCH (a)-[r:CREDITED_FOR]->(:Release)-[]-(l:Label) " +
                             "RETURN a {name:a.name, year:a.year, comment:a.comment, releases:releases, tags:tags," +
-                            " track_previews:a.track_previews, labels:collect(DISTINCT {id:ID(l),mbid:l.id,name:l.name})} " +
+                            " tracks:tracks, labels:collect(DISTINCT {id:ID(l),mbid:l.id,name:l.name})} " +
                             "LIMIT 1",
                     params);
 
@@ -140,13 +140,17 @@ public class MusicDatabase extends AbstractBinder {
                                     ))
                                     .collect(Collectors.toList())
                     );
-                    String preview_urls = (String) map.get("track_previews");
-                    if (preview_urls != null) {
-                        ObjectMapper mapper = new ObjectMapper();
-                        details.spotifyPreviewUrls = mapper.readValue(preview_urls, SpotifyPreviewUrl[].class);
-                    } else {
-                        details.spotifyPreviewUrls = new SpotifyPreviewUrl[0];
-                    }
+                    details.tracks.addAll(
+                            ((List<Map>) map.get("tracks"))
+                                    .stream()
+                                    .filter(x -> x.get("release") != null)
+                                    .map(x -> new SpotifyPreviewUrl(
+                                            (String) x.get("release"),
+                                            (String) x.get("name"),
+                                            (String) x.get("url")
+                                    ))
+                                    .collect(Collectors.toList())
+                    );
                 }
             } catch (Exception e) {
                 e.printStackTrace();