Merge pull request #51 from SRGSSR/develop

Switch RTS recommendation to playfff reco engine 2/2
SRGSSR · Jan 13, 2021 · 1fca9c0 · 1fca9c0
2 parents 70abe0a + a788b85
commit 1fca9c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/docs/RECOMMENDATION.md b/docs/RECOMMENDATION.md
@@ -25,7 +25,7 @@ The API doesn't not support paginations, therefore mobile applications didn't im
 | RTR audios | Pfff RE | Pfff RE |
 | RTR videos | Pfff RE | Pfff RE |
 | RTS audios | Pfff RE | Pfff RE |
-| RTS videos | **RTS RE** | **RTS RE** |
+| RTS videos | Pfff RE | Pfff RE |
 | SRF audios | Pfff RE | **SRF RE** |
 | SRF videos | Pfff RE | **SRF RE** |
 | SWI videos | Pfff RE | Pfff RE |

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>ch.srgssr</groupId>
     <artifactId>playfff</artifactId>
-    <version>28</version>
+    <version>29</version>
     <packaging>jar</packaging>
 
     <name>pfff</name>

diff --git a/src/main/java/ch/srgssr/playfff/service/RecommendationService.java b/src/main/java/ch/srgssr/playfff/service/RecommendationService.java
@@ -39,24 +39,18 @@ public RecommendedList getRecommendedUrns(String purpose, String urnString, bool
             switch (urn.getMam()) {
                 case SRF:
                     return srfRecommendedList(purpose, urnString, standalone);
-                case RTS:
                 case RSI:
                 case RTR:
+                case RTS:
                 case SWI:
                     return pfffRecommendedList(urnString, urn.getMediaType(), standalone);
             }
         }
         else {
             switch (urn.getMam()) {
-                case RTS:
-                    if (urn.getMediaType() == MediaType.VIDEO) {
-                        return rtsVideoRecommendedList(purpose, urnString, standalone);
-                    } else if (urn.getMediaType() == MediaType.AUDIO) {
-                        return pfffRecommendedList(urnString, MediaType.AUDIO, standalone);
-                    }
-                    break;
                 case RSI:
                 case RTR:
+                case RTS:
                 case SRF:
                 case SWI:
                     return pfffRecommendedList(urnString, urn.getMediaType(), standalone);

diff --git a/src/test/java/ch/srgssr/playfff/controller/RecommendationServiceTests.java b/src/test/java/ch/srgssr/playfff/controller/RecommendationServiceTests.java
@@ -24,7 +24,7 @@ public void getRecommendedUrnsContinuousplaybackRTSVideoTest() {
         RecommendedList recommendedList = recommendationService.getRecommendedUrns(purpose, mediaURN, standalone);
 
         Assert.assertNotNull(recommendedList.getRecommendationId());
-        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("net.azure-api.rts-datalab:"));
+        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("ch.srgssr.playfff:EpisodeComposition/LatestByShow/"));
         assertValidList(recommendedList);
     }
 
@@ -36,7 +36,7 @@ public void getRecommendedUrnsContinuousplaybackStandaloneRTSVideoTest() {
         RecommendedList recommendedList = recommendationService.getRecommendedUrns(purpose, mediaURN, standalone);
 
         Assert.assertNotNull(recommendedList.getRecommendationId());
-        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("net.azure-api.rts-datalab:"));
+        Assert.assertTrue(recommendedList.getRecommendationId().startsWith("ch.srgssr.playfff:EpisodeComposition/LatestByShow/"));
         assertValidList(recommendedList);
     }