Don't display deprecated URI in sameAs (#203)

hbz · Oct 10, 2022 · 3872262 · 3872262
1 parent bd52135
commit 3872262
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/models/AuthorityResource.java b/app/models/AuthorityResource.java
@@ -365,7 +365,11 @@ private List<LinkWithImage> getLinks() {
 		String dnbIcon = "https://portal.dnb.de/favicon.ico";
 		String dnbLabel = "Deutsche Nationalbibliothek (DNB)";
 		String dnbSubstring = "d-nb.info/gnd";
-		List<LinkWithImage> result = sameAs == null ? Collections.emptyList() : sameAs.stream().map(map -> {
+		JsonNode deprecatedUriNode = json.get("deprecatedUri");
+		List<LinkWithImage> result = sameAs == null ? Collections.emptyList()
+				: (deprecatedUriNode == null || deprecatedUriNode.size() == 0 ? sameAs.stream()
+						: nonDeprecated(deprecatedUriNode))
+						.map(map -> {
 			String url = map.get("id").toString();
 			Object icon = null;
 			Object label = null;
@@ -384,6 +388,11 @@ private List<LinkWithImage> getLinks() {
 		return result;
 	}
 
+	private Stream<Map<String, Object>> nonDeprecated(JsonNode deprecatedUriNode) {
+		return sameAs.stream()
+				.filter(sameAsObject -> !sameAsObject.get("id").equals(deprecatedUriNode.get(0).textValue()));
+	}
+
 	private String html(String field, ArrayList<LinkWithImage> links, int i) {
 		LinkWithImage link = links.get(i);
 		boolean hasImage = !link.image.isEmpty();