Skip to content

Commit 637e878

Browse files
committed
Fix Play Android recommendation requests
1 parent 2a55c32 commit 637e878

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/main/java/ch/srgssr/playfff/controller/RecommendationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class RecommendationController {
2222
RecommendationService service;
2323

2424
@Deprecated
25-
@RequestMapping("/api/v1/playlist/recommendation/{purpose}/{urn}")
25+
@RequestMapping({"/api/v1/playlist/recommendation/{purpose}/{urn}", "/api/v1/playlist/recommendation/{purpose}/{urn}.json"})
2626
@ResponseBody
2727
Object recommendationV1(
2828
HttpServletRequest request,
@@ -43,7 +43,7 @@ Object recommendationV1(
4343
}
4444
}
4545

46-
@RequestMapping("/api/v2/playlist/recommendation/{purpose}/{urn}")
46+
@RequestMapping({"/api/v2/playlist/recommendation/{purpose}/{urn}", "/api/v2/playlist/recommendation/{purpose}/{urn}.json"})
4747
@ResponseBody
4848
RecommendedList recommendationV2(
4949
HttpServletRequest request,

src/test/java/ch/srgssr/playfff/controller/RecommendationIntegrationTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ private void getRecommendationURNFormat(String mediaURN, boolean isAvailable) th
159159
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "false").param("format", format)).andExpect(status().isOk()).andExpect(jsonPath("$").isArray());
160160
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "true").param("format", format)).andExpect(status().isOk()).andExpect(jsonPath("$").isArray());
161161

162+
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN + ".json").param("format", format)).andExpect(status().isOk()).andExpect(jsonPath("$").isArray());
163+
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN + ".json").param("standalone", "false").param("format", format)).andExpect(status().isOk()).andExpect(jsonPath("$").isArray());
164+
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN + ".json").param("standalone", "true").param("format", format)).andExpect(status().isOk()).andExpect(jsonPath("$").isArray());
165+
162166
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN).param("format", format)).andExpect(status().isOk()).andExpect(isAvailable ? jsonPath("$[0]").value(mediaURN) : jsonPath("$").isEmpty());
163167
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "false").param("format", format)).andExpect(isAvailable ? jsonPath("$[0]").value(mediaURN) : jsonPath("$").isEmpty());
164168
mvc.perform(get("/api/v1/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "true").param("format", format)).andExpect(isAvailable ? jsonPath("$[0]").value(mediaURN) : jsonPath("$").isEmpty());
@@ -167,6 +171,10 @@ private void getRecommendationURNFormat(String mediaURN, boolean isAvailable) th
167171
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "false")).andExpect(status().isOk()).andExpect(jsonPath("$").isMap());
168172
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "true")).andExpect(status().isOk()).andExpect(jsonPath("$").isMap());
169173

174+
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN + ".json")).andExpect(status().isOk()).andExpect(jsonPath("$").isMap());
175+
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN + ".json").param("standalone", "false")).andExpect(status().isOk()).andExpect(jsonPath("$").isMap());
176+
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN + ".json").param("standalone", "true")).andExpect(status().isOk()).andExpect(jsonPath("$").isMap());
177+
170178
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN)).andExpect(status().isOk()).andExpect(isAvailable ? jsonPath("$.urns[0]").value(mediaURN) : jsonPath("$.urns").isEmpty());
171179
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "false")).andExpect(isAvailable ? jsonPath("$.urns[0]").value(mediaURN) : jsonPath("$.urns").isEmpty());
172180
mvc.perform(get("/api/v2/playlist/recommendation/" + purpose + "/" + mediaURN).param("standalone", "true")).andExpect(isAvailable ? jsonPath("$.urns[0]").value(mediaURN) : jsonPath("$.urns").isEmpty());

0 commit comments

Comments
 (0)