Merge pull request #15 from SRGSSR/develop

Set host domain in recommendation id
SRGSSR · Oct 4, 2018 · b3f517f · b3f517f
2 parents d1c9671 + 91e6b01
commit b3f517f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>pfff</artifactId>
-	<version>4</version>
+	<version>5</version>
 	<packaging>jar</packaging>
 
 	<name>pfff</name>

diff --git a/src/main/java/com/example/pfff/model/RecommendedList.java b/src/main/java/com/example/pfff/model/RecommendedList.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -16,8 +18,15 @@ public class RecommendedList {
     private String recommendationId;
     private List<String> urns;
 
-    public RecommendedList(String recommendationId, List<String> urns) {
-        this.recommendationId = recommendationId;
+    public RecommendedList(String host, String recommendationId, List<String> urns) {
+        if (host != null && recommendationId != null) {
+            List<String> components = Arrays.asList(host.split("\\."));
+            Collections.reverse(components);
+            String domain = String.join(".", components.toArray(new String[0]));
+            this.recommendationId = domain + ":" + recommendationId;
+        } else {
+            this.recommendationId = recommendationId;
+        }
         this.urns = urns;
     }
 

diff --git a/src/main/java/com/example/pfff/service/RecommendationService.java b/src/main/java/com/example/pfff/service/RecommendationService.java
@@ -32,7 +32,7 @@ public RecommendedList getRecommendedUrns(String purpose, String urn, boolean st
             System.out.println(url.toUriString());
 
             RecommendationResult recommendationResult = restTemplate.exchange(url.toUriString(), HttpMethod.GET, null, RecommendationResult.class).getBody();
-            return new RecommendedList(recommendationResult.getRecommendationId(), recommendationResult.getUrns());
+            return new RecommendedList(url.getHost(), recommendationResult.getRecommendationId(), recommendationResult.getUrns());
         }
         else {
             return new RecommendedList();

diff --git a/src/test/java/com/example/pfff/controller/RecommendationServiceTests.java b/src/test/java/com/example/pfff/controller/RecommendationServiceTests.java
@@ -26,6 +26,7 @@ public void getRecommendedUrnsContinuousplaybackRTSTest() {
         RecommendedList recommendedList = recommendationService.getRecommendedUrns(purpose, mediaURN, standalone);
 
         Assert.assertNotNull(recommendedList.getRecommendationId());
+        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("io.ebu.peach:"));
         Assert.assertNotNull(recommendedList.getUrns());
     }
 
@@ -37,6 +38,7 @@ public void getRecommendedUrnsContinuousplaybackStandaloneRTSTest() {
         RecommendedList recommendedList = recommendationService.getRecommendedUrns(purpose, mediaURN, standalone);
 
         Assert.assertNotNull(recommendedList.getRecommendationId());
+        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("io.ebu.peach:"));
         Assert.assertNotNull(recommendedList.getUrns());
     }