Commit 8f045a16 authored by Laura Heimann's avatar Laura Heimann

removed unneccessary code due to path integration in entity

parent 836bc284
......@@ -31,22 +31,12 @@ class APIUserController extends AbstractController
$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' => []]);
return $response;
} else {
$data['id'] = $result->getId();
$data['username'] = $result->getUsername();
$data['isVerified'] = $result->getIsVerified();
$data['isPatreon'] = $result->getIsPatreon();
$data['pronouns'] = $result->getPronouns();
if($result->getCoverReference()) {
$data['avatar'] = $baseUrl."/uploads/avatar/".$result->getCoverReference();
} else {
$data['avatar'] = $baseUrl."/assets/img/defaultAvatar.jpg";
}
$data = $result->getJSON();
// Get User Lists
$resultsSongs = $em->getRepository(Song::class)->findBy(array('uploader' => $result->getId(), 'publicationStatus' => array(0, 1)), array('uploadDate' => 'DESC'));
......@@ -62,15 +52,7 @@ class APIUserController extends AbstractController
$data['cards'] = [];
foreach($resultsCards as $result) {
$oneResult = [];
$oneResult['id'] = $result->getId();
$oneResult['icon'] = $baseUrl."/uploads/card/".$result->getCard()->getIcon();
$oneResult['title'] = $result->getCard()->getTitle();
$oneResult['givenDate'] = $result->getGivenDate();
$oneResult['description'] = $result->getCard()->getDescription();
$data['cards'][] = $oneResult;
$data['cards'][] = $result->getJSON();
}
$response = new JsonResponse(['version' => $this->getParameter('api_version'), 'status' => 200, 'data' => $data]);
......@@ -132,7 +114,6 @@ class APIUserController extends AbstractController
$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' => []]);
......@@ -159,7 +140,6 @@ class APIUserController extends AbstractController
$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' => []]);
......@@ -168,10 +148,7 @@ class APIUserController extends AbstractController
$resultsPlaylists = $em->getRepository(SongPlaylist::class)->findBy(array('user' => $result->getId()), array('id' => 'DESC'));
foreach($resultsPlaylists as $result) {
$newItem = $result->getJSON();
$newItem['cover'] = $baseUrl."/uploads/cover/".$result->getFileReference().".png";
$data[] = $newItem;
$data[] = $result->getJSON();
}
$response = new JsonResponse(['version' => $this->getParameter('api_version'), 'status' => 200, 'data' => $data]);
......@@ -189,7 +166,6 @@ class APIUserController extends AbstractController
$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' => []]);
......
......@@ -24,7 +24,6 @@ class APIConnectUserController extends AbstractController
public function getProfile(Request $request)
{
$em = $this->getDoctrine()->getManager();
$baseUrl = $request->getScheme() . '://' . $request->getHttpHost() . $request->getBasePath();
$data = [];
$connectToken = $request->query->get('connectToken');
......@@ -37,15 +36,7 @@ class APIConnectUserController extends AbstractController
$connection = $em->getRepository(Connection::class)->findOneBy(array('connectToken' => $connectToken));
if($connection) {
$data['id'] = $connection->getUser()->getId();
$data['username'] = $connection->getUser()->getUsername();
$data['isVerified'] = $connection->getUser()->getIsVerified();
$data['isPatreon'] = $connection->getUser()->getIsPatreon();
if($connection->getUser()->getCoverReference()) {
$data['avatar'] = $baseUrl."/uploads/avatar/".$connection->getUser()->getCoverReference();
} else {
$data['avatar'] = $baseUrl."/assets/img/defaultAvatar.jpg";
}
$data = $connection->getUser()->getJSON();
$response = new JsonResponse(['version' => $this->getParameter('api_version'), 'status' => 200, 'data' => $data]);
return $response;
......
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