Commit b4269e4b authored by Andreas Heimann's avatar Andreas Heimann

added slash links, fixed search not allowing slashes

parent 1473d3dc
...@@ -21,6 +21,7 @@ class APIClientController extends AbstractController ...@@ -21,6 +21,7 @@ class APIClientController extends AbstractController
{ {
/** /**
* @Route("/api/latestVersion/{platform}", name="api.latestVersion") * @Route("/api/latestVersion/{platform}", name="api.latestVersion")
* @Route("/api/latestVersion/{platform}/")
*/ */
public function latestVersion(string $platform) public function latestVersion(string $platform)
{ {
......
...@@ -21,6 +21,7 @@ class APIDiscoveryController extends AbstractController ...@@ -21,6 +21,7 @@ class APIDiscoveryController extends AbstractController
{ {
/** /**
* @Route("/api/songs/new/{offset}", name="api.songs.new") * @Route("/api/songs/new/{offset}", name="api.songs.new")
* @Route("/api/songs/new/{offset}/")
*/ */
public function songsNew(Request $request, int $offset = 0) public function songsNew(Request $request, int $offset = 0)
{ {
...@@ -56,6 +57,7 @@ class APIDiscoveryController extends AbstractController ...@@ -56,6 +57,7 @@ class APIDiscoveryController extends AbstractController
/** /**
* @Route("/api/songs/hot/{offset}", name="api.songs.hot") * @Route("/api/songs/hot/{offset}", name="api.songs.hot")
* @Route("/api/songs/hot/{offset}/")
*/ */
public function songsHot(Request $request, int $offset = 0) public function songsHot(Request $request, int $offset = 0)
{ {
...@@ -91,6 +93,7 @@ class APIDiscoveryController extends AbstractController ...@@ -91,6 +93,7 @@ class APIDiscoveryController extends AbstractController
/** /**
* @Route("/api/songs/popular/{offset}", name="api.songs.popular") * @Route("/api/songs/popular/{offset}", name="api.songs.popular")
* @Route("/api/songs/popular/{offset}/")
*/ */
public function songsPopular(Request $request, int $offset = 0) public function songsPopular(Request $request, int $offset = 0)
{ {
...@@ -104,7 +107,8 @@ class APIDiscoveryController extends AbstractController ...@@ -104,7 +107,8 @@ class APIDiscoveryController extends AbstractController
} }
/** /**
* @Route("/api/search/{searchQuery}", name="api.search") * @Route("/api/search/{searchQuery}", name="api.search", requirements={"token"=".+"})
* @Route("/api/search/{searchQuery}/", requirements={"token"=".+"})
*/ */
public function search(Request $request, string $searchQuery) public function search(Request $request, string $searchQuery)
{ {
...@@ -178,6 +182,7 @@ class APIDiscoveryController extends AbstractController ...@@ -178,6 +182,7 @@ class APIDiscoveryController extends AbstractController
/** /**
* @Route("/api/searchAll", name="api.search.all") * @Route("/api/searchAll", name="api.search.all")
* @Route("/api/searchAll/")
*/ */
public function searchAll(Request $request) public function searchAll(Request $request)
{ {
......
...@@ -21,6 +21,7 @@ class APIPingController extends AbstractController ...@@ -21,6 +21,7 @@ class APIPingController extends AbstractController
{ {
/** /**
* @Route("/api/ping", name="api.ping") * @Route("/api/ping", name="api.ping")
* @Route("/api/ping/")
*/ */
public function ping() public function ping()
{ {
......
...@@ -21,6 +21,7 @@ class APIPromosController extends AbstractController ...@@ -21,6 +21,7 @@ class APIPromosController extends AbstractController
{ {
/** /**
* @Route("/api/promos", name="api.promos") * @Route("/api/promos", name="api.promos")
* @Route("/api/promos/")
*/ */
public function promos(Request $request) public function promos(Request $request)
{ {
......
...@@ -21,6 +21,7 @@ class APISongController extends AbstractController ...@@ -21,6 +21,7 @@ class APISongController extends AbstractController
{ {
/** /**
* @Route("/api/song/{idOrReference}", name="api.songs.detail") * @Route("/api/song/{idOrReference}", name="api.songs.detail")
* @Route("/api/song/{idOrReference}/")
*/ */
public function songDetail(Request $request, $idOrReference) public function songDetail(Request $request, $idOrReference)
{ {
...@@ -58,6 +59,7 @@ class APISongController extends AbstractController ...@@ -58,6 +59,7 @@ class APISongController extends AbstractController
/** /**
* @Route("/api/song/{idOrReference}/reviews", name="api.songs.detail.reviews") * @Route("/api/song/{idOrReference}/reviews", name="api.songs.detail.reviews")
* @Route("/api/song/{idOrReference}/reviews/")
*/ */
public function songDetailReviews(Request $request, $idOrReference) public function songDetailReviews(Request $request, $idOrReference)
{ {
...@@ -95,6 +97,7 @@ class APISongController extends AbstractController ...@@ -95,6 +97,7 @@ class APISongController extends AbstractController
/** /**
* @Route("/api/song/{idOrReference}/spinplays", name="api.songs.detail.spinplays") * @Route("/api/song/{idOrReference}/spinplays", name="api.songs.detail.spinplays")
* @Route("/api/song/{idOrReference}/spinplays/")
*/ */
public function songDetailSpinPlays(Request $request, $idOrReference) public function songDetailSpinPlays(Request $request, $idOrReference)
{ {
...@@ -129,6 +132,7 @@ class APISongController extends AbstractController ...@@ -129,6 +132,7 @@ class APISongController extends AbstractController
/** /**
* @Route("/api/song/{id}/download", name="api.songs.download") * @Route("/api/song/{id}/download", name="api.songs.download")
* @Route("/api/song/{id}/download/")
*/ */
public function songDownload(int $id) public function songDownload(int $id)
{ {
......
...@@ -20,6 +20,7 @@ class APISongPlaylistController extends AbstractController ...@@ -20,6 +20,7 @@ class APISongPlaylistController extends AbstractController
{ {
/** /**
* @Route("/api/playlist/{id}", name="api.playlist.detail") * @Route("/api/playlist/{id}", name="api.playlist.detail")
* @Route("/api/playlist/{id}/")
* @param Request $request * @param Request $request
* @param $id * @param $id
* @return JsonResponse * @return JsonResponse
......
...@@ -21,6 +21,7 @@ class APIStreamStatusController extends AbstractController ...@@ -21,6 +21,7 @@ class APIStreamStatusController extends AbstractController
{ {
/** /**
* @Route("/api/streamStatus", name="api.streamStatus") * @Route("/api/streamStatus", name="api.streamStatus")
* @Route("/api/streamStatus/")
*/ */
public function streamStatus() public function streamStatus()
{ {
......
...@@ -13,6 +13,7 @@ use Symfony\Component\HttpClient\HttpClient; ...@@ -13,6 +13,7 @@ use Symfony\Component\HttpClient\HttpClient;
use App\Entity\ClientRelease; use App\Entity\ClientRelease;
use App\Entity\Song; use App\Entity\Song;
use App\Entity\SongReview; use App\Entity\SongReview;
use App\Entity\SongPlaylist;
use App\Entity\SongSpinPlay; use App\Entity\SongSpinPlay;
use App\Entity\User; use App\Entity\User;
use App\Entity\UserCard; use App\Entity\UserCard;
...@@ -22,6 +23,7 @@ class APIUserController extends AbstractController ...@@ -22,6 +23,7 @@ class APIUserController extends AbstractController
{ {
/** /**
* @Route("/api/user/{userId}", name="api.users.detail") * @Route("/api/user/{userId}", name="api.users.detail")
* @Route("/api/user/{userId}/")
*/ */
public function userDetail(Request $request, int $userId) public function userDetail(Request $request, int $userId)
{ {
...@@ -78,6 +80,7 @@ class APIUserController extends AbstractController ...@@ -78,6 +80,7 @@ class APIUserController extends AbstractController
/** /**
* @Route("/api/user/{userId}/charts", name="api.users.detail.charts") * @Route("/api/user/{userId}/charts", name="api.users.detail.charts")
* @Route("/api/user/{userId}/charts/")
*/ */
public function userDetailCharts(Request $request, int $userId) public function userDetailCharts(Request $request, int $userId)
{ {
...@@ -123,6 +126,7 @@ class APIUserController extends AbstractController ...@@ -123,6 +126,7 @@ class APIUserController extends AbstractController
/** /**
* @Route("/api/user/{userId}/reviews", name="api.users.detail.reviews") * @Route("/api/user/{userId}/reviews", name="api.users.detail.reviews")
* @Route("/api/user/{userId}/reviews/")
*/ */
public function userDetailReviews(Request $request, int $userId) public function userDetailReviews(Request $request, int $userId)
{ {
...@@ -148,9 +152,39 @@ class APIUserController extends AbstractController ...@@ -148,9 +152,39 @@ class APIUserController extends AbstractController
return $response; return $response;
} }
} }
/**
* @Route("/api/user/{userId}/playlists", name="api.users.detail.playlists")
* @Route("/api/user/{userId}/playlists/")
*/
public function userDetailPlaylists(Request $request, int $userId)
{
$em = $this->getDoctrine()->getManager();
$data = [];
$result = $em->getRepository(User::class)->findOneBy(array('id' => $userId));
$baseUrl = $request->getScheme() . '://' . $request->getHttpHost() . $request->getBasePath();
if(!$result) {
$response = new JsonResponse(['version' => $this->getParameter('api_version'), 'status' => 404, 'data' => []]);
$response->headers->set('Access-Control-Allow-Origin', '*');
return $response;
} else {
$resultsReviews = $em->getRepository(SongPlaylist::class)->findBy(array('user' => $result->getId()), array('id' => 'DESC'));
foreach($resultsReviews as $result) {
$data[] = $result->getJSON();
}
$response = new JsonResponse(['version' => $this->getParameter('api_version'), 'status' => 200, 'data' => $data]);
$response->headers->set('Access-Control-Allow-Origin', '*');
return $response;
}
}
/** /**
* @Route("/api/user/{userId}/spinplays", name="api.users.detail.spinplays") * @Route("/api/user/{userId}/spinplays", name="api.users.detail.spinplays")
* @Route("/api/user/{userId}/spinplays/")
*/ */
public function userDetailSpinPlays(Request $request, int $userId) public function userDetailSpinPlays(Request $request, int $userId)
{ {
......
...@@ -18,6 +18,7 @@ class APIConnectController extends AbstractController ...@@ -18,6 +18,7 @@ class APIConnectController extends AbstractController
{ {
/** /**
* @Route("/api/connect/generateCode", name="api.connect.generateCode") * @Route("/api/connect/generateCode", name="api.connect.generateCode")
* @Route("/api/connect/generateCode/")
*/ */
public function generateCode() public function generateCode()
{ {
...@@ -44,6 +45,7 @@ class APIConnectController extends AbstractController ...@@ -44,6 +45,7 @@ class APIConnectController extends AbstractController
} }
/** /**
* @Route("/api/connect/getToken", name="api.connect.getToken") * @Route("/api/connect/getToken", name="api.connect.getToken")
* @Route("/api/connect/getToken/")
*/ */
public function getToken(Request $request) public function getToken(Request $request)
{ {
...@@ -91,7 +93,8 @@ class APIConnectController extends AbstractController ...@@ -91,7 +93,8 @@ class APIConnectController extends AbstractController
} }
/** /**
* @Route("/api/connect/validateToken/", name="api.connect.validateToken") * @Route("/api/connect/validateToken", name="api.connect.validateToken")
* @Route("/api/connect/validateToken/")
*/ */
public function validateToken(Request $request) public function validateToken(Request $request)
{ {
......
...@@ -22,6 +22,7 @@ class APIConnectReviewsController extends AbstractController ...@@ -22,6 +22,7 @@ class APIConnectReviewsController extends AbstractController
/** /**
* @Route("/api/connect/reviews/{songID}/get", name="api.connect.reviews.get") * @Route("/api/connect/reviews/{songID}/get", name="api.connect.reviews.get")
* @Route("/api/connect/reviews/{songID}/get/")
*/ */
public function getReview(Request $request, $songID) public function getReview(Request $request, $songID)
{ {
...@@ -71,6 +72,7 @@ class APIConnectReviewsController extends AbstractController ...@@ -71,6 +72,7 @@ class APIConnectReviewsController extends AbstractController
/** /**
* @Route("/api/connect/reviews/{songID}/add", name="api.connect.reviews.add") * @Route("/api/connect/reviews/{songID}/add", name="api.connect.reviews.add")
* @Route("/api/connect/reviews/{songID}/add/")
*/ */
public function addReview(Request $request, $songID) public function addReview(Request $request, $songID)
{ {
......
...@@ -18,7 +18,8 @@ class APIConnectUserController extends AbstractController ...@@ -18,7 +18,8 @@ class APIConnectUserController extends AbstractController
{ {
/** /**
* @Route("/api/connect/profile/", name="api.connect.profile") * @Route("/api/connect/profile", name="api.connect.profile")
* @Route("/api/connect/profile/")
*/ */
public function getProfile(Request $request) public function getProfile(Request $request)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment